fixing osx_carbon

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

diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index cc19f5cad29f8082d1f20b96f1783e958c9b7e8f..199781f7cfbdb052d1b40f6becef40b15df8dd57 100644 (file)
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -1,32 +1,41 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utilsexec.cpp
+// Name:        src/os2/utilsexec.cpp

 // Purpose:     Various utilities
 // Author:      David Webster
 // Modified by:
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     Various utilities
 // Author:      David Webster
 // Modified by:
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

-#include "wx/setup.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/intl.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"
-

 #include "wx/process.h"
 
 #include "wx/os2/private.h"
 
 #include "wx/process.h"
 
 #include "wx/os2/private.h"
 

+#define PURE_32
+#ifndef __EMX__
+    #include <upm.h>
+    #ifndef __WATCOMC__
+        #include <netcons.h>
+        #include <netbios.h>
+    #endif
+#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>


@@ -37,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)
 


@@ -50,48 +60,44 @@ struct wxExecuteData
 public:
     ~wxExecuteData()
     {
 public:
     ~wxExecuteData()
     {

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

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

-    HWND                            hWnd;          // window to send wxWM_PROC_TERMINATED to [not used]
-    RESULTCODES                     vResultCodes;
-    wxProcess*                      pHandler;
-    ULONG                           ulExitCode;    // the exit code of the process
-    bool                            bState;        // set to FALSE when the process finishes
+    HWND         hWnd;          // window to send wxWM_PROC_TERMINATED to [not used]
+    RESULTCODES  vResultCodes;
+    wxProcess*   pHandler;
+    ULONG        ulExitCode;    // the exit code of the process
+    bool         bState;        // set to false when the process finishes

 };
 
 };
 

-static ULONG wxExecuteThread(
-  wxExecuteData*                    pData
-)
+static ULONG wxExecuteThread(wxExecuteData* pData)

 {
 {

-    ULONG                           ulRc;
-    PID                             vPidChild;
+    ULONG ulRc;
+    PID   vPidChild;
+
+//     cout << "Executing thread: " << endl;

 
 

-     ulRc = ::DosWaitChild( DCWA_PROCESSTREE
-                          ,DCWW_WAIT
+    ulRc = ::DosWaitChild( DCWA_PROCESSTREE
+                          ,DCWW_NOWAIT

                           ,&pData->vResultCodes
                           ,&vPidChild
                           ,pData->vResultCodes.codeTerminate // process PID to look at
                          );
     if (ulRc != NO_ERROR)
     {
                           ,&pData->vResultCodes
                           ,&vPidChild
                           ,pData->vResultCodes.codeTerminate // process PID to look at
                          );
     if (ulRc != NO_ERROR)
     {

-        wxLogLastError("DosWaitChild");
+        wxLogLastError(wxT("DosWaitChild"));

     }
     delete pData;
     }
     delete pData;

-
-
-//    ::WinSendMsg(pData->hWnd, (ULONG)wxWM_PROC_TERMINATED, 0, (MPARAM)pData);

     return 0;
 }
 
     return 0;
 }
 

-// Unlike windows where everything needs a window, console apps in OS/2
-// need no windows so this is not ever used
-MRESULT APIENTRY wxExecuteWindowCbk(
-  HWND                              hWnd
-, ULONG                             ulMessage
-, MPARAM                            wParam
-, MPARAM                            lParam
-)
+// window procedure of a hidden window which is created just to receive
+// the notification message when a process exits
+MRESULT APIENTRY wxExecuteWindowCbk( HWND   hWnd,
+                                     ULONG  ulMessage,
+                                     MPARAM WXUNUSED(wParam),
+                                     MPARAM lParam)

 {
     if (ulMessage == wxWM_PROC_TERMINATED)
     {
 {
     if (ulMessage == wxWM_PROC_TERMINATED)
     {


@@ -120,15 +126,16 @@ MRESULT APIENTRY wxExecuteWindowCbk(
     return 0;
 }
 
     return 0;
 }
 

-extern wxChar wxPanelClassName[];
-
-long wxExecute(
-  const wxString&                   rCommand
-, bool                              bSync
-, wxProcess*                        pHandler
-)
+long wxExecute( const wxString& rCommand,
+                int flags,
+                wxProcess* pHandler,
+                const wxExecuteEnv *env)

 {
 {

-    wxCHECK_MSG(!!rCommand, 0, wxT("empty command in wxExecute"));
+    if (rCommand.empty())
+    {
+//         cout << "empty command in wxExecute." << endl;
+        return 0;
+    }

 
     // create the process
     UCHAR                           vLoadError[CCHMAXPATH] = {0};
 
     // create the process
     UCHAR                           vLoadError[CCHMAXPATH] = {0};


@@ -136,56 +143,35 @@ long wxExecute(
     ULONG                           ulExecFlag;
     PSZ                             zArgs = NULL;
     PSZ                             zEnvs = NULL;
     ULONG                           ulExecFlag;
     PSZ                             zArgs = NULL;
     PSZ                             zEnvs = NULL;

-    ULONG                           ulWindowId;

     APIRET                          rc;
     APIRET                          rc;

-    PFNWP                           pOldProc;

     TID                             vTID;
 
     TID                             vTID;
 

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

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

-    if (::DosExecPgm( (PCHAR)vLoadError
-                     ,sizeof(vLoadError)
-                     ,ulExecFlag
-                     ,zArgs
-                     ,zEnvs
-                     ,&vResultCodes
-                     ,rCommand
-                    ))
+    rc = ::DosExecPgm( (PCHAR)vLoadError
+                      ,sizeof(vLoadError)
+                      ,ulExecFlag
+                      ,zArgs
+                      ,zEnvs
+                      ,&vResultCodes
+                      ,rCommand.c_str()
+                     );
+    if (rc != NO_ERROR)

     {
     {

-        wxLogSysError(_("Execution of command '%s' failed"), rCommand.c_str());
+        wxLogSysError(_("Execution of command '%s' failed with error: %ul"), rCommand.c_str(), rc);

         return 0;
     }
         return 0;
     }

-
-    // PM does not need non visible object windows to run console child processes
-/*
-    HWND                            hwnd = ::WinCreateWindow( HWND_DESKTOP
-                                                             ,wxPanelClassName
-                                                             ,NULL
-                                                             ,0
-                                                             ,0
-                                                             ,0
-                                                             ,0
-                                                             ,0
-                                                             ,NULLHANDLE
-                                                             ,NULLHANDLE
-                                                             ,ulWindowId
-                                                             ,NULL
-                                                             ,NULL
-                                                            );
-    wxASSERT_MSG( hwnd, wxT("can't create a hidden window for wxExecute") );
-    pOldProc = ::WinSubclassWindow(hwnd, (PFNWP)&wxExecuteWindowCbk);
-
-*/
+//     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,21 +190,23 @@ long wxExecute(
                           );
     if (rc != NO_ERROR)
     {
                           );
     if (rc != NO_ERROR)
     {

-        wxLogLastError("CreateThread in wxExecute");
-
-//      ::WinDestroyWindow(hwnd);
+        wxLogLastError(wxT("CreateThread in wxExecute"));

         delete pData;
 
         // the process still started up successfully...
         return vResultCodes.codeTerminate;
     }
         delete pData;
 
         // the process still started up successfully...
         return vResultCodes.codeTerminate;
     }

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

     {
     {

-        // clean up will be done when the process terminates
-

         // return the pid
         // return the pid

+        // warning: don't exit your app unless you actively
+        // kill and cleanup you child processes
+        // Maybe detach the process here???
+        // If cmd.exe need to pass DETACH to detach the process here

         return vResultCodes.codeTerminate;
     }
         return vResultCodes.codeTerminate;
     }

+
+    // waiting until command executed

     ::DosWaitThread(&vTID, DCWW_WAIT);
 
     ULONG ulExitCode = pData->vResultCodes.codeResult;
     ::DosWaitThread(&vTID, DCWW_WAIT);
 
     ULONG ulExitCode = pData->vResultCodes.codeResult;


@@ -230,49 +218,29 @@ long wxExecute(
 
 long wxExecute(
   char**                            ppArgv
 
 long wxExecute(
   char**                            ppArgv

-, bool                              bSync
+, int                               flags

 , wxProcess*                        pHandler
 , wxProcess*                        pHandler

+, const wxExecuteEnv *env

 )
 {
     wxString                        sCommand;
 
     while (*ppArgv != NULL)
     {
 )
 {
     wxString                        sCommand;
 
     while (*ppArgv != NULL)
     {

-        sCommand << *ppArgv++ << ' ';
+        wxString                    sArg((wxChar*)(*ppArgv++));
+
+
+        sCommand << sArg.c_str() << ' ';

     }
     sCommand.RemoveLast();
     return wxExecute( sCommand
     }
     sCommand.RemoveLast();
     return wxExecute( sCommand

-                     ,bSync
+                     ,flags

                      ,pHandler
                      ,pHandler

+                     , env

                     );
 }
 
                     );
 }
 

-bool wxGetFullHostName(
-  wxChar*                           zBuf
-, int                               nMaxSize
-)
+bool wxGetFullHostName( wxChar* zBuf, int nMaxSize)

 {
 {

-#if wxUSE_NET_API
-    char                            zServer[256];
-    char                            zComputer[256];
-    unsigned short                  nLevel = 0;
-    unsigned char*                  zBuffer;
-    unsigned short                  nBuffer;
-    unsigned short*                 pnTotalAvail;
-
-    NetBios32GetInfo( (const unsigned char*)zServer
-                     ,(const unsigned char*)zComputer
-                     ,nLevel
-                     ,zBuffer
-                     ,nBuffer
-                     ,pnTotalAvail
-                    );
-    strncpy(zBuf, zComputer, nMaxSize);
-    zBuf[nMaxSize] = _T('\0');
-#else
-    strcpy(zBuf, "noname");
-#endif
-    return *zBuf ? TRUE : FALSE;
-    return TRUE;
+    return wxGetHostName( zBuf, nMaxSize );

 }
 }

-