X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79066131734040a7d01b87566fc1262e7fbe51ad..7d2d5d81951888e76f93b33aca9899a9c480022b:/src/msw/utilsexc.cpp diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index 69ee8c8c46..7046329ee5 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998-2002 wxWindows dev team -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation #endif @@ -32,33 +32,36 @@ #include "wx/utils.h" #include "wx/app.h" #include "wx/intl.h" + #include "wx/log.h" #endif -#include "wx/log.h" - #ifdef __WIN32__ #include "wx/stream.h" #include "wx/process.h" #endif +#include "wx/apptrait.h" + #include "wx/msw/private.h" #include -#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) +#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__) && !defined(__WXMICROWIN__) -#include +#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) +#ifndef __UNIX__ + #include +#endif #ifndef __GNUWIN32__ #include @@ -121,7 +124,7 @@ public: bool state; // set to FALSE when the process finishes }; -#if defined(__WIN32__) && wxUSE_STREAMS +#if defined(__WIN32__) && wxUSE_STREAMS && !defined(__WXWINCE__) // ---------------------------------------------------------------------------- // wxPipeStreams @@ -137,13 +140,15 @@ public: bool IsOpened() const { return m_hInput != INVALID_HANDLE_VALUE; } // returns TRUE if there is any data to be read from the pipe - bool IsAvailable() const; + 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 @@ -157,6 +162,8 @@ protected: protected: HANDLE m_hOutput; + + DECLARE_NO_COPY_CLASS(wxPipeOutputStream) }; // define this to let wxexec.cpp know that we know what we're doing @@ -260,7 +267,7 @@ private: // thread function for the thread monitoring the process termination static DWORD __stdcall wxExecuteThread(void *arg) { - wxExecuteData *data = (wxExecuteData*)arg; + wxExecuteData * const data = (wxExecuteData *)arg; if ( ::WaitForSingleObject(data->hProcess, INFINITE) != WAIT_OBJECT_0 ) { @@ -291,7 +298,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, @@ -314,7 +321,7 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message, } else { - return DefWindowProc(hWnd, message, wParam, lParam); + return ::DefWindowProc(hWnd, message, wParam, lParam); } } @@ -322,7 +329,7 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message, // implementation of IO redirection support classes // ============================================================================ -#if wxUSE_STREAMS +#if wxUSE_STREAMS && !defined(__WXWINCE__) // ---------------------------------------------------------------------------- // wxPipeInputStreams @@ -339,7 +346,7 @@ wxPipeInputStream::~wxPipeInputStream() ::CloseHandle(m_hInput); } -bool wxPipeInputStream::IsAvailable() const +bool wxPipeInputStream::CanRead() const { if ( !IsOpened() ) return FALSE; @@ -368,9 +375,12 @@ bool wxPipeInputStream::IsAvailable() const // it had been closed ::CloseHandle(m_hInput); - wxConstCast(this, wxPipeInputStream)->m_hInput = INVALID_HANDLE_VALUE; + wxPipeInputStream *self = wxConstCast(this, wxPipeInputStream); - return FALSE; + self->m_hInput = INVALID_HANDLE_VALUE; + self->m_lasterror = wxSTREAM_EOF; + + nAvailable = 0; } return nAvailable != 0; @@ -378,26 +388,22 @@ bool wxPipeInputStream::IsAvailable() const 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 - if ( !IsAvailable() ) + if ( !IsOpened() ) { m_lasterror = wxSTREAM_EOF; return 0; } - m_lasterror = wxSTREAM_NOERROR; - 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; + m_lasterror = ::GetLastError() == ERROR_BROKEN_PIPE + ? wxSTREAM_EOF + : wxSTREAM_READ_ERROR; } + // bytesRead is set to 0, as desired, if an error occured return bytesRead; } @@ -417,18 +423,17 @@ wxPipeOutputStream::~wxPipeOutputStream() size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t len) { - DWORD bytesRead; + DWORD bytesWritten; - m_lasterror = wxSTREAM_NOERROR; - if ( !::WriteFile(m_hOutput, buffer, len, &bytesRead, NULL) ) + m_lasterror = wxSTREAM_NO_ERROR; + if ( !::WriteFile(m_hOutput, buffer, len, &bytesWritten, NULL) ) { - if ( ::GetLastError() == ERROR_BROKEN_PIPE ) - m_lasterror = wxSTREAM_EOF; - else - m_lasterror = wxSTREAM_READ_ERROR; + m_lasterror = ::GetLastError() == ERROR_BROKEN_PIPE + ? wxSTREAM_EOF + : wxSTREAM_WRITE_ERROR; } - return bytesRead; + return bytesWritten; } #endif // wxUSE_STREAMS @@ -446,10 +451,10 @@ static bool wxExecuteDDE(const wxString& ddeServer, const wxString& ddeTopic, const wxString& ddeCommand) { - bool ok; + bool ok = FALSE; wxDDEClient client; - wxConnectionBase *conn = client.MakeConnection(_T(""), + wxConnectionBase *conn = client.MakeConnection(wxEmptyString, ddeServer, ddeTopic); if ( !conn ) @@ -458,21 +463,23 @@ static bool wxExecuteDDE(const wxString& ddeServer, } 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); } } @@ -486,6 +493,14 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler) { wxCHECK_MSG( !!cmd, 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; #if wxUSE_IPC @@ -580,12 +595,10 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler) command = cmd; } -#if defined(__WIN32__) && !defined(__TWIN32__) - // the IO redirection is only supported with wxUSE_STREAMS BOOL redirect = FALSE; -#if wxUSE_STREAMS +#if wxUSE_STREAMS && !defined(__WXWINCE__) wxPipe pipeIn, pipeOut, pipeErr; // we'll save here the copy of pipeIn[Write] @@ -613,7 +626,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler) wxZeroMemory(si); si.cb = sizeof(si); -#if wxUSE_STREAMS +#if wxUSE_STREAMS && !defined(__WXWINCE__) if ( redirect ) { si.dwFlags = STARTF_USESTDHANDLES; @@ -656,7 +669,10 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler) #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 ; +#endif bool ok = ::CreateProcess ( @@ -673,7 +689,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler) &pi // process info ) != 0; -#if wxUSE_STREAMS +#if wxUSE_STREAMS && !defined(__WXWINCE__) // we can close the pipe ends used by child anyhow if ( redirect ) { @@ -685,7 +701,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler) if ( !ok ) { -#if wxUSE_STREAMS +#if wxUSE_STREAMS && !defined(__WXWINCE__) // close the other handles too if ( redirect ) { @@ -699,7 +715,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler) 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, @@ -741,10 +757,17 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler) // create a hidden window to receive notification about process // termination +#ifdef __WXWINCE__ + HWND hwnd = ::CreateWindow(gs_classForHiddenWindow, NULL, + WS_OVERLAPPED, + 0, 0, 0, 0, NULL, + (HMENU)NULL, wxGetInstance(), 0); +#else HWND hwnd = ::CreateWindow(gs_classForHiddenWindow, NULL, WS_OVERLAPPEDWINDOW, 0, 0, 0, 0, NULL, (HMENU)NULL, wxGetInstance(), 0); +#endif wxASSERT_MSG( hwnd, wxT("can't create a hidden window for wxExecute") ); // Alloc data @@ -798,7 +821,7 @@ long wxExecute(const wxString& cmd, int flags, 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() ) @@ -829,6 +852,12 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler) // ok, process ready to accept DDE requests ok = wxExecuteDDE(ddeServer, ddeTopic, ddeCommand); } + + if ( !ok ) + { + wxLogDebug(_T("Failed to send DDE request to the process \"%s\"."), + cmd.c_str()); + } } #endif // wxUSE_IPC @@ -840,68 +869,49 @@ long wxExecute(const wxString& cmd, int flags, 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 + // disable all app windows while waiting for the child process to finish + void *cookie = traits->BeforeChildWaitLoop(); - // wait until the child process terminates - while ( data->state ) - { -#if wxUSE_STREAMS - bufOut.Update(); - bufErr.Update(); + // wait until the child process terminates + while ( data->state ) + { +#if wxUSE_STREAMS && !defined(__WXWINCE__) + bufOut.Update(); + bufErr.Update(); #endif // wxUSE_STREAMS - // 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); - - // repaint the GUI - wxYield(); - } + // 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); -#if wxUSE_GUI + // we must process messages or we'd never get wxWM_PROC_TERMINATED + traits->AlwaysYield(); } -#endif // wxUSE_GUI + + traits->AfterChildWaitLoop(cookie); 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 flags & wxEXEC_SYNC ? -1 : 0; - - if ( flags & wxEXEC_SYNC ) - { - int running; - do - { - wxYield(); - running = GetModuleUsage((HINSTANCE)instanceID); - } while (running); - } - - return instanceID; -#endif // Win16/32 } -long wxExecute(char **argv, int flags, 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(); + command += _T(' '); + } return wxExecute(command, flags, handler); }