remove extraneous semicolons (patch 1299687)

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

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 2fa50268bf0a3690159586af0d3bcb4f361953a5..4eed50125a3a1eb0cf2a2ea42e3fbb08f5057fa7 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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"
 


@@ -124,7 +120,7 @@ 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
 };
 
 class wxExecuteModule : public wxModule


@@ -160,10 +156,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:


@@ -179,7 +175,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);


@@ -211,7 +208,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


@@ -225,31 +222,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;
 


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

-        return FALSE;
+        return false;

 
     DWORD nAvailable;
 
 
     DWORD nAvailable;
 


@@ -393,7 +381,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);
 


@@ -425,7 +413,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;
 }
 


@@ -436,26 +424,54 @@ 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


@@ -479,7 +495,7 @@ static bool wxExecuteDDE(const wxString& ddeServer,
                                                    ddeTopic);
     if ( !conn )
     {
                                                    ddeTopic);
     if ( !conn )
     {

-        ok = FALSE;
+        ok = false;

     }
     else // connected to DDE server
     {
     }
     else // connected to DDE server
     {


@@ -511,7 +527,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


@@ -844,7 +860,7 @@ 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:
                 break;
 
             case 0:


@@ -871,8 +887,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 )


@@ -890,7 +910,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;