Fix win32 wx-console stdout crash

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1315 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index a5407b0ea486c184036150a3a737b7e6ae8fd1f2..fe7ddfaa3893b3d94aacafb21c5d50b1ee80cbe4 100755 (executable)
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -205,7 +205,9 @@ init_msg(JCR *jcr, MSGS *msg)
       daemon_msgs = (MSGS *)malloc(sizeof(MSGS));
       memset(daemon_msgs, 0, sizeof(MSGS));
       for (i=1; i<=M_MAX; i++) {
+#ifndef WIN32
         add_msg_dest(daemon_msgs, MD_STDOUT, i, NULL, NULL);
+#endif
         add_msg_dest(daemon_msgs, MD_SYSLOG, i, NULL, NULL);
       }
       Dmsg1(050, "Create daemon global message resource 0x%x\n", daemon_msgs);
@@ -560,8 +562,10 @@ void dispatch_message(JCR *jcr, int type, int level, char *msg)
     Dmsg2(800, "Enter dispatch_msg type=%d msg=%s\n", type, msg);
 
     if (type == M_ABORT || type == M_ERROR_TERM) {
+#ifndef HAVE_WIN32
        fputs(msg, stdout);        /* print this here to INSURE that it is printed */
        fflush(stdout);
+#endif
 #if !defined(HAVE_CONSOLE)
 #if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
        MessageBox(NULL, msg, "Bacula", MB_OK);

diff --git a/bacula/src/win32/Makefile.in b/bacula/src/win32/Makefile.in
index cf800d3f1fc7b12456956a605da0fec54aa0aa46..e50f33cda3d5423bb1d646328022863a895ae45b 100644 (file)
--- a/bacula/src/win32/Makefile.in
+++ b/bacula/src/win32/Makefile.in
@@ -65,6 +65,8 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status winbacula.nsi.in
 
 clean:
        (cd baculafd; make clean)
+       (cd console; make clean)
+       (cd wx-console; make clean)
 
 distclean: clean
        rm -rf baculafd/Release baculafd/Debug

diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp
index 017c5443ca254eb784a3a7b627c946e830d87306..00cd10e8acd3a00a120c74f74207fe4b2bb57585 100644 (file)
--- a/bacula/src/win32/compat/compat.cpp
+++ b/bacula/src/win32/compat/compat.cpp
@@ -479,8 +479,11 @@ gettimeofday(struct timeval *tv, struct timezone *)
 }
 
 int
-syslog(int, const char *, const char *)
+syslog(int type, const char *fmt, const char *msg)
 {
+#ifndef HAVE_CONSOLE
+    MessageBox(NULL, msg, "Bacula", MB_OK);
+#endif
     return 0;
 }
 
@@ -1166,7 +1169,7 @@ write(int fd, const void *buf, size_t len)
 off_t
 lseek(int fd, off_t offset, int whence)
 {
-    return _lseeki64(fd, offset, whence);
+    return (off_t)_lseeki64(fd, offset, whence);
 }
 
 int

diff --git a/bacula/src/win32/wx-console/wx-console.mak b/bacula/src/win32/wx-console/wx-console.mak
index df78235e9cb0661c612b1c420972d49a8c0551e9..68a910e651fd719cfc89065ed6fb2e5fac42a132 100644 (file)
--- a/bacula/src/win32/wx-console/wx-console.mak
+++ b/bacula/src/win32/wx-console/wx-console.mak
@@ -92,7 +92,7 @@ CLEAN :
        -@erase "$(INTDIR)\wxbtableparser.obj"
        -@erase "$(INTDIR)\wxbtreectrl.obj"
        -@erase "$(INTDIR)\wxbutils.obj"
-       -@erase "$(OUTDIR)\wx-console.exe"
+        -@erase "$(OUTDIR)\wx-console.exe"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -102,7 +102,7 @@ RSC_PROJ=/l 0x409 /fo"$(INTDIR)\winres.res" /d "NDEBUG"
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\wx-console.bsc" 
 BSC32_SBRS= \
-       
+        
 LINK32=link.exe
 LINK32_FLAGS=wxmsw.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib winmm.lib \
   comctl32.lib comdlg32.lib Shell32.lib AdvAPI32.lib User32.lib Gdi32.lib wsock32.lib \
@@ -161,7 +161,7 @@ LINK32_OBJS= \
        "$(INTDIR)\wxbtableparser.obj" \
        "$(INTDIR)\wxbtreectrl.obj" \
        "$(INTDIR)\wxbutils.obj" \
-       "$(INTDIR)\wx-console_private.res"
+        "$(INTDIR)\wx-console_private.res"
 
 "$(OUTDIR)\wx-console.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -283,14 +283,14 @@ CLEAN :
        -@erase "$(INTDIR)\wxbtreectrl.sbr"
        -@erase "$(INTDIR)\wxbutils.obj
        -@erase "$(INTDIR)\wxbutils.sbr"
-       -@erase "$(OUTDIR)\wx-console.exe"
-       -@erase "$(OUTDIR)\wx-console.bsc"
+        -@erase "$(OUTDIR)\wx-console.exe"
+        -@erase "$(OUTDIR)\wx-console.bsc"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "../compat" /I "../.." /I "../../../depkgs-win32/wx/include" /I "../../../../depkgs-win32/wx/include" /I "../../../../depkgs-win32/wx/lib/msw" /I "../../../../depkgs-win32/pthreads" /I "../../../../depkgs-win32/zlib" /I "." /D "_DEBUG" /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /D "HAVE_WXCONSOLE" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "../compat" /I "../.." /I "../../../depkgs-win32/wx/include" /I "../../../../depkgs-win32/wx/include" /I "../../../../depkgs-win32/wx/lib/mswd" /I "../../../../depkgs-win32/pthreads" /I "../../../../depkgs-win32/zlib" /I "." /D "_DEBUG" /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /D "HAVE_WXCONSOLE" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\winres.res" /d "_DEBUG"
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\wx-console.bsc" 
@@ -411,7 +411,7 @@ LINK32_OBJS= \
        "$(INTDIR)\wxbtableparser.obj" \
        "$(INTDIR)\wxbtreectrl.obj" \
        "$(INTDIR)\wxbutils.obj" \
-       "$(INTDIR)\wx-console_private.res"
+        "$(INTDIR)\wx-console_private.res"
 
 "$(OUTDIR)\wx-console.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -462,7 +462,7 @@ LINK32_OBJS= \
 SOURCE=..\..\wx-console\wx-console_private.rc
 
 "$(INTDIR)\wx-console_private.res" : $(SOURCE) "$(INTDIR)"
-       $(RSC) /l 0x409 /fo"$(INTDIR)\wx-console_private.res" /d "NDEBUG" $(SOURCE)
+        $(RSC) /l 0x409 /fo"$(INTDIR)\wx-console_private.res" /d "NDEBUG" $(SOURCE)
 
 FILENAME=alist
 SOURCE=..\lib\alist.cpp
@@ -1453,4 +1453,3 @@ SOURCE=..\..\wx-console\wxbutils.cpp
 
 
 
-

diff --git a/bacula/src/win32/wx-console/wx-console.mak.in b/bacula/src/win32/wx-console/wx-console.mak.in
index 02f7776b4ce4c350805b6d3e2ce423486bcf84ef..9e58009249d634167b907d06d1935b0b3765873a 100644 (file)
--- a/bacula/src/win32/wx-console/wx-console.mak.in
+++ b/bacula/src/win32/wx-console/wx-console.mak.in
@@ -40,8 +40,8 @@ ALL : "$(OUTDIR)\wx-console.exe"
 
 
 CLEAN :
-       @@REL-CLEAN@@
-       -@erase "$(OUTDIR)\wx-console.exe"
+        @@REL-CLEAN@@
+        -@erase "$(OUTDIR)\wx-console.exe"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -51,15 +51,15 @@ RSC_PROJ=/l 0x409 /fo"$(INTDIR)\winres.res" /d "NDEBUG"
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\wx-console.bsc" 
 BSC32_SBRS= \
-       
+        
 LINK32=link.exe
 LINK32_FLAGS=wxmsw.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib winmm.lib \
   comctl32.lib comdlg32.lib Shell32.lib AdvAPI32.lib User32.lib Gdi32.lib wsock32.lib \
   wldap32.lib pthreadVCE.lib zlib.lib /nodefaultlib:libcmt.lib \
   /nologo /subsystem:windows /machine:I386 /out:"$(OUTDIR)\wx-console.exe" /libpath:"../../../../depkgs-win32/wx/lib" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" 
 LINK32_OBJS= \
-       @@REL-OBJS@@
-       "$(INTDIR)\wx-console_private.res"
+        @@REL-OBJS@@
+        "$(INTDIR)\wx-console_private.res"
 
 "$(OUTDIR)\wx-console.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -77,20 +77,20 @@ OutDir=.\Debug
 ALL : "$(OUTDIR)\wx-console.exe" "$(OUTDIR)\wx-console.bsc"
 
 CLEAN :
-       @@DEB-CLEAN@@
-       -@erase "$(OUTDIR)\wx-console.exe"
-       -@erase "$(OUTDIR)\wx-console.bsc"
+        @@DEB-CLEAN@@
+        -@erase "$(OUTDIR)\wx-console.exe"
+        -@erase "$(OUTDIR)\wx-console.bsc"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "../compat" /I "../.." /I "../../../depkgs-win32/wx/include" /I "../../../../depkgs-win32/wx/include" /I "../../../../depkgs-win32/wx/lib/msw" /I "../../../../depkgs-win32/pthreads" /I "../../../../depkgs-win32/zlib" /I "." /D "_DEBUG" /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /D "HAVE_WXCONSOLE" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "../compat" /I "../.." /I "../../../depkgs-win32/wx/include" /I "../../../../depkgs-win32/wx/include" /I "../../../../depkgs-win32/wx/lib/mswd" /I "../../../../depkgs-win32/pthreads" /I "../../../../depkgs-win32/zlib" /I "." /D "_DEBUG" /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /D "HAVE_WXCONSOLE" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\winres.res" /d "_DEBUG"
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\wx-console.bsc" 
 BSC32_SBRS= \
-       @@DEB-SBRS@@
+        @@DEB-SBRS@@
 
 "$(OUTDIR)\wx-console.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
     $(BSC32) @<<
@@ -103,8 +103,8 @@ LINK32_FLAGS=wxmswd.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib
   wldap32.lib pthreadVCE.lib zlib.lib /nodefaultlib:libcmtd.lib \
   /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"$(OUTDIR)\wx-console.exe" /libpath:"../../../../depkgs-win32/wx/lib" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" 
 LINK32_OBJS= \
-       @@DEB-OBJS@@
-       "$(INTDIR)\wx-console_private.res"
+        @@DEB-OBJS@@
+        "$(INTDIR)\wx-console_private.res"
 
 "$(OUTDIR)\wx-console.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -155,8 +155,7 @@ LINK32_OBJS= \
 SOURCE=..\..\wx-console\wx-console_private.rc
 
 "$(INTDIR)\wx-console_private.res" : $(SOURCE) "$(INTDIR)"
-       $(RSC) /l 0x409 /fo"$(INTDIR)\wx-console_private.res" /d "NDEBUG" $(SOURCE)
+        $(RSC) /l 0x409 /fo"$(INTDIR)\wx-console_private.res" /d "NDEBUG" $(SOURCE)
 
 @@OBJTARGETS@@
 
-