Changeset 741 for trunk/dll/comp.c

Timestamp:

Jul 29, 2007, 10:52:47 PM (18 years ago)

Author:

Gregg Young

Message:

Compare dirs crash fix shows filenames but wastes memory (CCHMAXPATH) and displays odd chars for file names on non matched files plus 0 in all other columns

File:

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

trunk/dll/comp.c

@@ -338 +338 @@
 
   case WM_DESTROY:
-    DosSleep(100L);
+    DosSleep(100);
     break;
   }
@@ -792 +792 @@
       RECORDINSERT ri;
       CHAR *pch;
-      CHAR fname[CCHMAXPATH];
 
       WinCancelShutdown(hmq, TRUE);
@@ -1027 +1026 @@
           //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
+          // 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;
-          pcir->pszDisplayName = NULL;  // Not used here
-          //pcir->pszSubject = pcir->szSubject;
-          //pcir->pszLongname = pcir->szLongname;
+          pcir->pszDisplayName = pcir->pszFileName;     // Not used here
+          pcir->pszSubject = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);
+          //pcir->pszLongname = pcir->pszFileName;
           pcir->pszDispAttr = pcir->szDispAttr;
           pcil->hwndCnr = hwndLeft;
-          //pcil->pszFileName = pcil->szFileName;
+          //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;
           pcil->pszDispAttr = pcil->szDispAttr;
-          pcil->pszDisplayName = NULL;  // Not used here
-          //pcil->pszSubject = pcil->szSubject;
-          //pcil->pszLongname = pcil->szLongname;
+          pcil->pszDisplayName = pcil->pszFileName;     // Not used here
+          pcil->pszSubject = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__) ;
+          //pcil->pszLongname = pcil->pszFileName;
           if ((filesl && filesl[l]) && (filesr && filesr[r])) {
             x = stricmp(filesl[l]->fname, filesr[r]->fname);
             if (!x) {
                 // Same
-              sprintf(fname, "%s%s%s", cmp->leftdir,
+              sprintf(pcil->pszFileName, "%s%s%s", cmp->leftdir,
                       (cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\') ?
                       NullStr : "\\", filesl[l]->fname);
               // pcil->rc.hptrIcon    = hptrFile;
-              pcil->pszFileName = xstrdup((fname + lenl), pszSrcFile, __LINE__);
+              pcil->pszFileName = pcil->pszFileName + lenl;
               pcil->attrFile = filesl[l]->attrFile;
               y = 0;
@@ -1086 +1087 @@
                 }
               }
-              sprintf(fname, "%s%s%s", cmp->rightdir,
+              sprintf(pcir->pszFileName, "%s%s%s", cmp->rightdir,
                       (cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\') ?
                       NullStr : "\\", filesr[r]->fname);
-              pcir->pszFileName = xstrdup((fname + lenr), pszSrcFile, __LINE__);
+              pcir->pszFileName = pcir->pszFileName + lenr;
               pcir->attrFile = filesr[r]->attrFile;
               // pcir->rc.hptrIcon    = hptrFile;
@@ -1184 +1185 @@
             else if (x < 0) {
               // Just on left
-              sprintf(fname, "%s%s%s", cmp->leftdir,
+              sprintf(pcil->pszFileName, "%s%s%s", cmp->leftdir,
                       (cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\') ?
                       NullStr : "\\", filesl[l]->fname);
-              pcil->pszFileName = xstrdup((fname + lenl), pszSrcFile, __LINE__);
+              pcil->pszFileName = pcil->pszFileName + lenl;
               pcil->attrFile = filesl[l]->attrFile;
               // pcil->rc.hptrIcon    = hptrFile;
@@ -1228 +1229 @@
             else {
               // Just on right
-              sprintf(fname, "%s%s%s", cmp->rightdir,
+              sprintf(pcir->pszFileName, "%s%s%s", cmp->rightdir,
                       (cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\') ?
                       NullStr : "\\", filesr[r]->fname);
-              pcir->pszFileName = xstrdup((fname + lenr), pszSrcFile, __LINE__);
+              pcir->pszFileName = pcir->pszFileName + lenr;
               pcir->attrFile = filesr[r]->attrFile;
               // pcir->rc.hptrIcon    = hptrFile;
@@ -1274 +1275 @@
           else if (filesl && filesl[l]) {
             // Just on left
-            sprintf(fname, "%s%s%s", cmp->leftdir,
+            sprintf(pcil->pszFileName, "%s%s%s", cmp->leftdir,
                     (cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\') ?
                     NullStr : "\\", filesl[l]->fname);
-            pcil->pszFileName = xstrdup((fname + lenl), pszSrcFile, __LINE__);
+            pcil->pszFileName = pcil->pszFileName + lenl;
             pcil->attrFile = filesl[l]->attrFile;
             // pcil->rc.hptrIcon    = hptrFile;
@@ -1318 +1319 @@
             /* filesr && filesr[r] */
             // Just on right
-            sprintf(fname, "%s%s%s", cmp->rightdir,
+            sprintf(pcir->pszFileName, "%s%s%s", cmp->rightdir,
                     (cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\') ?
                     NullStr : "\\", filesr[r]->fname);
-            pcir->pszFileName = xstrdup((fname + lenr), pszSrcFile, __LINE__);
+            pcir->pszFileName = pcir->pszFileName + lenr;
             pcir->attrFile = filesr[r]->attrFile;
             // pcir->rc.hptrIcon    = hptrFile;