X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/837e57436a89516a5fa9f478f401e06bd872c17c..37b8e6798782278fdfe4f3c1291aaff55cdbb8c9:/src/msw/utilsexc.cpp diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index 0c566962da..5cbd5a4957 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,45 +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" -#include "wx/process.h" -#include "wx/msw/private.h" +#ifdef __WIN32__ + #include "wx/process.h" +#endif -#include +#include "wx/msw/private.h" #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__) @@ -68,9 +74,26 @@ #endif #include +// ---------------------------------------------------------------------------- +// 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 { @@ -93,6 +116,9 @@ public: bool state; // set to FALSE when the process finishes }; +// ============================================================================ +// implementation +// ============================================================================ #ifdef __WIN32__ static DWORD wxExecuteThread(wxExecuteData *data) @@ -106,14 +132,13 @@ static DWORD wxExecuteThread(wxExecuteData *data) } wxASSERT_MSG( data->dwExitCode != STILL_ACTIVE, - _T("process should have terminated") ); + wxT("process should have terminated") ); // send a message indicating process termination to the window SendMessage(data->hWnd, wxWM_PROC_TERMINATED, 0, (LPARAM)data); return 0; } -#endif // window procedure of a hidden window which is created just to receive // the notification message when a process exits @@ -142,16 +167,19 @@ 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); + } } - -extern wxChar wxPanelClassName[]; +#endif long wxExecute(const wxString& command, bool sync, wxProcess *handler) { - wxCHECK_MSG( !!command, 0, _T("empty command in wxExecute") ); + wxCHECK_MSG( !!command, 0, wxT("empty command in wxExecute") ); #if defined(__WIN32__) && !defined(__TWIN32__) // the old code is disabled because we really need a process handle @@ -211,11 +239,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) #else // 1 // create the process STARTUPINFO si; -#ifdef __GNUWIN32__ - memset(&si, 0, sizeof(si)); -#else - ::ZeroMemory(&si, sizeof(si)); -#endif + wxZeroMemory(si); si.cb = sizeof(si); @@ -227,7 +251,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) @@ -239,20 +264,30 @@ 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, _T("can't create a hidden window for wxExecute") ); - - FARPROC ExecuteWindowInstance = MakeProcInstance((FARPROC)wxExecuteWindowCbk, - wxGetInstance()); - - ::SetWindowLong(hwnd, GWL_WNDPROC, (LONG) ExecuteWindowInstance); + wxASSERT_MSG( hwnd, wxT("can't create a hidden window for wxExecute") ); // Alloc data wxExecuteData *data = new wxExecuteData; @@ -262,7 +297,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) data->state = sync; if ( sync ) { - wxASSERT_MSG( !handler, _T("wxProcess param ignored for sync execution") ); + wxASSERT_MSG( !handler, wxT("wxProcess param ignored for sync execution") ); data->handler = NULL; } @@ -280,6 +315,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"); @@ -299,10 +346,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; @@ -339,33 +396,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); }