X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca289436cd4da42ed1be1480aebd01750eee41ec..c616c2e834192db06bbef18b9404824f563e335f:/src/msw/utilsexc.cpp diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index 6dfe980f2a..accecb3645 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/utilsexec.cpp -// Purpose: Various utilities +// Name: src/msw/utilsexc.cpp +// Purpose: wxExecute implementation for MSW // Author: Julian Smart // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) 1998-2002 wxWidgets dev team +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -32,37 +28,40 @@ #include "wx/utils.h" #include "wx/app.h" #include "wx/intl.h" + #include "wx/log.h" #endif -#include "wx/log.h" +#include "wx/stream.h" +#include "wx/process.h" -#ifdef __WIN32__ - #include "wx/stream.h" - #include "wx/process.h" -#endif +#include "wx/apptrait.h" + +#include "wx/module.h" #include "wx/msw/private.h" #include -#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) +#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #include #ifndef __MWERKS__ #include #endif #endif -#if defined(__GNUWIN32__) && !defined(__TWIN32__) +#if defined(__GNUWIN32__) #include #include #endif -#if defined(__WIN32__) && !defined(__WXWINE__) -#include +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) + #ifndef __UNIX__ + #include + #endif -#ifndef __GNUWIN32__ -#include -#endif + #ifndef __GNUWIN32__ + #include + #endif #endif #include @@ -79,6 +78,10 @@ #include "wx/dde.h" // for WX_DDE hack in wxExecute #endif // wxUSE_IPC +// implemented in utils.cpp +extern "C" WXDLLIMPEXP_BASE HWND +wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc); + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -93,6 +96,7 @@ // 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 *wxMSWEXEC_WNDCLASSNAME = wxT("_wxExecute_Internal_Class"); static const wxChar *gs_classForHiddenWindow = NULL; // ---------------------------------------------------------------------------- @@ -105,12 +109,10 @@ struct wxExecuteData public: ~wxExecuteData() { -#ifndef __WIN16__ if ( !::CloseHandle(hProcess) ) { wxLogLastError(wxT("CloseHandle(hProcess)")); } -#endif } HWND hWnd; // window to send wxWM_PROC_TERMINATED to @@ -118,10 +120,31 @@ public: DWORD dwProcessId; // pid of the process wxProcess *handler; DWORD dwExitCode; // the exit code of the process - bool state; // set to FALSE when the process finishes + bool state; // set to false when the process finishes }; -#if defined(__WIN32__) && wxUSE_STREAMS +class wxExecuteModule : public wxModule +{ +public: + virtual bool OnInit() { return true; } + virtual void OnExit() + { + if ( *gs_classForHiddenWindow ) + { + if ( !::UnregisterClass(wxMSWEXEC_WNDCLASSNAME, wxGetInstance()) ) + { + wxLogLastError(_T("UnregisterClass(wxExecClass)")); + } + + gs_classForHiddenWindow = NULL; + } + } + +private: + DECLARE_DYNAMIC_CLASS(wxExecuteModule) +}; + +#if wxUSE_STREAMS && !defined(__WXWINCE__) // ---------------------------------------------------------------------------- // wxPipeStreams @@ -131,140 +154,138 @@ class wxPipeInputStream: public wxInputStream { public: wxPipeInputStream(HANDLE hInput); - ~wxPipeInputStream(); + virtual ~wxPipeInputStream(); - virtual bool Eof() const; + // returns true if the pipe is still opened + bool IsOpened() const { return m_hInput != INVALID_HANDLE_VALUE; } + + // returns true if there is any data to be read from the pipe + virtual bool CanRead() const; protected: size_t OnSysRead(void *buffer, size_t len); protected: HANDLE m_hInput; + + DECLARE_NO_COPY_CLASS(wxPipeInputStream) }; class wxPipeOutputStream: public wxOutputStream { public: wxPipeOutputStream(HANDLE hOutput); - ~wxPipeOutputStream(); + virtual ~wxPipeOutputStream() { Close(); } + bool Close(); protected: size_t OnSysWrite(const void *buffer, size_t len); protected: HANDLE m_hOutput; -}; -// ================== -// wxPipeInputStream -// ================== + DECLARE_NO_COPY_CLASS(wxPipeOutputStream) +}; -wxPipeInputStream::wxPipeInputStream(HANDLE hInput) -{ - m_hInput = hInput; -} +// define this to let wxexec.cpp know that we know what we're doing +#define _WX_USED_BY_WXEXECUTE_ +#include "../common/execcmn.cpp" -wxPipeInputStream::~wxPipeInputStream() -{ - ::CloseHandle(m_hInput); -} +// ---------------------------------------------------------------------------- +// wxPipe represents a Win32 anonymous pipe +// ---------------------------------------------------------------------------- -bool wxPipeInputStream::Eof() const +class wxPipe { - DWORD nAvailable; +public: + // the symbolic names for the pipe ends + enum Direction + { + Read, + Write + }; - // function name is misleading, it works with anon pipes as well - DWORD rc = ::PeekNamedPipe - ( - m_hInput, // handle - NULL, 0, // ptr to buffer and its size - NULL, // [out] bytes read - &nAvailable, // [out] bytes available - NULL // [out] bytes left - ); + // default ctor doesn't do anything + wxPipe() { m_handles[Read] = m_handles[Write] = INVALID_HANDLE_VALUE; } - if ( !rc ) + // create the pipe, return true if ok, false on error + bool Create() { - if ( ::GetLastError() != ERROR_BROKEN_PIPE ) - { - // unexpected error - wxLogLastError(_T("PeekNamedPipe")); - } + // default secutiry attributes + SECURITY_ATTRIBUTES security; - // don't try to continue reading from a pipe if an error occured or if - // it had been closed - return TRUE; - } - else - { - return nAvailable == 0; - } -} + security.nLength = sizeof(security); + security.lpSecurityDescriptor = NULL; + security.bInheritHandle = TRUE; // to pass it to the child -size_t wxPipeInputStream::OnSysRead(void *buffer, size_t len) -{ - // reading from a pipe may block if there is no more data, always check for - // EOF first - m_lasterror = wxSTREAM_NOERROR; - if ( Eof() ) - return 0; + if ( !::CreatePipe(&m_handles[0], &m_handles[1], &security, 0) ) + { + wxLogSysError(_("Failed to create an anonymous pipe")); - DWORD bytesRead; - if ( !::ReadFile(m_hInput, buffer, len, &bytesRead, NULL) ) - { - if ( ::GetLastError() == ERROR_BROKEN_PIPE ) - m_lasterror = wxSTREAM_EOF; - else - m_lasterror = wxSTREAM_READ_ERROR; + return false; + } + + return true; } - return bytesRead; -} + // return true if we were created successfully + bool IsOk() const { return m_handles[Read] != INVALID_HANDLE_VALUE; } -// ================== -// wxPipeOutputStream -// ================== + // return the descriptor for one of the pipe ends + HANDLE operator[](Direction which) const { return m_handles[which]; } -wxPipeOutputStream::wxPipeOutputStream(HANDLE hOutput) -{ - m_hOutput = hOutput; -} - -wxPipeOutputStream::~wxPipeOutputStream() -{ - ::CloseHandle(m_hOutput); -} + // detach a descriptor, meaning that the pipe dtor won't close it, and + // return it + HANDLE Detach(Direction which) + { + HANDLE handle = m_handles[which]; + m_handles[which] = INVALID_HANDLE_VALUE; -size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t len) -{ - DWORD bytesRead; + return handle; + } - m_lasterror = wxSTREAM_NOERROR; - if ( !::WriteFile(m_hOutput, buffer, len, &bytesRead, NULL) ) + // close the pipe descriptors + void Close() { - if ( ::GetLastError() == ERROR_BROKEN_PIPE ) - m_lasterror = wxSTREAM_EOF; - else - m_lasterror = wxSTREAM_READ_ERROR; + for ( size_t n = 0; n < WXSIZEOF(m_handles); n++ ) + { + if ( m_handles[n] != INVALID_HANDLE_VALUE ) + { + ::CloseHandle(m_handles[n]); + m_handles[n] = INVALID_HANDLE_VALUE; + } + } } - return bytesRead; -} + // dtor closes the pipe descriptors + ~wxPipe() { Close(); } + +private: + HANDLE m_handles[2]; +}; -#endif // __WIN32__ +#endif // wxUSE_STREAMS // ============================================================================ // implementation // ============================================================================ -#ifdef __WIN32__ +// ---------------------------------------------------------------------------- +// process termination detecting support +// ---------------------------------------------------------------------------- -static DWORD wxExecuteThread(wxExecuteData *data) +// thread function for the thread monitoring the process termination +static DWORD __stdcall wxExecuteThread(void *arg) { - WaitForSingleObject(data->hProcess, INFINITE); + wxExecuteData * const data = (wxExecuteData *)arg; + + if ( ::WaitForSingleObject(data->hProcess, INFINITE) != WAIT_OBJECT_0 ) + { + wxLogDebug(_T("Waiting for the process termination failed!")); + } // get the exit code - if ( !GetExitCodeProcess(data->hProcess, &data->dwExitCode) ) + if ( !::GetExitCodeProcess(data->hProcess, &data->dwExitCode) ) { wxLogLastError(wxT("GetExitCodeProcess")); } @@ -273,7 +294,7 @@ static DWORD wxExecuteThread(wxExecuteData *data) wxT("process should have terminated") ); // send a message indicating process termination to the window - SendMessage(data->hWnd, wxWM_PROC_TERMINATED, 0, (LPARAM)data); + ::SendMessage(data->hWnd, wxWM_PROC_TERMINATED, 0, (LPARAM)data); return 0; } @@ -287,7 +308,7 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message, { DestroyWindow(hWnd); // we don't need it any more - wxExecuteData *data = (wxExecuteData *)lParam; + wxExecuteData * const data = (wxExecuteData *)lParam; if ( data->handler ) { data->handler->OnTerminate((int)data->dwProcessId, @@ -310,45 +331,191 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message, } else { - return DefWindowProc(hWnd, message, wParam, lParam); + return ::DefWindowProc(hWnd, message, wParam, lParam); + } +} + +// ============================================================================ +// implementation of IO redirection support classes +// ============================================================================ + +#if wxUSE_STREAMS && !defined(__WXWINCE__) + +// ---------------------------------------------------------------------------- +// wxPipeInputStreams +// ---------------------------------------------------------------------------- + +wxPipeInputStream::wxPipeInputStream(HANDLE hInput) +{ + m_hInput = hInput; +} + +wxPipeInputStream::~wxPipeInputStream() +{ + if ( m_hInput != INVALID_HANDLE_VALUE ) + ::CloseHandle(m_hInput); +} + +bool wxPipeInputStream::CanRead() const +{ + if ( !IsOpened() ) + return false; + + DWORD nAvailable; + + // function name is misleading, it works with anon pipes as well + DWORD rc = ::PeekNamedPipe + ( + m_hInput, // handle + NULL, 0, // ptr to buffer and its size + NULL, // [out] bytes read + &nAvailable, // [out] bytes available + NULL // [out] bytes left + ); + + if ( !rc ) + { + if ( ::GetLastError() != ERROR_BROKEN_PIPE ) + { + // unexpected error + wxLogLastError(_T("PeekNamedPipe")); + } + + // don't try to continue reading from a pipe if an error occurred or if + // it had been closed + ::CloseHandle(m_hInput); + + wxPipeInputStream *self = wxConstCast(this, wxPipeInputStream); + + self->m_hInput = INVALID_HANDLE_VALUE; + self->m_lasterror = wxSTREAM_EOF; + + nAvailable = 0; + } + + return nAvailable != 0; +} + +size_t wxPipeInputStream::OnSysRead(void *buffer, size_t len) +{ + if ( !IsOpened() ) + { + m_lasterror = wxSTREAM_EOF; + + return 0; + } + + DWORD bytesRead; + if ( !::ReadFile(m_hInput, buffer, len, &bytesRead, NULL) ) + { + m_lasterror = ::GetLastError() == ERROR_BROKEN_PIPE + ? wxSTREAM_EOF + : wxSTREAM_READ_ERROR; + } + + // bytesRead is set to 0, as desired, if an error occurred + return bytesRead; +} + +// ---------------------------------------------------------------------------- +// wxPipeOutputStream +// ---------------------------------------------------------------------------- + +wxPipeOutputStream::wxPipeOutputStream(HANDLE hOutput) +{ + m_hOutput = hOutput; + + // unblock the pipe to prevent deadlocks when we're writing to the pipe + // from which the child process can't read because it is writing in its own + // end of it + DWORD mode = PIPE_READMODE_BYTE | PIPE_NOWAIT; + if ( !::SetNamedPipeHandleState + ( + m_hOutput, + &mode, + NULL, // collection count (we don't set it) + NULL // timeout (we don't set it neither) + ) ) + { + wxLogLastError(_T("SetNamedPipeHandleState(PIPE_NOWAIT)")); } } -#endif // Win32 + +bool wxPipeOutputStream::Close() +{ + return ::CloseHandle(m_hOutput) != 0; +} + + +size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t len) +{ + m_lasterror = wxSTREAM_NO_ERROR; + + DWORD totalWritten = 0; + while ( len > 0 ) + { + DWORD chunkWritten; + if ( !::WriteFile(m_hOutput, buffer, len, &chunkWritten, NULL) ) + { + m_lasterror = ::GetLastError() == ERROR_BROKEN_PIPE + ? wxSTREAM_EOF + : wxSTREAM_WRITE_ERROR; + break; + } + + if ( !chunkWritten ) + break; + + buffer = (char *)buffer + chunkWritten; + totalWritten += chunkWritten; + len -= chunkWritten; + } + + return totalWritten; +} + +#endif // wxUSE_STREAMS + +// ============================================================================ +// wxExecute functions family +// ============================================================================ #if wxUSE_IPC // connect to the given server via DDE and ask it to execute the command -static bool wxExecuteDDE(const wxString& ddeServer, - const wxString& ddeTopic, - const wxString& ddeCommand) +bool +wxExecuteDDE(const wxString& ddeServer, + const wxString& ddeTopic, + const wxString& ddeCommand) { - bool ok; + bool ok wxDUMMY_INITIALIZE(false); wxDDEClient client; - wxConnectionBase *conn = client.MakeConnection(_T(""), - ddeServer, - ddeTopic); + wxConnectionBase * + conn = client.MakeConnection(wxEmptyString, ddeServer, ddeTopic); if ( !conn ) { - ok = FALSE; + ok = false; } else // connected to DDE server { - // the added complication here is that although most - // programs use XTYP_EXECUTE for their DDE API, some - // important ones - like IE and other MS stuff - use - // XTYP_REQUEST! + // the added complication here is that although most programs use + // XTYP_EXECUTE for their DDE API, some important ones -- like Word + // and other MS stuff - use XTYP_REQUEST! // - // so we try it first and then the other one if it - // failed + // moreover, anotheri mportant program (IE) understands both but + // returns an error from Execute() so we must try Request() first + // to avoid doing it twice { + // we're prepared for this one to fail, so don't show errors wxLogNull noErrors; + ok = conn->Request(ddeCommand) != NULL; } if ( !ok ) { - // now try execute - but show the errors + // now try execute -- but show the errors ok = conn->Execute(ddeCommand); } } @@ -358,9 +525,17 @@ static bool wxExecuteDDE(const wxString& ddeServer, #endif // wxUSE_IPC -long wxExecute(const wxString& cmd, bool sync, wxProcess *handler) +long wxExecute(const wxString& cmd, int flags, wxProcess *handler) { - wxCHECK_MSG( !!cmd, 0, wxT("empty command in wxExecute") ); + wxCHECK_MSG( !cmd.empty(), 0, wxT("empty command in wxExecute") ); + +#if wxUSE_THREADS + // for many reasons, the code below breaks down if it's called from another + // thread -- this could be fixed, but as Unix versions don't support this + // neither I don't want to waste time on this now + wxASSERT_MSG( wxThread::IsMain(), + _T("wxExecute() can be called only from the main thread") ); +#endif // wxUSE_THREADS wxString command; @@ -437,7 +612,7 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler) // termination, try to execute DDE command right now, it can succeed if // the process is already running - but as it fails if it's not // running, suppress any errors it might generate - if ( !sync ) + if ( !(flags & wxEXEC_SYNC) ) { wxLogNull noErrors; if ( wxExecuteDDE(ddeServer, ddeTopic, ddeCommand) ) @@ -456,49 +631,28 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler) command = cmd; } -#if defined(__WIN32__) && !defined(__TWIN32__) - // the IO redirection is only supported with wxUSE_STREAMS BOOL redirect = FALSE; -#if wxUSE_STREAMS - // the first elements are reading ends, the second are the writing ones - HANDLE hpipeStdin[2], - hpipeStdout[2], - hpipeStderr[2]; + +#if wxUSE_STREAMS && !defined(__WXWINCE__) + wxPipe pipeIn, pipeOut, pipeErr; + + // we'll save here the copy of pipeIn[Write] HANDLE hpipeStdinWrite = INVALID_HANDLE_VALUE; // open the pipes to which child process IO will be redirected if needed if ( handler && handler->IsRedirected() ) { - // default secutiry attributes - SECURITY_ATTRIBUTES security; - - security.nLength = sizeof(security); - security.lpSecurityDescriptor = NULL; - security.bInheritHandle = TRUE; - - // create stdin pipe - if ( !::CreatePipe(&hpipeStdin[0], &hpipeStdin[1], &security, 0) ) - { - wxLogSysError(_("Can't create the inter-process read pipe")); - - // indicate failure in both cases - return sync ? -1 : 0; - } - - // and a stdout one - if ( !::CreatePipe(&hpipeStdout[0], &hpipeStdout[1], &security, 0) ) + // create pipes for redirecting stdin, stdout and stderr + if ( !pipeIn.Create() || !pipeOut.Create() || !pipeErr.Create() ) { - ::CloseHandle(hpipeStdin[0]); - ::CloseHandle(hpipeStdin[1]); - - wxLogSysError(_("Can't create the inter-process write pipe")); + wxLogSysError(_("Failed to redirect the child process IO")); - return sync ? -1 : 0; + // indicate failure: we need to return different error code + // depending on the sync flag + return flags & wxEXEC_SYNC ? -1 : 0; } - (void)::CreatePipe(&hpipeStderr[0], &hpipeStderr[1], &security, 0); - redirect = TRUE; } #endif // wxUSE_STREAMS @@ -508,29 +662,35 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler) wxZeroMemory(si); si.cb = sizeof(si); -#if wxUSE_STREAMS +#if wxUSE_STREAMS && !defined(__WXWINCE__) if ( redirect ) { - // when the std IO is redirected, we don't show the (console) process - // window - si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; + si.dwFlags = STARTF_USESTDHANDLES; - si.hStdInput = hpipeStdin[0]; - si.hStdOutput = hpipeStdout[1]; - si.hStdError = hpipeStderr[1]; + si.hStdInput = pipeIn[wxPipe::Read]; + si.hStdOutput = pipeOut[wxPipe::Write]; + si.hStdError = pipeErr[wxPipe::Write]; - si.wShowWindow = SW_HIDE; + // when the std IO is redirected, we don't show the (console) process + // window by default, but this can be overridden by the caller by + // specifying wxEXEC_NOHIDE flag + if ( !(flags & wxEXEC_NOHIDE) ) + { + si.dwFlags |= STARTF_USESHOWWINDOW; + si.wShowWindow = SW_HIDE; + } // we must duplicate the handle to the write side of stdin pipe to make - // it non inheritable: indeed, we must close hpipeStdin[1] before - // launching the child process as otherwise this handle will be + // it non inheritable: indeed, we must close the writing end of pipeIn + // before launching the child process as otherwise this handle will be // inherited by the child which will never close it and so the pipe // will never be closed and the child will be left stuck in ReadFile() + HANDLE pipeInWrite = pipeIn.Detach(wxPipe::Write); if ( !::DuplicateHandle ( - GetCurrentProcess(), - hpipeStdin[1], - GetCurrentProcess(), + ::GetCurrentProcess(), + pipeInWrite, + ::GetCurrentProcess(), &hpipeStdinWrite, 0, // desired access: unused here FALSE, // not inherited @@ -540,89 +700,103 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler) wxLogLastError(_T("DuplicateHandle")); } - ::CloseHandle(hpipeStdin[1]); + ::CloseHandle(pipeInWrite); } #endif // wxUSE_STREAMS PROCESS_INFORMATION pi; - DWORD dwFlags = CREATE_DEFAULT_ERROR_MODE | CREATE_SUSPENDED; + DWORD dwFlags = CREATE_SUSPENDED; + +#ifndef __WXWINCE__ + dwFlags |= CREATE_DEFAULT_ERROR_MODE ; +#else + // we are assuming commands without spaces for now + wxString moduleName = command.BeforeFirst(wxT(' ')); + wxString arguments = command.AfterFirst(wxT(' ')); +#endif bool ok = ::CreateProcess ( - NULL, // application name (use only cmd line) + // WinCE requires appname to be non null + // Win32 allows for null +#ifdef __WXWINCE__ (wxChar *) - command.c_str(), // full command line - NULL, // security attributes: defaults for both - NULL, // the process and its main thread - redirect, // inherit handles if we use pipes - dwFlags, // process creation flags - NULL, // environment (use the same) - NULL, // current directory (use the same) - &si, // startup info (unused here) - &pi // process info + moduleName.c_str(), // application name + (wxChar *) + arguments.c_str(), // arguments +#else + NULL, // application name (use only cmd line) + (wxChar *) + command.c_str(), // full command line +#endif + NULL, // security attributes: defaults for both + NULL, // the process and its main thread + redirect, // inherit handles if we use pipes + dwFlags, // process creation flags + NULL, // environment (use the same) + NULL, // current directory (use the same) + &si, // startup info (unused here) + &pi // process info ) != 0; -#if wxUSE_STREAMS +#if wxUSE_STREAMS && !defined(__WXWINCE__) // we can close the pipe ends used by child anyhow if ( redirect ) { - ::CloseHandle(hpipeStdin[0]); - ::CloseHandle(hpipeStdout[1]); - ::CloseHandle(hpipeStderr[1]); + ::CloseHandle(pipeIn.Detach(wxPipe::Read)); + ::CloseHandle(pipeOut.Detach(wxPipe::Write)); + ::CloseHandle(pipeErr.Detach(wxPipe::Write)); } #endif // wxUSE_STREAMS if ( !ok ) { -#if wxUSE_STREAMS +#if wxUSE_STREAMS && !defined(__WXWINCE__) // close the other handles too if ( redirect ) { - ::CloseHandle(hpipeStdout[0]); - ::CloseHandle(hpipeStderr[0]); + ::CloseHandle(pipeOut.Detach(wxPipe::Read)); + ::CloseHandle(pipeErr.Detach(wxPipe::Read)); } #endif // wxUSE_STREAMS wxLogSysError(_("Execution of command '%s' failed"), command.c_str()); - return sync ? -1 : 0; + return flags & wxEXEC_SYNC ? -1 : 0; } -#if wxUSE_STREAMS +#if wxUSE_STREAMS && !defined(__WXWINCE__) + // the input buffer bufOut is connected to stdout, this is why it is + // called bufOut and not bufIn + wxStreamTempInputBuffer bufOut, + bufErr; + if ( redirect ) { // We can now initialize the wxStreams - wxInputStream *inStream = new wxPipeInputStream(hpipeStdout[0]), - *errStream = new wxPipeInputStream(hpipeStderr[0]); - wxOutputStream *outStream = new wxPipeOutputStream(hpipeStdinWrite); + wxPipeInputStream * + outStream = new wxPipeInputStream(pipeOut.Detach(wxPipe::Read)); + wxPipeInputStream * + errStream = new wxPipeInputStream(pipeErr.Detach(wxPipe::Read)); + wxPipeOutputStream * + inStream = new wxPipeOutputStream(hpipeStdinWrite); - handler->SetPipeStreams(inStream, outStream, errStream); - } -#endif // wxUSE_STREAMS - - // register the class for the hidden window used for the notifications - if ( !gs_classForHiddenWindow ) - { - gs_classForHiddenWindow = _T("wxHiddenWindow"); + handler->SetPipeStreams(outStream, inStream, errStream); - WNDCLASS wndclass; - wxZeroMemory(wndclass); - wndclass.lpfnWndProc = (WNDPROC)wxExecuteWindowCbk; - wndclass.hInstance = wxGetInstance(); - wndclass.lpszClassName = gs_classForHiddenWindow; - - if ( !::RegisterClass(&wndclass) ) - { - wxLogLastError(wxT("RegisterClass(hidden window)")); - } + bufOut.Init(outStream); + bufErr.Init(errStream); } +#endif // wxUSE_STREAMS // 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); + HWND hwnd = wxCreateHiddenWindow + ( + &gs_classForHiddenWindow, + wxMSWEXEC_WNDCLASSNAME, + (WNDPROC)wxExecuteWindowCbk + ); + wxASSERT_MSG( hwnd, wxT("can't create a hidden window for wxExecute") ); // Alloc data @@ -630,8 +804,8 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler) data->hProcess = pi.hProcess; data->dwProcessId = pi.dwProcessId; data->hWnd = hwnd; - data->state = sync; - if ( sync ) + data->state = (flags & wxEXEC_SYNC) != 0; + if ( flags & wxEXEC_SYNC ) { // handler may be !NULL for capturing program output, but we don't use // it wxExecuteData struct in this case @@ -646,7 +820,7 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler) DWORD tid; HANDLE hThread = ::CreateThread(NULL, 0, - (LPTHREAD_START_ROUTINE)wxExecuteThread, + wxExecuteThread, (void *)data, 0, &tid); @@ -676,7 +850,7 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler) ::CloseHandle(hThread); -#if wxUSE_IPC +#if wxUSE_IPC && !defined(__WXWINCE__) // second part of DDE hack: now establish the DDE conversation with the // just launched process if ( !ddeServer.empty() ) @@ -700,7 +874,7 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler) case WAIT_TIMEOUT: wxLogDebug(_T("Timeout too small in WaitForInputIdle")); - ok = FALSE; + ok = false; break; case 0: @@ -710,14 +884,13 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler) if ( !ok ) { - // FIXME just as above we don't check Execute() return code - wxLogNull nolog; - (void)conn->Execute(ddeCommand); + wxLogDebug(_T("Failed to send DDE request to the process \"%s\"."), + cmd.c_str()); } } #endif // wxUSE_IPC - if ( !sync ) + if ( !(flags & wxEXEC_SYNC) ) { // clean up will be done when the process terminates @@ -725,90 +898,57 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler) return pi.dwProcessId; } - // waiting until command executed (disable everything while doing it) -#if wxUSE_GUI - { - wxBusyCursor bc; + wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL; + wxCHECK_MSG( traits, -1, _T("no wxAppTraits in wxExecute()?") ); - wxWindowDisabler wd; -#endif // wxUSE_GUI + void *cookie = NULL; + if ( !(flags & wxEXEC_NODISABLE) ) + { + // disable all app windows while waiting for the child process to finish + cookie = traits->BeforeChildWaitLoop(); + } + // wait until the child process terminates while ( data->state ) - wxYield(); + { +#if wxUSE_STREAMS && !defined(__WXWINCE__) + bufOut.Update(); + bufErr.Update(); +#endif // wxUSE_STREAMS -#if wxUSE_GUI + // don't eat 100% of the CPU -- ugly but anything else requires + // real async IO which we don't have for the moment + ::Sleep(50); + + // we must process messages or we'd never get wxWM_PROC_TERMINATED + traits->AlwaysYield(); + } + + if ( !(flags & wxEXEC_NODISABLE) ) + { + // reenable disabled windows back + traits->AfterChildWaitLoop(cookie); } -#endif // wxUSE_GUI DWORD dwExitCode = data->dwExitCode; delete data; // return the exit code return dwExitCode; -#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 } -long wxExecute(char **argv, bool sync, wxProcess *handler) +long wxExecute(wxChar **argv, int flags, wxProcess *handler) { wxString command; - while ( *argv != NULL ) + for ( ;; ) { - command << *argv++ << ' '; - } + command += *argv++; + if ( !*argv ) + break; - command.RemoveLast(); - - return wxExecute(command, sync, handler); -} - -#if wxUSE_GUI - -// ---------------------------------------------------------------------------- -// Metafile helpers -// ---------------------------------------------------------------------------- - -extern void PixelToHIMETRIC(LONG *x, LONG *y) -{ - ScreenHDC hdcRef; - - int iWidthMM = GetDeviceCaps(hdcRef, HORZSIZE), - iHeightMM = GetDeviceCaps(hdcRef, VERTSIZE), - iWidthPels = GetDeviceCaps(hdcRef, HORZRES), - iHeightPels = GetDeviceCaps(hdcRef, VERTRES); - - *x *= (iWidthMM * 100); - *x /= iWidthPels; - *y *= (iHeightMM * 100); - *y /= iHeightPels; -} - -extern void HIMETRICToPixel(LONG *x, LONG *y) -{ - ScreenHDC hdcRef; - - int iWidthMM = GetDeviceCaps(hdcRef, HORZSIZE), - iHeightMM = GetDeviceCaps(hdcRef, VERTSIZE), - iWidthPels = GetDeviceCaps(hdcRef, HORZRES), - iHeightPels = GetDeviceCaps(hdcRef, VERTRES); + command += _T(' '); + } - *x *= iWidthPels; - *x /= (iWidthMM * 100); - *y *= iHeightPels; - *y /= (iHeightMM * 100); + return wxExecute(command, flags, handler); } - -#endif // wxUSE_GUI