More GTK+ 1.3.1 fixes

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

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

-#include <direct.h>
+#ifdef __EMX__
+#include <dirent.h>
+#endif

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


@@ -36,15 +38,14 @@
 #include <errno.h>
 #include <stdarg.h>
 
 #include <errno.h>
 #include <stdarg.h>
 

-#define INCL_DOS
-#define INCL_PM
-#define INCL_GPI
-#include <os2.h>
-#include<netdb.h>

 #define PURE_32
 #define PURE_32

-#include<upm.h>

 
 

-// In the WIN.INI file
+#ifndef __EMX__
+#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 eUSERID[]    = _T("UserId");
 static const wxChar WX_SECTION[] = _T("wxWindows");
 static const wxChar eHOSTNAME[]  = _T("HostName");
 static const wxChar eUSERID[]    = _T("UserId");


@@ -56,83 +57,159 @@ static const wxChar eUSERNAME[]  = _T("UserName");
 // functions beyond those provided by WinSock
 
 // Get full hostname (eg. DoDo.BSn-Germany.crg.de)
 // functions beyond those provided by WinSock
 
 // Get full hostname (eg. DoDo.BSn-Germany.crg.de)

-bool wxGetHostName(wxChar *buf, int maxSize)
+bool wxGetHostName(
+  wxChar*                           zBuf
+, int                               nMaxSize
+)

 {
 #if wxUSE_NET_API
 {
 #if wxUSE_NET_API

-  char                               server[256];
-  char                               computer[256];
-  unsigned long                      ulLevel;
-  unsigned char*                     pbBuffer;
-  unsigned long                      ulBuffer;
-  unsigned long*                     pulTotalAvail;
-
-  NetBios32GetInfo( server
-                   ,computer
-                   ,ulLevel
-                   ,pbBuffer
-                   ,ulBuffer
-                   ,pulTotalAvail
-                  );
-  strcpy(buf, server);
+    char                            zServer[256];
+    char                            zComputer[256];
+    unsigned long                   ulLevel = 0;
+    unsigned char*                  zBuffer = NULL;
+    unsigned long                   ulBuffer = 256;
+    unsigned long*                  pulTotalAvail = NULL;
+
+    NetBios32GetInfo( (const unsigned char*)zServer
+                     ,(const unsigned char*)zComputer
+                     ,ulLevel
+                     ,zBuffer
+                     ,ulBuffer
+                     ,pulTotalAvail
+                    );
+    strcpy(zBuf, zServer);

 #else
 #else

-  wxChar *sysname;
-  const wxChar *default_host = _T("noname");
-
-  if ((sysname = wxGetenv(_T("SYSTEM_NAME"))) == NULL)
-  {
-      // GetProfileString(WX_SECTION, eHOSTNAME, default_host, buf, maxSize - 1);
-  }
-  else
-      wxStrncpy(buf, sysname, maxSize - 1);
-  buf[maxSize] = _T('\0');
+    wxChar*                         zSysname;
+    const wxChar*                   zDefaultHost = _T("noname");
+
+    if ((zSysname = wxGetenv(_T("SYSTEM_NAME"))) == NULL)
+    {
+        ULONG n = ::PrfQueryProfileString( HINI_PROFILE
+                                          ,(PSZ)WX_SECTION
+                                          ,(PSZ)eHOSTNAME
+                                          ,(PSZ)zDefaultHost
+                                          ,(void*)zBuf
+                                          ,(ULONG)nMaxSize - 1
+                                         );
+    }
+    else
+        wxStrncpy(zBuf, zSysname, nMaxSize - 1);
+    zBuf[nMaxSize] = _T('\0');

 #endif
 #endif

-  return *buf ? TRUE : FALSE;
+    return *zBuf ? TRUE : FALSE;

 }
 
 // Get user ID e.g. jacs
 }
 
 // Get user ID e.g. jacs

-bool wxGetUserId(wxChar *buf, int maxSize)
-{
-  return(U32ELOCL((unsigned char*)buf, (unsigned long *)&maxSize));
+bool wxGetUserId(
+  wxChar*                           zBuf
+, 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;
+#endif
+    return FALSE;

 }
 
 }
 

-bool wxGetUserName(wxChar *buf, int maxSize)
+bool wxGetUserName(
+  wxChar*                           zBuf
+, int                               nMaxSize
+)

 {
 #ifdef USE_NET_API
 {
 #ifdef USE_NET_API

-    wxGetUserId(buf, maxSize);
+    wxGetUserId( zBuf
+                ,nMaxSize
+               );

 #else
 #else

-    wxStrncpy(buf, _T("Unknown User"), maxSize);
+    wxStrncpy(zBuf, _T("Unknown User"), nMaxSize);

 #endif
 #endif

-  return TRUE;
+    return TRUE;

 }
 
 }
 

-int wxKill(long pid, int sig)
+int wxKill(
+  long                              lPid
+, int                               nSig
+)

 {
 {

-  return 0;
+    return((int)::DosKillProcess(0, (PID)lPid));

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

-bool wxShell(const wxString& command)
-{
-  wxChar *shell;
-  if ((shell = wxGetenv(_T("COMSPEC"))) == NULL)
-    shell = _T("\\CMD.EXE");
+bool wxShell(
+  const wxString&                   rCommand
+)
+{
+    wxChar*                         zShell = _T("CMD.EXE");
+    wxString                        sInputs;
+    wxChar                          zTmp[255];
+    STARTDATA                       SData = {0};
+    PSZ                             PgmTitle = "Command Shell";
+    APIRET                          rc;
+    PID                             vPid = 0;
+    ULONG                           ulSessID = 0;
+    UCHAR                           achObjBuf[256] = {0}; //error data if DosStart fails
+    RESULTCODES                     vResult;
+
+    SData.Length   = sizeof(STARTDATA);
+    SData.Related  = SSF_RELATED_INDEPENDENT;
+    SData.FgBg     = SSF_FGBG_FORE;
+    SData.TraceOpt = SSF_TRACEOPT_NONE;
+    SData.PgmTitle = PgmTitle;
+    SData.PgmName  = zShell;
+
+    sInputs = "/C " + rCommand;
+    SData.PgmInputs     = (BYTE*)sInputs.c_str();
+    SData.TermQ         = 0;
+    SData.Environment   = 0;
+    SData.InheritOpt    = SSF_INHERTOPT_SHELL;
+    SData.SessionType   = SSF_TYPE_WINDOWABLEVIO;
+    SData.IconFile      = 0;
+    SData.PgmHandle     = 0;
+    SData.PgmControl    = SSF_CONTROL_VISIBLE | SSF_CONTROL_MAXIMIZE;
+    SData.InitXPos      = 30;
+    SData.InitYPos      = 40;
+    SData.InitXSize     = 200;
+    SData.InitYSize     = 140;
+    SData.Reserved      = 0;
+    SData.ObjectBuffer  = (char*)achObjBuf;
+    SData.ObjectBuffLen = (ULONG)sizeof(achObjBuf);
+
+    rc = ::DosStartSession(&SData, &ulSessID, &vPid);
+    if (rc == 0 || rc == 457) // NO_ERROR or SMG_START_IN_BACKGROUND
+    {
+        PTIB                            ptib;
+        PPIB                            ppib;

 
 

-  wxChar tmp[255];
-  if (command != "")
-    wxSprintf(tmp, "%s /c %s", shell, WXSTRINGCAST command);
-  else
-    wxStrcpy(tmp, shell);
+        ::DosGetInfoBlocks(&ptib, &ppib);

 
 

-  return (wxExecute((wxChar *)tmp, FALSE) != 0);
+        ::DosWaitChild( DCWA_PROCESS
+                       ,DCWW_WAIT
+                       ,&vResult
+                       ,&ppib->pib_ulpid
+                       ,vPid
+                      );
+    }
+    return (rc != 0);

 }
 
 // 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()
 {

-    // return (long)GetFreeSpace(0);
-    return 0L;
+    void*                           pMemptr = NULL;
+    ULONG                           lSize;
+    ULONG                           lMemFlags;
+    APIRET                          rc;
+
+    lMemFlags = PAG_FREE;
+    rc = ::DosQueryMem(pMemptr, &lSize, &lMemFlags);
+    if (rc != 0)
+        return -1L;
+    return (long)lSize;

 }
 
 // Sleep for nSecs seconds. Attempt a Windows implementation using timers.
 }
 
 // Sleep for nSecs seconds. Attempt a Windows implementation using timers.


@@ -140,36 +217,28 @@ static bool inTimer = FALSE;
 
 class wxSleepTimer: public wxTimer
 {
 
 class wxSleepTimer: public wxTimer
 {

- public:
-  inline void Notify()
-  {
-    inTimer = FALSE;
-    Stop();
-  }
+public:
+    inline void Notify()
+    {
+        inTimer = FALSE;
+        Stop();
+    }

 };
 
 };
 

-static wxTimer *wxTheSleepTimer = NULL;
+static wxTimer*                     wxTheSleepTimer = NULL;

 
 

-void wxUsleep(unsigned long milliseconds)
+void wxUsleep(
+  unsigned long                     ulMilliseconds
+)

 {
 {

-    ::DosSleep(milliseconds);
+    ::DosSleep(ulMilliseconds/1000l);

 }
 
 }
 

-void wxSleep(int nSecs)
+void wxSleep(
+  int                               nSecs
+)

 {
 {

-  if (inTimer)
-    return;
-
-  wxTheSleepTimer = new wxSleepTimer;
-  inTimer = TRUE;
-  wxTheSleepTimer->Start(nSecs*1000);
-  while (inTimer)
-  {
-    if (wxTheApp->Pending())
-      wxTheApp->Dispatch();
-  }
-  delete wxTheSleepTimer;
-  wxTheSleepTimer = NULL;
+    ::DosSleep(1000 * nSecs);

 }
 
 // Consume all events until no more left
 }
 
 // Consume all events until no more left


@@ -179,48 +248,55 @@ void wxFlushEvents()
 }
 
 // Output a debug mess., in a system dependent fashion.
 }
 
 // Output a debug mess., in a system dependent fashion.

-void wxDebugMsg(const wxChar *fmt ...)
+void wxDebugMsg(
+  const wxChar*                     zFmt ...
+)

 {
 {

-  va_list ap;
-  static wxChar buffer[512];
-
-  if (!wxTheApp->GetWantDebugOutput())
-    return ;
-
-  va_start(ap, fmt);
-
-   sprintf(buffer,fmt,ap) ;
+    va_list                         vAp;
+    static wxChar                   zBuffer[512];

 
 

-  va_end(ap);
+    if (!wxTheApp->GetWantDebugOutput())
+        return ;
+    va_start(vAp, zFmt);
+    sprintf(zBuffer, zFmt, vAp) ;
+    va_end(vAp);

 }
 
 // Non-fatal error: pop up message box and (possibly) continue
 }
 
 // Non-fatal error: pop up message box and (possibly) continue

-void wxError(const wxString& msg, const wxString& title)
-{
-  wxSprintf(wxBuffer, "%s\nContinue?", WXSTRINGCAST msg);
-  if (::WinMessageBox( HWND_DESKTOP
-                      ,NULL
-                      ,(PSZ)wxBuffer
-                      ,(PSZ)WXSTRINGCAST title
-                      ,0
-                      ,MB_ICONEXCLAMATION | MB_YESNO
-                     ) == MBID_YES)
+void wxError(
+  const wxString&                   rMsg
+, const wxString&                   rTitle
+)
+{
+    wxBuffer = new wxChar[256];
+    wxSprintf(wxBuffer, "%s\nContinue?", WXSTRINGCAST rMsg);
+    if (::WinMessageBox( HWND_DESKTOP
+                        ,NULL
+                        ,(PSZ)wxBuffer
+                        ,(PSZ)WXSTRINGCAST rTitle
+                        ,0
+                        ,MB_ICONEXCLAMATION | MB_YESNO
+                       ) == MBID_YES)
+    delete[] wxBuffer;

     wxExit();
 }
 
 // Fatal error: pop up message box and abort
     wxExit();
 }
 
 // Fatal error: pop up message box and abort

-void wxFatalError(const wxString& rMsg, const wxString& rTitle)
+void wxFatalError(
+  const wxString&                   rMsg
+, const wxString&                   rTitle
+)

 {
 {

-    unsigned long                   rc;
+    unsigned long                   ulRc;

 
 

-    rc = ::WinMessageBox( HWND_DESKTOP
-                         ,NULL
-                         ,WXSTRINGCAST rMsg
-                         ,WXSTRINGCAST rTitle
-                         ,0
-                         ,MB_NOICON | MB_OK
-                        );
-    DosExit(EXIT_PROCESS, rc);
+    ulRc = ::WinMessageBox( HWND_DESKTOP
+                           ,NULL
+                           ,WXSTRINGCAST rMsg
+                           ,WXSTRINGCAST rTitle
+                           ,0
+                           ,MB_NOICON | MB_OK
+                          );
+    DosExit(EXIT_PROCESS, ulRc);

 }
 
 // Emit a beeeeeep
 }
 
 // Emit a beeeeeep


@@ -231,123 +307,250 @@ void wxBell()
 
 // Chris Breeze 27/5/98: revised WIN32 code to
 // detect WindowsNT correctly
 
 // Chris Breeze 27/5/98: revised WIN32 code to
 // detect WindowsNT correctly

-int wxGetOsVersion(int *majorVsn, int *minorVsn)
-{
-  ULONG                 aulSysInfo[QSV_MAX] = {0};
-
-  if (DosQuerySysInfo( 1L
-                      ,QSV_MAX
-                      ,(PVOID)aulSysInfo
-                      ,sizeof(ULONG) * QSV_MAX
-                     ))
-  {
-     *majorVsn = aulSysInfo[QSV_VERSION_MAJOR];
-     *minorVsn = aulSysInfo[QSV_VERSION_MINOR];
-     return wxWINDOWS_OS2;
-  }
-  return wxWINDOWS; // error if we get here, return generic value
+int wxGetOsVersion(
+  int*                              pMajorVsn
+, int*                              pMinorVsn
+)
+{
+    ULONG                           ulSysInfo[QSV_MAX] = {0};
+    APIRET                          ulrc;
+
+    ulrc = ::DosQuerySysInfo( 1L
+                             ,QSV_MAX
+                             ,(PVOID)ulSysInfo
+                             ,sizeof(ULONG) * QSV_MAX
+                            );
+    if (ulrc == 0L)
+    {
+        *pMajorVsn = ulSysInfo[QSV_VERSION_MAJOR];
+        *pMajorVsn = *pMajorVsn/10;
+        *pMinorVsn = ulSysInfo[QSV_VERSION_MINOR];
+        return wxWINDOWS_OS2;
+    }
+    return wxWINDOWS; // error if we get here, return generic value

 }
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 }
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)

-// TODO: Ability to read and write to an INI file
-

 #if wxUSE_RESOURCES
 #if wxUSE_RESOURCES

-bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
-{
-// TODO:
-/*
-  if (file != "")
-    return (WritePrivateProfileString((PCSZ)WXSTRINGCAST section, (PCSZ)WXSTRINGCAST entry, (PCSZ)value, (PCSZ)WXSTRINGCAST file) != 0);
-  else
-    return (WriteProfileString((PCSZ)WXSTRINGCAST section, (PCSZ)WXSTRINGCAST entry, (PCSZ)WXSTRINGCAST value) != 0);
-*/
+bool wxWriteResource(
+  const wxString&                   rSection
+, const wxString&                   rEntry
+, const wxString&                   rValue
+, const wxString&                   rFile
+)
+{
+    HAB                             hab = 0;
+    HINI                            hIni = 0;
+
+    if (rFile != "")
+    {
+        hIni = ::PrfOpenProfile(hab, (PSZ)WXSTRINGCAST rFile);
+        if (hIni != 0L)
+        {
+            return (::PrfWriteProfileString( hIni
+                                            ,(PSZ)WXSTRINGCAST rSection
+                                            ,(PSZ)WXSTRINGCAST rEntry
+                                            ,(PSZ)WXSTRINGCAST rValue
+                                           ));
+        }
+    }
+    else
+        return (::PrfWriteProfileString( HINI_PROFILE
+                                        ,(PSZ)WXSTRINGCAST rSection
+                                        ,(PSZ)WXSTRINGCAST rEntry
+                                        ,(PSZ)WXSTRINGCAST rValue
+                                       ));

     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
+bool wxWriteResource(
+  const wxString&                   rSection
+, const wxString&                   rEntry
+, float                             fValue
+, const wxString&                   rFile
+)

 {
 {

-  wxChar buf[50];
-  wxSprintf(buf, "%.4f", value);
-  return wxWriteResource(section, entry, buf, file);
+    wxChar                          zBuf[50];
+
+    wxSprintf(zBuf, "%.4f", fValue);
+    return wxWriteResource( rSection
+                           ,rEntry
+                           ,zBuf
+                           ,rFile
+                          );

 }
 
 }
 

-bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
+bool wxWriteResource(
+  const wxString&                   rSection
+, const wxString&                   rEntry
+, long                              lValue
+, const wxString&                   rFile
+)

 {
 {

-  wxChar buf[50];
-  wxSprintf(buf, "%ld", value);
-  return wxWriteResource(section, entry, buf, file);
+    wxChar                          zBuf[50];
+
+    wxSprintf(zBuf, "%ld", lValue);
+    return wxWriteResource( rSection
+                           ,rEntry
+                           ,zBuf
+                           ,rFile
+                          );

 }
 
 }
 

-bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
+bool wxWriteResource(
+  const wxString&                   rSection
+, const wxString&                   rEntry
+, int                               lValue
+, const wxString&                   rFile
+)

 {
 {

-  wxChar buf[50];
-  wxSprintf(buf, "%d", value);
-  return wxWriteResource(section, entry, buf, file);
+    wxChar                          zBuf[50];
+
+    wxSprintf(zBuf, "%d", lValue);
+    return wxWriteResource( rSection
+                           ,rEntry
+                           ,zBuf
+                           ,rFile
+                          );

 }
 
 }
 

-bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file)
+bool wxGetResource(
+  const wxString&                   rSection
+, const wxString&                   rEntry
+, wxChar**                          ppValue
+, const wxString&                   rFile
+)

 {
 {

-  static const wxChar defunkt[] = _T("$$default");
-// TODO:
-/*
-  if (file != "")
-  {
-    int n = GetPrivateProfileString((PCSZ)WXSTRINGCAST section, (PCSZ)WXSTRINGCAST entry, (PCSZ)defunkt,
-                                    (PSZ)wxBuffer, 1000, (PCSZ)WXSTRINGCAST file);
-    if (n == 0 || wxStrcmp(wxBuffer, defunkt) == 0)
-     return FALSE;
-  }
-  else
-  {
-    int n = GetProfileString((PCSZ)WXSTRINGCAST section, (PCSZ)WXSTRINGCAST entry, (LPCTSTR)defunkt,
-                                    (PSZ)wxBuffer, 1000);
-    if (n == 0 || wxStrcmp(wxBuffer, defunkt) == 0)
-      return FALSE;
-  }
-  if (*value) delete[] (*value);
-      *value = copystring(wxBuffer);
-      return TRUE;
-*/
-    return FALSE;
+    HAB                             hab = 0;
+    HINI                            hIni = 0;
+    wxChar                          zDefunkt[] = _T("$$default");
+    char                            zBuf[1000];
+
+    if (rFile != "")
+    {
+        hIni = ::PrfOpenProfile(hab, (PSZ)WXSTRINGCAST rFile);
+        if (hIni != 0L)
+        {
+            ULONG n = ::PrfQueryProfileString( hIni
+                                              ,(PSZ)WXSTRINGCAST rSection
+                                              ,(PSZ)WXSTRINGCAST rEntry
+                                              ,(PSZ)zDefunkt
+                                              ,(PVOID)zBuf
+                                              ,1000
+                                             );
+            if (zBuf == NULL)
+                return FALSE;
+            if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0)
+                return FALSE;
+            zBuf[n-1] = '\0';
+        }
+        else
+            return FALSE;
+    }
+    else
+    {
+        ULONG n = ::PrfQueryProfileString( HINI_PROFILE
+                                          ,(PSZ)WXSTRINGCAST rSection
+                                          ,(PSZ)WXSTRINGCAST rEntry
+                                          ,(PSZ)zDefunkt
+                                          ,(PVOID)zBuf
+                                          ,1000
+                                         );
+        if (zBuf == NULL)
+            return FALSE;
+        if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0)
+            return FALSE;
+        zBuf[n-1] = '\0';
+    }
+    strcpy((char*)*ppValue, zBuf);
+    return TRUE;

 }
 
 }
 

-bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
+bool wxGetResource(
+  const wxString&                   rSection
+, const wxString&                   rEntry
+, float*                            pValue
+, const wxString&                   rFile
+)

 {
 {

-  wxChar *s = NULL;
-  bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
-  if (succ)
-  {
-    *value = (float)wxStrtod(s, NULL);
-    delete[] s;
-    return TRUE;
-  }
-  else return FALSE;
+    wxChar*                         zStr = NULL;
+
+    zStr = new wxChar[1000];
+    bool                            bSucc = wxGetResource( rSection
+                                                          ,rEntry
+                                                          ,(wxChar **)&zStr
+                                                          ,rFile
+                                                         );
+
+    if (bSucc)
+    {
+        *pValue = (float)wxStrtod(zStr, NULL);
+        delete[] zStr;
+        return TRUE;
+    }
+    else
+    {
+        delete[] zStr;
+        return FALSE;
+    }

 }
 
 }
 

-bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
+bool wxGetResource(
+  const wxString&                   rSection
+, const wxString&                   rEntry
+, long*                             pValue
+, const wxString&                   rFile
+)

 {
 {

-  wxChar *s = NULL;
-  bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
-  if (succ)
-  {
-    *value = wxStrtol(s, NULL, 10);
-    delete[] s;
-    return TRUE;
-  }
-  else return FALSE;
+    wxChar*                           zStr = NULL;
+
+    zStr = new wxChar[1000];
+    bool                              bSucc = wxGetResource( rSection
+                                                            ,rEntry
+                                                            ,(wxChar **)&zStr
+                                                            ,rFile
+                                                           );
+
+    if (bSucc)
+    {
+        *pValue = wxStrtol(zStr, NULL, 10);
+        delete[] zStr;
+        return TRUE;
+    }
+    else
+    {
+        delete[] zStr;
+        return FALSE;
+    }

 }
 
 }
 

-bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
+bool wxGetResource(
+  const wxString&                   rSection
+, const wxString&                   rEntry
+, int*                              pValue
+, const wxString&                   rFile
+)

 {
 {

-  wxChar *s = NULL;
-  bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
-  if (succ)
-  {
-    *value = (int)wxStrtol(s, NULL, 10);
-    delete[] s;
-    return TRUE;
-  }
-  else return FALSE;
+    wxChar*                         zStr = NULL;
+
+    zStr = new wxChar[1000];
+    bool                            bSucc = wxGetResource( rSection
+                                                          ,rEntry
+                                                          ,(wxChar **)&zStr
+                                                          ,rFile
+                                                         );
+
+    if (bSucc)
+    {
+        *pValue = (int)wxStrtol(zStr, NULL, 10);
+        delete[] zStr;
+        return TRUE;
+    }
+    else
+    {
+        delete[] zStr;
+        return FALSE;
+    }

 }
 #endif // wxUSE_RESOURCES
 
 }
 #endif // wxUSE_RESOURCES
 


@@ -360,11 +563,13 @@ HCURSOR gs_wxBusyCursorOld = 0;  // old cursor
 static int gs_wxBusyCursorCount = 0;
 
 // Set the cursor to the busy cursor for all windows
 static int gs_wxBusyCursorCount = 0;
 
 // Set the cursor to the busy cursor for all windows

-void wxBeginBusyCursor(wxCursor *cursor)
+void wxBeginBusyCursor(
+  wxCursor*                         pCursor
+)

 {
     if ( gs_wxBusyCursorCount++ == 0 )
     {
 {
     if ( gs_wxBusyCursorCount++ == 0 )
     {

-        gs_wxBusyCursor = (HCURSOR)cursor->GetHCURSOR();
+        gs_wxBusyCursor = (HCURSOR)pCursor->GetHCURSOR();

         ::WinSetPointer(HWND_DESKTOP, (HPOINTER)gs_wxBusyCursor);
     }
     //else: nothing to do, already set
         ::WinSetPointer(HWND_DESKTOP, (HPOINTER)gs_wxBusyCursor);
     }
     //else: nothing to do, already set


@@ -373,10 +578,11 @@ void wxBeginBusyCursor(wxCursor *cursor)
 // Restore cursor to normal
 void wxEndBusyCursor()
 {
 // Restore cursor to normal
 void wxEndBusyCursor()
 {

-    wxCHECK_RET( gs_wxBusyCursorCount > 0,
-                 _T("no matching wxBeginBusyCursor() for wxEndBusyCursor()"));
+    wxCHECK_RET( gs_wxBusyCursorCount > 0
+                ,_T("no matching wxBeginBusyCursor() for wxEndBusyCursor()")
+               );

 
 

-    if ( --gs_wxBusyCursorCount == 0 )
+    if (--gs_wxBusyCursorCount == 0)

     {
         ::WinSetPointer(HWND_DESKTOP, (HPOINTER)gs_wxBusyCursorOld);
         gs_wxBusyCursorOld = 0;
     {
         ::WinSetPointer(HWND_DESKTOP, (HPOINTER)gs_wxBusyCursorOld);
         gs_wxBusyCursorOld = 0;


@@ -386,219 +592,307 @@ void wxEndBusyCursor()
 // TRUE if we're between the above two calls
 bool wxIsBusy()
 {
 // TRUE if we're between the above two calls
 bool wxIsBusy()
 {

-  return (gs_wxBusyCursorCount > 0);
+    return (gs_wxBusyCursorCount > 0);

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------

-const wxChar* wxGetHomeDir(wxString *pstr)
+const wxChar* wxGetHomeDir(
+  wxString*                         pStr
+)

 {
 {

-  wxString& strDir = *pstr;
+    wxString&                       rStrDir = *pStr;

 
 

-  // OS/2 has no idea about home,
-  // so use the working directory instead?
+    // OS/2 has no idea about home,
+    // so use the working directory instead?

 
 

-  // 256 was taken from os2def.h
+    // 256 was taken from os2def.h

 #ifndef MAX_PATH
 #  define MAX_PATH  256
 #endif
 
 #ifndef MAX_PATH
 #  define MAX_PATH  256
 #endif
 

+    char                            zDirName[256];
+    ULONG                           ulDirLen;

 
 

-    char     DirName[256];
-    ULONG    DirLen;
-
-    ::DosQueryCurrentDir( 0, DirName, &DirLen);
-    strDir = DirName;
-  return strDir.c_str();
+    ::DosQueryCurrentDir(0, zDirName, &ulDirLen);
+    rStrDir = zDirName;
+    return rStrDir.c_str();

 }
 
 }
 

-// Hack for MS-DOS
-wxChar *wxGetUserHome (const wxString& user)
+// Hack for OS/2
+wxChar* wxGetUserHome (
+  const wxString&                   rUser
+)

 {
 {

-  wxChar *home;
-  wxString user1(user);
+    wxChar*                         zHome;
+    wxString                        sUser1(rUser);
+
+    wxBuffer = new wxChar[256];
+#ifndef __EMX__
+    if (sUser1 != _T(""))
+    {
+        wxChar                      zTmp[64];

 
 

-  if (user1 != _T("")) {
-    wxChar tmp[64];
-    if (wxGetUserId(tmp, sizeof(tmp)/sizeof(char))) {
-      // Guests belong in the temp dir
-      if (wxStricmp(tmp, _T("annonymous")) == 0) {
-        if ((home = wxGetenv(_T("TMP"))) != NULL ||
-            (home = wxGetenv(_T("TMPDIR"))) != NULL ||
-            (home = wxGetenv(_T("TEMP"))) != NULL)
-            return *home ? home : (wxChar*)_T("\\");
-      }
-      if (wxStricmp(tmp, WXSTRINGCAST user1) == 0)
-        user1 = _T("");
+        if (wxGetUserId( zTmp
+                        ,sizeof(zTmp)/sizeof(char)
+                       ))
+        {
+            // Guests belong in the temp dir
+            if (wxStricmp(zTmp, _T("annonymous")) == 0)
+            {
+                if ((zHome = wxGetenv(_T("TMP"))) != NULL    ||
+                    (zHome = wxGetenv(_T("TMPDIR"))) != NULL ||
+                    (zHome = wxGetenv(_T("TEMP"))) != NULL)
+                    delete[] wxBuffer;
+                    return *zHome ? zHome : (wxChar*)_T("\\");
+            }
+            if (wxStricmp(zTmp, WXSTRINGCAST sUser1) == 0)
+                sUser1 = _T("");
+        }

     }
     }

-  }
-  if (user1 == _T(""))
-    if ((home = wxGetenv(_T("HOME"))) != NULL)
+#endif
+    if (sUser1 == _T(""))

     {
     {

-      wxStrcpy(wxBuffer, home);
-      Unix2DosFilename(wxBuffer);
-      return wxBuffer;
+        if ((zHome = wxGetenv(_T("HOME"))) != NULL)
+        {
+            wxStrcpy(wxBuffer, zHome);
+            Unix2DosFilename(wxBuffer);
+            wxStrcpy(zHome, wxBuffer);
+            delete[] wxBuffer;
+            return zHome;
+        }

     }
     }

-  return NULL; // No home known!
+    delete[] wxBuffer;
+    return NULL; // No home known!

 }
 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.
 }
 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.

-bool wxCheckForInterrupt(wxWindow *wnd)
+bool wxCheckForInterrupt(
+  wxWindow*                         pWnd
+)

 {
 {

-  if(wnd){
-    QMSG            msg;
-    HAB             hab;
-    HWND            hwndFilter;
+    if(pWnd)
+    {
+        QMSG                        vMsg;
+        HAB                         hab = 0;
+        HWND                        hwndFilter = NULLHANDLE;
+        HWND                        hwndWin= (HWND) pWnd->GetHWND();

 
 

-    HWND win= (HWND) wnd->GetHWND();
-    while(::WinPeekMsg(hab,&msg,hwndFilter,0,0,PM_REMOVE))
+        while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE))
+        {
+            ::WinDispatchMsg(hab, &vMsg);
+        }
+        return TRUE;//*** temporary?
+    }
+    else

     {
     {

-      ::WinDispatchMsg( hab, &msg );
+        wxFAIL_MSG(_T("pWnd==NULL !!!"));
+        return FALSE;//*** temporary?

     }
     }

-    return TRUE;//*** temporary?
-  }
-  else{
-    wxFAIL_MSG(_T("wnd==NULL !!!"));
-
-    return FALSE;//*** temporary?
-  }
-}
-
-wxChar *wxLoadUserResource(const wxString& resourceName, const wxString& resourceType)
-{
-  wxChar *s = NULL;
-
-/*
-*  How to in PM?
-*
-* #if !defined(__WIN32__) || defined(__TWIN32__)
-*   HRSRC hResource = ::FindResource(wxGetInstance(), WXSTRINGCAST resourceName, WXSTRINGCAST resourceType);
-* #else
-* #ifdef UNICODE
-*   HRSRC hResource = ::FindResourceW(wxGetInstance(), WXSTRINGCAST resourceName, WXSTRINGCAST resourceType);
-* #else
-*   HRSRC hResource = ::FindResourceA(wxGetInstance(), WXSTRINGCAST resourceName, WXSTRINGCAST resourceType);
-* #endif
-* #endif
-*
-*   if (hResource == 0)
-*     return NULL;
-*   HGLOBAL hData = ::LoadResource(wxGetInstance(), hResource);
-*   if (hData == 0)
-*     return NULL;
-*   wxChar *theText = (wxChar *)LockResource(hData);
-*   if (!theText)
-*     return NULL;
-*
-* s = copystring(theText);
-*/
-  return s;
-}
-
-void wxGetMousePosition( int* x, int* y )
-{
-  POINTL pt;
-  ::WinQueryPointerPos( HWND_DESKTOP, & pt );
-  *x = pt.x;
-  *y = pt.y;
+}
+
+void wxGetMousePosition(
+  int*                              pX
+, int*                              pY
+)
+{
+    POINTL                          vPt;
+
+    ::WinQueryPointerPos(HWND_DESKTOP, &vPt);
+    *pX = vPt.x;
+    *pY = vPt.y;

 };
 
 // Return TRUE if we have a colour display
 bool wxColourDisplay()
 {
 };
 
 // Return TRUE if we have a colour display
 bool wxColourDisplay()
 {

-  bool flag;
-  // TODO:  use DosQueryDevCaps to figure it out
-  return flag;
+    HPS                             hpsScreen;
+    HDC                             hdcScreen;
+    LONG                            lColors;
+
+    hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
+    hdcScreen = ::GpiQueryDevice(hpsScreen);
+    ::DevQueryCaps(hdcScreen, CAPS_COLORS, 1L, &lColors);
+    return(lColors > 1L);

 }
 
 // Returns depth of screen
 int wxDisplayDepth()
 {
 }
 
 // Returns depth of screen
 int wxDisplayDepth()
 {

-    HDC                             hDc = ::WinOpenWindowDC((HWND)NULL);
-    long                            lArray[CAPS_COLOR_BITCOUNT];
-    int                             nPlanes;
-    int                             nBitsPerPixel;
-    int                             nDepth;
-
-    if(DevQueryCaps( hDc
-                    ,CAPS_FAMILY
-                    ,CAPS_COLOR_BITCOUNT
-                    ,lArray
-                   ))
-    {
-        nPlanes = (int)lArray[CAPS_COLOR_PLANES];
-        nBitsPerPixel = (int)lArray[CAPS_COLOR_BITCOUNT];
-        nDepth = nPlanes * nBitsPerPixel;
-    }
-    DevCloseDC(hDc);
+    HPS                             hpsScreen;
+    HDC                             hdcScreen;
+    LONG                            lPlanes;
+    LONG                            lBitsPerPixel;
+    LONG                            nDepth;
+
+    hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
+    hdcScreen = ::GpiQueryDevice(hpsScreen);
+    ::DevQueryCaps(hdcScreen, CAPS_COLOR_PLANES, 1L, &lPlanes);
+    ::DevQueryCaps(hdcScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitsPerPixel);
+
+    nDepth = (int)(lPlanes * lBitsPerPixel);
+    DevCloseDC(hdcScreen);

     return (nDepth);
 }
 
 // Get size of display
     return (nDepth);
 }
 
 // Get size of display

-void wxDisplaySize(int *width, int *height)
+void wxDisplaySize(
+  int*                              pWidth
+, int*                              pHeight
+)

 {
 {

-    HDC                             hDc = ::WinOpenWindowDC((HWND)NULL);
-    long                            lArray[CAPS_HEIGHT];
+    HPS                             hpsScreen;
+    HDC                             hdcScreen;
+    LONG                            lWidth;
+    LONG                            lHeight;

 
 

-    if(DevQueryCaps( hDc
-                    ,CAPS_FAMILY
-                    ,CAPS_HEIGHT
-                    ,lArray
-                   ))
-    {
-        *width  = (int)lArray[CAPS_WIDTH];
-        *height = (int)lArray[CAPS_HEIGHT];
-    }
-    DevCloseDC(hDc);
+    hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
+    hdcScreen = ::GpiQueryDevice(hpsScreen);
+    ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L, &lWidth);
+    ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L, &lHeight);
+    DevCloseDC(hdcScreen);
+    *pWidth = (int)lWidth;
+    *pHeight = (int)lHeight;
+}
+
+void wxDisplaySizeMM(
+  int*                              pWidth
+, int*                              pHeight
+)
+{
+    HPS                             hpsScreen;
+    HDC                             hdcScreen;
+
+    hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
+    hdcScreen = ::GpiQueryDevice(hpsScreen);
+
+    if (pWidth)
+        ::DevQueryCaps( hdcScreen
+                       ,CAPS_HORIZONTAL_RESOLUTION
+                       ,1L
+                       ,(PLONG)pWidth
+                      );
+    if (pHeight)
+        ::DevQueryCaps( hdcScreen
+                       ,CAPS_VERTICAL_RESOLUTION
+                       ,1L
+                       ,(PLONG)pHeight
+                      );

 }
 
 }
 

-bool wxDirExists(const wxString& dir)
+bool wxDirExists(
+  const wxString&                   rDir
+)

 {
 {

-   // TODO:  Control program file stuff
-   return TRUE;
+    return (::DosSetCurrentDir(WXSTRINGCAST rDir));

 }
 
 // ---------------------------------------------------------------------------
 // window information functions
 // ---------------------------------------------------------------------------
 
 }
 
 // ---------------------------------------------------------------------------
 // window information functions
 // ---------------------------------------------------------------------------
 

-wxString WXDLLEXPORT wxGetWindowText(WXHWND hWnd)
+wxString WXDLLEXPORT wxGetWindowText(
+  WXHWND                            hWnd
+)

 {
 {

-    wxString str;
-    long len = ::WinQueryWindowTextLength((HWND)hWnd) + 1;
-    ::WinQueryWindowText((HWND)hWnd, len, str.GetWriteBuf((int)len));
-    str.UngetWriteBuf();
+    wxString                        vStr;
+    long                            lLen = ::WinQueryWindowTextLength((HWND)hWnd) + 1;

 
 

-    return str;
+    ::WinQueryWindowText((HWND)hWnd, lLen, vStr.GetWriteBuf((int)lLen));
+    vStr.UngetWriteBuf();
+
+    return vStr;

 }
 
 }
 

-wxString WXDLLEXPORT wxGetWindowClass(WXHWND hWnd)
+wxString WXDLLEXPORT wxGetWindowClass(
+  WXHWND                            hWnd
+)

 {
 {

-    wxString str;
-
-    int len = 256; // some starting value
+    wxString                        vStr;
+    int                             nLen = 256; // some starting value

 
     for ( ;; )
     {
 
     for ( ;; )
     {

-        int count = ::WinQueryClassName((HWND)hWnd, len, str.GetWriteBuf(len));
+        int                         nCount = ::WinQueryClassName((HWND)hWnd, nLen, vStr.GetWriteBuf(nLen));

 
 

-        str.UngetWriteBuf();
-        if ( count == len )
+        vStr.UngetWriteBuf();
+        if (nCount == nLen )

         {
             // the class name might have been truncated, retry with larger
             // buffer
         {
             // the class name might have been truncated, retry with larger
             // buffer

-            len *= 2;
+            nLen *= 2;

         }
         else
         {
             break;
         }
     }
         }
         else
         {
             break;
         }
     }

-    return str;
+    return vStr;

 }
 
 }
 

-WXWORD WXDLLEXPORT wxGetWindowId(WXHWND hWnd)
+WXWORD WXDLLEXPORT wxGetWindowId(
+  WXHWND                            hWnd
+)

 {
     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
+
+