// 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/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 <direct.h>
+#ifdef __EMX__
+#include <dirent.h>
+#endif
#include <sys/stat.h>
#include <io.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)
public:
~wxExecuteData()
{
+// 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;
- 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)
{
- wxLogLastError("DosWaitChild");
+ wxLogLastError(wxT("DosWaitChild"));
}
delete pData;
-
-
-// ::WinSendMsg(pData->hWnd, (ULONG)wxWM_PROC_TERMINATED, 0, (MPARAM)pData);
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)
{
return 0;
}
-extern wxChar wxPanelClassName[];
-
-long wxExecute(
- const wxString& rCommand
-, bool bSync
-, wxProcess* pHandler
-)
+long wxExecute( const wxString& rCommand,
+ int flags,
+ wxProcess* pHandler)
{
- 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};
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;
- if (::DosExecPgm( (PCHAR)vLoadError
- ,sizeof(vLoadError)
- ,ulExecFlag
- ,zArgs
- ,zEnvs
- ,&vResultCodes
- ,rCommand
- ))
+ rc = ::DosExecPgm( (PCHAR)vLoadError
+ ,sizeof(vLoadError)
+ ,ulExecFlag
+ ,zArgs
+ ,zEnvs
+ ,&vResultCodes
+ ,(PSZ)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;
}
-
- // 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;
- 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;
);
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;
}
- if (!bSync)
+ if (!(flags & wxEXEC_SYNC))
{
- // clean up will be done when the process terminates
-
// 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;
}
+
+ // waiting until command executed
::DosWaitThread(&vTID, DCWW_WAIT);
ULONG ulExitCode = pData->vResultCodes.codeResult;
long wxExecute(
char** ppArgv
-, bool bSync
+, int flags
, wxProcess* pHandler
)
{
while (*ppArgv != NULL)
{
- sCommand << *ppArgv++ << ' ';
+ wxString sArg((wxChar*)(*ppArgv++));
+
+
+ sCommand << sArg.c_str() << ' ';
}
sCommand.RemoveLast();
return wxExecute( sCommand
- ,bSync
+ ,flags
,pHandler
);
}
-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;
+ 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
- ,nLevel
+ ,ulLevel
,zBuffer
- ,nBuffer
- ,pnTotalAvail
+ ,ulBuffer
+ ,pulTotalAvail
);
strncpy(zBuf, zComputer, nMaxSize);
zBuf[nMaxSize] = _T('\0');
#else
- strcpy(zBuf, "noname");
+ wxUnusedVar(nMaxSize);
+ strcpy((char*)zBuf, "noname");
#endif
- return *zBuf ? TRUE : FALSE;
- return TRUE;
+ return *zBuf ? true : false;
}
-
projects / wxWidgets.git / blobdiff