X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2478fde622a16d25c66690af353dfdc37e7b582..4b1ae1539c549eb612e5d2b6876124138ce9cb4e:/src/msw/utilsexc.cpp?ds=inline diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index d42b1a4838..43abd701ea 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) 1998-2002 wxWindows dev team +// Copyright: (c) 1998-2002 wxWidgets dev team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation #endif @@ -35,18 +35,18 @@ #include "wx/log.h" #endif -#ifdef __WIN32__ - #include "wx/stream.h" - #include "wx/process.h" -#endif +#include "wx/stream.h" +#include "wx/process.h" #include "wx/apptrait.h" +#include "wx/module.h" + #include "wx/msw/private.h" #include -#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) +#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #include #ifndef __MWERKS__ #include @@ -58,14 +58,14 @@ #include #endif -#if defined(__WIN32__) && !defined(__WXMICROWIN__) -#ifndef __UNIX__ - #include -#endif +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) + #ifndef __UNIX__ + #include + #endif -#ifndef __GNUWIN32__ -#include -#endif + #ifndef __GNUWIN32__ + #include + #endif #endif #include @@ -82,6 +82,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 // ---------------------------------------------------------------------------- @@ -96,6 +100,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; // ---------------------------------------------------------------------------- @@ -108,12 +113,10 @@ struct wxExecuteData public: ~wxExecuteData() { -#ifndef __WIN16__ if ( !::CloseHandle(hProcess) ) { wxLogLastError(wxT("CloseHandle(hProcess)")); } -#endif } HWND hWnd; // window to send wxWM_PROC_TERMINATED to @@ -124,7 +127,28 @@ public: 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 @@ -211,21 +235,12 @@ public: bool IsOk() const { return m_handles[Read] != INVALID_HANDLE_VALUE; } // return the descriptor for one of the pipe ends - HANDLE operator[](Direction which) const - { - wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_handles), - _T("invalid pipe index") ); - - return m_handles[which]; - } + HANDLE operator[](Direction which) const { return m_handles[which]; } // detach a descriptor, meaning that the pipe dtor won't close it, and // return it HANDLE Detach(Direction which) { - wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_handles), - _T("invalid pipe index") ); - HANDLE handle = m_handles[which]; m_handles[which] = INVALID_HANDLE_VALUE; @@ -258,8 +273,6 @@ private: // implementation // ============================================================================ -#ifdef __WIN32__ - // ---------------------------------------------------------------------------- // process termination detecting support // ---------------------------------------------------------------------------- @@ -329,7 +342,7 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message, // implementation of IO redirection support classes // ============================================================================ -#if wxUSE_STREAMS +#if wxUSE_STREAMS && !defined(__WXWINCE__) // ---------------------------------------------------------------------------- // wxPipeInputStreams @@ -438,8 +451,6 @@ size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t len) #endif // wxUSE_STREAMS -#endif // Win32 - // ============================================================================ // wxExecute functions family // ============================================================================ @@ -451,10 +462,10 @@ static bool wxExecuteDDE(const wxString& ddeServer, const wxString& ddeTopic, const wxString& ddeCommand) { - bool ok = FALSE; + bool ok wxDUMMY_INITIALIZE(false); wxDDEClient client; - wxConnectionBase *conn = client.MakeConnection(_T(""), + wxConnectionBase *conn = client.MakeConnection(wxEmptyString, ddeServer, ddeTopic); if ( !conn ) @@ -463,22 +474,24 @@ 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 one 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->Execute(ddeCommand); + + ok = conn->Request(ddeCommand) != NULL; } if ( !ok ) { - // now try request - but show the errors - ok = conn->Request(ddeCommand) != NULL; + // now try execute -- but show the errors + ok = conn->Execute(ddeCommand); } } @@ -596,7 +609,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler) // 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] @@ -624,7 +637,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; @@ -667,7 +680,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 ( @@ -684,7 +700,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 ) { @@ -696,7 +712,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 ) { @@ -710,7 +726,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, @@ -733,29 +749,15 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler) } #endif // wxUSE_STREAMS - // 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(wxT("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); + HWND hwnd = wxCreateHiddenWindow + ( + &gs_classForHiddenWindow, + wxMSWEXEC_WNDCLASSNAME, + (WNDPROC)wxExecuteWindowCbk + ); + wxASSERT_MSG( hwnd, wxT("can't create a hidden window for wxExecute") ); // Alloc data @@ -809,7 +811,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() ) @@ -840,6 +842,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 @@ -860,7 +868,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler) // wait until the child process terminates while ( data->state ) { -#if wxUSE_STREAMS +#if wxUSE_STREAMS && !defined(__WXWINCE__) bufOut.Update(); bufErr.Update(); #endif // wxUSE_STREAMS