compilation fixes - wxGTK compiles but not links

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 171942f093c432c3c3afcb80834c2c91dabec8bd..dea7aeb352d05cd47f9beac40c61ba0b9ab5e3c8 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -51,8 +51,6 @@ extern "C" {
 
 #include "wx/timer.h"
 
 
 #include "wx/timer.h"
 

-#include <ctype.h>
-

 #if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__)
     #include <direct.h>
 
 #if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__)
     #include <direct.h>
 


@@ -90,15 +88,11 @@ extern "C" {
     #endif
 #endif
 
     #endif
 #endif
 

-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>

 #ifndef __WATCOMC__
     #if !(defined(_MSC_VER) && (_MSC_VER > 800))
         #include <errno.h>
     #endif
 #endif
 #ifndef __WATCOMC__
     #if !(defined(_MSC_VER) && (_MSC_VER > 800))
         #include <errno.h>
     #endif
 #endif

-#include <stdarg.h>

 
 //// BEGIN for console support: VC++ only
 #ifdef __VISUALC__
 
 //// BEGIN for console support: VC++ only
 #ifdef __VISUALC__


@@ -109,13 +103,7 @@ extern "C" {
 
 #include "wx/ioswrap.h"
 
 
 #include "wx/ioswrap.h"
 

-#if wxUSE_IOSTREAMH
-// N.B. BC++ doesn't have istream.h, ostream.h
-#  include <io.h>
-#  include <fstream.h>
-#else
-#  include <fstream>
-#endif
+#include "wx/ioswrap.h"

 
 /* Need to undef new if including crtdbg.h */
 #  ifdef new
 
 /* Need to undef new if including crtdbg.h */
 #  ifdef new


@@ -513,65 +501,204 @@ bool wxSetEnv(const wxString& var, const wxChar *value)
 // process management
 // ----------------------------------------------------------------------------
 
 // process management
 // ----------------------------------------------------------------------------
 

-int wxKill(long pid, wxSignal sig)
+#ifdef __WIN32__
+
+// structure used to pass parameters from wxKill() to wxEnumFindByPidProc()
+struct wxFindByPidParams

 {
 {

-#ifndef __WIN32__
-    return -1;
-#else
-    // This in a work in progress. We need to eliminate the call to wxSleep,
-    // deal with child processes, and also test it :-)
-    HWND hHwnd;
-    HANDLE hProcess;
-    unsigned long code;
-    bool terminateSuccess = TRUE;
-
-    hProcess = OpenProcess(PROCESS_TERMINATE | PROCESS_QUERY_INFORMATION,
-                           FALSE, (unsigned long)pid);
-    if (hProcess == NULL)
-        return -1;
+    wxFindByPidParams() { hwnd = 0; pid = 0; }
+
+    // the HWND used to return the result
+    HWND hwnd;
+
+    // the PID we're looking from
+    DWORD pid;
+};

 
 

-    if (sig == wxSIGKILL)
-        terminateSuccess = (TerminateProcess(hProcess, 0) != 0);
-    else if (sig != wxSIGNONE)
+// wxKill helper: EnumWindows() callback which is used to find the first (top
+// level) window belonging to the given process
+BOOL CALLBACK wxEnumFindByPidProc(HWND hwnd, LPARAM lParam)
+{
+    DWORD pid;
+    (void)::GetWindowThreadProcessId(hwnd, &pid);
+
+    wxFindByPidParams *params = (wxFindByPidParams *)lParam;
+    if ( pid == params->pid )
+    {
+        // remember the window we found
+        params->hwnd = hwnd;
+
+        // return FALSE to stop the enumeration
+        return FALSE;
+    }
+
+    // continue enumeration
+    return TRUE;
+}
+
+#endif // __WIN32__
+
+int wxKill(long pid, wxSignal sig, wxKillError *krc)
+{
+#ifdef __WIN32__
+    // get the process handle to operate on
+    HANDLE hProcess = ::OpenProcess(SYNCHRONIZE |
+                                    PROCESS_TERMINATE |
+                                    PROCESS_QUERY_INFORMATION,
+                                    FALSE, // not inheritable
+                                    (DWORD)pid);
+    if ( hProcess == NULL )

     {
     {

-        hHwnd = ::FindWindow(NULL, NULL);
-        while (hHwnd != 0)
+        if ( krc )

         {
         {

-            if (::GetParent(hHwnd) == 0)
+            if ( ::GetLastError() == ERROR_ACCESS_DENIED )
+            {
+                *krc = wxKILL_ACCESS_DENIED;
+            }
+            else

             {
             {

-                unsigned long testpid = 0;
-                GetWindowThreadProcessId(hHwnd, &testpid);
-                if ((unsigned long)pid == testpid)
+                *krc = wxKILL_NO_PROCESS;
+            }
+        }
+
+        return -1;
+    }
+
+    bool ok = TRUE;
+    switch ( sig )
+    {
+        case wxSIGKILL:
+            // kill the process forcefully returning -1 as error code
+            if ( !::TerminateProcess(hProcess, (UINT)-1) )
+            {
+                wxLogSysError(_("Failed to kill process %d"), pid);
+
+                if ( krc )

                 {
                 {

-                    PostMessage(hHwnd, WM_QUIT, 0, 0);
-                    // How to make this better?
-                    // If we don't wait, the return value is wrong.
-                    wxSleep(1);
-                    break;
+                    // this is not supposed to happen if we could open the
+                    // process
+                    *krc = wxKILL_ERROR;
+                }
+
+                ok = FALSE;
+            }
+            break;
+
+        case wxSIGNONE:
+            // do nothing, we just want to test for process existence
+            break;
+
+        default:
+            // any other signal means "terminate"
+            {
+                wxFindByPidParams params;
+                params.pid = (DWORD)pid;
+
+                // EnumWindows() has nice semantics: it returns 0 if it found
+                // something or if an error occured and non zero if it
+                // enumerated all the window
+                if ( !::EnumWindows(wxEnumFindByPidProc, (LPARAM)&params) )
+                {
+                    // did we find any window?
+                    if ( params.hwnd )
+                    {
+                        // tell the app to close
+                        //
+                        // NB: this is the harshest way, the app won't have
+                        //     opportunity to save any files, for example, but
+                        //     this is probably what we want here. If not we
+                        //     can also use SendMesageTimeout(WM_CLOSE)
+                        if ( !::PostMessage(params.hwnd, WM_QUIT, 0, 0) )
+                        {
+                            wxLogLastError(_T("PostMessage(WM_QUIT)"));
+                        }
+                    }
+                    else // it was an error then
+                    {
+                        wxLogLastError(_T("EnumWindows"));
+
+                        ok = FALSE;
+                    }
+                }
+                else // no windows for this PID
+                {
+                    if ( krc )
+                    {
+                        *krc = wxKILL_ERROR;
+                    }
+
+                    ok = FALSE;

                 }
             }
                 }
             }

-            hHwnd = GetWindow(hHwnd, GW_HWNDNEXT);
+    }
+
+    // the return code
+    DWORD rc;
+
+    if ( ok )
+    {
+        // as we wait for a short time, we can use just WaitForSingleObject()
+        // and not MsgWaitForMultipleObjects()
+        switch ( ::WaitForSingleObject(hProcess, 500 /* msec */) )
+        {
+            case WAIT_OBJECT_0:
+                // process terminated
+                if ( !::GetExitCodeProcess(hProcess, &rc) )
+                {
+                    wxLogLastError(_T("GetExitCodeProcess"));
+                }
+                break;
+
+            default:
+                wxFAIL_MSG( _T("unexpected WaitForSingleObject() return") );
+                // fall through
+
+            case WAIT_FAILED:
+                wxLogLastError(_T("WaitForSingleObject"));
+                // fall through
+
+            case WAIT_TIMEOUT:
+                if ( krc )
+                {
+                    *krc = wxKILL_ERROR;
+                }
+
+                rc = STILL_ACTIVE;
+                break;

         }
     }
         }
     }

+    else // !ok
+    {
+        // just to suppress the warnings about uninitialized variable
+        rc = 0;
+    }

 
 

-    GetExitCodeProcess(hProcess, &code);
-    CloseHandle(hProcess);
+    ::CloseHandle(hProcess);

 
 

-    if (sig == wxSIGNONE)
+    // the return code is the same as from Unix kill(): 0 if killed
+    // successfully or -1 on error
+    if ( sig == wxSIGNONE )

     {
     {

-        if (code == STILL_ACTIVE)
+        if ( ok && rc == STILL_ACTIVE )
+        {
+            // there is such process => success

             return 0;
             return 0;

-        else
-            return -1;
+        }

     }
     }

-    else
+    else // not SIGNONE

     {
     {

-        if (!terminateSuccess || code == STILL_ACTIVE)
-            return -1;
-        else
+        if ( ok && rc != STILL_ACTIVE )
+        {
+            // killed => success

             return 0;
             return 0;

+        }

     }
     }

-#endif
+#else // Win15
+    wxFAIL_MSG( _T("not implemented") );
+#endif // Win32/Win16
+
+    // error
+    return -1;

 }
 
 // Execute a program in an Interactive Shell
 }
 
 // Execute a program in an Interactive Shell


@@ -723,10 +850,12 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

+#if wxUSE_TIMER
+

 // Sleep for nSecs seconds. Attempt a Windows implementation using timers.
 static bool gs_inTimer = FALSE;
 
 // Sleep for nSecs seconds. Attempt a Windows implementation using timers.
 static bool gs_inTimer = FALSE;
 

-class wxSleepTimer: public wxTimer
+class wxSleepTimer : public wxTimer

 {
 public:
     virtual void Notify()
 {
 public:
     virtual void Notify()


@@ -742,7 +871,7 @@ void wxUsleep(unsigned long milliseconds)
 {
 #ifdef __WIN32__
     ::Sleep(milliseconds);
 {
 #ifdef __WIN32__
     ::Sleep(milliseconds);

-#else
+#else // !Win32

     if (gs_inTimer)
         return;
 
     if (gs_inTimer)
         return;
 


@@ -756,7 +885,7 @@ void wxUsleep(unsigned long milliseconds)
     }
     delete wxTheSleepTimer;
     wxTheSleepTimer = NULL;
     }
     delete wxTheSleepTimer;
     wxTheSleepTimer = NULL;

-#endif
+#endif // Win32/!Win32

 }
 
 void wxSleep(int nSecs)
 }
 
 void wxSleep(int nSecs)


@@ -782,6 +911,8 @@ void wxFlushEvents()
 //  wxYield();
 }
 
 //  wxYield();
 }
 

+#endif // wxUSE_TIMER
+

 #elif defined(__WIN32__) // wxUSE_GUI
 
 void wxUsleep(unsigned long milliseconds)
 #elif defined(__WIN32__) // wxUSE_GUI
 
 void wxUsleep(unsigned long milliseconds)


@@ -1184,6 +1315,44 @@ WXWORD WXDLLEXPORT wxGetWindowId(WXHWND hWnd)
 
 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI
 

+#if wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// Metafile helpers
+// ----------------------------------------------------------------------------
+
+extern void PixelToHIMETRIC(LONG *x, LONG *y)
+{
+    ScreenHDC hdcRef;
+
+    int iWidthMM = GetDeviceCaps(hdcRef, HORZSIZE),
+        iHeightMM = GetDeviceCaps(hdcRef, VERTSIZE),
+        iWidthPels = GetDeviceCaps(hdcRef, HORZRES),
+        iHeightPels = GetDeviceCaps(hdcRef, VERTRES);
+
+    *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);
+}
+
+#endif // wxUSE_GUI
+

 #if 0
 //------------------------------------------------------------------------
 // wild character routines
 #if 0
 //------------------------------------------------------------------------
 // wild character routines