X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11c7d5b6d1cb54d5ffdc11d8ff092b41e225bfb6..fb0de762f3e019e4d0c3a5816d10b934500833db:/src/msw/utilsexc.cpp diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index e6570d80a3..12a78c001a 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utilsexec.cpp +// Name: msw/utilsexec.cpp // Purpose: Various utilities // Author: Julian Smart // Modified by: @@ -9,48 +9,51 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ -#pragma implementation + #pragma implementation #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/setup.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/intl.h" + #include "wx/utils.h" + #include "wx/app.h" + #include "wx/intl.h" #endif #include "wx/log.h" #ifdef __WIN32__ -#include "wx/process.h" + #include "wx/process.h" #endif #include "wx/msw/private.h" -#include - #include #if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) -#include + #include #ifndef __MWERKS__ -#include + #include #endif #endif -#ifdef __GNUWIN32__ -#ifndef __TWIN32__ -#include -#include -#endif +#if defined(__GNUWIN32__) && !defined(__TWIN32__) + #include + #include #endif #if defined(__WIN32__) && !defined(__WXWINE__) @@ -71,9 +74,30 @@ #endif #include +#if wxUSE_IPC + #include "wx/dde.h" // for WX_DDE hack in wxExecute +#endif // wxUSE_IPC + +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + // this message is sent when the process we're waiting for terminates #define wxWM_PROC_TERMINATED (WM_USER + 10000) +// ---------------------------------------------------------------------------- +// this module globals +// ---------------------------------------------------------------------------- + +// 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 *gs_classForHiddenWindow = NULL; + +// ---------------------------------------------------------------------------- +// private types +// ---------------------------------------------------------------------------- + // structure describing the process we're being waiting for struct wxExecuteData { @@ -96,6 +120,9 @@ public: bool state; // set to FALSE when the process finishes }; +// ============================================================================ +// implementation +// ============================================================================ #ifdef __WIN32__ static DWORD wxExecuteThread(wxExecuteData *data) @@ -144,17 +171,91 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message, // asynchronous execution - we should do the clean up delete data; } - } - return 0; + return 0; + } + else + { + return DefWindowProc(hWnd, message, wParam, lParam); + } } -#endif +#endif // Win32 -extern wxChar wxPanelClassName[]; - -long wxExecute(const wxString& command, bool sync, wxProcess *handler) +long wxExecute(const wxString& cmd, bool sync, wxProcess *handler) { - wxCHECK_MSG( !!command, 0, wxT("empty command in wxExecute") ); + wxCHECK_MSG( !!cmd, 0, wxT("empty command in wxExecute") ); + + wxString command; +#if wxUSE_IPC + // DDE hack: this is really not pretty, but we need to allow this for + // transparent handling of DDE servers in wxMimeTypesManager. Usually it + // returns the command which should be run to view/open/... a file of the + // given type. Sometimes, however, this command just launches the server + // and an additional DDE request must be made to really open the file. To + // keep all this well hidden from the application, we allow a special form + // of command: WX_DDE::DDE_SERVER:DDE_TOPIC:DDE_COMMAND in which + // case we execute just and process the rest below + wxString ddeServer, ddeTopic, ddeCommand; + static const size_t lenDdePrefix = 7; // strlen("WX_DDE:") + if ( cmd.Left(lenDdePrefix) == _T("WX_DDE#") ) + { + const wxChar *p = cmd.c_str() + 7; + while ( *p && *p != _T('#') ) + { + command += *p++; + } + + if ( *p ) + { + // skip '#' + p++; + } + else + { + wxFAIL_MSG(_T("invalid WX_DDE command in wxExecute")); + } + + while ( *p && *p != _T('#') ) + { + ddeServer += *p++; + } + + if ( *p ) + { + // skip '#' + p++; + } + else + { + wxFAIL_MSG(_T("invalid WX_DDE command in wxExecute")); + } + + while ( *p && *p != _T('#') ) + { + ddeTopic += *p++; + } + + if ( *p ) + { + // skip '#' + p++; + } + else + { + wxFAIL_MSG(_T("invalid WX_DDE command in wxExecute")); + } + + while ( *p ) + { + ddeCommand += *p++; + } + } + else +#endif // wxUSE_IPC + { + // no DDE + command = cmd; + } #if defined(__WIN32__) && !defined(__TWIN32__) // the old code is disabled because we really need a process handle @@ -212,6 +313,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) return result; #else // 1 + // create the process STARTUPINFO si; wxZeroMemory(si); @@ -226,7 +328,8 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) NULL, // security attributes: defaults for both NULL, // the process and its main thread FALSE, // don't inherit handles - CREATE_DEFAULT_ERROR_MODE, // flags + CREATE_DEFAULT_ERROR_MODE | + CREATE_SUSPENDED, // flags NULL, // environment (use the same) NULL, // current directory (use the same) &si, // startup info (unused here) @@ -238,21 +341,31 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) return 0; } - // close unneeded handle - if ( !::CloseHandle(pi.hThread) ) - wxLogLastError("CloseHandle(hThread)"); + // 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("RegisterClass(hidden window)"); + } + } // create a hidden window to receive notification about process // termination - HWND hwnd = ::CreateWindow(wxPanelClassName, NULL, 0, 0, 0, 0, 0, NULL, + HWND hwnd = ::CreateWindow(gs_classForHiddenWindow, NULL, + WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, (HMENU)NULL, wxGetInstance(), 0); wxASSERT_MSG( hwnd, wxT("can't create a hidden window for wxExecute") ); - FARPROC ExecuteWindowInstance = MakeProcInstance((FARPROC)wxExecuteWindowCbk, - wxGetInstance()); - - ::SetWindowLong(hwnd, GWL_WNDPROC, (LONG) ExecuteWindowInstance); - // Alloc data wxExecuteData *data = new wxExecuteData; data->hProcess = pi.hProcess; @@ -279,6 +392,18 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) 0, &tid); + // resume process we created now - whether the thread creation succeeded or + // not + if ( ::ResumeThread(pi.hThread) == (DWORD)-1 ) + { + // ignore it - what can we do? + wxLogLastError("ResumeThread in wxExecute"); + } + + // close unneeded handle + if ( !::CloseHandle(pi.hThread) ) + wxLogLastError("CloseHandle(hThread)"); + if ( !hThread ) { wxLogLastError("CreateThread in wxExecute"); @@ -290,6 +415,22 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) return pi.dwProcessId; } +#if wxUSE_IPC + // second part of DDE hack: now establish the DDE conversation with the + // just launched process + if ( !!ddeServer ) + { + wxDDEClient client; + wxConnectionBase *conn = client.MakeConnection(_T(""), + ddeServer, + ddeTopic); + if ( !conn || !conn->Execute(ddeCommand) ) + { + wxLogError(_("Couldn't launch DDE server '%s'."), command.c_str()); + } + } +#endif // wxUSE_IPC + if ( !sync ) { // clean up will be done when the process terminates @@ -298,10 +439,20 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) return pi.dwProcessId; } - // waiting until command executed + // waiting until command executed (disable everything while doing it) +#if wxUSE_GUI + wxBeginBusyCursor(); + wxEnableTopLevelWindows(FALSE); +#endif // wxUSE_GUI + while ( data->state ) wxYield(); +#if wxUSE_GUI + wxEnableTopLevelWindows(TRUE); + wxEndBusyCursor(); +#endif // wxUSE_GUI + DWORD dwExitCode = data->dwExitCode; delete data; @@ -338,33 +489,36 @@ long wxExecute(char **argv, bool sync, wxProcess *handler) return wxExecute(command, sync, handler); } -bool wxGetFullHostName(wxChar *buf, int maxSize) +// ---------------------------------------------------------------------------- +// Metafile helpers +// ---------------------------------------------------------------------------- + +extern void PixelToHIMETRIC(LONG *x, LONG *y) { -#if defined(__WIN32__) && !defined(__TWIN32__) - DWORD nSize = maxSize ; - if ( !::GetComputerName(buf, &nSize) ) - { - wxLogLastError("GetComputerName"); + ScreenHDC hdcRef; - return FALSE; - } -#else - char *sysname; - const char *default_host = "noname"; -static const char WX_SECTION[] = "wxWindows"; -static const char eHOSTNAME[] = "HostName"; - - if ((sysname = getenv("SYSTEM_NAME")) == NULL) { - GetProfileString(WX_SECTION, eHOSTNAME, default_host, buf, maxSize - 1); - } else - strncpy(buf, sysname, maxSize - 1); - buf[maxSize] = '\0'; - if ( *buf == '\0' ) - { - wxLogLastError("GetComputerName"); + int iWidthMM = GetDeviceCaps(hdcRef, HORZSIZE), + iHeightMM = GetDeviceCaps(hdcRef, VERTSIZE), + iWidthPels = GetDeviceCaps(hdcRef, HORZRES), + iHeightPels = GetDeviceCaps(hdcRef, VERTRES); - return FALSE; - } -#endif - return TRUE; + *x *= (iWidthMM * 100); + *x /= iWidthPels; + *y *= (iHeightMM * 100); + *y /= iHeightPels; +} + +extern void HIMETRICToPixel(LONG *x, LONG *y) +{ + ScreenHDC hdcRef; + + int iWidthMM = GetDeviceCaps(hdcRef, HORZSIZE), + iHeightMM = GetDeviceCaps(hdcRef, VERTSIZE), + iWidthPels = GetDeviceCaps(hdcRef, HORZRES), + iHeightPels = GetDeviceCaps(hdcRef, VERTRES); + + *x *= iWidthPels; + *x /= (iWidthMM * 100); + *y *= iHeightPels; + *y /= (iHeightMM * 100); }