X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9317fd47263a9521466156d7bf0f7988000bf15..a06066343d670807825adcafebfa4fb8cfff5521:/src/msw/utilsexc.cpp diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index 6df190c161..453b7efc5d 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -37,6 +37,7 @@ #include "wx/log.h" #ifdef __WIN32__ + #include "wx/stream.h" #include "wx/process.h" #endif @@ -74,6 +75,10 @@ #endif #include +#if wxUSE_IPC + #include "wx/dde.h" // for WX_DDE hack in wxExecute +#endif // wxUSE_IPC + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -116,6 +121,94 @@ public: bool state; // set to FALSE when the process finishes }; + +#ifdef __WIN32__ +// ---------------------------------------------------------------------------- +// wxPipeStreams +// ---------------------------------------------------------------------------- + +class wxPipeInputStream: public wxInputStream { +public: + wxPipeInputStream(HANDLE hInput); + ~wxPipeInputStream(); + +protected: + size_t OnSysRead(void *buffer, size_t len); + +protected: + HANDLE m_hInput; +}; + +class wxPipeOutputStream: public wxOutputStream { +public: + wxPipeOutputStream(HANDLE hOutput); + ~wxPipeOutputStream(); + +protected: + size_t OnSysWrite(const void *buffer, size_t len); + +protected: + HANDLE m_hOutput; +}; + +// ================== +// wxPipeInputStream +// ================== + +wxPipeInputStream::wxPipeInputStream(HANDLE hInput) +{ + m_hInput = hInput; +} + +wxPipeInputStream::~wxPipeInputStream() +{ + ::CloseHandle(m_hInput); +} + +size_t wxPipeInputStream::OnSysRead(void *buffer, size_t len) +{ + DWORD bytesRead; + + m_lasterror = wxSTREAM_NOERROR; + if (! ::ReadFile(m_hInput, buffer, len, &bytesRead, NULL) ) { + if (GetLastError() == ERROR_BROKEN_PIPE) + m_lasterror = wxSTREAM_EOF; + else + m_lasterror = wxSTREAM_READ_ERROR; + } + return bytesRead; +} + +// ================== +// wxPipeOutputStream +// ================== + +wxPipeOutputStream::wxPipeOutputStream(HANDLE hOutput) +{ + m_hOutput = hOutput; +} + +wxPipeOutputStream::~wxPipeOutputStream() +{ + ::CloseHandle(m_hOutput); +} + +size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t len) +{ + DWORD bytesRead; + + m_lasterror = wxSTREAM_NOERROR; + if (! ::WriteFile(m_hOutput, buffer, len, &bytesRead, NULL) ) { + if (GetLastError() == ERROR_BROKEN_PIPE) + m_lasterror = wxSTREAM_EOF; + else + m_lasterror = wxSTREAM_READ_ERROR; + } + return bytesRead; +} + +#endif // __WIN32__ + // ============================================================================ // implementation // ============================================================================ @@ -167,15 +260,91 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message, // asynchronous execution - we should do the clean up delete data; } - } - return 0; + return 0; + } + else + { + return DefWindowProc(hWnd, message, wParam, lParam); + } } -#endif +#endif // Win32 -long wxExecute(const wxString& command, bool sync, wxProcess *handler) +long wxExecute(const wxString& cmd, bool sync, wxProcess *handler) { - wxCHECK_MSG( !!command, 0, wxT("empty command in wxExecute") ); + wxCHECK_MSG( !!cmd, 0, wxT("empty command in wxExecute") ); + + wxString command; +#if wxUSE_IPC + // DDE hack: this is really not pretty, but we need to allow this for + // transparent handling of DDE servers in wxMimeTypesManager. Usually it + // returns the command which should be run to view/open/... a file of the + // given type. Sometimes, however, this command just launches the server + // and an additional DDE request must be made to really open the file. To + // keep all this well hidden from the application, we allow a special form + // of command: WX_DDE::DDE_SERVER:DDE_TOPIC:DDE_COMMAND in which + // case we execute just and process the rest below + wxString ddeServer, ddeTopic, ddeCommand; + static const size_t lenDdePrefix = 7; // strlen("WX_DDE:") + if ( cmd.Left(lenDdePrefix) == _T("WX_DDE#") ) + { + const wxChar *p = cmd.c_str() + 7; + while ( *p && *p != _T('#') ) + { + command += *p++; + } + + if ( *p ) + { + // skip '#' + p++; + } + else + { + wxFAIL_MSG(_T("invalid WX_DDE command in wxExecute")); + } + + while ( *p && *p != _T('#') ) + { + ddeServer += *p++; + } + + if ( *p ) + { + // skip '#' + p++; + } + else + { + wxFAIL_MSG(_T("invalid WX_DDE command in wxExecute")); + } + + while ( *p && *p != _T('#') ) + { + ddeTopic += *p++; + } + + if ( *p ) + { + // skip '#' + p++; + } + else + { + wxFAIL_MSG(_T("invalid WX_DDE command in wxExecute")); + } + + while ( *p ) + { + ddeCommand += *p++; + } + } + else +#endif // wxUSE_IPC + { + // no DDE + command = cmd; + } #if defined(__WIN32__) && !defined(__TWIN32__) // the old code is disabled because we really need a process handle @@ -209,7 +378,6 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) // only reached for space not inside quotes break; } - wxString commandArgs = pc; wxWindow *winTop = wxTheApp->GetTopWindow(); @@ -233,6 +401,56 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) 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); @@ -246,23 +464,49 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) (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 - CREATE_DEFAULT_ERROR_MODE, // flags + 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; } - // close unneeded handle - if ( !::CloseHandle(pi.hThread) ) - wxLogLastError("CloseHandle(hThread)"); + // 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"); @@ -276,15 +520,14 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) if ( !::RegisterClass(&wndclass) ) { wxLogLastError("RegisterClass(hidden window)"); - - return FALSE; } } // create a hidden window to receive notification about process // termination HWND hwnd = ::CreateWindow(gs_classForHiddenWindow, NULL, - 0, 0, 0, 0, 0, NULL, + WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, (HMENU)NULL, wxGetInstance(), 0); wxASSERT_MSG( hwnd, wxT("can't create a hidden window for wxExecute") ); @@ -296,8 +539,8 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) data->state = sync; if ( sync ) { - wxASSERT_MSG( !handler, wxT("wxProcess param ignored for sync execution") ); - + // handler may be !NULL for capturing program output, but we don't use + // it wxExecuteData struct in this case data->handler = NULL; } else @@ -314,6 +557,18 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) 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"); @@ -325,6 +580,22 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) 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 @@ -333,10 +604,21 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) return pi.dwProcessId; } - // waiting until command executed + // 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;