Forward port of changes for using themed drawing of owner-drawn buttons.

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

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index e1e0d9dc989341829f5f633a68df2497b4aba801..8df728921e05026034928c9cca4fb1ef836fa6f1 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,15 +29,17 @@
     #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

 #endif
 
 #endif
 

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

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

+#include "wx/module.h"
+

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


@@ -58,14 +56,14 @@
     #include <sys/stat.h>
 #endif
 
     #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,10 @@
     #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
 

+// implemented in utils.cpp
+extern "C" WXDLLIMPEXP_BASE HWND
+wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
+

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


@@ -96,6 +98,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
 // 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;
 
 // ----------------------------------------------------------------------------


@@ -108,12 +111,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 +122,31 @@ 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
+};
+
+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 defined(__WIN32__) && wxUSE_STREAMS && !defined(__WXWINCE__)
+#if wxUSE_STREAMS && !defined(__WXWINCE__)

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


@@ -136,10 +158,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:


@@ -155,7 +177,8 @@ class wxPipeOutputStream: public wxOutputStream
 {
 public:
     wxPipeOutputStream(HANDLE hOutput);
 {
 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);


@@ -187,7 +210,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 +224,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 +272,6 @@ private:
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-#ifdef __WIN32__
-

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


@@ -349,7 +361,7 @@ wxPipeInputStream::~wxPipeInputStream()
 bool wxPipeInputStream::CanRead() const
 {
     if ( !IsOpened() )
 bool wxPipeInputStream::CanRead() const
 {
     if ( !IsOpened() )

-        return FALSE;
+        return false;

 
     DWORD nAvailable;
 
 
     DWORD nAvailable;
 


@@ -371,7 +383,7 @@ bool wxPipeInputStream::CanRead() const
             wxLogLastError(_T("PeekNamedPipe"));
         }
 
             wxLogLastError(_T("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);
 


@@ -403,7 +415,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 +426,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(_T("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 +485,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);

         }
     }
 
         }
     }
 


@@ -489,7 +529,7 @@ static bool wxExecuteDDE(const wxString& ddeServer,
 
 long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 {
 
 long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 {

-    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
 
 #if wxUSE_THREADS
     // for many reasons, the code below breaks down if it's called from another


@@ -668,23 +708,37 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 
     PROCESS_INFORMATION pi;
     DWORD dwFlags = CREATE_SUSPENDED;
 
     PROCESS_INFORMATION pi;
     DWORD dwFlags = CREATE_SUSPENDED;

+

 #ifndef __WXWINCE__
     dwFlags |= CREATE_DEFAULT_ERROR_MODE ;
 #ifndef __WXWINCE__
     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
 
     bool ok = ::CreateProcess
                 (
 #endif
 
     bool ok = ::CreateProcess
                 (

-                 NULL,              // application name (use only cmd line)
+                    // WinCE requires appname to be non null
+                    // Win32 allows for null
+#ifdef __WXWINCE__

                  (wxChar *)
                  (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
+                 moduleName.c_str(), // application name
+                 (wxChar *)
+                 arguments.c_str(),  // arguments
+#else
+                 NULL,               // application name (use only cmd line)
+                 (wxChar *)
+                 command.c_str(),    // 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
+                 NULL,               // environment (use the same)
+                 NULL,               // current directory (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 +790,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


@@ -843,13 +876,19 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
             case WAIT_TIMEOUT:
                 wxLogDebug(_T("Timeout too small in WaitForInputIdle"));
 
             case WAIT_TIMEOUT:
                 wxLogDebug(_T("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(_T("Failed to send DDE request to the process \"%s\"."),
+                       cmd.c_str());
+        }

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


@@ -864,8 +903,12 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
     wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
     wxCHECK_MSG( traits, -1, _T("no wxAppTraits in wxExecute()?") );
 
     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
-    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 )
 
     // wait until the child process terminates
     while ( data->state )


@@ -883,7 +926,11 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
         traits->AlwaysYield();
     }
 
         traits->AlwaysYield();
     }
 

-    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;


@@ -907,4 +954,3 @@ long wxExecute(wxChar **argv, int flags, wxProcess *handler)
 
     return wxExecute(command, flags, handler);
 }
 
     return wxExecute(command, flags, handler);
 }

-