Changeset 751 for trunk/dll/objcnr.c

Timestamp:

Aug 3, 2007, 1:05:48 AM (18 years ago)

Author:

Steven Levine

Message:

Sync rest of code with CNRITEM mods
Sync code with ARCITEM mods
Get compare dialog working
Still some issues with status display
Still some issues with directory sizes tree display
Heap check diagnostic code mostly enabled

File:

• trunk/dll/objcnr.c (modified) (4 diffs)

trunk/dll/objcnr.c

@@ -15 +15 @@
   03 Nov 06 SHL Renames
   22 Mar 07 GKY Use QWL_USER
+  01 Aug 07 SHL Rework to sync with CNRITEM mods
 
 ***********************************************************************/
@@ -93 +94 @@
     pciP = WinSendMsg(hwndCnr,
                       CM_ALLOCRECORD,
-                      MPFROMLONG(EXTRA_RECORD_BYTES2),
+                      MPFROMLONG(EXTRA_RECORD_BYTES),
                       MPFROMLONG(1L));
     if (!pciP) {
@@ -100 +101 @@
     }
     pciP->pszFileName = xstrdup(filename, pszSrcFile, __LINE__);
-    pciP->pszDispAttr = pciP->szDispAttr;
-    *pciP->szDispAttr = 0;
-    //pciP->pszSubject = pciP->szSubject;
-    pciP->pszSubject = xstrdup(NullStr, pszSrcFile, __LINE__);  // 23 Jul 07 SHL
-    //pciP->pszLongname = pciP->szLongname;
-    pciP->pszLongname = xstrdup(NullStr, pszSrcFile, __LINE__);
+    pciP->pszDispAttr = NullStr;
+    pciP->pszSubject = NullStr;
+    pciP->pszLongname = NullStr;
     if (strlen(filename) < 4)
-      pciP->pszFileName = pciP->pszFileName;
+      pciP->pszDisplayName = pciP->pszFileName;
     else {
       p = strrchr(pciP->pszFileName, '\\');
@@ -114 +112 @@
       else if (*(p + 1))
         p++;
-      pciP->pszFileName = p;
-    }
-    pciP->rc.pszIcon = pciP->pszFileName;
+      pciP->pszDisplayName = p;
+    }
+    pciP->rc.pszIcon = pciP->pszDisplayName;
     if (fForceUpper)
       strupr(pciP->pszFileName);