Changeset 353

Timestamp:

Jul 26, 2006, 9:39:09 PM (19 years ago)

Author:

root

Message:

Check more run time errors

File:

• trunk/dll/remap.c (modified) (21 diffs)

trunk/dll/remap.c

@@ -5 +5 @@
 
   Copyright (c) 1993, 1998 M. Kimes
-  Copyright (c) 2004, 2005 Steven H.Levine
+  Copyright (c) 2004, 2006 Steven H.Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
   06 Aug 05 SHL Renames
+  22 Jul 06 SHL Check more run time errors
 
 ***********************************************************************/
@@ -27 +28 @@
 
 #pragma data_seg(DATA1)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(FMREMAP,RemapDlgProc,load_resources,save_resources)
 #pragma alloc_text(FMREMAP,add_resource,remove_resource,free_resources)
@@ -51 +55 @@
 
 
-VOID load_resources (VOID) {
-
+VOID load_resources (VOID)
+{
   /* load linked list of resources from RESOURCE.DAT file */
 
@@ -65 +69 @@
     strcat(s,"\\");
   strcat(s,"RESOURCE.DAT");
-  fp = _fsopen(s,"r",SH_DENYWR);
-  if(fp) {
+  fp = xfsopen(s,"r",SH_DENYWR,pszSrcFile,__LINE__);
+  if (fp) {
     while(x < MAXNUMRES && !feof(fp)) {
       if(!fgets(s,sizeof(s),fp))
@@ -73 +77 @@
       bstripcr(s);
       if(*s && *s != ';') {
-        info = malloc(sizeof(LINKRES));
-        if(info) {
-          info->res = strdup(s);
-          if(info->res) {
+        info = xmalloc(sizeof(LINKRES),pszSrcFile,__LINE__);
+        if (info) {
+          info->res = xstrdup(s,pszSrcFile,__LINE__);
+          if (!info->res)
+            free(info);
+          else {
             x++;
             info->next = NULL;
@@ -85 +91 @@
             last = info;
           }
-          else
-            free(info);
         }
       }
@@ -95 +99 @@
 
 
-VOID save_resources (VOID) {
-
+VOID save_resources (VOID)
+{
   /* save linked list of resources to RESOURCE.DAT file */
 
@@ -110 +114 @@
   strcat(s,"RESOURCE.DAT");
   if(reshead) {
-    fp = fopen(s,"w");
-    if(fp) {
+    fp = xfopen(s,"w",pszSrcFile,__LINE__);
+    if (fp) {
       fputs(GetPString(IDS_REMOTEFILETEXT),fp);
       info = reshead;
-      while(info) {
+      while (info) {
         fprintf(fp,
                 "%0.*s\n",
@@ -129 +133 @@
 
 
-BOOL add_resource (CHAR *res) {
-
+BOOL add_resource (CHAR *res)
+{
   LINKRES *info,*last = NULL;
   INT      x = 0;
@@ -146 +150 @@
     x++;
   }
-  info = malloc(sizeof(LINKRES));
+  info = xmalloc(sizeof(LINKRES),pszSrcFile,__LINE__);
   if(info) {
-    info->res = strdup(res);
-    if(info->res) {
+    info->res = xstrdup(res,pszSrcFile,__LINE__);
+    if (!info->res)
+      free(info);
+    else {
       info->next = NULL;
       if(!reshead)
@@ -162 +168 @@
       return TRUE;
     }
-    else
-      free(info);
   }
   return FALSE;
@@ -169 +173 @@
 
 
-BOOL remove_resource (CHAR *res) {
-
+BOOL remove_resource (CHAR *res)
+{
   LINKRES *info,*last = NULL;
 
@@ -195 +199 @@
 
 
-VOID free_resources (VOID) {
-
+VOID free_resources (VOID)
+{
   LINKRES *info,*next;
 
@@ -211 +215 @@
 
 
-MRESULT EXPENTRY RemapDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY RemapDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   static BOOL fRemapped;
   static APPNOTIFY *apphead = NULL,*apptail = NULL;
@@ -601 +605 @@
                                           MAP_ATTACHTO,
                                           NullStr);
-                        info = malloc(sizeof(APPNOTIFY));
-                        if(info) {
-                          memset(info,0,sizeof(APPNOTIFY));
+                        info = xmallocz(sizeof(APPNOTIFY),pszSrcFile,__LINE__);
+                        if (info) {
                           info->happ = happ;
                           info->attach = FALSE;
@@ -626 +629 @@
                                params);
                     }
-#ifdef NEVER
+#ifdef NEVER                            // fixme to be gone?
                     DosError(FERR_DISABLEHARDERR);
                     rc = DosFSAttach(d,
@@ -633 +636 @@
                                      strlen(d) + 1,
                                      FS_DETACH);
-                    if(!rc) {
+                    if (rc) {
+                      Dos_Error(MB_CANCEL,
+                                rc,
+                                hwnd,
+                                pszSrcFile,
+                                __LINE__,
+                                GetPString(IDS_DETACHFAILEDTEXT),
+                                d,
+                                s);
+                    }
+                    else {
                       fRemapped = TRUE;
                       WinSendDlgItemMsg(hwnd,
@@ -646 +659 @@
                                         MPFROMP(d));
                     }
-                    else
-                      Dos_Error(MB_CANCEL,
-                                rc,
-                                hwnd,
-                                __FILE__,
-                                __LINE__,
-                                GetPString(IDS_DETACHFAILEDTEXT),
-                                d,
-                                s);
-#endif
+#endif                                  // fixme to be gone?
                     break;
 
@@ -727 +731 @@
                     APPNOTIFY *info;
 
-                    info = malloc(sizeof(APPNOTIFY));
-                    if(info) {
-                      memset(info,0,sizeof(APPNOTIFY));
+                    info = xmallocz(sizeof(APPNOTIFY),pszSrcFile,__LINE__);
+                    if (info) {
                       info->happ = happ;
                       info->attach = TRUE;
@@ -751 +754 @@
                            p,
                            params);
-#ifdef NEVER
+#ifdef NEVER                            // fixme to be gone?
                   DosError(FERR_DISABLEHARDERR);
                   rc = DosFSAttach(d,s,s,strlen(s) + 1,FS_ATTACH);
-                  if(!rc) {
+                  if (rc) {
+                    Dos_Error(MB_CANCEL,
+                              rc,
+                              hwnd,
+                              pszSrcFile,
+                              __LINE__,
+                              GetPString(IDS_ATTACHFAILEDTEXT),
+                              s,
+                              d);
+                  }
+                  else {
                     fRemapped = TRUE;
                     WinSendDlgItemMsg(hwnd,
@@ -767 +780 @@
                                       MPFROMP(d));
                   }
-                  else
-                    Dos_Error(MB_CANCEL,
-                              rc,
-                              hwnd,
-                              __FILE__,
-                              __LINE__,
-                              GetPString(IDS_ATTACHFAILEDTEXT),
-                              s,
-                              d);
-#endif
+#endif                                  // fixme to be gone?
                 }
               }