*** empty log message ***

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

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 9c2ea76d18b71d52fbdb716078e620581abb2034..ec490fca949cb2d3d3972536eb52e7d7e4c6b06e 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -24,7 +24,11 @@
 #include "wx/intl.h"
 
 #include <ctype.h>
 #include "wx/intl.h"
 
 #include <ctype.h>

+#ifdef __EMX__
+#include <dirent.h>
+#else

 #include <direct.h>
 #include <direct.h>

+#endif

 
 #include "wx/log.h"
 
 
 #include "wx/log.h"
 


@@ -41,9 +45,11 @@
 #define INCL_GPI
 #include <os2.h>
 #define PURE_32
 #define INCL_GPI
 #include <os2.h>
 #define PURE_32

+#ifndef __EMX__

 #include <upm.h>
 #include <netcons.h>
 #include <netbios.h>
 #include <upm.h>
 #include <netcons.h>
 #include <netbios.h>

+#endif

 
 static const wxChar WX_SECTION[] = _T("wxWindows");
 static const wxChar eHOSTNAME[]  = _T("HostName");
 
 static const wxChar WX_SECTION[] = _T("wxWindows");
 static const wxChar eHOSTNAME[]  = _T("HostName");


@@ -65,9 +71,9 @@ bool wxGetHostName(
     char                            zServer[256];
     char                            zComputer[256];
     unsigned long                   ulLevel = 0;
     char                            zServer[256];
     char                            zComputer[256];
     unsigned long                   ulLevel = 0;

-    unsigned char*                  zBuffer;
-    unsigned long                   ulBuffer;
-    unsigned long*                  pulTotalAvail;
+    unsigned char*                  zBuffer = NULL;
+    unsigned long                   ulBuffer = 256;
+    unsigned long*                  pulTotalAvail = NULL;

 
     NetBios32GetInfo( (const unsigned char*)zServer
                      ,(const unsigned char*)zComputer
 
     NetBios32GetInfo( (const unsigned char*)zServer
                      ,(const unsigned char*)zComputer


@@ -104,10 +110,12 @@ bool wxGetUserId(
 , int                               nType
 )
 {
 , int                               nType
 )
 {

+#ifndef __EMX__

     long                            lrc;
     // UPM procs return 0 on success
     lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType);
     if (lrc == 0) return TRUE;
     long                            lrc;
     // UPM procs return 0 on success
     lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType);
     if (lrc == 0) return TRUE;

+#endif

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -197,7 +205,7 @@ bool wxShell(
 // 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()
 {

-    void*                           pMemptr;
+    void*                           pMemptr = NULL;

     ULONG                           lSize;
     ULONG                           lMemFlags;
     APIRET                          rc;
     ULONG                           lSize;
     ULONG                           lMemFlags;
     APIRET                          rc;


@@ -336,8 +344,8 @@ bool wxWriteResource(
 , const wxString&                   rFile
 )
 {
 , const wxString&                   rFile
 )
 {

-    HAB                             hab;
-    HINI                            hIni;
+    HAB                             hab = 0;
+    HINI                            hIni = 0;

 
     if (rFile != "")
     {
 
     if (rFile != "")
     {


@@ -418,8 +426,8 @@ bool wxGetResource(
 , const wxString&                   rFile
 )
 {
 , const wxString&                   rFile
 )
 {

-    HAB                             hab;
-    HINI                            hIni;
+    HAB                             hab = 0;
+    HINI                            hIni = 0;

     wxChar                          zDefunkt[] = _T("$$default");
     char                            zBuf[1000];
 
     wxChar                          zDefunkt[] = _T("$$default");
     char                            zBuf[1000];
 


@@ -624,6 +632,7 @@ wxChar* wxGetUserHome (
     wxString                        sUser1(rUser);
 
     wxBuffer = new wxChar[256];
     wxString                        sUser1(rUser);
 
     wxBuffer = new wxChar[256];

+#ifndef __EMX__

     if (sUser1 != _T(""))
     {
         wxChar                      zTmp[64];
     if (sUser1 != _T(""))
     {
         wxChar                      zTmp[64];


@@ -645,6 +654,7 @@ wxChar* wxGetUserHome (
                 sUser1 = _T("");
         }
     }
                 sUser1 = _T("");
         }
     }

+#endif

     if (sUser1 == _T(""))
     {
         if ((zHome = wxGetenv(_T("HOME"))) != NULL)
     if (sUser1 == _T(""))
     {
         if ((zHome = wxGetenv(_T("HOME"))) != NULL)


@@ -669,8 +679,8 @@ bool wxCheckForInterrupt(
     if(pWnd)
     {
         QMSG                        vMsg;
     if(pWnd)
     {
         QMSG                        vMsg;

-        HAB                         hab;
-        HWND                        hwndFilter;
+        HAB                         hab = 0;
+        HWND                        hwndFilter = NULLHANDLE;

         HWND                        hwndWin= (HWND) pWnd->GetHWND();
 
         while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE))
         HWND                        hwndWin= (HWND) pWnd->GetHWND();
 
         while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE))


@@ -738,12 +748,16 @@ void wxDisplaySize(
 {
     HPS                             hpsScreen;
     HDC                             hdcScreen;
 {
     HPS                             hpsScreen;
     HDC                             hdcScreen;

+    LONG                            lWidth;
+    LONG                            lHeight;

 
     hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
     hdcScreen = ::GpiQueryDevice(hpsScreen);
 
     hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
     hdcScreen = ::GpiQueryDevice(hpsScreen);

-    ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L, (PLONG)pWidth);
-    ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L, (PLONG)pHeight);
+    ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L, &lWidth);
+    ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L, &lHeight);

     DevCloseDC(hdcScreen);
     DevCloseDC(hdcScreen);

+    *pWidth = (int)lWidth;
+    *pHeight = (int)lHeight;

 }
 
 bool wxDirExists(
 }
 
 bool wxDirExists(


@@ -803,3 +817,62 @@ WXWORD WXDLLEXPORT wxGetWindowId(
     return ::WinQueryWindowUShort((HWND)hWnd, QWS_ID);
 }
 
     return ::WinQueryWindowUShort((HWND)hWnd, QWS_ID);
 }
 

+wxString WXDLLEXPORT wxPMErrorToStr(
+  ERRORID                           vError
+)
+{
+    wxString                        sError;
+
+    //
+    // Remove the high order byte -- it is useless
+    //
+    vError &= 0x0000ffff;
+    switch(vError)
+    {
+        case PMERR_INVALID_HWND:
+            sError = wxT("Invalid window handle specified");
+            break;
+
+        case PMERR_INVALID_FLAG:
+            sError = wxT("Invalid flag bit set");
+            break;
+
+        case PMERR_NO_MSG_QUEUE:
+            sError = wxT("No message queue available");
+            break;
+
+        case PMERR_INVALID_PARM:
+            sError = wxT("Parameter contained invalid data");
+            break;
+
+        case PMERR_INVALID_PARAMETERS:
+            sError = wxT("Parameter value is out of range");
+            break;
+
+        case PMERR_PARAMETER_OUT_OF_RANGE:
+            sError = wxT("Parameter value is out of range");
+            break;
+
+        case PMERR_INVALID_INTEGER_ATOM:
+            sError = wxT("Not a valid atom");
+            break;
+
+        case PMERR_INVALID_HATOMTBL:
+            sError = wxT("Atom table handle is invalid");
+            break;
+
+        case PMERR_INVALID_ATOM_NAME:
+            sError = wxT("Not a valid atom name");
+            break;
+
+        case PMERR_ATOM_NAME_NOT_FOUND:
+            sError = wxT("Valid name format, but cannot find name in atom table");
+            break;
+
+        default:
+            sError = wxT("Unknown error");
+    }
+    return(sError);
+} // end of wxPMErrorToStr
+
+