Changeset 342 for trunk/dll/assoc.c

Timestamp:

Jul 26, 2006, 4:00:11 AM (19 years ago)

Author:

root

Message:

Use Runtime_Error

File:

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

trunk/dll/assoc.c

@@ -5 +5 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004 Steven H.Levine
+  Copyright (c) 2004, 2006 Steven H.Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
+  14 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -47 +48 @@
 static BOOL       assloaded = FALSE;
 
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(ASSOC2,free_commands,load_associations,save_associations)
 #pragma alloc_text(ASSOC2,ExecAssociation,AssocTextProc)
 
-
-MRESULT EXPENTRY AssocTextProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY AssocTextProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   PFNWP oldproc = (PFNWP)WinQueryWindowPtr(hwnd,QWL_USER);
   static BOOL emphasized = FALSE;
@@ -98 +100 @@
 
 
-VOID free_associations (VOID) {
-
+VOID free_associations (VOID)
+{
   LINKASSOC *info,*next;
 
@@ -116 +118 @@
 
 
-VOID load_associations (VOID) {
-
+VOID load_associations (VOID)
+{
   FILE      *fp;
   LINKASSOC *info;
@@ -134 +136 @@
   strcat(mask,"ASSOC.DAT");
   fp = _fsopen(mask,"r",SH_DENYWR);
-  if(fp) {
+  if (fp) {
     while(!feof(fp)) {
       if(!fgets(mask,CCHMAXPATH + 24,fp))
@@ -157 +159 @@
       if(!*cl)
         continue;
-      info = malloc(sizeof(LINKASSOC));
-      if(info) {
-        memset(info,0,sizeof(LINKASSOC));
-        info->cl = strdup(cl);
-        info->mask = strdup(mask);
+      info = xmallocz(sizeof(LINKASSOC),pszSrcFile,__LINE__);
+      if (info) {
+        info->cl = xstrdup(cl,pszSrcFile,__LINE__);
+        info->mask = xstrdup(mask,pszSrcFile,__LINE__);
         if(*sig)
-          info->sig = strdup(sig);
+          info->sig = xstrdup(sig,pszSrcFile,__LINE__);
         info->offset = atol(offset);
         info->flags = atol(flags);
-        if(!info->cl || !info->mask) {
-          if(info->cl)
+        if (!info->cl || !info->mask) {
+          if (info->cl)
             free(info->cl);
-          if(info->mask)
+          if (info->mask)
             free(info->mask);
-          free(info);
+          free (info);
           break;
         }
@@ -188 +189 @@
 
 
-VOID save_associations (VOID) {
-
+VOID save_associations (VOID)
+{
   LINKASSOC *info;
   FILE      *fp;
@@ -220 +221 @@
     strcat(s,"\\");
   strcat(s,"ASSOC.DAT");
-  fp = fopen(s,"w");
-  if(fp) {
+  fp = xfopen(s,"w",pszSrcFile,__LINE__);
+  if (fp) {
     fputs(GetPString(IDS_ASSOCFILETEXT),fp);
     info = asshead;
@@ -244 +245 @@
 
 
-LINKASSOC * add_association (ASSOC *addme) {
-
+LINKASSOC * add_association (ASSOC *addme)
+{
   LINKASSOC *info;
 
@@ -258 +259 @@
     }
     if(!info) {
-      info = malloc(sizeof(LINKASSOC));
+      info = xmallocz(sizeof(LINKASSOC),pszSrcFile,__LINE__);
       if(info) {
-        memset(info,0,sizeof(LINKASSOC));
-        info->cl = strdup(addme->cl);
-        info->mask = strdup(addme->mask);
+        info->cl = xstrdup(addme->cl,pszSrcFile,__LINE__);
+        info->mask = xstrdup(addme->mask,pszSrcFile,__LINE__);
         if(*addme->sig)
-          info->sig = strdup(addme->sig);
+          info->sig = xstrdup(addme->sig,pszSrcFile,__LINE__);
         if(addme->offset)
           info->offset = addme->offset;
@@ -295 +295 @@
 
 
-BOOL kill_association (ASSOC *killme) {
-
+BOOL kill_association (ASSOC *killme)
+{
   LINKASSOC *info;
 
@@ -333 +333 @@
 
 
-INT ExecAssociation (HWND hwnd, CHAR *datafile) {
-
+INT ExecAssociation (HWND hwnd, CHAR *datafile)
+{
   CHAR      *file,sig[CCHMAXPATH],sigl[CCHMAXPATH],mask[CCHMAXPATH],*p;
   FILE      *fp;
@@ -382 +382 @@
                  info->sig);
           literal(sigl);
-          fp = _fsopen(datafile,
-                       "rb",
-                       SH_DENYNO);
-          if(fp) {
+          fp = _fsopen(datafile,"rb",SH_DENYNO);
+          if (fp) {
             if(info->offset < 0L) {
               fseek(fp,
@@ -463 +461 @@
 
 
-MRESULT EXPENTRY AssocDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY AssocDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   LINKASSOC *info;
   SHORT      x;
@@ -558 +556 @@
                                                     MPVOID);
               if(!info) {
-                DosBeep(50,100);
+                Runtime_Error(pszSrcFile, __LINE__, "Query item handle failed");
                 break;
               }
@@ -698 +696 @@
               temp.flags |= PROMPT;
             info = add_association(&temp);
-            if(info) {
+            if(!info)
+              Runtime_Error(pszSrcFile, __LINE__, "add_association");
+            else {
 
               CHAR s[1002 + CCHMAXPATH + 6];
@@ -730 +730 @@
               save_associations();
             }
-            else
-              DosBeep(50,200);
           }
           break;
@@ -754 +752 @@
                                 NULL,
                                 0L);
-            if(kill_association(&temp)) {
+            if(!kill_association(&temp))
+              Runtime_Error(pszSrcFile, __LINE__, "kill_association");
+            else {
               x = (SHORT)WinSendDlgItemMsg(hwnd,
                                            ASS_LISTBOX,
@@ -772 +772 @@
               save_associations();
             }
-            else
-              DosBeep(50,200);
           }
           break;
@@ -783 +781 @@
 
 
-VOID EditAssociations (HWND hwnd) {
-
+VOID EditAssociations (HWND hwnd)
+{
   static CHAR stop = 0;
 
@@ -795 +793 @@
   stop = 0;
 }
-