X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/909b4f08a132c12a6a70959edd2a6e1aebf4497d..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/os2/utilsexc.cpp diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp index 1ebf118034..199781f7cf 100644 --- a/src/os2/utilsexc.cpp +++ b/src/os2/utilsexc.cpp @@ -1,37 +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 -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // 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 -#include "wx/log.h" - #include "wx/process.h" #include "wx/os2/private.h" -#define INCL_DOSPROCESS -#define INCL_DOSERRORS -#define INCL_DOS -#include +#define PURE_32 +#ifndef __EMX__ + #include + #ifndef __WATCOMC__ + #include + #include + #endif +#endif #include -#include +#ifdef __EMX__ +#include +#endif #include #include @@ -42,6 +46,7 @@ #include #include + // this message is sent when the process we're waiting for terminates #define wxWM_PROC_TERMINATED (WM_USER + 10000) @@ -55,25 +60,23 @@ struct wxExecuteData public: ~wxExecuteData() { - cout << "Closing thread: " << endl; +// cout << "Closing thread: " << endl; 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; +// cout << "Executing thread: " << endl; ulRc = ::DosWaitChild( DCWA_PROCESSTREE ,DCWW_NOWAIT @@ -83,7 +86,7 @@ static ULONG wxExecuteThread( ); if (ulRc != NO_ERROR) { - wxLogLastError("DosWaitChild"); + wxLogLastError(wxT("DosWaitChild")); } delete pData; return 0; @@ -91,12 +94,10 @@ static ULONG wxExecuteThread( // 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 wParam -, MPARAM lParam -) +MRESULT APIENTRY wxExecuteWindowCbk( HWND hWnd, + ULONG ulMessage, + MPARAM WXUNUSED(wParam), + MPARAM lParam) { if (ulMessage == wxWM_PROC_TERMINATED) { @@ -125,17 +126,14 @@ MRESULT APIENTRY wxExecuteWindowCbk( 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) { - if (rCommand.IsEmpty()) + if (rCommand.empty()) { - cout << "empty command in wxExecute." << endl; +// cout << "empty command in wxExecute." << endl; return 0; } @@ -145,12 +143,10 @@ long wxExecute( ULONG ulExecFlag; PSZ zArgs = NULL; PSZ zEnvs = NULL; - ULONG ulWindowId; APIRET rc; - PFNWP pOldProc; TID vTID; - if (bSync) + if (flags & wxEXEC_SYNC) ulExecFlag = EXEC_SYNC; else ulExecFlag = EXEC_ASYNCRESULT; @@ -161,21 +157,21 @@ long wxExecute( ,zArgs ,zEnvs ,&vResultCodes - ,(PSZ)rCommand.c_str() + ,rCommand.c_str() ); if (rc != NO_ERROR) { 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; - 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; @@ -194,13 +190,13 @@ long wxExecute( ); if (rc != NO_ERROR) { - wxLogLastError("CreateThread in wxExecute"); + wxLogLastError(wxT("CreateThread in wxExecute")); delete pData; // 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 @@ -222,49 +218,29 @@ long wxExecute( long wxExecute( char** ppArgv -, bool bSync +, int flags , wxProcess* pHandler +, const wxExecuteEnv *env ) { wxString sCommand; while (*ppArgv != NULL) { - sCommand << *ppArgv++ << ' '; + wxString sArg((wxChar*)(*ppArgv++)); + + + sCommand << sArg.c_str() << ' '; } sCommand.RemoveLast(); return wxExecute( sCommand - ,bSync + ,flags ,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 long ulLevel = 0; - unsigned char* zBuffer; - unsigned long ulBuffer; - unsigned long* pulTotalAvail; - - NetBios32GetInfo( (const unsigned char*)zServer - ,(const unsigned char*)zComputer - ,ulLevel - ,zBuffer - ,ulBuffer - ,pulTotalAvail - ); - strncpy(zBuf, zComputer, nMaxSize); - zBuf[nMaxSize] = _T('\0'); -#else - strcpy(zBuf, "noname"); -#endif - return *zBuf ? TRUE : FALSE; - return TRUE; + return wxGetHostName( zBuf, nMaxSize ); } -