Changeset 439

Timestamp:

Aug 24, 2006, 6:45:27 AM (19 years ago)

Author:

root

Message:

Use Runtime_Error more

Location:

trunk/dll

Files:

• autoview.c (modified) (7 diffs)
• avl.c (modified) (6 diffs)

trunk/dll/autoview.c ¶

@@ -15 +15 @@
   29 May 06 SHL Sync with archiver.bb2 mods
   22 Jul 06 SHL Check more run time errors
+  15 Aug 06 SHL Use Runtime_Error more
 
 ***********************************************************************/
@@ -216 +217 @@
 }
 
+static PSZ pszBufOvfMsg = "Buffer overflow";
 
 ULONG CreateHexDump (CHAR *pchInBuf,ULONG cbInBuf,
@@ -232 +234 @@
     while (ibIn < cbInBuf) {
       if (pchOut - pchOutBuf + cbOutLine >= cbOutBuf) {
-        saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"hex buf ovf");
+        Runtime_Error(pszSrcFile, __LINE__, pszBufOvfMsg);
         break;
       }
@@ -403 +405 @@
                         *dest = 0;
                         if (dest - obuff >= obufflen)
-                          saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"obuff ovf");
+                          Runtime_Error(pszSrcFile, __LINE__, pszBufOvfMsg);
                       }
                       if(*obuff)
@@ -503 +505 @@
                   } // while
                   if (p - buff >= bufflen)
-                    saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"buff ovf");
+                    Runtime_Error(pszSrcFile, __LINE__, pszBufOvfMsg);
                   if(*buff)
                     WinSetWindowText(hwndAutoview,buff);
@@ -586 +588 @@
                         } // while
                         if (p - buff >= 65536) {
-                          saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"eabuff ovf");
+                          Runtime_Error(pszSrcFile, __LINE__, pszBufOvfMsg);
                           buff[65535] = 0;      // Try to stay alive
                           break;
@@ -687 +689 @@
           if (_beginthread(MakeAutoWin,NULL,65536,(PVOID)hwnd) == -1) {
             Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            PostMsg(hwnd,
-                    UM_CLOSE,
-                    MPVOID,
-                    MPVOID);
+            PostMsg(hwnd,UM_CLOSE,MPVOID,MPVOID);
           }
         }

trunk/dll/avl.c ¶

@@ -23 +23 @@
   14 Jul 06 SHL Use Runtime_Error
   29 Jul 06 SHL Use xfgets, xfgets_bstripcr
+  15 Aug 06 SHL Use Runtime_Error more
 
 ***********************************************************************/
@@ -728 +729 @@
 //=== SBoxDlgProc() Select archiver to use or edit, supports list reorder too ===
 
+static PSZ pszCantFindMsg = "Can't find item %d";
+
 MRESULT EXPENTRY SBoxDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
@@ -882 +885 @@
             if (!pat) {
               if (arcsighead)
-                saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u", sSelect, pszSrcFile, __LINE__);
+                Runtime_Error(pszSrcFile, __LINE__, pszCantFindMsg, sSelect);
               else
                 arcsighead = ad.info;
@@ -921 +924 @@
           ; // Find self
 
-        if (!pat) {
-          saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u",sSelect, pszSrcFile, __LINE__);
-        }
+        if (!pat)
+          Runtime_Error(pszSrcFile, __LINE__, pszCantFindMsg, sSelect);
         else {
           // Delete current
@@ -962 +964 @@
         for (i = 0, pat = arcsighead; pat && i < sSelect; pat = pat->next, i++)
           ; // Find self
-        if (!pat || !pat->prev) {
-          saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u",sSelect, pszSrcFile, __LINE__);
-        }
+        if (!pat || !pat->prev)
+          Runtime_Error(pszSrcFile, __LINE__, pszCantFindMsg, sSelect);
         else {
           ARC_TYPE *patGDad;
@@ -1009 +1010 @@
         for (i = 0, pat = arcsighead; pat && i < sSelect; pat = pat->next, i++)
           ; // Find self
-        if (!pat || !pat->next) {
-          saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d/%d at %s::%u",sSelect, sItemCount, pszSrcFile, __LINE__);
-        }
+        if (!pat || !pat->next) 
+          Runtime_Error(pszSrcFile, __LINE__, "Can't find item %d of %d", sSelect, sItemCount);
         else {
           ARC_TYPE *patDad;