mingw32 compilation fixes

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

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 2bae71d97b58f55aba721de4f0990cba91b54144..9c2ea76d18b71d52fbdb716078e620581abb2034 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -265,6 +265,7 @@ void wxError(
 , const wxString&                   rTitle
 )
 {
 , const wxString&                   rTitle
 )
 {

+    wxBuffer = new wxChar[256];

     wxSprintf(wxBuffer, "%s\nContinue?", WXSTRINGCAST rMsg);
     if (::WinMessageBox( HWND_DESKTOP
                         ,NULL
     wxSprintf(wxBuffer, "%s\nContinue?", WXSTRINGCAST rMsg);
     if (::WinMessageBox( HWND_DESKTOP
                         ,NULL


@@ -273,6 +274,7 @@ void wxError(
                         ,0
                         ,MB_ICONEXCLAMATION | MB_YESNO
                        ) == MBID_YES)
                         ,0
                         ,MB_ICONEXCLAMATION | MB_YESNO
                        ) == MBID_YES)

+    delete[] wxBuffer;

     wxExit();
 }
 
     wxExit();
 }
 


@@ -418,7 +420,8 @@ bool wxGetResource(
 {
     HAB                             hab;
     HINI                            hIni;
 {
     HAB                             hab;
     HINI                            hIni;

-    static const wxChar             zDefunkt[] = _T("$$default");
+    wxChar                          zDefunkt[] = _T("$$default");
+    char                            zBuf[1000];

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


@@ -429,11 +432,14 @@ bool wxGetResource(
                                               ,(PSZ)WXSTRINGCAST rSection
                                               ,(PSZ)WXSTRINGCAST rEntry
                                               ,(PSZ)zDefunkt
                                               ,(PSZ)WXSTRINGCAST rSection
                                               ,(PSZ)WXSTRINGCAST rEntry
                                               ,(PSZ)zDefunkt

-                                              ,(void*)*ppValue
+                                              ,(PVOID)zBuf

                                               ,1000
                                              );
                                               ,1000
                                              );

-            if (n != 0L || wxStrcmp(*ppValue, zDefunkt) == 0)
+            if (zBuf == NULL)

                 return FALSE;
                 return FALSE;

+            if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0)
+                return FALSE;
+            zBuf[n-1] = '\0';

         }
         else
             return FALSE;
         }
         else
             return FALSE;


@@ -444,12 +450,16 @@ bool wxGetResource(
                                           ,(PSZ)WXSTRINGCAST rSection
                                           ,(PSZ)WXSTRINGCAST rEntry
                                           ,(PSZ)zDefunkt
                                           ,(PSZ)WXSTRINGCAST rSection
                                           ,(PSZ)WXSTRINGCAST rEntry
                                           ,(PSZ)zDefunkt

-                                          ,(void*)*ppValue
+                                          ,(PVOID)zBuf

                                           ,1000
                                          );
                                           ,1000
                                          );

-        if (n != 0L || wxStrcmp(*ppValue, zDefunkt) == 0)
+        if (zBuf == NULL)
+            return FALSE;
+        if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0)

             return FALSE;
             return FALSE;

+        zBuf[n-1] = '\0';

     }
     }

+    strcpy((char*)*ppValue, zBuf);

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -461,6 +471,8 @@ bool wxGetResource(
 )
 {
     wxChar*                         zStr = NULL;
 )
 {
     wxChar*                         zStr = NULL;

+
+    zStr = new wxChar[1000];

     bool                            bSucc = wxGetResource( rSection
                                                           ,rEntry
                                                           ,(wxChar **)&zStr
     bool                            bSucc = wxGetResource( rSection
                                                           ,rEntry
                                                           ,(wxChar **)&zStr


@@ -473,7 +485,11 @@ bool wxGetResource(
         delete[] zStr;
         return TRUE;
     }
         delete[] zStr;
         return TRUE;
     }

-    else return FALSE;
+    else
+    {
+        delete[] zStr;
+        return FALSE;
+    }

 }
 
 bool wxGetResource(
 }
 
 bool wxGetResource(


@@ -484,6 +500,8 @@ bool wxGetResource(
 )
 {
     wxChar*                           zStr = NULL;
 )
 {
     wxChar*                           zStr = NULL;

+
+    zStr = new wxChar[1000];

     bool                              bSucc = wxGetResource( rSection
                                                             ,rEntry
                                                             ,(wxChar **)&zStr
     bool                              bSucc = wxGetResource( rSection
                                                             ,rEntry
                                                             ,(wxChar **)&zStr


@@ -496,7 +514,11 @@ bool wxGetResource(
         delete[] zStr;
         return TRUE;
     }
         delete[] zStr;
         return TRUE;
     }

-    else return FALSE;
+    else
+    {
+        delete[] zStr;
+        return FALSE;
+    }

 }
 
 bool wxGetResource(
 }
 
 bool wxGetResource(


@@ -507,6 +529,8 @@ bool wxGetResource(
 )
 {
     wxChar*                         zStr = NULL;
 )
 {
     wxChar*                         zStr = NULL;

+
+    zStr = new wxChar[1000];

     bool                            bSucc = wxGetResource( rSection
                                                           ,rEntry
                                                           ,(wxChar **)&zStr
     bool                            bSucc = wxGetResource( rSection
                                                           ,rEntry
                                                           ,(wxChar **)&zStr


@@ -519,7 +543,11 @@ bool wxGetResource(
         delete[] zStr;
         return TRUE;
     }
         delete[] zStr;
         return TRUE;
     }

-    else return FALSE;
+    else
+    {
+        delete[] zStr;
+        return FALSE;
+    }

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


@@ -595,6 +623,7 @@ wxChar* wxGetUserHome (
     wxChar*                         zHome;
     wxString                        sUser1(rUser);
 
     wxChar*                         zHome;
     wxString                        sUser1(rUser);
 

+    wxBuffer = new wxChar[256];

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


@@ -609,6 +638,7 @@ wxChar* wxGetUserHome (
                 if ((zHome = wxGetenv(_T("TMP"))) != NULL    ||
                     (zHome = wxGetenv(_T("TMPDIR"))) != NULL ||
                     (zHome = wxGetenv(_T("TEMP"))) != NULL)
                 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)
                     return *zHome ? zHome : (wxChar*)_T("\\");
             }
             if (wxStricmp(zTmp, WXSTRINGCAST sUser1) == 0)


@@ -616,13 +646,18 @@ wxChar* wxGetUserHome (
         }
     }
     if (sUser1 == _T(""))
         }
     }
     if (sUser1 == _T(""))

+    {

         if ((zHome = wxGetenv(_T("HOME"))) != NULL)
         {
             wxStrcpy(wxBuffer, zHome);
             Unix2DosFilename(wxBuffer);
         if ((zHome = wxGetenv(_T("HOME"))) != NULL)
         {
             wxStrcpy(wxBuffer, zHome);
             Unix2DosFilename(wxBuffer);

-            return 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
 }
 
 // Check whether this window wants to process messages, e.g. Stop button