X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45d5a0c6d884a616ddbac796192032a384c7ba85..9d180f3ad0459709707ca591295c7c885d09c614:/src/msw/utilsexc.cpp diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index 58b26f2c07..d42b1a4838 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 ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -33,9 +33,6 @@ #include "wx/app.h" #include "wx/intl.h" #include "wx/log.h" - #if wxUSE_GUI // See 'dirty hack' below. - #include "wx/frame.h" - #endif #endif #ifdef __WIN32__ @@ -43,24 +40,28 @@ #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__) #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__) +#ifndef __UNIX__ + #include +#endif #ifndef __GNUWIN32__ #include @@ -139,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 @@ -159,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 @@ -341,12 +346,8 @@ wxPipeInputStream::~wxPipeInputStream() ::CloseHandle(m_hInput); } -bool wxPipeInputStream::IsAvailable() const +bool wxPipeInputStream::CanRead() const { - // FIXME -#ifdef __WXWINE__ - return FALSE; -#else if ( !IsOpened() ) return FALSE; @@ -374,37 +375,35 @@ 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; -#endif } 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; } @@ -424,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 @@ -453,7 +451,7 @@ static bool wxExecuteDDE(const wxString& ddeServer, const wxString& ddeTopic, const wxString& ddeCommand) { - bool ok; + bool ok = FALSE; wxDDEClient client; wxConnectionBase *conn = client.MakeConnection(_T(""), @@ -470,17 +468,17 @@ static bool wxExecuteDDE(const wxString& ddeServer, // important ones - like IE and other MS stuff - use // XTYP_REQUEST! // - // so we try it first and then the other one if it + // so we try one first and then the other one if it // failed { wxLogNull noErrors; - ok = conn->Request(ddeCommand) != NULL; + ok = conn->Execute(ddeCommand); } if ( !ok ) { - // now try execute - but show the errors - ok = conn->Execute(ddeCommand); + // now try request - but show the errors + ok = conn->Request(ddeCommand) != NULL; } } @@ -493,6 +491,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 @@ -587,8 +593,6 @@ 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; @@ -847,100 +851,35 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler) return pi.dwProcessId; } + wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL; + wxCHECK_MSG( traits, -1, _T("no wxAppTraits in wxExecute()?") ); + // disable all app windows while waiting for the child process to finish -#if wxUSE_GUI - - /* - We use a dirty hack here to disable all application windows (which we - must do because otherwise the calls to wxYield() could lead to some very - unexpected reentrancies in the users code) but to avoid losing - focus/activation entirely when the child process terminates which would - happen if we simply disabled everything using wxWindowDisabler. Indeed, - remember that Windows will never activate a disabled window and when the - last childs window is closed and Windows looks for a window to activate - all our windows are still disabled. There is no way to enable them in - time because we don't know when the childs windows are going to be - closed, so the solution we use here is to keep one special tiny frame - enabled all the time. Then when the child terminates it will get - activated and when we close it below -- after reenabling all the other - windows! -- the previously active window becomes activated again and - everything is ok. - */ - wxWindow *winActive; - { - wxBusyCursor bc; - - // first disable all existing windows - wxWindowDisabler wd; - - // then create an "invisible" frame: it has minimal size, is positioned - // (hopefully) outside the screen and doesn't appear on the taskbar - winActive = new wxFrame - ( - wxTheApp->GetTopWindow(), - -1, - _T(""), - wxPoint(32600, 32600), - wxSize(1, 1), - wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR - ); - winActive->Show(); -#endif // wxUSE_GUI - - // wait until the child process terminates - while ( data->state ) - { + void *cookie = traits->BeforeChildWaitLoop(); + + // wait until the child process terminates + while ( data->state ) + { #if wxUSE_STREAMS - bufOut.Update(); - bufErr.Update(); + 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); - -#if wxUSE_GUI - // repaint the GUI - wxYield(); -#else // !GUI - // dispatch the messages to the hidden window so that it could - // process the wxWM_PROC_TERMINATED notification - MSG msg; - ::PeekMessage(&msg, hwnd, 0, 0, PM_REMOVE); -#endif // GUI/!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); -#if wxUSE_GUI + // we must process messages or we'd never get wxWM_PROC_TERMINATED + traits->AlwaysYield(); } - // finally delete the dummy frame and, as wd has been already destroyed and - // the other windows reenabled, the activation is going to return to the - // window which had it before - winActive->Destroy(); -#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(wxChar **argv, int flags, wxProcess *handler)