// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) 1998-2002 wxWindows dev team
-// Licence: wxWindows license
+// Copyright: (c) 1998-2002 wxWidgets dev team
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation
#endif
#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__
- #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 <ctype.h>
-#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__)
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
#include <direct.h>
#ifndef __MWERKS__
#include <dos.h>
#endif
#endif
-#if defined(__GNUWIN32__) && !defined(__TWIN32__)
+#if defined(__GNUWIN32__)
#include <sys/unistd.h>
#include <sys/stat.h>
#endif
-#if defined(__WIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
-#include <io.h>
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+ #ifndef __UNIX__
+ #include <io.h>
+ #endif
-#ifndef __GNUWIN32__
-#include <shellapi.h>
-#endif
+ #ifndef __GNUWIN32__
+ #include <shellapi.h>
+ #endif
#endif
#include <stdio.h>
#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
// ----------------------------------------------------------------------------
// 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;
// ----------------------------------------------------------------------------
public:
~wxExecuteData()
{
-#ifndef __WIN16__
if ( !::CloseHandle(hProcess) )
{
wxLogLastError(wxT("CloseHandle(hProcess)"));
}
-#endif
}
HWND hWnd; // window to send wxWM_PROC_TERMINATED to
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
protected:
HANDLE m_hInput;
+
+ DECLARE_NO_COPY_CLASS(wxPipeInputStream)
};
class wxPipeOutputStream: public wxOutputStream
protected:
HANDLE m_hOutput;
+
+ DECLARE_NO_COPY_CLASS(wxPipeOutputStream)
};
// define this to let wxexec.cpp know that we know what we're doing
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;
// implementation
// ============================================================================
-#ifdef __WIN32__
-
// ----------------------------------------------------------------------------
// process termination detecting support
// ----------------------------------------------------------------------------
// implementation of IO redirection support classes
// ============================================================================
-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && !defined(__WXWINCE__)
// ----------------------------------------------------------------------------
// wxPipeInputStreams
bool wxPipeInputStream::CanRead() const
{
- // FIXME
-#ifdef __WXWINE__
- return FALSE;
-#else // !Wine
if ( !IsOpened() )
return FALSE;
}
return nAvailable != 0;
-#endif // Wine/!Wine
}
size_t wxPipeInputStream::OnSysRead(void *buffer, size_t len)
#endif // wxUSE_STREAMS
-#endif // Win32
-
// ============================================================================
// wxExecute functions family
// ============================================================================
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 )
}
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);
}
}
{
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
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]
wxZeroMemory(si);
si.cb = sizeof(si);
-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && !defined(__WXWINCE__)
if ( redirect )
{
si.dwFlags = STARTF_USESTDHANDLES;
#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
(
&pi // process info
) != 0;
-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && !defined(__WXWINCE__)
// we can close the pipe ends used by child anyhow
if ( redirect )
{
if ( !ok )
{
-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && !defined(__WXWINCE__)
// close the other handles too
if ( redirect )
{
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,
}
#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
::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() )
// 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
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;
+ void *cookie = traits->BeforeChildWaitLoop();
+
+ // wait until the child process terminates
+ while ( data->state )
{
- 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 )
- {
-#if wxUSE_STREAMS
- bufOut.Update();
- bufErr.Update();
+#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);
-
-#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)
projects / wxWidgets.git / blobdiff