Changeset 742 for trunk/dll/comp.c

Timestamp:

Jul 30, 2007, 12:56:30 AM (18 years ago)

Author:

Steven Levine

Message:

Use Win_Error to report container errors

File:

• trunk/dll/comp.c (modified) (16 diffs)

trunk/dll/comp.c

@@ -24 +24 @@
   03 Nov 06 SHL Count thread usage
   22 Mar 07 GKY Use QWL_USER
+  29 Jul 07 SHL Use Win_Error to report container errors
 
 ***********************************************************************/
@@ -429 +430 @@
                            MPFROM2SHORT(1, CMA_FREE | CMA_INVALIDATE));
               }
-              else {
+              else {
                 pci->pszFileName = xstrdup(NullStr, pszSrcFile, __LINE__);
                 //pci->pszFileName = pci->szFileName;
@@ -480 +481 @@
                 if (cmp->rightdir[strlen(cmp->rightdir) - 1] != '\\')
                   pciO->pszFileName++;
-              }
+              }
               strcpy(pciO->szDispAttr, pci->szDispAttr);
               pciO->attrFile = pci->attrFile;
@@ -561 +562 @@
                 if (cmp->rightdir[strlen(cmp->rightdir) - 1] != '\\')
                   pciO->pszFileName++;
-              }
+              }
               strcpy(pciO->szDispAttr, pci->szDispAttr);
               pciO->attrFile = pci->attrFile;
@@ -997 +998 @@
                                MPFROMLONG(recsNeeded));
         if (!pcilFirst) {
-          Runtime_Error(pszSrcFile, __LINE__, "CM_ALLOCRECORD %u failed",
-                        recsNeeded);
+          Win_Error(hwndLeft, cmp->hwnd, pszSrcFile, __LINE__, "CM_ALLOCRECORD %u failed",
+                    recsNeeded);
           recsNeeded = 0;
         }
@@ -1007 +1008 @@
                                MPFROMLONG(recsNeeded));
         if (!pcirFirst) {
-          Runtime_Error(pszSrcFile, __LINE__, "CM_ALLOCRECORD %u failed",
-                        recsNeeded);
+          Win_Error(hwndRight, cmp->hwnd, pszSrcFile, __LINE__, "CM_ALLOCRECORD %u failed",
+                    recsNeeded);
           recsNeeded = 0;
           pcil = pcilFirst;
@@ -1026 +1027 @@
           //pcir->pszFileName = pcir->szFileName;
           // 23 Jul 07 SHL fixme to set pszIcon after pszFileName allocated
-          // 23 Jul 07 SHL fixme to set pszLongName after pszFileName allocated
-          pcir->pszFileName = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);//29 Jul 07 GKY Temp fix to crash
+          // 23 Jul 07 SHL fixme to set pszLongName after pszFileName allocated
+          pcir->pszFileName = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);//29 Jul 07 GKY Temp fix to crash
           pcir->rc.pszIcon = pcir->pszFileName;
           pcir->rc.hptrIcon = (HPOINTER) 0;
@@ -1035 +1036 @@
           pcir->pszDispAttr = pcir->szDispAttr;
           pcil->hwndCnr = hwndLeft;
-          //pcil->pszFileName = pcil->szFileName;
-          pcil->pszFileName = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);//29 Jul 07 GKY Temp fix to crash
+          //pcil->pszFileName = pcil->szFileName;
+          pcil->pszFileName = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);//29 Jul 07 GKY Temp fix to crash
           pcil->rc.pszIcon = pcil->pszFileName;
           pcil->rc.hptrIcon = (HPOINTER) 0;
@@ -1046 +1047 @@
             x = stricmp(filesl[l]->fname, filesr[r]->fname);
             if (!x) {
-                // Same
+                // Same
               sprintf(pcil->pszFileName, "%s%s%s", cmp->leftdir,
                       (cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\') ?
                       NullStr : "\\", filesl[l]->fname);
-              // pcil->rc.hptrIcon    = hptrFile;
+              // pcil->rc.hptrIcon = hptrFile;
               pcil->pszFileName = pcil->pszFileName + lenl;
               pcil->attrFile = filesl[l]->attrFile;
@@ -1092 +1093 @@
               pcir->pszFileName = pcir->pszFileName + lenr;
               pcir->attrFile = filesr[r]->attrFile;
-              // pcir->rc.hptrIcon    = hptrFile;
+              // pcir->rc.hptrIcon = hptrFile;
               y = 0;
               for (x = 0; x < 6; x++)
@@ -1190 +1191 @@
               pcil->pszFileName = pcil->pszFileName + lenl;
               pcil->attrFile = filesl[l]->attrFile;
-              // pcil->rc.hptrIcon    = hptrFile;
+              // pcil->rc.hptrIcon = hptrFile;
               y = 0;
               for (x = 0; x < 6; x++)
@@ -1234 +1235 @@
               pcir->pszFileName = pcir->pszFileName + lenr;
               pcir->attrFile = filesr[r]->attrFile;
-              // pcir->rc.hptrIcon    = hptrFile;
+              // pcir->rc.hptrIcon = hptrFile;
               y = 0;
               for (x = 0; x < 6; x++) {
@@ -1280 +1281 @@
             pcil->pszFileName = pcil->pszFileName + lenl;
             pcil->attrFile = filesl[l]->attrFile;
-            // pcil->rc.hptrIcon    = hptrFile;
+            // pcil->rc.hptrIcon = hptrFile;
             y = 0;
             for (x = 0; x < 6; x++)
@@ -1324 +1325 @@
             pcir->pszFileName = pcir->pszFileName + lenr;
             pcir->attrFile = filesr[r]->attrFile;
-            // pcir->rc.hptrIcon    = hptrFile;
+            // pcir->rc.hptrIcon = hptrFile;
             y = 0;
             for (x = 0; x < 6; x++) {
@@ -1386 +1387 @@
         if (!WinSendMsg(hwndLeft, CM_INSERTRECORD,
                         MPFROMP(pcilFirst), MPFROMP(&ri))) {
+          Win_Error(hwndLeft, cmp->hwnd, pszSrcFile, __LINE__, "CM_INSERTRECORD");
           pcil = pcilFirst;
           while (pcil) {
@@ -1404 +1406 @@
         if (!WinSendMsg(hwndRight, CM_INSERTRECORD,
                         MPFROMP(pcirFirst), MPFROMP(&ri))) {
+          Win_Error(hwndLeft, cmp->hwnd, pszSrcFile, __LINE__, "CM_INSERTRECORD");
           WinSendMsg(hwndLeft, CM_REMOVERECORD,
                      MPVOID, MPFROM2SHORT(0, CMA_FREE | CMA_INVALIDATE));