Changeset 352 for trunk/dll/mainwnd2.c

Timestamp:

Jul 26, 2006, 9:35:45 PM (19 years ago)

Author:

root

Message:

Use Runtime_Error

File:

• trunk/dll/mainwnd2.c (modified) (7 diffs)

trunk/dll/mainwnd2.c

@@ -14 +14 @@
   02 Jan 06 SHL Use QWL_USER more
   02 Jan 06 SHL Map IDM_WINDOWDLG to match IBM_TWODIRS
+  17 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -20 +21 @@
 #define INCL_WIN
 #define INCL_GPI
-
 #include <os2.h>
+
 #include <stdlib.h>
 #include <stdio.h>
@@ -44 +45 @@
   HWND hwndMax;
 } PERSON1DATA;
+
+static PSZ pszSrcFile = __FILE__;
 
 #pragma alloc_text(PERSON11,MainFrameWndProc2,MainWndProc2)
@@ -515 +518 @@
           COMPARE *cmp;
 
-          cmp = malloc(sizeof(COMPARE));
-          if (cmp)
-          {
-            memset(cmp, 0, sizeof(COMPARE));
+          cmp = xmallocz(sizeof(COMPARE),pszSrcFile,__LINE__);
+          if (cmp) {
             cmp -> size = sizeof(COMPARE);
             strcpy(cmp -> leftdir, wa.szCurrentPath1);
@@ -731 +732 @@
       if (!hwndCnr)
       {
-        DosBeep(50, 100);
+        Runtime_Error(pszSrcFile, __LINE__, "no window");
         break;
       }
@@ -817 +818 @@
     WinSetWindowUShort(hwnd, QWL_USER + 12, 0);
     WinSetWindowUShort(hwnd, QWL_USER + 16, 0);
-    if (_beginthread(MakeMainObjWin,
-                     NULL,
-                     245760,
-                     MPVOID) == -1)
-    {
-      PostMsg(hwnd,
-              WM_CLOSE,
-              MPVOID,
-              MPVOID);
+    if (_beginthread(MakeMainObjWin,NULL,245760,MPVOID) == -1) {
+      Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
+      PostMsg(hwnd,WM_CLOSE,MPVOID,MPVOID);
       return 0;
     }
@@ -831 +826 @@
       DosSleep(64);
 
-    pd = malloc(sizeof(PERSON1DATA));
+    pd = xmallocz(sizeof(PERSON1DATA),pszSrcFile,__LINE__);
     if (!pd)
       WinDestroyWindow(WinQueryWindow(hwnd, QW_PARENT));
-    else
-    {
-      memset(pd, 0, sizeof(PERSON1DATA));
+    else {
       pd -> size = sizeof(PERSON1DATA);
       WinSetWindowPtr(hwnd, QWL_USER + 4, (PVOID)pd);