X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2173b18fc874406b56eeb8676980f6996f7546c1..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/os2/utilsexc.cpp diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp index da80a3b213..199781f7cf 100644 --- a/src/os2/utilsexc.cpp +++ b/src/os2/utilsexc.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utilsexec.cpp +// Name: src/os2/utilsexec.cpp // Purpose: Various utilities // Author: David Webster // Modified by: @@ -13,23 +13,23 @@ #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 PURE_32 #ifndef __EMX__ -#include -#include -#include + #include + #ifndef __WATCOMC__ + #include + #include + #endif #endif #include @@ -64,19 +64,17 @@ public: 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; @@ -96,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) { @@ -130,13 +126,12 @@ MRESULT APIENTRY wxExecuteWindowCbk( return 0; } -long wxExecute( - const wxString& rCommand -, int flags -, 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; return 0; @@ -162,7 +157,7 @@ long wxExecute( ,zArgs ,zEnvs ,&vResultCodes - ,(PSZ)rCommand.c_str() + ,rCommand.c_str() ); if (rc != NO_ERROR) { @@ -225,6 +220,7 @@ long wxExecute( char** ppArgv , int flags , wxProcess* pHandler +, const wxExecuteEnv *env ) { wxString sCommand; @@ -240,35 +236,11 @@ long wxExecute( return wxExecute( sCommand ,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 = NULL; - unsigned long ulBuffer = 256; - unsigned long* pulTotalAvail = NULL; - - NetBios32GetInfo( (const unsigned char*)zServer - ,(const unsigned char*)zComputer - ,ulLevel - ,zBuffer - ,ulBuffer - ,pulTotalAvail - ); - strncpy(zBuf, zComputer, nMaxSize); - zBuf[nMaxSize] = _T('\0'); -#else - strcpy((char*)zBuf, "noname"); -#endif - return *zBuf ? TRUE : FALSE; - return TRUE; + return wxGetHostName( zBuf, nMaxSize ); } -