- if (((long)result) <= 32) {
- free(cl);
-
- wxLogSysError(_("Can't execute command '%s'"), command.c_str());
- return 0;
- }
-
- // Alloc data
- data = new wxExecuteData;
-
- // Create window
- window = CreateWindow(wxPanelClassName, NULL, 0, 0, 0, 0, 0, NULL,
- (HMENU) NULL, wxGetInstance(), 0);
-
- FARPROC ExecuteWindowInstance = MakeProcInstance((FARPROC) wxExecuteWindowCbk,
- wxGetInstance());
-
- SetWindowLong(window, GWL_WNDPROC, (LONG) ExecuteWindowInstance);
- SetWindowLong(window, GWL_USERDATA, (LONG) data);
-
- data->process = result;
- data->window = window;
- data->state = sync;
- data->handler = (sync) ? NULL : handler;
-
- dresult = (DWORD)CreateThread(NULL, 0,
- (LPTHREAD_START_ROUTINE)wxExecuteThread,
- (void *)data, 0, &tid);
- if (dresult == 0) {
- wxDebugMsg("wxExecute PANIC: I can't create the waiting thread !");
- DestroyWindow(window);
- return (long)result;
- }
-
- if (!sync)
- {
- free(cl);
- return (long)result;
- }
-
- // waiting until command executed
- while (data->state)
- wxYield();
-
- free(cl);
- return 0;
-#else
- long instanceID = WinExec((LPCSTR) WXSTRINGCAST command, SW_SHOW);
- if (instanceID < 32) return(0);
-
- if (sync) {
- int running;
- do {
- wxYield();
- running = GetModuleUsage((HANDLE)instanceID);
- } while (running);
- }
- return(instanceID);
-#endif
+#if defined(__WIN32__) && !defined(__TWIN32__)
+ // the old code is disabled because we really need a process handle
+ // if we want to execute it asynchronously or even just get its
+ // return code and for this we must use CreateProcess() and not
+ // ShellExecute()
+#if 0
+ // isolate command and arguments
+ wxString commandName;
+ bool insideQuotes = FALSE;
+ const char *pc;
+ for ( pc = command.c_str(); *pc != '\0'; pc++ )
+ {
+ switch ( *pc )
+ {
+ case ' ':
+ case '\t':
+ if ( !insideQuotes )
+ break;
+ // fall through
+
+ case '"':
+ insideQuotes = !insideQuotes;
+ // fall through
+
+ default:
+ commandName += *pc;
+ continue; // skip the next break
+ }
+
+ // only reached for space not inside quotes
+ break;
+ }
+ wxString commandArgs = pc;
+
+ wxWindow *winTop = wxTheApp->GetTopWindow();
+ HWND hwndTop = (HWND)(winTop ? winTop->GetHWND() : 0);
+
+ HANDLE result;
+#ifdef __GNUWIN32__
+ result = ShellExecute(hwndTop,
+ (const wchar_t)"open",
+ (const wchar_t)commandName,
+ (const wchar_t)commandArgs,
+ (const wchar_t)NULL,
+ SW_SHOWNORMAL);
+#else // !GNUWIN32
+ result = ShellExecute(hwndTop, "open", commandName,
+ commandArgs, NULL, SW_SHOWNORMAL);
+#endif // GNUWIN32
+
+ if ( ((long)result) <= 32 )
+ wxLogSysError(_("Can't execute command '%s'"), command.c_str());
+
+ return result;
+#else // 1
+
+ HANDLE hpipeRead[2];
+ HANDLE hpipeWrite[2];
+ HANDLE hStdIn = INVALID_HANDLE_VALUE;
+ HANDLE hStdOut = INVALID_HANDLE_VALUE;
+
+ // we need to inherit handles in the child process if we want to redirect
+ // its IO
+ BOOL inheritHandles = FALSE;
+
+ // open the pipes to which child process IO will be redirected if needed
+ if ( handler && handler->IsRedirected() )
+ {
+ SECURITY_ATTRIBUTES security;
+
+ security.nLength = sizeof(security);
+ security.lpSecurityDescriptor = NULL;
+ security.bInheritHandle = TRUE;
+
+ if ( !::CreatePipe(&hpipeRead[0], &hpipeRead[1], &security, 0) )
+ {
+ wxLogSysError(_("Can't create the inter-process read pipe"));
+
+ return 0;
+ }
+
+ if ( !::CreatePipe(&hpipeWrite[0], &hpipeWrite[1], &security, 0) )
+ {
+ ::CloseHandle(hpipeRead[0]);
+ ::CloseHandle(hpipeRead[1]);
+
+ wxLogSysError(_("Can't create the inter-process write pipe"));
+
+ return 0;
+ }
+
+ // We need to save the old stdio handles to restore them after the call
+ // to CreateProcess
+ hStdIn = ::GetStdHandle(STD_INPUT_HANDLE);
+ hStdOut = ::GetStdHandle(STD_OUTPUT_HANDLE);
+
+ if ( !::SetStdHandle(STD_INPUT_HANDLE, hpipeRead[0]) ||
+ !::SetStdHandle(STD_OUTPUT_HANDLE, hpipeWrite[1]) )
+ {
+ wxLogDebug(_T("Failed to change stdin/out handles"));
+ }
+
+ inheritHandles = TRUE;
+ }
+
+ // create the process
+ STARTUPINFO si;
+ wxZeroMemory(si);
+
+ si.cb = sizeof(si);
+
+ PROCESS_INFORMATION pi;
+
+ if ( ::CreateProcess(
+ NULL, // application name (use only cmd line)
+ (wxChar *)command.c_str(), // full command line
+ NULL, // security attributes: defaults for both
+ NULL, // the process and its main thread
+ inheritHandles, // inherit handles if we need pipes
+ CREATE_DEFAULT_ERROR_MODE |
+ CREATE_SUSPENDED, // flags
+ NULL, // environment (use the same)
+ NULL, // current directory (use the same)
+ &si, // startup info (unused here)
+ &pi // process info
+ ) == 0 )
+ {
+ if ( inheritHandles )
+ {
+ ::CloseHandle(hpipeWrite[0]);
+ ::CloseHandle(hpipeWrite[1]);
+ ::CloseHandle(hpipeRead[0]);
+ ::CloseHandle(hpipeRead[1]);
+ }
+
+ wxLogSysError(_("Execution of command '%s' failed"), command.c_str());
+
+ return 0;
+ }
+
+ // Restore the old stdio handles
+ if ( inheritHandles )
+ {
+ if ( !::SetStdHandle(STD_INPUT_HANDLE, hStdIn) ||
+ !::SetStdHandle(STD_OUTPUT_HANDLE, hStdOut) )
+ {
+ wxLogDebug(_T("Failed to restore old stdin/out handles"));
+ }
+
+ // they're still opened in child process
+ ::CloseHandle(hpipeWrite[1]);
+ ::CloseHandle(hpipeRead[0]);
+
+ // We can now initialize the wxStreams
+ wxInputStream *inStream = new wxPipeInputStream(hpipeWrite[0]);
+ wxOutputStream *outStream = new wxPipeOutputStream(hpipeRead[1]);
+
+ handler->SetPipeStreams(inStream, outStream);
+ }
+
+ // register the class for the hidden window used for the notifications
+ 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)");
+ }
+ }
+
+ // create a hidden window to receive notification about process
+ // termination
+ HWND hwnd = ::CreateWindow(gs_classForHiddenWindow, NULL,
+ WS_OVERLAPPEDWINDOW,
+ 0, 0, 0, 0, NULL,
+ (HMENU)NULL, wxGetInstance(), 0);
+ 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;
+ if ( sync )
+ {
+ // handler may be !NULL for capturing program output, but we don't use
+ // it wxExecuteData struct in this case
+ data->handler = NULL;
+ }
+ else
+ {
+ // may be NULL or not
+ data->handler = handler;
+ }
+
+ DWORD tid;
+ HANDLE hThread = ::CreateThread(NULL,
+ 0,
+ (LPTHREAD_START_ROUTINE)wxExecuteThread,
+ (void *)data,
+ 0,
+ &tid);
+
+ // resume process we created now - whether the thread creation succeeded or
+ // not
+ if ( ::ResumeThread(pi.hThread) == (DWORD)-1 )
+ {
+ // ignore it - what can we do?
+ wxLogLastError("ResumeThread in wxExecute");
+ }
+
+ // close unneeded handle
+ if ( !::CloseHandle(pi.hThread) )
+ wxLogLastError("CloseHandle(hThread)");
+
+ if ( !hThread )
+ {
+ wxLogLastError("CreateThread in wxExecute");
+
+ DestroyWindow(hwnd);
+ delete data;
+
+ // the process still started up successfully...
+ return pi.dwProcessId;
+ }
+
+#if wxUSE_IPC
+ // second part of DDE hack: now establish the DDE conversation with the
+ // just launched process
+ if ( !!ddeServer )
+ {
+ wxDDEClient client;
+ wxConnectionBase *conn = client.MakeConnection(_T(""),
+ ddeServer,
+ ddeTopic);
+ if ( !conn || !conn->Execute(ddeCommand) )
+ {
+ wxLogError(_("Couldn't launch DDE server '%s'."), command.c_str());
+ }
+ }
+#endif // wxUSE_IPC
+
+ if ( !sync )
+ {
+ // clean up will be done when the process terminates
+
+ // return the pid
+ return pi.dwProcessId;
+ }
+
+ // waiting until command executed (disable everything while doing it)
+#if wxUSE_GUI
+ {
+ wxBusyCursor bc;
+
+ wxWindowDisabler wd;
+#endif // wxUSE_GUI
+
+ while ( data->state )
+ wxYield();
+
+#if wxUSE_GUI
+ }
+#endif // wxUSE_GUI
+
+ DWORD dwExitCode = data->dwExitCode;
+ delete data;
+
+ // 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((HINSTANCE)instanceID);
+ } while (running);
+ }
+
+ return(instanceID);
+#endif // Win16/32
projects / wxWidgets.git / blobdiff