Canvas: added some DECLARE_CLASS macros to stop it failing

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

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 453b7efc5d82151bde76325650bafc3240c0027d..21b74439c33f7289e21634a72d3428fe4a1c592e 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -45,7 +45,7 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

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

     #include <direct.h>
 #ifndef __MWERKS__
     #include <dos.h>
     #include <direct.h>
 #ifndef __MWERKS__
     #include <dos.h>


@@ -57,7 +57,7 @@
     #include <sys/stat.h>
 #endif
 
     #include <sys/stat.h>
 #endif
 

-#if defined(__WIN32__) && !defined(__WXWINE__)
+#if defined(__WIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)

 #include <io.h>
 
 #ifndef __GNUWIN32__
 #include <io.h>
 
 #ifndef __GNUWIN32__


@@ -108,7 +108,7 @@ public:
 #ifndef __WIN16__
         if ( !::CloseHandle(hProcess) )
         {
 #ifndef __WIN16__
         if ( !::CloseHandle(hProcess) )
         {

-            wxLogLastError("CloseHandle(hProcess)");
+            wxLogLastError(wxT("CloseHandle(hProcess)"));

         }
 #endif
     }
         }
 #endif
     }


@@ -121,17 +121,20 @@ public:
     bool       state;         // set to FALSE when the process finishes
 };
 
     bool       state;         // set to FALSE when the process finishes
 };
 

+#if defined(__WIN32__) && wxUSE_STREAMS

 
 

-#ifdef __WIN32__

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

-class wxPipeInputStream: public wxInputStream {
+class wxPipeInputStream: public wxInputStream
+{

 public:
     wxPipeInputStream(HANDLE hInput);
     ~wxPipeInputStream();
 
 public:
     wxPipeInputStream(HANDLE hInput);
     ~wxPipeInputStream();
 

+    virtual bool Eof() const;
+

 protected:
     size_t OnSysRead(void *buffer, size_t len);
 
 protected:
     size_t OnSysRead(void *buffer, size_t len);
 


@@ -139,7 +142,8 @@ protected:
     HANDLE m_hInput;
 };
 
     HANDLE m_hInput;
 };
 

-class wxPipeOutputStream: public wxOutputStream {
+class wxPipeOutputStream: public wxOutputStream
+{

 public:
     wxPipeOutputStream(HANDLE hOutput);
     ~wxPipeOutputStream();
 public:
     wxPipeOutputStream(HANDLE hOutput);
     ~wxPipeOutputStream();


@@ -165,17 +169,55 @@ wxPipeInputStream::~wxPipeInputStream()
     ::CloseHandle(m_hInput);
 }
 
     ::CloseHandle(m_hInput);
 }
 

-size_t wxPipeInputStream::OnSysRead(void *buffer, size_t len)
+bool wxPipeInputStream::Eof() const

 {
 {

-    DWORD bytesRead;
+    DWORD nAvailable;
+
+    // function name is misleading, it works with anon pipes as well
+    DWORD rc = ::PeekNamedPipe
+                    (
+                      m_hInput,     // handle
+                      NULL, 0,      // ptr to buffer and its size
+                      NULL,         // [out] bytes read
+                      &nAvailable,  // [out] bytes available
+                      NULL          // [out] bytes left
+                    );
+
+    if ( !rc )
+    {
+        if ( ::GetLastError() != ERROR_BROKEN_PIPE )
+        {
+            // unexpected error
+            wxLogLastError(_T("PeekNamedPipe"));
+        }
+
+        // don't try to continue reading from a pipe if an error occured or if
+        // it had been closed
+        return TRUE;
+    }
+    else
+    {
+        return nAvailable == 0;
+    }
+}

 
 

+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

     m_lasterror = wxSTREAM_NOERROR;
     m_lasterror = wxSTREAM_NOERROR;

-    if (! ::ReadFile(m_hInput, buffer, len, &bytesRead, NULL) ) {
-        if (GetLastError() == ERROR_BROKEN_PIPE)
+    if ( Eof() )
+        return 0;
+
+    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 = wxSTREAM_EOF;
         else
             m_lasterror = wxSTREAM_READ_ERROR;
     }

+

     return bytesRead;
 }
 
     return bytesRead;
 }
 


@@ -198,12 +240,14 @@ size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t len)
     DWORD bytesRead;
 
     m_lasterror = wxSTREAM_NOERROR;
     DWORD bytesRead;
 
     m_lasterror = wxSTREAM_NOERROR;

-    if (! ::WriteFile(m_hOutput, buffer, len, &bytesRead, NULL) ) {
-        if (GetLastError() == ERROR_BROKEN_PIPE)
+    if ( !::WriteFile(m_hOutput, buffer, len, &bytesRead, NULL) )
+    {
+        if ( ::GetLastError() == ERROR_BROKEN_PIPE )

             m_lasterror = wxSTREAM_EOF;
         else
             m_lasterror = wxSTREAM_READ_ERROR;
     }
             m_lasterror = wxSTREAM_EOF;
         else
             m_lasterror = wxSTREAM_READ_ERROR;
     }

+

     return bytesRead;
 }
 
     return bytesRead;
 }
 


@@ -214,14 +258,17 @@ size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t len)
 // ============================================================================
 
 #ifdef __WIN32__
 // ============================================================================
 
 #ifdef __WIN32__

-static DWORD wxExecuteThread(wxExecuteData *data)
+
+static DWORD __stdcall wxExecuteThread(void *arg)

 {
 {

+    wxExecuteData *data = (wxExecuteData*)arg;
+

     WaitForSingleObject(data->hProcess, INFINITE);
 
     // get the exit code
     if ( !GetExitCodeProcess(data->hProcess, &data->dwExitCode) )
     {
     WaitForSingleObject(data->hProcess, INFINITE);
 
     // get the exit code
     if ( !GetExitCodeProcess(data->hProcess, &data->dwExitCode) )
     {

-        wxLogLastError("GetExitCodeProcess");
+        wxLogLastError(wxT("GetExitCodeProcess"));

     }
 
     wxASSERT_MSG( data->dwExitCode != STILL_ACTIVE,
     }
 
     wxASSERT_MSG( data->dwExitCode != STILL_ACTIVE,


@@ -270,11 +317,55 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
 }
 #endif // Win32
 
 }
 #endif // Win32
 

-long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
+#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 ok;
+
+    wxDDEClient client;
+    wxConnectionBase *conn = client.MakeConnection(_T(""),
+                                                   ddeServer,
+                                                   ddeTopic);
+    if ( !conn )
+    {
+        ok = FALSE;
+    }
+    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!
+        //
+        // so we try it first and then the other one if it
+        // failed
+        {
+            wxLogNull noErrors;
+            ok = conn->Request(ddeCommand) != NULL;
+        }
+
+        if ( !ok )
+        {
+            // now try execute - but show the errors
+            ok = conn->Execute(ddeCommand);
+        }
+    }
+
+    return ok;
+}
+
+#endif // wxUSE_IPC
+
+long wxExecute(const wxString& cmd, int flags, wxProcess *handler)

 {
     wxCHECK_MSG( !!cmd, 0, wxT("empty command in wxExecute") );
 
     wxString command;
 {
     wxCHECK_MSG( !!cmd, 0, wxT("empty command in wxExecute") );
 
     wxString command;

+

 #if wxUSE_IPC
     // DDE hack: this is really not pretty, but we need to allow this for
     // transparent handling of DDE servers in wxMimeTypesManager. Usually it
 #if wxUSE_IPC
     // DDE hack: this is really not pretty, but we need to allow this for
     // transparent handling of DDE servers in wxMimeTypesManager. Usually it


@@ -282,12 +373,17 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
     // given type. Sometimes, however, this command just launches the server
     // and an additional DDE request must be made to really open the file. To
     // keep all this well hidden from the application, we allow a special form
     // given type. Sometimes, however, this command just launches the server
     // and an additional DDE request must be made to really open the file. To
     // keep all this well hidden from the application, we allow a special form

-    // of command: WX_DDE:<command>:DDE_SERVER:DDE_TOPIC:DDE_COMMAND in which
+    // of command: WX_DDE#<command>#DDE_SERVER#DDE_TOPIC#DDE_COMMAND in which

     // 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#") )
     {
     // 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#") )
     {

+        // speed up the concatenations below
+        ddeServer.reserve(256);
+        ddeTopic.reserve(256);
+        ddeCommand.reserve(256);
+

         const wxChar *p = cmd.c_str() + 7;
         while ( *p && *p != _T('#') )
         {
         const wxChar *p = cmd.c_str() + 7;
         while ( *p && *p != _T('#') )
         {


@@ -338,6 +434,22 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
         {
             ddeCommand += *p++;
         }
         {
             ddeCommand += *p++;
         }

+
+        // if we want to just launch the program and not wait for its
+        // termination, try to execute DDE command right now, it can succeed if
+        // the process is already running - but as it fails if it's not
+        // running, suppress any errors it might generate
+        if ( !(flags & wxEXEC_SYNC) )
+        {
+            wxLogNull noErrors;
+            if ( wxExecuteDDE(ddeServer, ddeTopic, ddeCommand) )
+            {
+                // a dummy PID - this is a hack, of course, but it's well worth
+                // it as we don't open a new server each time we're called
+                // which would be quite bad
+                return -1;
+            }
+        }

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


@@ -347,164 +459,154 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
     }
 
 #if defined(__WIN32__) && !defined(__TWIN32__)
     }
 
 #if defined(__WIN32__) && !defined(__TWIN32__)

-    // the old code is disabled because we really need a process handle
-    // if we want to execute it asynchronously or even just get its
-    // return code and for this we must use CreateProcess() and not
-    // ShellExecute()
-#if 0
-    // isolate command and arguments
-    wxString commandName;
-    bool insideQuotes = FALSE;
-    const char *pc;
-    for ( pc = command.c_str(); *pc != '\0'; pc++ )
-    {
-        switch ( *pc )
-        {
-            case ' ':
-            case '\t':
-                if ( !insideQuotes )
-                    break;
-                // fall through
-
-            case '"':
-                insideQuotes = !insideQuotes;
-                // fall through

 
 

-            default:
-                commandName += *pc;
-                continue;   // skip the next break
-        }
-
-        // only reached for space not inside quotes
-        break;
-    }
-    wxString commandArgs = pc;
-
-    wxWindow *winTop = wxTheApp->GetTopWindow();
-    HWND hwndTop = (HWND)(winTop ? winTop->GetHWND() : 0);
-
-    HANDLE result;
-#ifdef __GNUWIN32__
-    result = ShellExecute(hwndTop,
-                          (const wchar_t)"open",
-                          (const wchar_t)commandName,
-                          (const wchar_t)commandArgs,
-                          (const wchar_t)NULL,
-                          SW_SHOWNORMAL);
-#else // !GNUWIN32
-    result = ShellExecute(hwndTop, "open", commandName,
-                          commandArgs, NULL, SW_SHOWNORMAL);
-#endif // GNUWIN32
-
-    if ( ((long)result) <= 32 )
-        wxLogSysError(_("Can't execute command '%s'"), command.c_str());
-
-    return result;
-#else // 1
-
-    HANDLE hpipeRead[2];
-    HANDLE hpipeWrite[2];
-    HANDLE hStdIn = INVALID_HANDLE_VALUE;
-    HANDLE hStdOut = INVALID_HANDLE_VALUE;
-
-    // we need to inherit handles in the child process if we want to redirect
-    // its IO
-    BOOL inheritHandles = FALSE;
+    // the IO redirection is only supported with wxUSE_STREAMS
+    BOOL redirect = FALSE;
+#if wxUSE_STREAMS
+    // the first elements are reading ends, the second are the writing ones
+    HANDLE hpipeStdin[2],
+           hpipeStdout[2],
+           hpipeStderr[2];
+    HANDLE hpipeStdinWrite = INVALID_HANDLE_VALUE;

 
     // open the pipes to which child process IO will be redirected if needed
     if ( handler && handler->IsRedirected() )
     {
 
     // open the pipes to which child process IO will be redirected if needed
     if ( handler && handler->IsRedirected() )
     {

+        // default secutiry attributes

         SECURITY_ATTRIBUTES security;
 
         security.nLength              = sizeof(security);
         security.lpSecurityDescriptor = NULL;
         security.bInheritHandle       = TRUE;
 
         SECURITY_ATTRIBUTES security;
 
         security.nLength              = sizeof(security);
         security.lpSecurityDescriptor = NULL;
         security.bInheritHandle       = TRUE;
 

-        if ( !::CreatePipe(&hpipeRead[0], &hpipeRead[1], &security, 0) )
+        // create stdin pipe
+        if ( !::CreatePipe(&hpipeStdin[0], &hpipeStdin[1], &security, 0) )

         {
             wxLogSysError(_("Can't create the inter-process read pipe"));
 
         {
             wxLogSysError(_("Can't create the inter-process read pipe"));
 

-            return 0;
+            // indicate failure: we need to return different error code
+            // depending on the sync flag
+            return flags & wxEXEC_SYNC ? -1 : 0;

         }
 
         }
 

-        if ( !::CreatePipe(&hpipeWrite[0], &hpipeWrite[1], &security, 0) )
+        // and a stdout one
+        if ( !::CreatePipe(&hpipeStdout[0], &hpipeStdout[1], &security, 0) )

         {
         {

-            ::CloseHandle(hpipeRead[0]);
-            ::CloseHandle(hpipeRead[1]);
+            ::CloseHandle(hpipeStdin[0]);
+            ::CloseHandle(hpipeStdin[1]);

 
             wxLogSysError(_("Can't create the inter-process write pipe"));
 
 
             wxLogSysError(_("Can't create the inter-process write pipe"));
 

-            return 0;
+            return flags & wxEXEC_SYNC ? -1 : 0;

         }
 
         }
 

-        // We need to save the old stdio handles to restore them after the call
-        // to CreateProcess
-        hStdIn  = ::GetStdHandle(STD_INPUT_HANDLE);
-        hStdOut = ::GetStdHandle(STD_OUTPUT_HANDLE);
+        (void)::CreatePipe(&hpipeStderr[0], &hpipeStderr[1], &security, 0);

 
 

-        if ( !::SetStdHandle(STD_INPUT_HANDLE, hpipeRead[0]) ||
-             !::SetStdHandle(STD_OUTPUT_HANDLE, hpipeWrite[1]) )
-        {
-            wxLogDebug(_T("Failed to change stdin/out handles"));
-        }
-
-        inheritHandles = TRUE;
+        redirect = TRUE;

     }
     }

+#endif // wxUSE_STREAMS

 
     // create the process
     STARTUPINFO si;
     wxZeroMemory(si);
 
     // create the process
     STARTUPINFO si;
     wxZeroMemory(si);

-

     si.cb = sizeof(si);
 
     si.cb = sizeof(si);
 

-    PROCESS_INFORMATION pi;
-
-    if ( ::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
-                         inheritHandles,      // inherit handles if we need pipes
-                         CREATE_DEFAULT_ERROR_MODE |
-                         CREATE_SUSPENDED,           // flags
-                         NULL,       // environment (use the same)
-                         NULL,       // current directory (use the same)
-                         &si,        // startup info (unused here)
-                         &pi         // process info
-                        ) == 0 )
+#if wxUSE_STREAMS
+    if ( redirect )

     {
     {

-        if ( inheritHandles )
+        si.dwFlags = STARTF_USESTDHANDLES;
+
+        si.hStdInput = hpipeStdin[0];
+        si.hStdOutput = hpipeStdout[1];
+        si.hStdError = hpipeStderr[1];
+
+        // 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) )

         {
         {

-            ::CloseHandle(hpipeWrite[0]);
-            ::CloseHandle(hpipeWrite[1]);
-            ::CloseHandle(hpipeRead[0]);
-            ::CloseHandle(hpipeRead[1]);
+            si.dwFlags |= STARTF_USESHOWWINDOW;
+            si.wShowWindow = SW_HIDE;

         }
 
         }
 

-        wxLogSysError(_("Execution of command '%s' failed"), command.c_str());
+        // we must duplicate the handle to the write side of stdin pipe to make
+        // it non inheritable: indeed, we must close hpipeStdin[1] before
+        // launching the child process as otherwise this handle will be
+        // inherited by the child which will never close it and so the pipe
+        // will never be closed and the child will be left stuck in ReadFile()
+        if ( !::DuplicateHandle
+                (
+                    GetCurrentProcess(),
+                    hpipeStdin[1],
+                    GetCurrentProcess(),
+                    &hpipeStdinWrite,
+                    0,                      // desired access: unused here
+                    FALSE,                  // not inherited
+                    DUPLICATE_SAME_ACCESS   // same access as for src handle
+                ) )
+        {
+            wxLogLastError(_T("DuplicateHandle"));
+        }

 
 

-        return 0;
+        ::CloseHandle(hpipeStdin[1]);

     }
     }

+#endif // wxUSE_STREAMS

 
 

-    // Restore the old stdio handles
-    if ( inheritHandles )
+    PROCESS_INFORMATION pi;
+    DWORD dwFlags = CREATE_DEFAULT_ERROR_MODE | CREATE_SUSPENDED;
+
+    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
+                ) != 0;
+
+#if wxUSE_STREAMS
+    // we can close the pipe ends used by child anyhow
+    if ( redirect )
+    {
+        ::CloseHandle(hpipeStdin[0]);
+        ::CloseHandle(hpipeStdout[1]);
+        ::CloseHandle(hpipeStderr[1]);
+    }
+#endif // wxUSE_STREAMS
+
+    if ( !ok )

     {
     {

-        if ( !::SetStdHandle(STD_INPUT_HANDLE, hStdIn) ||
-             !::SetStdHandle(STD_OUTPUT_HANDLE, hStdOut) )
+#if wxUSE_STREAMS
+        // close the other handles too
+        if ( redirect )

         {
         {

-            wxLogDebug(_T("Failed to restore old stdin/out handles"));
+            ::CloseHandle(hpipeStdout[0]);
+            ::CloseHandle(hpipeStderr[0]);

         }
         }

+#endif // wxUSE_STREAMS
+
+        wxLogSysError(_("Execution of command '%s' failed"), command.c_str());

 
 

-        // they're still opened in child process
-        ::CloseHandle(hpipeWrite[1]);
-        ::CloseHandle(hpipeRead[0]);
+        return flags & wxEXEC_SYNC ? -1 : 0;
+    }

 
 

+#if wxUSE_STREAMS
+    if ( redirect )
+    {

         // We can now initialize the wxStreams
         // We can now initialize the wxStreams

-        wxInputStream *inStream = new wxPipeInputStream(hpipeWrite[0]);
-        wxOutputStream *outStream = new wxPipeOutputStream(hpipeRead[1]);
+        wxInputStream *inStream = new wxPipeInputStream(hpipeStdout[0]),
+                      *errStream = new wxPipeInputStream(hpipeStderr[0]);
+        wxOutputStream *outStream = new wxPipeOutputStream(hpipeStdinWrite);

 
 

-        handler->SetPipeStreams(inStream, outStream);
+        handler->SetPipeStreams(inStream, outStream, errStream);

     }
     }

+#endif // wxUSE_STREAMS

 
     // register the class for the hidden window used for the notifications
     if ( !gs_classForHiddenWindow )
 
     // register the class for the hidden window used for the notifications
     if ( !gs_classForHiddenWindow )


@@ -519,7 +621,7 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
 
         if ( !::RegisterClass(&wndclass) )
         {
 
         if ( !::RegisterClass(&wndclass) )
         {

-            wxLogLastError("RegisterClass(hidden window)");
+            wxLogLastError(wxT("RegisterClass(hidden window)"));

         }
     }
 
         }
     }
 


@@ -536,8 +638,8 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
     data->hProcess    = pi.hProcess;
     data->dwProcessId = pi.dwProcessId;
     data->hWnd        = hwnd;
     data->hProcess    = pi.hProcess;
     data->dwProcessId = pi.dwProcessId;
     data->hWnd        = hwnd;

-    data->state       = sync;
-    if ( sync )
+    data->state       = (flags & wxEXEC_SYNC) != 0;
+    if ( flags & wxEXEC_SYNC )

     {
         // handler may be !NULL for capturing program output, but we don't use
         // it wxExecuteData struct in this case
     {
         // handler may be !NULL for capturing program output, but we don't use
         // it wxExecuteData struct in this case


@@ -552,7 +654,7 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
     DWORD tid;
     HANDLE hThread = ::CreateThread(NULL,
                                     0,
     DWORD tid;
     HANDLE hThread = ::CreateThread(NULL,
                                     0,

-                                    (LPTHREAD_START_ROUTINE)wxExecuteThread,
+                                    wxExecuteThread,

                                     (void *)data,
                                     0,
                                     &tid);
                                     (void *)data,
                                     0,
                                     &tid);


@@ -562,16 +664,16 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
     if ( ::ResumeThread(pi.hThread) == (DWORD)-1 )
     {
         // ignore it - what can we do?
     if ( ::ResumeThread(pi.hThread) == (DWORD)-1 )
     {
         // ignore it - what can we do?

-        wxLogLastError("ResumeThread in wxExecute");
+        wxLogLastError(wxT("ResumeThread in wxExecute"));

     }
 
     // close unneeded handle
     if ( !::CloseHandle(pi.hThread) )
     }
 
     // close unneeded handle
     if ( !::CloseHandle(pi.hThread) )

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

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

-        wxLogLastError("CreateThread in wxExecute");
+        wxLogLastError(wxT("CreateThread in wxExecute"));

 
         DestroyWindow(hwnd);
         delete data;
 
         DestroyWindow(hwnd);
         delete data;


@@ -580,23 +682,43 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
         return pi.dwProcessId;
     }
 
         return pi.dwProcessId;
     }
 

+    ::CloseHandle(hThread);
+

 #if wxUSE_IPC
     // second part of DDE hack: now establish the DDE conversation with the
     // just launched process
 #if wxUSE_IPC
     // second part of DDE hack: now establish the DDE conversation with the
     // just launched process

-    if ( !!ddeServer )
+    if ( !ddeServer.empty() )

     {
     {

-        wxDDEClient client;
-        wxConnectionBase *conn = client.MakeConnection(_T(""),
-                                                       ddeServer,
-                                                       ddeTopic);
-        if ( !conn || !conn->Execute(ddeCommand) )
+        bool ok;
+
+        // give the process the time to init itself
+        //
+        // we use a very big timeout hoping that WaitForInputIdle() will return
+        // much sooner, but not INFINITE just in case the process hangs
+        // completely - like this we will regain control sooner or later
+        switch ( ::WaitForInputIdle(pi.hProcess, 10000 /* 10 seconds */) )

         {
         {

-            wxLogError(_("Couldn't launch DDE server '%s'."), command.c_str());
+            default:
+                wxFAIL_MSG( _T("unexpected WaitForInputIdle() return code") );
+                // fall through
+
+            case -1:
+                wxLogLastError(_T("WaitForInputIdle() in wxExecute"));
+
+            case WAIT_TIMEOUT:
+                wxLogDebug(_T("Timeout too small in WaitForInputIdle"));
+
+                ok = FALSE;
+                break;
+
+            case 0:
+                // ok, process ready to accept DDE requests
+                ok = wxExecuteDDE(ddeServer, ddeTopic, ddeCommand);

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

-    if ( !sync )
+    if ( !(flags & wxEXEC_SYNC) )

     {
         // clean up will be done when the process terminates
 
     {
         // clean up will be done when the process terminates
 


@@ -613,7 +735,11 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
 #endif // wxUSE_GUI
 
     while ( data->state )
 #endif // wxUSE_GUI
 
     while ( data->state )

+    {
+        // don't take 100% of the CPU
+        ::Sleep(500);

         wxYield();
         wxYield();

+    }

 
 #if wxUSE_GUI
     }
 
 #if wxUSE_GUI
     }


@@ -624,24 +750,26 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
 
     // return the exit code
     return dwExitCode;
 
     // return the exit code
     return dwExitCode;

-#endif // 0/1

 #else // Win16
     long instanceID = WinExec((LPCSTR) WXSTRINGCAST command, SW_SHOW);
 #else // Win16
     long instanceID = WinExec((LPCSTR) WXSTRINGCAST command, SW_SHOW);

-    if (instanceID < 32) return(0);
+    if (instanceID < 32)
+        return flags & wxEXEC_SYNC ? -1 : 0;

 
 

-    if (sync) {
+    if ( flags & wxEXEC_SYNC )
+    {

         int running;
         int running;

-        do {
+        do
+        {

             wxYield();
             running = GetModuleUsage((HINSTANCE)instanceID);
         } while (running);
     }
 
             wxYield();
             running = GetModuleUsage((HINSTANCE)instanceID);
         } while (running);
     }
 

-    return(instanceID);
+    return instanceID;

 #endif // Win16/32
 }
 
 #endif // Win16/32
 }
 

-long wxExecute(char **argv, bool sync, wxProcess *handler)
+long wxExecute(char **argv, int flags, wxProcess *handler)

 {
     wxString command;
 
 {
     wxString command;
 


@@ -652,39 +780,6 @@ long wxExecute(char **argv, bool sync, wxProcess *handler)
 
     command.RemoveLast();
 
 
     command.RemoveLast();
 

-    return wxExecute(command, sync, handler);
+    return wxExecute(command, flags, handler);

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// Metafile helpers
-// ----------------------------------------------------------------------------
-
-extern void PixelToHIMETRIC(LONG *x, LONG *y)
-{
-    ScreenHDC hdcRef;
-
-    int iWidthMM = GetDeviceCaps(hdcRef, HORZSIZE),
-        iHeightMM = GetDeviceCaps(hdcRef, VERTSIZE),
-        iWidthPels = GetDeviceCaps(hdcRef, HORZRES),
-        iHeightPels = GetDeviceCaps(hdcRef, VERTRES);
-
-    *x *= (iWidthMM * 100);
-    *x /= iWidthPels;
-    *y *= (iHeightMM * 100);
-    *y /= iHeightPels;
-}
-
-extern void HIMETRICToPixel(LONG *x, LONG *y)
-{
-    ScreenHDC hdcRef;
-
-    int iWidthMM = GetDeviceCaps(hdcRef, HORZSIZE),
-        iHeightMM = GetDeviceCaps(hdcRef, VERTSIZE),
-        iWidthPels = GetDeviceCaps(hdcRef, HORZRES),
-        iHeightPels = GetDeviceCaps(hdcRef, VERTRES);
-
-    *x *= iWidthPels;
-    *x /= (iWidthMM * 100);
-    *y *= iHeightPels;
-    *y /= (iHeightMM * 100);
-}