applied patch to build wxMSW with CW7 (patch 550445)

[wxWidgets.git] / src / os2 / utilsexc.cpp

diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index 88048a5d18896941a105924bb0a94b6e9e374a0d..82318cbcaf845b86136e1b01414ca8493bc2517a 100644 (file)
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -25,17 +25,17 @@
 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 

-#define INCL_DOSPROCESS
-#define INCL_DOSERRORS
-#define INCL_DOS
-#include <os2.h>

 #define PURE_32
 #define PURE_32

+#ifndef __EMX__

 #include <upm.h>
 #include <netcons.h>
 #include <netbios.h>
 #include <upm.h>
 #include <netcons.h>
 #include <netbios.h>

+#endif

 
 #include <ctype.h>
 
 #include <ctype.h>

-#include <direct.h>
+#ifdef __EMX__
+#include <dirent.h>
+#endif

 
 #include <sys/stat.h>
 #include <io.h>
 
 #include <sys/stat.h>
 #include <io.h>


@@ -46,6 +46,7 @@
 #include <errno.h>
 #include <stdarg.h>
 
 #include <errno.h>
 #include <stdarg.h>
 

+

 // this message is sent when the process we're waiting for terminates
 #define wxWM_PROC_TERMINATED (WM_USER + 10000)
 
 // this message is sent when the process we're waiting for terminates
 #define wxWM_PROC_TERMINATED (WM_USER + 10000)
 


@@ -59,7 +60,7 @@ struct wxExecuteData
 public:
     ~wxExecuteData()
     {
 public:
     ~wxExecuteData()
     {

-        cout << "Closing thread: " << endl;
+//         cout << "Closing thread: " << endl;

         DosExit(EXIT_PROCESS, 0);
     }
 
         DosExit(EXIT_PROCESS, 0);
     }
 


@@ -77,7 +78,7 @@ static ULONG wxExecuteThread(
     ULONG                           ulRc;
     PID                             vPidChild;
 
     ULONG                           ulRc;
     PID                             vPidChild;
 

-    cout << "Executing thread: " << endl;
+//     cout << "Executing thread: " << endl;

 
     ulRc = ::DosWaitChild( DCWA_PROCESSTREE
                           ,DCWW_NOWAIT
 
     ulRc = ::DosWaitChild( DCWA_PROCESSTREE
                           ,DCWW_NOWAIT


@@ -129,17 +130,15 @@ MRESULT APIENTRY wxExecuteWindowCbk(
     return 0;
 }
 
     return 0;
 }
 

-extern wxChar wxPanelClassName[];
-

 long wxExecute(
   const wxString&                   rCommand
 long wxExecute(
   const wxString&                   rCommand

-, bool                              bSync
+, int                               flags

 , wxProcess*                        pHandler
 )
 {
     if (rCommand.IsEmpty())
     {
 , wxProcess*                        pHandler
 )
 {
     if (rCommand.IsEmpty())
     {

-        cout << "empty command in wxExecute." << endl;
+//         cout << "empty command in wxExecute." << endl;

         return 0;
     }
 
         return 0;
     }
 


@@ -154,7 +153,7 @@ long wxExecute(
     PFNWP                           pOldProc;
     TID                             vTID;
 
     PFNWP                           pOldProc;
     TID                             vTID;
 

-    if (bSync)
+    if (flags & wxEXEC_SYNC)

         ulExecFlag = EXEC_SYNC;
     else
         ulExecFlag = EXEC_ASYNCRESULT;
         ulExecFlag = EXEC_SYNC;
     else
         ulExecFlag = EXEC_ASYNCRESULT;


@@ -172,14 +171,14 @@ long wxExecute(
         wxLogSysError(_("Execution of command '%s' failed with error: %ul"), rCommand.c_str(), rc);
         return 0;
     }
         wxLogSysError(_("Execution of command '%s' failed with error: %ul"), rCommand.c_str(), rc);
         return 0;
     }

-    cout << "Executing: " << rCommand.c_str() << endl;
+//     cout << "Executing: " << rCommand.c_str() << endl;

     // Alloc data
     wxExecuteData*                  pData = new wxExecuteData;
 
     pData->vResultCodes = vResultCodes;
     pData->hWnd         = NULLHANDLE;
     // Alloc data
     wxExecuteData*                  pData = new wxExecuteData;
 
     pData->vResultCodes = vResultCodes;
     pData->hWnd         = NULLHANDLE;

-    pData->bState       = bSync;
-    if (bSync)
+    pData->bState       = (flags & wxEXEC_SYNC) != 0;
+    if (flags & wxEXEC_SYNC)

     {
         wxASSERT_MSG(!pHandler, wxT("wxProcess param ignored for sync execution"));
         pData->pHandler = NULL;
     {
         wxASSERT_MSG(!pHandler, wxT("wxProcess param ignored for sync execution"));
         pData->pHandler = NULL;


@@ -204,7 +203,7 @@ long wxExecute(
         // the process still started up successfully...
         return vResultCodes.codeTerminate;
     }
         // the process still started up successfully...
         return vResultCodes.codeTerminate;
     }

-    if (!bSync)
+    if (!(flags & wxEXEC_SYNC))

     {
         // return the pid
         // warning: don't exit your app unless you actively
     {
         // return the pid
         // warning: don't exit your app unless you actively


@@ -226,7 +225,7 @@ long wxExecute(
 
 long wxExecute(
   char**                            ppArgv
 
 long wxExecute(
   char**                            ppArgv

-, bool                              bSync
+, int                               flags

 , wxProcess*                        pHandler
 )
 {
 , wxProcess*                        pHandler
 )
 {


@@ -238,7 +237,7 @@ long wxExecute(
     }
     sCommand.RemoveLast();
     return wxExecute( sCommand
     }
     sCommand.RemoveLast();
     return wxExecute( sCommand

-                     ,bSync
+                     ,flags

                      ,pHandler
                     );
 }
                      ,pHandler
                     );
 }


@@ -252,9 +251,9 @@ bool wxGetFullHostName(
     char                            zServer[256];
     char                            zComputer[256];
     unsigned long                   ulLevel = 0;
     char                            zServer[256];
     char                            zComputer[256];
     unsigned long                   ulLevel = 0;

-    unsigned char*                  zBuffer;
-    unsigned long                   ulBuffer;
-    unsigned long*                  pulTotalAvail;
+    unsigned char*                  zBuffer = NULL;
+    unsigned long                   ulBuffer = 256;
+    unsigned long*                  pulTotalAvail = NULL;

 
     NetBios32GetInfo( (const unsigned char*)zServer
                      ,(const unsigned char*)zComputer
 
     NetBios32GetInfo( (const unsigned char*)zServer
                      ,(const unsigned char*)zComputer