implement wxCairoContext::GetPartialTextExtents for wxGTK

[wxWidgets.git] / src / msw / utilsexc.cpp

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index e1e0d9dc989341829f5f633a68df2497b4aba801..416fe17562c293a26d5774b7b568db8fcfdf4f9e 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/utilsexec.cpp
+// Name:        src/msw/utilsexc.cpp

 // Purpose:     wxExecute implementation for MSW
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxExecute implementation for MSW
 // Author:      Julian Smart
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -33,39 +29,41 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#ifdef __WIN32__
-    #include "wx/stream.h"
-    #include "wx/process.h"
-#endif
-
+#include "wx/process.h"
+#include "wx/thread.h"

 #include "wx/apptrait.h"
 #include "wx/apptrait.h"

+#include "wx/evtloop.h"
+#include "wx/vector.h"
+

 
 #include "wx/msw/private.h"
 
 #include <ctype.h>
 
 
 #include "wx/msw/private.h"
 
 #include <ctype.h>
 

-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+#if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

     #include <direct.h>
     #include <direct.h>

-#ifndef __MWERKS__

     #include <dos.h>
 #endif
     #include <dos.h>
 #endif

-#endif

 
 #if defined(__GNUWIN32__)
     #include <sys/unistd.h>
     #include <sys/stat.h>
 #endif
 
 
 #if defined(__GNUWIN32__)
     #include <sys/unistd.h>
     #include <sys/stat.h>
 #endif
 

-#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-#ifndef __UNIX__
-    #include <io.h>
-#endif
+#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>
 #endif
 
 #include <stdio.h>


@@ -82,6 +80,8 @@
     #include "wx/dde.h"         // for WX_DDE hack in wxExecute
 #endif // wxUSE_IPC
 
     #include "wx/dde.h"         // for WX_DDE hack in wxExecute
 #endif // wxUSE_IPC
 

+#include "wx/msw/private/hiddenwin.h"
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -96,8 +96,16 @@
 // 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
 // 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;
 
 static const wxChar *gs_classForHiddenWindow = NULL;
 

+// event used to wake up threads waiting in wxExecuteThread
+static HANDLE gs_heventShutdown = NULL;
+
+// handles of all threads monitoring the execution of asynchronously running
+// processes
+static wxVector<HANDLE> gs_asyncThreads;
+

 // ----------------------------------------------------------------------------
 // private types
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private types
 // ----------------------------------------------------------------------------


@@ -108,12 +116,10 @@ struct wxExecuteData
 public:
     ~wxExecuteData()
     {
 public:
     ~wxExecuteData()
     {

-#ifndef __WIN16__

         if ( !::CloseHandle(hProcess) )
         {
             wxLogLastError(wxT("CloseHandle(hProcess)"));
         }
         if ( !::CloseHandle(hProcess) )
         {
             wxLogLastError(wxT("CloseHandle(hProcess)"));
         }

-#endif

     }
 
     HWND       hWnd;          // window to send wxWM_PROC_TERMINATED to
     }
 
     HWND       hWnd;          // window to send wxWM_PROC_TERMINATED to


@@ -121,10 +127,70 @@ public:
     DWORD      dwProcessId;   // pid of the process
     wxProcess *handler;
     DWORD      dwExitCode;    // the exit code of the process
     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 && !defined(__WXWINCE__)
+class wxExecuteModule : public wxModule
+{
+public:
+    virtual bool OnInit() { return true; }
+    virtual void OnExit()
+    {
+        if ( gs_heventShutdown )
+        {
+            // stop any threads waiting for the termination of asynchronously
+            // running processes
+            if ( !::SetEvent(gs_heventShutdown) )
+            {
+                wxLogDebug(wxT("Failed to set shutdown event in wxExecuteModule"));
+            }
+
+            ::CloseHandle(gs_heventShutdown);
+            gs_heventShutdown = NULL;
+
+            // now wait until they terminate
+            if ( !gs_asyncThreads.empty() )
+            {
+                const size_t numThreads = gs_asyncThreads.size();
+
+                if ( ::WaitForMultipleObjects
+                       (
+                        numThreads,
+                        &gs_asyncThreads[0],
+                        TRUE,   // wait for all of them to become signalled
+                        3000    // long but finite value
+                       ) == WAIT_TIMEOUT )
+                {
+                    wxLogDebug(wxT("Failed to stop all wxExecute monitor threads"));
+                }
+
+                for ( size_t n = 0; n < numThreads; n++ )
+                {
+                    ::CloseHandle(gs_asyncThreads[n]);
+                }
+
+                gs_asyncThreads.clear();
+            }
+        }
+
+        if ( gs_classForHiddenWindow )
+        {
+            if ( !::UnregisterClass(wxMSWEXEC_WNDCLASSNAME, wxGetInstance()) )
+            {
+                wxLogLastError(wxT("UnregisterClass(wxExecClass)"));
+            }
+
+            gs_classForHiddenWindow = NULL;
+        }
+    }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxExecuteModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxExecuteModule, wxModule)
+
+#if wxUSE_STREAMS && !defined(__WXWINCE__)

 
 // ----------------------------------------------------------------------------
 // wxPipeStreams
 
 // ----------------------------------------------------------------------------
 // wxPipeStreams


@@ -136,10 +202,10 @@ public:
     wxPipeInputStream(HANDLE hInput);
     virtual ~wxPipeInputStream();
 
     wxPipeInputStream(HANDLE hInput);
     virtual ~wxPipeInputStream();
 

-    // returns TRUE if the pipe is still opened
+    // returns true if the pipe is still opened

     bool IsOpened() const { return m_hInput != INVALID_HANDLE_VALUE; }
 
     bool IsOpened() const { return m_hInput != INVALID_HANDLE_VALUE; }
 

-    // returns TRUE if there is any data to be read from the pipe
+    // returns true if there is any data to be read from the pipe

     virtual bool CanRead() const;
 
 protected:
     virtual bool CanRead() const;
 
 protected:


@@ -148,14 +214,15 @@ protected:
 protected:
     HANDLE m_hInput;
 
 protected:
     HANDLE m_hInput;
 

-    DECLARE_NO_COPY_CLASS(wxPipeInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxPipeInputStream);

 };
 
 class wxPipeOutputStream: public wxOutputStream
 {
 public:
     wxPipeOutputStream(HANDLE hOutput);
 };
 
 class wxPipeOutputStream: public wxOutputStream
 {
 public:
     wxPipeOutputStream(HANDLE hOutput);

-    virtual ~wxPipeOutputStream();
+    virtual ~wxPipeOutputStream() { Close(); }
+    bool Close();

 
 protected:
     size_t OnSysWrite(const void *buffer, size_t len);
 
 protected:
     size_t OnSysWrite(const void *buffer, size_t len);


@@ -163,7 +230,7 @@ protected:
 protected:
     HANDLE m_hOutput;
 
 protected:
     HANDLE m_hOutput;
 

-    DECLARE_NO_COPY_CLASS(wxPipeOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxPipeOutputStream);

 };
 
 // define this to let wxexec.cpp know that we know what we're doing
 };
 
 // define this to let wxexec.cpp know that we know what we're doing


@@ -187,7 +254,7 @@ public:
     // default ctor doesn't do anything
     wxPipe() { m_handles[Read] = m_handles[Write] = INVALID_HANDLE_VALUE; }
 
     // default ctor doesn't do anything
     wxPipe() { m_handles[Read] = m_handles[Write] = INVALID_HANDLE_VALUE; }
 

-    // create the pipe, return TRUE if ok, FALSE on error
+    // create the pipe, return true if ok, false on error

     bool Create()
     {
         // default secutiry attributes
     bool Create()
     {
         // default secutiry attributes


@@ -201,31 +268,22 @@ public:
         {
             wxLogSysError(_("Failed to create an anonymous pipe"));
 
         {
             wxLogSysError(_("Failed to create an anonymous pipe"));
 

-            return FALSE;
+            return false;

         }
 
         }
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    // return TRUE if we were created successfully
+    // return true if we were created successfully

     bool IsOk() const { return m_handles[Read] != INVALID_HANDLE_VALUE; }
 
     // return the descriptor for one of the pipe ends
     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)
     {
 
     // 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;
 
         HANDLE handle = m_handles[which];
         m_handles[which] = INVALID_HANDLE_VALUE;
 


@@ -258,8 +316,6 @@ private:
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-#ifdef __WIN32__
-

 // ----------------------------------------------------------------------------
 // process termination detecting support
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // process termination detecting support
 // ----------------------------------------------------------------------------


@@ -269,22 +325,48 @@ static DWORD __stdcall wxExecuteThread(void *arg)
 {
     wxExecuteData * const data = (wxExecuteData *)arg;
 
 {
     wxExecuteData * const data = (wxExecuteData *)arg;
 

-    if ( ::WaitForSingleObject(data->hProcess, INFINITE) != WAIT_OBJECT_0 )
+    // create the shutdown event if we're the first thread starting to wait
+    if ( !gs_heventShutdown )

     {
     {

-        wxLogDebug(_T("Waiting for the process termination failed!"));
+        // create a manual initially non-signalled event object
+        gs_heventShutdown = ::CreateEvent(NULL, TRUE, FALSE, NULL);
+        if ( !gs_heventShutdown )
+        {
+            wxLogDebug(wxT("CreateEvent() in wxExecuteThread failed"));
+        }

     }
 
     }
 

-    // get the exit code
-    if ( !::GetExitCodeProcess(data->hProcess, &data->dwExitCode) )
+    HANDLE handles[2] = { data->hProcess, gs_heventShutdown };
+    switch ( ::WaitForMultipleObjects(2, handles, FALSE, INFINITE) )

     {
     {

-        wxLogLastError(wxT("GetExitCodeProcess"));
-    }
+        case WAIT_OBJECT_0:
+            // process terminated, get its exit code
+            if ( !::GetExitCodeProcess(data->hProcess, &data->dwExitCode) )
+            {
+                wxLogLastError(wxT("GetExitCodeProcess"));
+            }

 
 

-    wxASSERT_MSG( data->dwExitCode != STILL_ACTIVE,
-                  wxT("process should have terminated") );
+            wxASSERT_MSG( data->dwExitCode != STILL_ACTIVE,
+                          wxT("process should have terminated") );

 
 

-    // send a message indicating process termination to the window
-    ::SendMessage(data->hWnd, wxWM_PROC_TERMINATED, 0, (LPARAM)data);
+            // send a message indicating process termination to the window
+            ::SendMessage(data->hWnd, wxWM_PROC_TERMINATED, 0, (LPARAM)data);
+            break;
+
+        case WAIT_OBJECT_0 + 1:
+            // we're shutting down but the process is still running -- leave it
+            // run but clean up the associated data
+            if ( !data->state )
+            {
+                delete data;
+            }
+            //else: exiting while synchronously executing process is still
+            //      running? this shouldn't happen...
+            break;
+
+        default:
+            wxLogDebug(wxT("Waiting for the process termination failed!"));
+    }

 
     return 0;
 }
 
     return 0;
 }


@@ -309,7 +391,7 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
         {
             // we're executing synchronously, tell the waiting thread
             // that the process finished
         {
             // we're executing synchronously, tell the waiting thread
             // that the process finished

-            data->state = 0;
+            data->state = false;

         }
         else
         {
         }
         else
         {


@@ -348,8 +430,19 @@ wxPipeInputStream::~wxPipeInputStream()
 
 bool wxPipeInputStream::CanRead() const
 {
 
 bool wxPipeInputStream::CanRead() const
 {

+    // we can read if there's something in the put back buffer
+    // even pipe is closed
+    if ( m_wbacksize > m_wbackcur )
+        return true;
+
+    wxPipeInputStream * const self = wxConstCast(this, wxPipeInputStream);
+

     if ( !IsOpened() )
     if ( !IsOpened() )

-        return FALSE;
+    {
+        // set back to mark Eof as it may have been unset by Ungetch()
+        self->m_lasterror = wxSTREAM_EOF;
+        return false;
+    }

 
     DWORD nAvailable;
 
 
     DWORD nAvailable;
 


@@ -368,15 +461,13 @@ bool wxPipeInputStream::CanRead() const
         if ( ::GetLastError() != ERROR_BROKEN_PIPE )
         {
             // unexpected error
         if ( ::GetLastError() != ERROR_BROKEN_PIPE )
         {
             // unexpected error

-            wxLogLastError(_T("PeekNamedPipe"));
+            wxLogLastError(wxT("PeekNamedPipe"));

         }
 
         }
 

-        // don't try to continue reading from a pipe if an error occured or if
+        // don't try to continue reading from a pipe if an error occurred or if

         // it had been closed
         ::CloseHandle(m_hInput);
 
         // it had been closed
         ::CloseHandle(m_hInput);
 

-        wxPipeInputStream *self = wxConstCast(this, wxPipeInputStream);
-

         self->m_hInput = INVALID_HANDLE_VALUE;
         self->m_lasterror = wxSTREAM_EOF;
 
         self->m_hInput = INVALID_HANDLE_VALUE;
         self->m_lasterror = wxSTREAM_EOF;
 


@@ -403,7 +494,7 @@ size_t wxPipeInputStream::OnSysRead(void *buffer, size_t len)
                         : wxSTREAM_READ_ERROR;
     }
 
                         : wxSTREAM_READ_ERROR;
     }
 

-    // bytesRead is set to 0, as desired, if an error occured
+    // bytesRead is set to 0, as desired, if an error occurred

     return bytesRead;
 }
 
     return bytesRead;
 }
 


@@ -414,32 +505,58 @@ size_t wxPipeInputStream::OnSysRead(void *buffer, size_t len)
 wxPipeOutputStream::wxPipeOutputStream(HANDLE hOutput)
 {
     m_hOutput = hOutput;
 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(wxT("SetNamedPipeHandleState(PIPE_NOWAIT)"));
+    }

 }
 
 }
 

-wxPipeOutputStream::~wxPipeOutputStream()
+bool wxPipeOutputStream::Close()

 {
 {

-    ::CloseHandle(m_hOutput);
+   return ::CloseHandle(m_hOutput) != 0;

 }
 
 }
 

+

 size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t len)
 {
 size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t len)
 {

-    DWORD bytesWritten;
-

     m_lasterror = wxSTREAM_NO_ERROR;
     m_lasterror = wxSTREAM_NO_ERROR;

-    if ( !::WriteFile(m_hOutput, buffer, len, &bytesWritten, NULL) )
+
+    DWORD totalWritten = 0;
+    while ( len > 0 )

     {
     {

-        m_lasterror = ::GetLastError() == ERROR_BROKEN_PIPE
-                            ? wxSTREAM_EOF
-                            : wxSTREAM_WRITE_ERROR;
+        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 bytesWritten;
+    return totalWritten;

 }
 
 #endif // wxUSE_STREAMS
 
 }
 
 #endif // wxUSE_STREAMS
 

-#endif // Win32
-

 // ============================================================================
 // wxExecute functions family
 // ============================================================================
 // ============================================================================
 // wxExecute functions family
 // ============================================================================


@@ -447,38 +564,40 @@ size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t len)
 #if wxUSE_IPC
 
 // connect to the given server via DDE and ask it to execute the command
 #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 = FALSE;
+    bool ok wxDUMMY_INITIALIZE(false);

 
     wxDDEClient client;
 
     wxDDEClient client;

-    wxConnectionBase *conn = client.MakeConnection(wxEmptyString,
-                                                   ddeServer,
-                                                   ddeTopic);
+    wxConnectionBase *
+        conn = client.MakeConnection(wxEmptyString, ddeServer, ddeTopic);

     if ( !conn )
     {
     if ( !conn )
     {

-        ok = FALSE;
+        ok = false;

     }
     else // connected to DDE server
     {
     }
     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;
             wxLogNull noErrors;

-            ok = conn->Execute(ddeCommand);
+
+            ok = conn->Request(ddeCommand) != NULL;

         }
 
         if ( !ok )
         {
         }
 
         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);

         }
     }
 
         }
     }
 


@@ -487,16 +606,17 @@ static bool wxExecuteDDE(const wxString& ddeServer,
 
 #endif // wxUSE_IPC
 
 
 #endif // wxUSE_IPC
 

-long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
+long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
+               const wxExecuteEnv *env)

 {
 {

-    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(),
 
 #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") );
+                    wxT("wxExecute() can be called only from the main thread") );

 #endif // wxUSE_THREADS
 
     wxString command;
 #endif // wxUSE_THREADS
 
     wxString command;


@@ -512,7 +632,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
     // case we execute just <command> and process the rest below
     wxString ddeServer, ddeTopic, ddeCommand;
     static const size_t lenDdePrefix = 7;   // strlen("WX_DDE:")
     // case we execute just <command> and process the rest below
     wxString ddeServer, ddeTopic, ddeCommand;
     static const size_t lenDdePrefix = 7;   // strlen("WX_DDE:")

-    if ( cmd.Left(lenDdePrefix) == _T("WX_DDE#") )
+    if ( cmd.Left(lenDdePrefix) == wxT("WX_DDE#") )

     {
         // speed up the concatenations below
         ddeServer.reserve(256);
     {
         // speed up the concatenations below
         ddeServer.reserve(256);


@@ -520,7 +640,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
         ddeCommand.reserve(256);
 
         const wxChar *p = cmd.c_str() + 7;
         ddeCommand.reserve(256);
 
         const wxChar *p = cmd.c_str() + 7;

-        while ( *p && *p != _T('#') )
+        while ( *p && *p != wxT('#') )

         {
             command += *p++;
         }
         {
             command += *p++;
         }


@@ -532,10 +652,10 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
         }
         else
         {
         }
         else
         {

-            wxFAIL_MSG(_T("invalid WX_DDE command in wxExecute"));
+            wxFAIL_MSG(wxT("invalid WX_DDE command in wxExecute"));

         }
 
         }
 

-        while ( *p && *p != _T('#') )
+        while ( *p && *p != wxT('#') )

         {
             ddeServer += *p++;
         }
         {
             ddeServer += *p++;
         }


@@ -547,10 +667,10 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
         }
         else
         {
         }
         else
         {

-            wxFAIL_MSG(_T("invalid WX_DDE command in wxExecute"));
+            wxFAIL_MSG(wxT("invalid WX_DDE command in wxExecute"));

         }
 
         }
 

-        while ( *p && *p != _T('#') )
+        while ( *p && *p != wxT('#') )

         {
             ddeTopic += *p++;
         }
         {
             ddeTopic += *p++;
         }


@@ -562,7 +682,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
         }
         else
         {
         }
         else
         {

-            wxFAIL_MSG(_T("invalid WX_DDE command in wxExecute"));
+            wxFAIL_MSG(wxT("invalid WX_DDE command in wxExecute"));

         }
 
         while ( *p )
         }
 
         while ( *p )


@@ -633,15 +753,6 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
         si.hStdOutput = pipeOut[wxPipe::Write];
         si.hStdError = pipeErr[wxPipe::Write];
 
         si.hStdOutput = pipeOut[wxPipe::Write];
         si.hStdError = pipeErr[wxPipe::Write];
 

-        // 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 the writing end of pipeIn
         // before launching the child process as otherwise this handle will be
         // we must duplicate the handle to the write side of stdin pipe to make
         // it non inheritable: indeed, we must close the writing end of pipeIn
         // before launching the child process as otherwise this handle will be


@@ -659,32 +770,109 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
                     DUPLICATE_SAME_ACCESS   // same access as for src handle
                 ) )
         {
                     DUPLICATE_SAME_ACCESS   // same access as for src handle
                 ) )
         {

-            wxLogLastError(_T("DuplicateHandle"));
+            wxLogLastError(wxT("DuplicateHandle"));

         }
 
         ::CloseHandle(pipeInWrite);
     }
 #endif // wxUSE_STREAMS
 
         }
 
         ::CloseHandle(pipeInWrite);
     }
 #endif // wxUSE_STREAMS
 

+    // The default logic for showing the console is to show it only if the IO
+    // is not redirected however wxEXEC_{SHOW,HIDE}_CONSOLE flags can be
+    // explicitly specified to change it.
+    if ( (flags & wxEXEC_HIDE_CONSOLE) ||
+            (redirect && !(flags & wxEXEC_SHOW_CONSOLE)) )
+    {
+        si.dwFlags |= STARTF_USESHOWWINDOW;
+        si.wShowWindow = SW_HIDE;
+    }
+
+

     PROCESS_INFORMATION pi;
     DWORD dwFlags = CREATE_SUSPENDED;
     PROCESS_INFORMATION pi;
     DWORD dwFlags = CREATE_SUSPENDED;

+

 #ifndef __WXWINCE__
 #ifndef __WXWINCE__

+    if ( (flags & wxEXEC_MAKE_GROUP_LEADER) &&
+            (wxGetOsVersion() == wxOS_WINDOWS_NT) )
+        dwFlags |= CREATE_NEW_PROCESS_GROUP;
+

     dwFlags |= CREATE_DEFAULT_ERROR_MODE ;
     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
 
 #endif
 

+    wxWxCharBuffer envBuffer;
+    bool useCwd = false;
+    if ( env )
+    {
+        useCwd = !env->cwd.empty();
+
+        // Translate environment variable map into NUL-terminated list of
+        // NUL-terminated strings.
+        if ( !env->env.empty() )
+        {
+#if wxUSE_UNICODE
+            // Environment variables can contain non-ASCII characters. We could
+            // check for it and not use this flag if everything is really ASCII
+            // only but there doesn't seem to be any reason to do it so just
+            // assume Unicode by default.
+            dwFlags |= CREATE_UNICODE_ENVIRONMENT;
+#endif // wxUSE_UNICODE
+
+            wxEnvVariableHashMap::const_iterator it;
+
+            size_t envSz = 1; // ending '\0'
+            for ( it = env->env.begin(); it != env->env.end(); ++it )
+            {
+                // Add size of env variable name and value, and '=' char and
+                // ending '\0'
+                envSz += it->first.length() + it->second.length() + 2;
+            }
+
+            envBuffer.extend(envSz);
+
+            wxChar *p = envBuffer.data();
+            for ( it = env->env.begin(); it != env->env.end(); ++it )
+            {
+                const wxString line = it->first + wxS("=") + it->second;
+
+                // Include the trailing NUL which will always terminate the
+                // buffer returned by t_str().
+                const size_t len = line.length() + 1;
+
+                wxTmemcpy(p, line.t_str(), len);
+
+                p += len;
+            }
+
+            // And another NUL to terminate the list of NUL-terminated strings.
+            *p = 0;
+        }
+    }
+

     bool ok = ::CreateProcess
                 (
     bool ok = ::CreateProcess
                 (

-                 NULL,              // application name (use only cmd line)
-                 (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
+                    // WinCE requires appname to be non null
+                    // Win32 allows for null
+#ifdef __WXWINCE__
+                 moduleName.t_str(), // application name
+                 wxMSW_CONV_LPTSTR(arguments), // arguments
+#else
+                 NULL,               // application name (use only cmd line)
+                 wxMSW_CONV_LPTSTR(command), // 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
+                 envBuffer.data(),   // environment (may be NULL which is fine)
+                 useCwd              // initial working directory
+                    ? wxMSW_CONV_LPTSTR(env->cwd)
+                    : NULL,          //     (or use the same)
+                 &si,                // startup info (unused here)
+                 &pi                 // process info

                 ) != 0;
 
 #if wxUSE_STREAMS && !defined(__WXWINCE__)
                 ) != 0;
 
 #if wxUSE_STREAMS && !defined(__WXWINCE__)


@@ -736,36 +924,15 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
     }
 #endif // wxUSE_STREAMS
 
     }
 #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
     // 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
+    HWND hwnd = wxCreateHiddenWindow
+                (
+                    &gs_classForHiddenWindow,
+                    wxMSWEXEC_WNDCLASSNAME,
+                    (WNDPROC)wxExecuteWindowCbk
+                );
+

     wxASSERT_MSG( hwnd, wxT("can't create a hidden window for wxExecute") );
 
     // Alloc data
     wxASSERT_MSG( hwnd, wxT("can't create a hidden window for wxExecute") );
 
     // Alloc data


@@ -784,6 +951,9 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
     {
         // may be NULL or not
         data->handler = handler;
     {
         // may be NULL or not
         data->handler = handler;

+
+        if (handler)
+            handler->SetPid(pi.dwProcessId);

     }
 
     DWORD tid;
     }
 
     DWORD tid;


@@ -804,7 +974,9 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 
     // close unneeded handle
     if ( !::CloseHandle(pi.hThread) )
 
     // close unneeded handle
     if ( !::CloseHandle(pi.hThread) )

+    {

         wxLogLastError(wxT("CloseHandle(hThread)"));
         wxLogLastError(wxT("CloseHandle(hThread)"));

+    }

 
     if ( !hThread )
     {
 
     if ( !hThread )
     {


@@ -817,7 +989,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
         return pi.dwProcessId;
     }
 
         return pi.dwProcessId;
     }
 

-    ::CloseHandle(hThread);
+    gs_asyncThreads.push_back(hThread);

 
 #if wxUSE_IPC && !defined(__WXWINCE__)
     // second part of DDE hack: now establish the DDE conversation with the
 
 #if wxUSE_IPC && !defined(__WXWINCE__)
     // second part of DDE hack: now establish the DDE conversation with the


@@ -834,22 +1006,28 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
         switch ( ::WaitForInputIdle(pi.hProcess, 10000 /* 10 seconds */) )
         {
             default:
         switch ( ::WaitForInputIdle(pi.hProcess, 10000 /* 10 seconds */) )
         {
             default:

-                wxFAIL_MSG( _T("unexpected WaitForInputIdle() return code") );
+                wxFAIL_MSG( wxT("unexpected WaitForInputIdle() return code") );

                 // fall through
 
                 // fall through
 

-            case -1:
-                wxLogLastError(_T("WaitForInputIdle() in wxExecute"));
+            case WAIT_FAILED:
+                wxLogLastError(wxT("WaitForInputIdle() in wxExecute"));

 
             case WAIT_TIMEOUT:
 
             case WAIT_TIMEOUT:

-                wxLogDebug(_T("Timeout too small in WaitForInputIdle"));
+                wxLogDebug(wxT("Timeout too small in WaitForInputIdle"));

 
 

-                ok = FALSE;
+                ok = false;

                 break;
 
             case 0:
                 // ok, process ready to accept DDE requests
                 ok = wxExecuteDDE(ddeServer, ddeTopic, ddeCommand);
         }
                 break;
 
             case 0:
                 // ok, process ready to accept DDE requests
                 ok = wxExecuteDDE(ddeServer, ddeTopic, ddeCommand);
         }

+
+        if ( !ok )
+        {
+            wxLogDebug(wxT("Failed to send DDE request to the process \"%s\"."),
+                       cmd.c_str());
+        }

     }
 #endif // wxUSE_IPC
 
     }
 #endif // wxUSE_IPC
 


@@ -862,28 +1040,47 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
     }
 
     wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
     }
 
     wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;

-    wxCHECK_MSG( traits, -1, _T("no wxAppTraits in wxExecute()?") );
+    wxCHECK_MSG( traits, -1, wxT("no wxAppTraits in wxExecute()?") );

 
 

-    // disable all app windows while waiting for the child process to finish
-    void *cookie = traits->BeforeChildWaitLoop();
+    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 )
     {
 #if wxUSE_STREAMS && !defined(__WXWINCE__)
 
     // wait until the child process terminates
     while ( data->state )
     {
 #if wxUSE_STREAMS && !defined(__WXWINCE__)

-        bufOut.Update();
-        bufErr.Update();
+        if ( !bufOut.Update() && !bufErr.Update() )

 #endif // wxUSE_STREAMS
 #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);
+        }

 
 

-        // 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 always process messages for our hidden window or we'd never
+        // get wxWM_PROC_TERMINATED and so this loop would never terminate
+        MSG msg;
+        ::PeekMessage(&msg, data->hWnd, 0, 0, PM_REMOVE);

 
 

-        // we must process messages or we'd never get wxWM_PROC_TERMINATED
-        traits->AlwaysYield();
+        // we may also need to process messages for all the other application
+        // windows
+        if ( !(flags & wxEXEC_NOEVENTS) )
+        {
+            wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
+            if ( loop )
+                loop->Yield();
+        }

     }
 
     }
 

-    traits->AfterChildWaitLoop(cookie);
+    if ( !(flags & wxEXEC_NODISABLE) )
+    {
+        // reenable disabled windows back
+        traits->AfterChildWaitLoop(cookie);
+    }

 
     DWORD dwExitCode = data->dwExitCode;
     delete data;
 
     DWORD dwExitCode = data->dwExitCode;
     delete data;


@@ -892,19 +1089,62 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
     return dwExitCode;
 }
 
     return dwExitCode;
 }
 

-long wxExecute(wxChar **argv, int flags, wxProcess *handler)
+template <typename CharType>
+long wxExecuteImpl(CharType **argv, int flags, wxProcess *handler,
+                   const wxExecuteEnv *env)

 {
     wxString command;
 {
     wxString command;

+    command.reserve(1024);

 
 

+    wxString arg;

     for ( ;; )
     {
     for ( ;; )
     {

-        command += *argv++;
+        arg = *argv++;
+
+        bool quote;
+        if ( arg.empty() )
+        {
+            // we need to quote empty arguments, otherwise they'd just
+            // disappear
+            quote = true;
+        }
+        else // non-empty
+        {
+            // escape any quotes present in the string to avoid interfering
+            // with the command line parsing in the child process
+            arg.Replace("\"", "\\\"", true /* replace all */);
+
+            // and quote any arguments containing the spaces to prevent them from
+            // being broken down
+            quote = arg.find_first_of(" \t") != wxString::npos;
+        }
+
+        if ( quote )
+            command += '\"' + arg + '\"';
+        else
+            command += arg;
+

         if ( !*argv )
             break;
 
         if ( !*argv )
             break;
 

-        command += _T(' ');
+        command += ' ';

     }
 
     }
 

-    return wxExecute(command, flags, handler);
+    return wxExecute(command, flags, handler, env);
+}
+
+long wxExecute(char **argv, int flags, wxProcess *handler,
+               const wxExecuteEnv *env)
+{
+    return wxExecuteImpl(argv, flags, handler, env);
+}
+
+#if wxUSE_UNICODE
+
+long wxExecute(wchar_t **argv, int flags, wxProcess *handler,
+               const wxExecuteEnv *env)
+{
+    return wxExecuteImpl(argv, flags, handler, env);

 }
 
 }
 

+#endif // wxUSE_UNICODE