Changeset 334 for trunk/dll

Timestamp:

Jul 25, 2006, 9:02:00 PM (19 years ago)

Author:

root

Message:

Check more run time errors

Location:

trunk/dll

Files:

• shadow.c (modified) (9 diffs)
• worker.c (modified) (16 diffs)

trunk/dll/shadow.c

@@ +1 @@
+
+/***********************************************************************
+
+  $Id$
+
+  Desktop shadows
+
+  Copyright (c) 1993-97 M. Kimes
+  Copyright (c) 2006 Steven H. Levine
+
+  22 Jul 06 SHL Check more run time errors
+
+***********************************************************************/
+
 #define INCL_DOS
 #define INCL_WIN
-
 #include <os2.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -11 +26 @@
 
 #pragma data_seg(DATA1)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(SHADOW,CreateProgramObject,CreateDataObject,CreateFolderObject,CreateShadowObject)
 
 HOBJECT CreateProgramObject (CHAR *objtitle,CHAR *location,CHAR *path,
-                             CHAR *cnr) {
-
+                             CHAR *cnr)
+{
   HOBJECT obj = (HOBJECT)0;
   CHAR    *s;
@@ -27 +45 @@
                          CO_FAILIFEXISTS);
   if(obj) {
-    s = malloc(5192);
-    if(s) {
+    s = xmalloc(5192,pszSrcFile,__LINE__);
+    if (s) {
       sprintf(s,
               "EXENAME=%s%s%s%s%s;PARAMETERS=%%*;OBJECTID=<FM2_%s>",
@@ -90 +108 @@
 
 
-HOBJECT CreateFolderObject (CHAR *objtitle,CHAR *cnr) {
-
+HOBJECT CreateFolderObject (CHAR *objtitle,CHAR *cnr)
+{
   HOBJECT obj = (HOBJECT)0;
   CHAR    s[1050];
@@ -121 +139 @@
   if(!cnr)
     return obj;
-  s = malloc(5192);
-  if(s) {
+  s = xmalloc(5192,pszSrcFile,__LINE__);
+  if (s) {
     sprintf(s,
             "SHADOWID=%s%s%s",
@@ -171 +189 @@
 #pragma alloc_text(SHADOW2,MakeShadows,OpenObject)
 
-VOID MakeShadows (HWND hwnd,CHAR **list,ULONG Shadows,CHAR *cnr, CHAR *foldername) {
-
+VOID MakeShadows (HWND hwnd,CHAR **list,ULONG Shadows,CHAR *cnr, CHAR *foldername)
+{
   INT           x = 0;
   CHAR          szBuff[CCHMAXPATH + 8];
@@ -289 +307 @@
 
 
-VOID OpenObject (CHAR *filename,CHAR *type,HWND hwnd) {
-
+VOID OpenObject (CHAR *filename,CHAR *type,HWND hwnd)
+{
   HOBJECT hWPSObject;
 
@@ -323 +341 @@
 
 
-BOOL RunSeamless (CHAR *exename,CHAR *args,HWND hwnd) {
-
+BOOL RunSeamless (CHAR *exename,CHAR *args,HWND hwnd)
+{
   CHAR settings[1024 + CCHMAXPATH + 80];
   BOOL ret;
@@ -350 +368 @@
   return ret;
 }
-

trunk/dll/worker.c

@@ -14 +14 @@
   06 Jun 05 SHL Rework Action for VAC3.65 compat
   27 Jul 05 SHL IDM_DOITYOURSELF - avoid need to strip in ExecOnList
-  29 May 06 SHL Comments
+  22 Jul 06 SHL Comments
+  22 Jul 06 SHL Check more run time errors
 
 ***********************************************************************/
@@ -37 +38 @@
 
 #pragma data_seg(DATA2)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(MASSACTION,MassAction)
 #pragma alloc_text(ACTION,Action)
@@ -71 +75 @@
     case IDM_EXTRACT:
       {
-        li = malloc(sizeof(LISTINFO));
-        if (li)
-        {
-          memset(li, 0, sizeof(LISTINFO));
-          wk = malloc(sizeof(WORKER));
-          if (wk)
-          {
-            memset(wk, 0, sizeof(WORKER));
+        li = xmallocz(sizeof(LISTINFO),pszSrcFile,__LINE__);
+        if (li) {
+          wk = xmallocz(sizeof(WORKER),pszSrcFile,__LINE__);
+          if (wk) {
             wk -> size = sizeof(WORKER);
             wk -> hwndCnr = hwndCnr;
@@ -93 +93 @@
               break;
             }
-            if (_beginthread(MassAction,
-                             NULL,
-                             122880,
-                             (PVOID) wk) == -1)
-            {
+            if (_beginthread(MassAction,NULL,122880,(PVOID) wk) == -1)
+            {
+              Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
               FreeListInfo(wk -> li);
               free(wk);
@@ -281 +279 @@
                 {
 
-                  CHAR *temp = strdup(wk -> li -> list[x]);
+                  CHAR *temp = xstrdup(wk -> li -> list[x],pszSrcFile,__LINE__);
 
                   if (temp)
@@ -323 +321 @@
                   }
                   in = _fsopen(wk -> li -> list[x], moder, SH_DENYWR);
-                  if (in)
-                  {
+                  if (!in)
+                  {
+                    if (saymsg(MB_ENTERCANCEL,
+                               HWND_DESKTOP,
+                               GetPString(IDS_MERGEERRORTEXT),
+                               GetPString(IDS_CANTOPENINPUTTEXT),
+                               wk -> li -> list[x]) == MBID_CANCEL)
+                      goto Abort;
+                  }
+                  else {
                     out = _fsopen(wk -> li -> targetpath, modew, SH_DENYWR);
                     if (out)
@@ -363 +369 @@
                     }
                     fclose(in);
-                  }
-                  else
-                  {
-                    if (saymsg(MB_ENTERCANCEL,
-                               HWND_DESKTOP,
-                               GetPString(IDS_MERGEERRORTEXT),
-                               GetPString(IDS_CANTOPENINPUTTEXT),
-                               wk -> li -> list[x]) == MBID_CANCEL)
-                      goto Abort;
                   }
                 }
@@ -947 +944 @@
                                      rc,
                                      wk -> hwndFrame,
-                                     __FILE__,
+                                     pszSrcFile,
                                      __LINE__,
                                      "%s %s \"%s\" %s\"%s\" %s.",
@@ -1102 +1099 @@
               Notify(message);
               if (toupper(*wk -> li -> targetpath) < 'C')
-                DosBeep(1000, 25);
+                DosBeep(1000, 25);      // Wake up user
               DosSleep(33L);
               if (wk -> li -> type == IDM_WPSMOVE ||
@@ -1240 +1237 @@
                 FILE *fp;
 
-                fp = fopen("$FM2PLAY.$$$", "w");
+                fp = xfopen("$FM2PLAY.$$$", "w",pszSrcFile,__LINE__);
                 if (fp)
                 {
@@ -1339 +1336 @@
                 strcpy(p, wk -> li -> list[x]);
                 free(wk -> li -> list[x]);
-                wk -> li -> list[x] = strdup(szBuffer);
+                wk -> li -> list[x] = xstrdup(szBuffer,pszSrcFile,__LINE__);
               }
               if (wk -> li -> list[0])
@@ -1575 +1572 @@
               for (x = 0; wk -> li -> list[x]; x++)
               {
-                temp = strdup(wk -> li -> list[x]);
+                temp = xstrdup(wk -> li -> list[x],pszSrcFile,__LINE__);
                 if (temp && WinIsWindow(hab2, wk -> hwndCnr))
                 {
@@ -1630 +1627 @@
               for (x = 0; wk -> li -> list[x]; x++)
               {
-                temp = strdup(wk -> li -> list[x]);
+                temp = xstrdup(wk -> li -> list[x],pszSrcFile,__LINE__);
                 if (temp && WinIsWindow(hab2, wk -> hwndCnr))
                 {
@@ -1692 +1689 @@
               {
                 strcpy(wk -> li -> targetpath, printer);
-                if (_beginthread(PrintList,
-                                 NULL,
-                                 65536,
-                                 (PVOID) wk -> li) != -1)
+                if (_beginthread(PrintList,NULL,65536,(PVOID) wk -> li) == -1)
+                  Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
+                else
                   wk -> li = NULL;      /* prevent LISTINFO li from being freed */
               }
@@ -1821 +1817 @@
                           GetPString(IDS_ISTEXT));
                 if (ro || hs || sysdir)
-                  DosBeep(300, 100);
+                  DosBeep(300, 100);    // Wake up user
                 strcat(prompt,
                        GetPString(IDS_DELPROMPT6TEXT));
@@ -1894 +1890 @@
                                 error,
                                 wk -> hwndFrame,
-                                __FILE__,
+                                pszSrcFile,
                                 __LINE__,
                                 GetPString(IDS_DELETEFAILED2TEXT),