/////////////////////////////////////////////////////////////////////////////
-// Name: utilsexec.cpp
+// Name: msw/utilsexec.cpp
// Purpose: Various utilities
// Author: Julian Smart
// Modified by:
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
#ifdef __GNUG__
-#pragma implementation
+ #pragma implementation
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#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"
#endif
#include "wx/log.h"
-#include "wx/process.h"
-#include "wx/msw/private.h"
+#ifdef __WIN32__
+ #include "wx/process.h"
+#endif
-#include <windows.h>
+#include "wx/msw/private.h"
#include <ctype.h>
-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
-#include <direct.h>
+#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__)
+ #include <direct.h>
#ifndef __MWERKS__
-#include <dos.h>
+ #include <dos.h>
#endif
#endif
-#ifdef __GNUWIN32__
-#ifndef __TWIN32__
-#include <sys/unistd.h>
-#include <sys/stat.h>
-#endif
+#if defined(__GNUWIN32__) && !defined(__TWIN32__)
+ #include <sys/unistd.h>
+ #include <sys/stat.h>
#endif
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXWINE__)
#include <io.h>
#ifndef __GNUWIN32__
#endif
#include <stdarg.h>
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
// this message is sent when the process we're waiting for terminates
#define wxWM_PROC_TERMINATED (WM_USER + 10000)
+// ----------------------------------------------------------------------------
+// this module globals
+// ----------------------------------------------------------------------------
+
+// we need to create a hidden window to receive the process termination
+// notifications and for this we need a (Win) class name for it which we will
+// register the first time it's needed
+static const wxChar *gs_classForHiddenWindow = NULL;
+
+// ----------------------------------------------------------------------------
+// private types
+// ----------------------------------------------------------------------------
+
// structure describing the process we're being waiting for
struct wxExecuteData
{
bool state; // set to FALSE when the process finishes
};
+// ============================================================================
+// implementation
+// ============================================================================
#ifdef __WIN32__
static DWORD wxExecuteThread(wxExecuteData *data)
}
wxASSERT_MSG( data->dwExitCode != STILL_ACTIVE,
- "process should have terminated" );
+ wxT("process should have terminated") );
// send a message indicating process termination to the window
SendMessage(data->hWnd, wxWM_PROC_TERMINATED, 0, (LPARAM)data);
-
+
return 0;
}
-#endif
// window procedure of a hidden window which is created just to receive
// the notification message when a process exits
data->handler->OnTerminate((int)data->dwProcessId,
(int)data->dwExitCode);
}
-
+
if ( data->state )
{
// we're executing synchronously, tell the waiting thread
return 0;
}
-
-extern char wxPanelClassName[];
+#endif
long wxExecute(const wxString& command, bool sync, wxProcess *handler)
{
- wxCHECK_MSG( !!command, 0, "empty command in wxExecute" );
+ wxCHECK_MSG( !!command, 0, wxT("empty command in wxExecute") );
#if defined(__WIN32__) && !defined(__TWIN32__)
// the old code is disabled because we really need a process handle
result = ShellExecute(hwndTop, "open", commandName,
commandArgs, NULL, SW_SHOWNORMAL);
#endif // GNUWIN32
-
+
if ( ((long)result) <= 32 )
wxLogSysError(_("Can't execute command '%s'"), command.c_str());
#else // 1
// create the process
STARTUPINFO si;
-#ifdef __GNUWIN32__
- memset(&si, 0, sizeof(si));
-#else
- ::ZeroMemory(&si, sizeof(si));
-#endif
+ wxZeroMemory(si);
si.cb = sizeof(si);
if ( ::CreateProcess(
NULL, // application name (use only cmd line)
- (char *)command.c_str(), // full command line
+ (wxChar *)command.c_str(), // full command line
NULL, // security attributes: defaults for both
NULL, // the process and its main thread
FALSE, // don't inherit handles
if ( !::CloseHandle(pi.hThread) )
wxLogLastError("CloseHandle(hThread)");
+ if ( !gs_classForHiddenWindow )
+ {
+ gs_classForHiddenWindow = _T("wxHiddenWindow");
+
+ WNDCLASS wndclass;
+ wxZeroMemory(wndclass);
+ wndclass.lpfnWndProc = (WNDPROC)wxExecuteWindowCbk;
+ wndclass.hInstance = wxGetInstance();
+ wndclass.lpszClassName = gs_classForHiddenWindow;
+
+ if ( !::RegisterClass(&wndclass) )
+ {
+ wxLogLastError("RegisterClass(hidden window)");
+
+ return FALSE;
+ }
+ }
+
// create a hidden window to receive notification about process
// termination
- HWND hwnd = ::CreateWindow(wxPanelClassName, NULL, 0, 0, 0, 0, 0, NULL,
+ HWND hwnd = ::CreateWindow(gs_classForHiddenWindow, NULL,
+ 0, 0, 0, 0, 0, NULL,
(HMENU)NULL, wxGetInstance(), 0);
- wxASSERT_MSG( hwnd, "can't create a hidden window for wxExecute" );
-
- FARPROC ExecuteWindowInstance = MakeProcInstance((FARPROC)wxExecuteWindowCbk,
- wxGetInstance());
-
- ::SetWindowLong(hwnd, GWL_WNDPROC, (LONG) ExecuteWindowInstance);
-
+ wxASSERT_MSG( hwnd, wxT("can't create a hidden window for wxExecute") );
+
// Alloc data
wxExecuteData *data = new wxExecuteData;
data->hProcess = pi.hProcess;
data->dwProcessId = pi.dwProcessId;
data->hWnd = hwnd;
data->state = sync;
- data->handler = handler;
+ if ( sync )
+ {
+ wxASSERT_MSG( !handler, wxT("wxProcess param ignored for sync execution") );
+
+ data->handler = NULL;
+ }
+ else
+ {
+ // may be NULL or not
+ data->handler = handler;
+ }
DWORD tid;
HANDLE hThread = ::CreateThread(NULL,
// the process still started up successfully...
return pi.dwProcessId;
}
-
+
if ( !sync )
{
// clean up will be done when the process terminates
+
+ // return the pid
return pi.dwProcessId;
}
-
+
// waiting until command executed
while ( data->state )
wxYield();
-
+
+ DWORD dwExitCode = data->dwExitCode;
delete data;
- return pi.dwProcessId;
+ // return the exit code
+ return dwExitCode;
#endif // 0/1
#else // Win16
long instanceID = WinExec((LPCSTR) WXSTRINGCAST command, SW_SHOW);
if (instanceID < 32) return(0);
-
+
if (sync) {
int running;
do {
wxYield();
- running = GetModuleUsage((HANDLE)instanceID);
+ running = GetModuleUsage((HINSTANCE)instanceID);
} while (running);
}
long wxExecute(char **argv, bool sync, wxProcess *handler)
{
wxString command;
-
+
while ( *argv != NULL )
{
command << *argv++ << ' ';
return wxExecute(command, sync, handler);
}
+
projects / wxWidgets.git / blobdiff