xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index db4da1ef05d479f1ce6ca901d9c03da2022e82bc..7046329ee5a42f54e3b9692c9548d589d7d99d08 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998-2002 wxWindows dev team
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998-2002 wxWindows dev team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation
 #endif
 
     #pragma implementation
 #endif
 


@@ -33,9 +33,6 @@
     #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_GUI                  // See 'dirty hack' below.
-    #include "wx/frame.h"
-#endif

 #endif
 
 #ifdef __WIN32__
 #endif
 
 #ifdef __WIN32__


@@ -43,24 +40,28 @@
     #include "wx/process.h"
 #endif
 
     #include "wx/process.h"
 #endif
 

+#include "wx/apptrait.h"
+

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

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

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

-#if defined(__GNUWIN32__) && !defined(__TWIN32__)
+#if defined(__GNUWIN32__)

     #include <sys/unistd.h>
     #include <sys/stat.h>
 #endif
 
     #include <sys/unistd.h>
     #include <sys/stat.h>
 #endif
 

-#if defined(__WIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
-#include <io.h>
+#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+#ifndef __UNIX__
+    #include <io.h>
+#endif

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


@@ -123,7 +124,7 @@ public:
     bool       state;         // set to FALSE when the process finishes
 };
 
     bool       state;         // set to FALSE when the process finishes
 };
 

-#if defined(__WIN32__) && wxUSE_STREAMS
+#if defined(__WIN32__) && wxUSE_STREAMS && !defined(__WXWINCE__)

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


@@ -139,13 +140,15 @@ public:
     bool IsOpened() const { return m_hInput != INVALID_HANDLE_VALUE; }
 
     // returns TRUE if there is any data to be read from the pipe
     bool IsOpened() const { return m_hInput != INVALID_HANDLE_VALUE; }
 
     // returns TRUE if there is any data to be read from the pipe

-    bool IsAvailable() const;
+    virtual bool CanRead() const;

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

+
+    DECLARE_NO_COPY_CLASS(wxPipeInputStream)

 };
 
 class wxPipeOutputStream: public wxOutputStream
 };
 
 class wxPipeOutputStream: public wxOutputStream


@@ -159,6 +162,8 @@ protected:
 
 protected:
     HANDLE m_hOutput;
 
 protected:
     HANDLE m_hOutput;

+
+    DECLARE_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


@@ -262,7 +267,7 @@ private:
 // thread function for the thread monitoring the process termination
 static DWORD __stdcall wxExecuteThread(void *arg)
 {
 // thread function for the thread monitoring the process termination
 static DWORD __stdcall wxExecuteThread(void *arg)
 {

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

 
     if ( ::WaitForSingleObject(data->hProcess, INFINITE) != WAIT_OBJECT_0 )
     {
 
     if ( ::WaitForSingleObject(data->hProcess, INFINITE) != WAIT_OBJECT_0 )
     {


@@ -293,7 +298,7 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
     {
         DestroyWindow(hWnd);    // we don't need it any more
 
     {
         DestroyWindow(hWnd);    // we don't need it any more
 

-        wxExecuteData *data = (wxExecuteData *)lParam;
+        wxExecuteData * const data = (wxExecuteData *)lParam;

         if ( data->handler )
         {
             data->handler->OnTerminate((int)data->dwProcessId,
         if ( data->handler )
         {
             data->handler->OnTerminate((int)data->dwProcessId,


@@ -316,7 +321,7 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
     }
     else
     {
     }
     else
     {

-        return DefWindowProc(hWnd, message, wParam, lParam);
+        return ::DefWindowProc(hWnd, message, wParam, lParam);

     }
 }
 
     }
 }
 


@@ -324,7 +329,7 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
 // implementation of IO redirection support classes
 // ============================================================================
 
 // implementation of IO redirection support classes
 // ============================================================================
 

-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && !defined(__WXWINCE__)

 
 // ----------------------------------------------------------------------------
 // wxPipeInputStreams
 
 // ----------------------------------------------------------------------------
 // wxPipeInputStreams


@@ -341,12 +346,8 @@ wxPipeInputStream::~wxPipeInputStream()
         ::CloseHandle(m_hInput);
 }
 
         ::CloseHandle(m_hInput);
 }
 

-bool wxPipeInputStream::IsAvailable() const
+bool wxPipeInputStream::CanRead() const

 {
 {

-    // FIXME
-#ifdef __WXWINE__
-    return FALSE;
-#else

     if ( !IsOpened() )
         return FALSE;
 
     if ( !IsOpened() )
         return FALSE;
 


@@ -374,37 +375,35 @@ bool wxPipeInputStream::IsAvailable() const
         // it had been closed
         ::CloseHandle(m_hInput);
 
         // it had been closed
         ::CloseHandle(m_hInput);
 

-        wxConstCast(this, wxPipeInputStream)->m_hInput = INVALID_HANDLE_VALUE;
+        wxPipeInputStream *self = wxConstCast(this, wxPipeInputStream);

 
 

-        return FALSE;
+        self->m_hInput = INVALID_HANDLE_VALUE;
+        self->m_lasterror = wxSTREAM_EOF;
+
+        nAvailable = 0;

     }
 
     return nAvailable != 0;
     }
 
     return nAvailable != 0;

-#endif

 }
 
 size_t wxPipeInputStream::OnSysRead(void *buffer, size_t len)
 {
 }
 
 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
-    if ( !IsAvailable() )
+    if ( !IsOpened() )

     {
         m_lasterror = wxSTREAM_EOF;
 
         return 0;
     }
 
     {
         m_lasterror = wxSTREAM_EOF;
 
         return 0;
     }
 

-    m_lasterror = wxSTREAM_NOERROR;
-

     DWORD bytesRead;
     if ( !::ReadFile(m_hInput, buffer, len, &bytesRead, NULL) )
     {
     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 = ::GetLastError() == ERROR_BROKEN_PIPE
+                        ? wxSTREAM_EOF
+                        : wxSTREAM_READ_ERROR;

     }
 
     }
 

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

     return bytesRead;
 }
 
     return bytesRead;
 }
 


@@ -424,18 +423,17 @@ wxPipeOutputStream::~wxPipeOutputStream()
 
 size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t len)
 {
 
 size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t len)
 {

-    DWORD bytesRead;
+    DWORD bytesWritten;

 
 

-    m_lasterror = wxSTREAM_NOERROR;
-    if ( !::WriteFile(m_hOutput, buffer, len, &bytesRead, NULL) )
+    m_lasterror = wxSTREAM_NO_ERROR;
+    if ( !::WriteFile(m_hOutput, buffer, len, &bytesWritten, NULL) )

     {
     {

-        if ( ::GetLastError() == ERROR_BROKEN_PIPE )
-            m_lasterror = wxSTREAM_EOF;
-        else
-            m_lasterror = wxSTREAM_READ_ERROR;
+        m_lasterror = ::GetLastError() == ERROR_BROKEN_PIPE
+                            ? wxSTREAM_EOF
+                            : wxSTREAM_WRITE_ERROR;

     }
 
     }
 

-    return bytesRead;
+    return bytesWritten;

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


@@ -453,10 +451,10 @@ static bool wxExecuteDDE(const wxString& ddeServer,
                          const wxString& ddeTopic,
                          const wxString& ddeCommand)
 {
                          const wxString& ddeTopic,
                          const wxString& ddeCommand)
 {

-    bool ok;
+    bool ok = FALSE;

 
     wxDDEClient client;
 
     wxDDEClient client;

-    wxConnectionBase *conn = client.MakeConnection(_T(""),
+    wxConnectionBase *conn = client.MakeConnection(wxEmptyString,

                                                    ddeServer,
                                                    ddeTopic);
     if ( !conn )
                                                    ddeServer,
                                                    ddeTopic);
     if ( !conn )


@@ -465,21 +463,23 @@ static bool wxExecuteDDE(const wxString& ddeServer,
     }
     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 it 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->Request(ddeCommand) != NULL;
         }
 
         if ( !ok )
         {
             ok = conn->Request(ddeCommand) != NULL;
         }
 
         if ( !ok )
         {

-            // now try execute - but show the errors
+            // now try execute -- but show the errors

             ok = conn->Execute(ddeCommand);
         }
     }
             ok = conn->Execute(ddeCommand);
         }
     }


@@ -493,6 +493,14 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 {
     wxCHECK_MSG( !!cmd, 0, wxT("empty command in wxExecute") );
 
 {
     wxCHECK_MSG( !!cmd, 0, wxT("empty command in wxExecute") );
 

+#if wxUSE_THREADS
+    // for many reasons, the code below breaks down if it's called from another
+    // thread -- this could be fixed, but as Unix versions don't support this
+    // neither I don't want to waste time on this now
+    wxASSERT_MSG( wxThread::IsMain(),
+                    _T("wxExecute() can be called only from the main thread") );
+#endif // wxUSE_THREADS
+

     wxString command;
 
 #if wxUSE_IPC
     wxString command;
 
 #if wxUSE_IPC


@@ -587,12 +595,10 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
         command = cmd;
     }
 
         command = cmd;
     }
 

-#if defined(__WIN32__) && !defined(__TWIN32__)
-

     // the IO redirection is only supported with wxUSE_STREAMS
     BOOL redirect = FALSE;
 
     // the IO redirection is only supported with wxUSE_STREAMS
     BOOL redirect = FALSE;
 

-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && !defined(__WXWINCE__)

     wxPipe pipeIn, pipeOut, pipeErr;
 
     // we'll save here the copy of pipeIn[Write]
     wxPipe pipeIn, pipeOut, pipeErr;
 
     // we'll save here the copy of pipeIn[Write]


@@ -620,7 +626,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
     wxZeroMemory(si);
     si.cb = sizeof(si);
 
     wxZeroMemory(si);
     si.cb = sizeof(si);
 

-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && !defined(__WXWINCE__)

     if ( redirect )
     {
         si.dwFlags = STARTF_USESTDHANDLES;
     if ( redirect )
     {
         si.dwFlags = STARTF_USESTDHANDLES;


@@ -663,7 +669,10 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 #endif // wxUSE_STREAMS
 
     PROCESS_INFORMATION pi;
 #endif // wxUSE_STREAMS
 
     PROCESS_INFORMATION pi;

-    DWORD dwFlags = CREATE_DEFAULT_ERROR_MODE | CREATE_SUSPENDED;
+    DWORD dwFlags = CREATE_SUSPENDED;
+#ifndef __WXWINCE__
+    dwFlags |= CREATE_DEFAULT_ERROR_MODE ;
+#endif

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


@@ -680,7 +689,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
                  &pi                // process info
                 ) != 0;
 
                  &pi                // process info
                 ) != 0;
 

-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && !defined(__WXWINCE__)

     // we can close the pipe ends used by child anyhow
     if ( redirect )
     {
     // we can close the pipe ends used by child anyhow
     if ( redirect )
     {


@@ -692,7 +701,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 
     if ( !ok )
     {
 
     if ( !ok )
     {

-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && !defined(__WXWINCE__)

         // close the other handles too
         if ( redirect )
         {
         // close the other handles too
         if ( redirect )
         {


@@ -706,7 +715,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
         return flags & wxEXEC_SYNC ? -1 : 0;
     }
 
         return flags & wxEXEC_SYNC ? -1 : 0;
     }
 

-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && !defined(__WXWINCE__)

     // the input buffer bufOut is connected to stdout, this is why it is
     // called bufOut and not bufIn
     wxStreamTempInputBuffer bufOut,
     // the input buffer bufOut is connected to stdout, this is why it is
     // called bufOut and not bufIn
     wxStreamTempInputBuffer bufOut,


@@ -748,10 +757,17 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 
     // 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);
     HWND hwnd = ::CreateWindow(gs_classForHiddenWindow, NULL,
                                WS_OVERLAPPEDWINDOW,
                                0, 0, 0, 0, NULL,
                                (HMENU)NULL, wxGetInstance(), 0);

+#endif

     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


@@ -805,7 +821,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 
     ::CloseHandle(hThread);
 
 
     ::CloseHandle(hThread);
 

-#if wxUSE_IPC
+#if wxUSE_IPC && !defined(__WXWINCE__)

     // second part of DDE hack: now establish the DDE conversation with the
     // just launched process
     if ( !ddeServer.empty() )
     // second part of DDE hack: now establish the DDE conversation with the
     // just launched process
     if ( !ddeServer.empty() )


@@ -836,6 +852,12 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
                 // ok, process ready to accept DDE requests
                 ok = wxExecuteDDE(ddeServer, ddeTopic, ddeCommand);
         }
                 // 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
 


@@ -847,93 +869,35 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
         return pi.dwProcessId;
     }
 
         return pi.dwProcessId;
     }
 

+    wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+    wxCHECK_MSG( traits, -1, _T("no wxAppTraits in wxExecute()?") );
+

     // disable all app windows while waiting for the child process to finish
     // disable all app windows while waiting for the child process to finish

-#if wxUSE_GUI
-
-    /*
-       We use a dirty hack here to disable all application windows (which we
-       must do because otherwise the calls to wxYield() could lead to some very
-       unexpected reentrancies in the users code) but to avoid losing
-       focus/activation entirely when the child process terminates which would
-       happen if we simply disabled everything using wxWindowDisabler. Indeed,
-       remember that Windows will never activate a disabled window and when the
-       last childs window is closed and Windows looks for a window to activate
-       all our windows are still disabled. There is no way to enable them in
-       time because we don't know when the childs windows are going to be
-       closed, so the solution we use here is to keep one special tiny frame
-       enabled all the time. Then when the child terminates it will get
-       activated and when we close it below -- after reenabling all the other
-       windows! -- the previously active window becomes activated again and
-       everything is ok.
-     */
-    wxWindow *winActive;
-    {
-        wxBusyCursor bc;
-
-        // first disable all existing windows
-        wxWindowDisabler wd;
-
-        // then create an "invisible" frame: it has minimal size, is positioned
-        // (hopefully) outside the screen and doesn't appear on the taskbar
-        winActive = new wxFrame
-                        (
-                            wxTheApp->GetTopWindow(),
-                            -1,
-                            _T(""),
-                            wxPoint(32600, 32600),
-                            wxSize(1, 1),
-                            wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR
-                        );
-        winActive->Show();
-#endif // wxUSE_GUI
-
-        // wait until the child process terminates
-        while ( data->state )
-        {
-#if wxUSE_STREAMS
-            bufOut.Update();
-            bufErr.Update();
-#endif // wxUSE_STREAMS
+    void *cookie = traits->BeforeChildWaitLoop();

 
 

-            // 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);
+    // wait until the child process terminates
+    while ( data->state )
+    {
+#if wxUSE_STREAMS && !defined(__WXWINCE__)
+        bufOut.Update();
+        bufErr.Update();
+#endif // wxUSE_STREAMS

 
 

-            // repaint the GUI
-            wxYield();
-        }
+        // don't eat 100% of the CPU -- ugly but anything else requires
+        // real async IO which we don't have for the moment
+        ::Sleep(50);

 
 

-#if wxUSE_GUI
+        // we must process messages or we'd never get wxWM_PROC_TERMINATED
+        traits->AlwaysYield();

     }
 
     }
 

-    // finally delete the dummy frame and, as wd has been already destroyed and
-    // the other windows reenabled, the activation is going to return to the
-    // window which had it before
-    winActive->Destroy();
-#endif // wxUSE_GUI
+    traits->AfterChildWaitLoop(cookie);

 
     DWORD dwExitCode = data->dwExitCode;
     delete data;
 
     // return the exit code
     return dwExitCode;
 
     DWORD dwExitCode = data->dwExitCode;
     delete data;
 
     // return the exit code
     return dwExitCode;

-#else // Win16
-    long instanceID = WinExec((LPCSTR) WXSTRINGCAST command, SW_SHOW);
-    if (instanceID < 32)
-        return flags & wxEXEC_SYNC ? -1 : 0;
-
-    if ( flags & wxEXEC_SYNC )
-    {
-        int running;
-        do
-        {
-            wxYield();
-            running = GetModuleUsage((HINSTANCE)instanceID);
-        } while (running);
-    }
-
-    return instanceID;
-#endif // Win16/32

 }
 
 long wxExecute(wxChar **argv, int flags, wxProcess *handler)
 }
 
 long wxExecute(wxChar **argv, int flags, wxProcess *handler)