Changeset 349 for trunk/dll

Timestamp:

Jul 26, 2006, 7:16:35 PM (19 years ago)

Author:

root

Message:

Use Runtime_Error

File:

• trunk/dll/objcnr.c (modified) (13 diffs)

trunk/dll/objcnr.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2005 Steven H. Levine
+  Copyright (c) 2005, 2006 Steven H. Levine
 
   24 May 05 SHL Rework for CNRITEM.szSubject
+  13 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -15 +16 @@
 #define INCL_DOS
 #define INCL_WIN
-
 #include <os2.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
-
-#pragma data_seg(DATA1)
-#pragma alloc_text(OBJCNR,ProcessDir,FillCnrs,ObjCnrDlgProc)
 
 typedef struct {
@@ -41 +40 @@
 } TEMP;
 
-static HWND objcnrwnd = (HWND)0;
-
-
-static VOID ProcessDir (HWND hwndCnr,CHAR *filename,PCNRITEM pciParent,
-                        CHAR *stopflag) {
-
+#pragma data_seg(DATA1)
+
+static PSZ pszSrcFile = __FILE__;
+
+static HWND objcnrwnd;
+
+#pragma alloc_text(OBJCNR,ProcessDir,FillCnrs,ObjCnrDlgProc)
+
+static VOID ProcessDir(HWND hwndCnr,CHAR *filename,PCNRITEM pciParent,
+                       CHAR *stopflag)
+{
   CHAR          maskstr[CCHMAXPATH],*endpath,*p;
   ULONG         nm,ulM;
@@ -55 +59 @@
   PCNRITEM      pciP;
 
-  ffb = malloc(sizeof(FILEFINDBUF3));
+  ffb = xmalloc(sizeof(FILEFINDBUF3),pszSrcFile,__LINE__);
   if(!ffb)
     return;
@@ -112 +116 @@
               rc,
               HWND_DESKTOP,
-              __FILE__,
+              pszSrcFile,
               __LINE__,
               GetPString(IDS_CANTFINDDIRTEXT),
@@ -145 +149 @@
     ulM = min(FilesToGet,225);
   if(ulM > 1L) {
-    fft = realloc(ffb, sizeof(FILEFINDBUF3) * ulM);
+    fft = xrealloc(ffb, sizeof(FILEFINDBUF3) * ulM,pszSrcFile,__LINE__);
     if(!fft)
       ulM = 1L;
@@ -191 +195 @@
 
 
-static VOID FillCnrs (VOID *args) {
-
+static VOID FillCnrs (VOID *args)
+{
   HAB           hab;
   HMQ           hmq;
@@ -220 +224 @@
 
 
-MRESULT EXPENTRY ObjCnrDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY ObjCnrDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   TEMP *data;
 
   switch(msg) {
     case WM_INITDLG:
-      if(objcnrwnd || !mp2) {
-        if(objcnrwnd) {
-          WinSetWindowPos(objcnrwnd,HWND_TOP,0,0,0,0,
-                          SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
-          DosBeep(1000,100);
-        }
-        else
-          DosBeep(50,100);
+      if(objcnrwnd) {
+        Runtime_Error(pszSrcFile, __LINE__, "objcnrwnd set");
+        WinSetWindowPos(objcnrwnd,HWND_TOP,0,0,0,0,
+                        SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
         WinDismissDlg(hwnd,0);
         break;
       }
+      if(!mp2) {
+        Runtime_Error(pszSrcFile, __LINE__, "mp2 NULL");
+        WinDismissDlg(hwnd,0);
+        break;
+      }
       objcnrwnd = hwnd;
-      data = malloc(sizeof(TEMP));
+      data = xmallocz(sizeof(TEMP),pszSrcFile,__LINE__);
       if(!data) {
         WinDismissDlg(hwnd,0);
         break;
       }
-      memset(data,0,sizeof(TEMP));
       data->dirname = (CHAR *)mp2;
       WinSetWindowPtr(hwnd,0,(PVOID)data);
@@ -251 +255 @@
         DIRSIZE *dirsize;
 
-        dirsize = malloc(sizeof(DIRSIZE));
+        dirsize = xmalloc(sizeof(DIRSIZE),pszSrcFile,__LINE__);
         if(!dirsize) {
           WinDismissDlg(hwnd,0);
@@ -259 +263 @@
         dirsize->filename = data->dirname;
         dirsize->hwndCnr = WinWindowFromID(hwnd,OBJCNR_CNR);
-        if(_beginthread(FillCnrs,NULL,65536 * 8,(PVOID)dirsize) == -1) {
+        if (_beginthread(FillCnrs,NULL,65536 * 8,(PVOID)dirsize) == -1) {
+          Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
           free(dirsize);
           WinDismissDlg(hwnd,0);
@@ -271 +276 @@
 
     case UM_SETUP:
-//      WinEnableWindowUpdate(WinWindowFromID(hwnd,OBJCNR_CNR),FALSE);
+      // WinEnableWindowUpdate(WinWindowFromID(hwnd,OBJCNR_CNR),FALSE);
       {
         CNRINFO    cnri;
@@ -375 +380 @@
 
             if(data->working) {
-              DosBeep(50,100);
+              Runtime_Error(pszSrcFile, __LINE__, "working unexpected");
               break;
             }
@@ -398 +403 @@
               data->dying = TRUE;
               data->stopflag = 0xff;
-              DosBeep(1000,100);
+              Runtime_Error(pszSrcFile, __LINE__, "working unexpected");
               break;
             }