#include "wx/utils.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
-#include "wx/log.h"
-
#ifdef __WIN32__
#include "wx/stream.h"
#include "wx/process.h"
#include <ctype.h>
-#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__)
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__)
#include <direct.h>
#ifndef __MWERKS__
#include <dos.h>
#include <sys/stat.h>
#endif
-#if defined(__WIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
-#include <io.h>
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+#ifndef __UNIX__
+ #include <io.h>
+#endif
#ifndef __GNUWIN32__
#include <shellapi.h>
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;
+
+ DECLARE_NO_COPY_CLASS(wxPipeInputStream)
};
class wxPipeOutputStream: public wxOutputStream
protected:
HANDLE m_hOutput;
+
+ DECLARE_NO_COPY_CLASS(wxPipeOutputStream)
};
// define this to let wxexec.cpp know that we know what we're doing
// 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 )
{
{
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,
}
else
{
- return DefWindowProc(hWnd, message, wParam, lParam);
+ return ::DefWindowProc(hWnd, message, wParam, lParam);
}
}
::CloseHandle(m_hInput);
}
-bool wxPipeInputStream::IsAvailable() const
+bool wxPipeInputStream::CanRead() const
{
- // FIXME
-#ifdef __WXWINE__
- return FALSE;
-#else
if ( !IsOpened() )
return FALSE;
// 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;
-#endif
}
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_NOERROR;
-
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;
}
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
const wxString& ddeTopic,
const wxString& ddeCommand)
{
- bool ok;
+ bool ok = FALSE;
wxDDEClient client;
wxConnectionBase *conn = client.MakeConnection(_T(""),
// important ones - like IE and other MS stuff - use
// XTYP_REQUEST!
//
- // so we try it first and then the other one if it
+ // so we try one first and then the other one if it
// failed
{
wxLogNull noErrors;
- ok = conn->Request(ddeCommand) != NULL;
+ ok = conn->Execute(ddeCommand);
}
if ( !ok )
{
- // now try execute - but show the errors
- ok = conn->Execute(ddeCommand);
+ // now try request - but show the errors
+ ok = conn->Request(ddeCommand) != NULL;
}
}
return pi.dwProcessId;
}
- // waiting until command executed (disable everything while doing it)
+ // 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
// real async IO which we don't have for the moment
::Sleep(50);
+#if wxUSE_GUI
// repaint the GUI
wxYield();
+#else // !GUI
+ // dispatch the messages to the hidden window so that it could
+ // process the wxWM_PROC_TERMINATED notification
+ MSG msg;
+ ::PeekMessage(&msg, hwnd, 0, 0, PM_REMOVE);
+#endif // GUI/!GUI
}
#if wxUSE_GUI
}
+
+ // 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
DWORD dwExitCode = data->dwExitCode;
projects / wxWidgets.git / blobdiff