/////////////////////////////////////////////////////////////////////////////
-// 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$
-// Copyright: (c) 1998-2002 wxWindows dev team
+// Copyright: (c) 1998-2002 wxWidgets dev team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#endif // wxUSE_IPC
// implemented in utils.cpp
-extern "C" HWND
+extern "C" WXDLLIMPEXP_BASE HWND
wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
// ----------------------------------------------------------------------------
public:
~wxExecuteData()
{
-#ifndef __WIN16__
if ( !::CloseHandle(hProcess) )
{
wxLogLastError(wxT("CloseHandle(hProcess)"));
}
-#endif
}
HWND hWnd; // window to send wxWM_PROC_TERMINATED to
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
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; }
- // 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:
{
public:
wxPipeOutputStream(HANDLE hOutput);
- virtual ~wxPipeOutputStream();
+ virtual ~wxPipeOutputStream() { Close(); }
+ bool Close();
protected:
size_t OnSysWrite(const void *buffer, size_t len);
// 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
{
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
- 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)
{
- 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;
bool wxPipeInputStream::CanRead() const
{
if ( !IsOpened() )
- return FALSE;
+ return false;
DWORD nAvailable;
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);
: 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;
}
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)
{
- DWORD bytesWritten;
-
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
#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;
- wxConnectionBase *conn = client.MakeConnection(wxEmptyString,
- ddeServer,
- ddeTopic);
+ wxConnectionBase *
+ conn = client.MakeConnection(wxEmptyString, ddeServer, ddeTopic);
if ( !conn )
{
- ok = FALSE;
+ ok = false;
}
else // connected to DDE server
{
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
PROCESS_INFORMATION pi;
DWORD dwFlags = CREATE_SUSPENDED;
+
#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
(
- NULL, // application name (use only cmd line)
+ // WinCE requires appname to be non null
+ // Win32 allows for null
+#ifdef __WXWINCE__
+ (wxChar *)
+ moduleName.c_str(), // application name
(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
+ 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__)
case WAIT_TIMEOUT:
wxLogDebug(_T("Timeout too small in WaitForInputIdle"));
- ok = FALSE;
+ ok = false;
break;
case 0:
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 )
traits->AlwaysYield();
}
- traits->AfterChildWaitLoop(cookie);
+ if ( !(flags & wxEXEC_NODISABLE) )
+ {
+ // reenable disabled windows back
+ traits->AfterChildWaitLoop(cookie);
+ }
DWORD dwExitCode = data->dwExitCode;
delete data;
return wxExecute(command, flags, handler);
}
-
projects / wxWidgets.git / blobdiff