fixed compilation warnings

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 66414baaa242ce4d4ce150992fd8db08016a0409..0b2827e0e798051b7bff6bc53221b70bb4e11ab0 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -48,7 +48,7 @@
 
 #include "wx/timer.h"
 
 
 #include "wx/timer.h"
 

-#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__)
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__)

     #include <direct.h>
 
     #ifndef __MWERKS__
     #include <direct.h>
 
     #ifndef __MWERKS__


@@ -56,7 +56,7 @@
     #endif
 #endif  //GNUWIN32
 
     #endif
 #endif  //GNUWIN32
 

-#if defined(__CYGWIN__) && !defined(__TWIN32__)
+#if defined(__CYGWIN__)

     #include <sys/unistd.h>
     #include <sys/stat.h>
     #include <sys/cygwin.h> // for cygwin_conv_to_full_win32_path()
     #include <sys/unistd.h>
     #include <sys/stat.h>
     #include <sys/cygwin.h> // for cygwin_conv_to_full_win32_path()


@@ -78,8 +78,10 @@
     #include <lm.h>
 #endif // USE_NET_API
 
     #include <lm.h>
 #endif // USE_NET_API
 

-#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>
 
     #ifndef __GNUWIN32__
         #include <shellapi.h>


@@ -145,7 +147,7 @@ static const wxChar eUSERID[]    = wxT("UserId");
 // Get hostname only (without domain name)
 bool wxGetHostName(wxChar *buf, int maxSize)
 {
 // Get hostname only (without domain name)
 bool wxGetHostName(wxChar *buf, int maxSize)
 {

-#if defined(__WIN32__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__)
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)

     DWORD nSize = maxSize;
     if ( !::GetComputerName(buf, &nSize) )
     {
     DWORD nSize = maxSize;
     if ( !::GetComputerName(buf, &nSize) )
     {


@@ -171,13 +173,14 @@ bool wxGetHostName(wxChar *buf, int maxSize)
 // get full hostname (with domain name if possible)
 bool wxGetFullHostName(wxChar *buf, int maxSize)
 {
 // get full hostname (with domain name if possible)
 bool wxGetFullHostName(wxChar *buf, int maxSize)
 {

-#if defined(__WIN32__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__))
+#if defined(__WIN32__) && !defined(__WXMICROWIN__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__))

     // TODO should use GetComputerNameEx() when available
 
     // the idea is that if someone had set wxUSE_SOCKETS to 0 the code
     // shouldn't use winsock.dll (a.k.a. ws2_32.dll) at all so only use this
     // code if we link with it anyhow
 #if wxUSE_SOCKETS
     // TODO should use GetComputerNameEx() when available
 
     // the idea is that if someone had set wxUSE_SOCKETS to 0 the code
     // shouldn't use winsock.dll (a.k.a. ws2_32.dll) at all so only use this
     // code if we link with it anyhow
 #if wxUSE_SOCKETS

+

     WSADATA wsa;
     if ( WSAStartup(MAKEWORD(1, 1), &wsa) == 0 )
     {
     WSADATA wsa;
     if ( WSAStartup(MAKEWORD(1, 1), &wsa) == 0 )
     {


@@ -213,6 +216,7 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
             return TRUE;
         }
     }
             return TRUE;
         }
     }

+

 #endif // wxUSE_SOCKETS
 
 #endif // Win32
 #endif // wxUSE_SOCKETS
 
 #endif // Win32


@@ -223,7 +227,7 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
 // Get user ID e.g. jacs
 bool wxGetUserId(wxChar *buf, int maxSize)
 {
 // Get user ID e.g. jacs
 bool wxGetUserId(wxChar *buf, int maxSize)
 {

-#if defined(__WIN32__) && !defined(__win32s__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__)
+#if defined(__WIN32__) && !defined(__win32s__) && !defined(__WXMICROWIN__)

     DWORD nSize = maxSize;
     if ( ::GetUserName(buf, &nSize) == 0 )
     {
     DWORD nSize = maxSize;
     if ( ::GetUserName(buf, &nSize) == 0 )
     {


@@ -362,7 +366,7 @@ const wxChar* wxGetHomeDir(wxString *pstr)
 {
   wxString& strDir = *pstr;
 
 {
   wxString& strDir = *pstr;
 

-  #if defined(__UNIX__) && !defined(__TWIN32__)
+  #if defined(__UNIX__)

     const wxChar *szHome = wxGetenv("HOME");
     if ( szHome == NULL ) {
       // we're homeless...
     const wxChar *szHome = wxGetenv("HOME");
     if ( szHome == NULL ) {
       // we're homeless...


@@ -650,8 +654,6 @@ bool wxSetEnv(const wxString& var, const wxChar *value)
 // process management
 // ----------------------------------------------------------------------------
 
 // process management
 // ----------------------------------------------------------------------------
 

-#ifdef __WIN32__
-

 // structure used to pass parameters from wxKill() to wxEnumFindByPidProc()
 struct wxFindByPidParams
 {
 // structure used to pass parameters from wxKill() to wxEnumFindByPidProc()
 struct wxFindByPidParams
 {


@@ -662,6 +664,8 @@ struct wxFindByPidParams
 
     // the PID we're looking from
     DWORD pid;
 
     // the PID we're looking from
     DWORD pid;

+
+    DECLARE_NO_COPY_CLASS(wxFindByPidParams)

 };
 
 // wxKill helper: EnumWindows() callback which is used to find the first (top
 };
 
 // wxKill helper: EnumWindows() callback which is used to find the first (top


@@ -685,11 +689,8 @@ BOOL CALLBACK wxEnumFindByPidProc(HWND hwnd, LPARAM lParam)
     return TRUE;
 }
 
     return TRUE;
 }
 

-#endif // __WIN32__
-

 int wxKill(long pid, wxSignal sig, wxKillError *krc)
 {
 int wxKill(long pid, wxSignal sig, wxKillError *krc)
 {

-#ifdef __WIN32__

     // get the process handle to operate on
     HANDLE hProcess = ::OpenProcess(SYNCHRONIZE |
                                     PROCESS_TERMINATE |
     // get the process handle to operate on
     HANDLE hProcess = ::OpenProcess(SYNCHRONIZE |
                                     PROCESS_TERMINATE |


@@ -826,25 +827,19 @@ int wxKill(long pid, wxSignal sig, wxKillError *krc)
 
     // the return code is the same as from Unix kill(): 0 if killed
     // successfully or -1 on error
 
     // the return code is the same as from Unix kill(): 0 if killed
     // successfully or -1 on error

-    if ( sig == wxSIGNONE )
-    {
-        if ( ok && rc == STILL_ACTIVE )
-        {
-            // there is such process => success
-            return 0;
-        }
-    }
-    else // not SIGNONE
+    //
+    // be careful to interpret rc correctly: for wxSIGNONE we return success if
+    // the process exists, for all the other sig values -- if it doesn't
+    if ( ok &&
+            ((sig == wxSIGNONE) == (rc == STILL_ACTIVE)) )

     {
     {

-        if ( ok && rc != STILL_ACTIVE )
+        if ( krc )

         {
         {

-            // killed => success
-            return 0;
+            *krc = wxKILL_OK;

         }
         }

+
+        return 0;

     }
     }

-#else // Win16
-    wxFAIL_MSG( _T("not implemented") );
-#endif // Win32/Win16

 
     // error
     return -1;
 
     // error
     return -1;


@@ -872,7 +867,7 @@ bool wxShell(const wxString& command)
     return wxExecute(cmd, wxEXEC_SYNC) == 0;
 }
 
     return wxExecute(cmd, wxEXEC_SYNC) == 0;
 }
 

-// Shutdown or reboot the PC 
+// Shutdown or reboot the PC

 bool wxShutdown(wxShutdownFlags wFlags)
 {
 #ifdef __WIN32__
 bool wxShutdown(wxShutdownFlags wFlags)
 {
 #ifdef __WIN32__


@@ -880,31 +875,29 @@ bool wxShutdown(wxShutdownFlags wFlags)
 
     if ( wxGetOsVersion(NULL, NULL) == wxWINDOWS_NT ) // if is NT or 2K
     {
 
     if ( wxGetOsVersion(NULL, NULL) == wxWINDOWS_NT ) // if is NT or 2K
     {

-        // Get a token for this process. 
-        HANDLE hToken; 
+        // Get a token for this process.
+        HANDLE hToken;

         bOK = ::OpenProcessToken(GetCurrentProcess(),
                                  TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY,
                                  &hToken) != 0;
         bOK = ::OpenProcessToken(GetCurrentProcess(),
                                  TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY,
                                  &hToken) != 0;

-#ifndef __WXWINE__

         if ( bOK )
         {
         if ( bOK )
         {

-            TOKEN_PRIVILEGES tkp; 
+            TOKEN_PRIVILEGES tkp;

 
 

-            // Get the LUID for the shutdown privilege. 
+            // Get the LUID for the shutdown privilege.

             ::LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME,
             ::LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME,

-                                   &tkp.Privileges[0].Luid); 
+                                   &tkp.Privileges[0].Luid);

 
 

-            tkp.PrivilegeCount = 1;  // one privilege to set    
-            tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; 
+            tkp.PrivilegeCount = 1;  // one privilege to set
+            tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;

 
 

-            // Get the shutdown privilege for this process. 
+            // Get the shutdown privilege for this process.

             ::AdjustTokenPrivileges(hToken, FALSE, &tkp, 0,
             ::AdjustTokenPrivileges(hToken, FALSE, &tkp, 0,

-                                    (PTOKEN_PRIVILEGES)NULL, 0); 
+                                    (PTOKEN_PRIVILEGES)NULL, 0);

 
 

-            // Cannot test the return value of AdjustTokenPrivileges. 
+            // Cannot test the return value of AdjustTokenPrivileges.

             bOK = ::GetLastError() == ERROR_SUCCESS;
         }
             bOK = ::GetLastError() == ERROR_SUCCESS;
         }

-#endif

     }
 
     if ( bOK )
     }
 
     if ( bOK )


@@ -925,7 +918,7 @@ bool wxShutdown(wxShutdownFlags wFlags)
                 return FALSE;
         }
 
                 return FALSE;
         }
 

-        bOK = ::ExitWindowsEx(EWX_SHUTDOWN | EWX_FORCE | EWX_REBOOT, 0) != 0; 
+        bOK = ::ExitWindowsEx(EWX_SHUTDOWN | EWX_FORCE | EWX_REBOOT, 0) != 0;

     }
 
     return bOK;
     }
 
     return bOK;


@@ -941,7 +934,7 @@ bool wxShutdown(wxShutdownFlags wFlags)
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 long wxGetFreeMemory()
 {
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 long wxGetFreeMemory()
 {

-#if defined(__WIN32__) && !defined(__BORLANDC__) && !defined(__TWIN32__)
+#if defined(__WIN32__) && !defined(__BORLANDC__)

     MEMORYSTATUS memStatus;
     memStatus.dwLength = sizeof(MEMORYSTATUS);
     GlobalMemoryStatus(&memStatus);
     MEMORYSTATUS memStatus;
     memStatus.dwLength = sizeof(MEMORYSTATUS);
     GlobalMemoryStatus(&memStatus);


@@ -1018,7 +1011,7 @@ wxString wxGetOsDescription()
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {

-#if defined(__WIN32__) && !defined(__SC__)
+#if defined(__WIN32__) 

     static int ver = -1, major = -1, minor = -1;
 
     if ( ver == -1 )
     static int ver = -1, major = -1, minor = -1;
 
     if ( ver == -1 )


@@ -1106,6 +1099,8 @@ void wxUsleep(unsigned long milliseconds)
 #else // !Win32
     if (gs_inTimer)
         return;
 #else // !Win32
     if (gs_inTimer)
         return;

+    if (miliseconds <= 0)
+        return;

 
     wxTheSleepTimer = new wxSleepTimer;
     gs_inTimer = TRUE;
 
     wxTheSleepTimer = new wxSleepTimer;
     gs_inTimer = TRUE;


@@ -1124,6 +1119,8 @@ void wxSleep(int nSecs)
 {
     if (gs_inTimer)
         return;
 {
     if (gs_inTimer)
         return;

+    if (nSecs <= 0)
+         return;

 
     wxTheSleepTimer = new wxSleepTimer;
     gs_inTimer = TRUE;
 
     wxTheSleepTimer = new wxSleepTimer;
     gs_inTimer = TRUE;


@@ -1319,7 +1316,11 @@ static HCURSOR gs_wxBusyCursor = 0;     // new, busy cursor
 static HCURSOR gs_wxBusyCursorOld = 0;  // old cursor
 static int gs_wxBusyCursorCount = 0;
 
 static HCURSOR gs_wxBusyCursorOld = 0;  // old cursor
 static int gs_wxBusyCursorCount = 0;
 

+#ifdef __DIGITALMARS__
+extern "C" HCURSOR wxGetCurrentBusyCursor()
+#else

 extern HCURSOR wxGetCurrentBusyCursor()
 extern HCURSOR wxGetCurrentBusyCursor()

+#endif

 {
     return gs_wxBusyCursor;
 }
 {
     return gs_wxBusyCursor;
 }