Changeset 730 for trunk/dll/objcnr.c

Timestamp:

Jul 22, 2007, 7:57:09 PM (18 years ago)

Author:

Gregg Young

Message:

Preliminary work on variable sized container buffers. Removes szFileName etc. Builds fine but traps.

File:

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

trunk/dll/objcnr.c

@@ -67 +67 @@
   RECORDINSERT ri;
   PCNRITEM pciP;
+  CHAR *f = 0;
 
   ffb = xmalloc(sizeof(FILEFINDBUF3), pszSrcFile, __LINE__);
@@ -98 +99 @@
       return;
     }
-    strcpy(pciP->szFileName, filename);
+    pciP->pszFileName = xstrdup(filename, pszSrcFile, __LINE__);
     pciP->pszDispAttr = pciP->szDispAttr;
-    pciP->pszSubject = pciP->szSubject;
-    pciP->pszLongname = pciP->szLongname;
+    //pciP->pszSubject = pciP->szSubject;
+    //pciP->pszLongname = pciP->szLongname;
     pciP->pszDispAttr = pciP->szDispAttr;
-    *pciP->szDispAttr = *pciP->szLongname = *pciP->szSubject = 0;
+    *pciP->szDispAttr = 0;
+    pciP->pszLongname = xstrdup(f, pszSrcFile, __LINE__);
+    pciP->pszSubject = xstrdup(f, pszSrcFile, __LINE__);
     if (strlen(filename) < 4)
-      pciP->pszFileName = pciP->szFileName;
+      pciP->pszFileName = pciP->pszFileName;
     else {
-      p = strrchr(pciP->szFileName, '\\');
+      p = strrchr(pciP->pszFileName, '\\');
       if (!p)
-        pciP->pszFileName = pciP->szFileName;
+        pciP->pszFileName = pciP->pszFileName;
       else if (*(p + 1))
         p++;
@@ -116 +119 @@
     pciP->rc.pszIcon = pciP->pszFileName;
     if (fForceUpper)
-      strupr(pciP->szFileName);
+      strupr(pciP->pszFileName);
     else if (fForceLower)
-      strlwr(pciP->szFileName);
+      strlwr(pciP->pszFileName);
     pciP->rc.flRecordAttr |= CRA_RECORDREADONLY;
   }
@@ -133 +136 @@
     HPOINTER hptr;
 
-    hptr = WinLoadFileIcon(pciP->szFileName, FALSE);
+    hptr = WinLoadFileIcon(pciP->pszFileName, FALSE);
     if (hptr)
       pciP->rc.hptrIcon = hptr;
@@ -399 +402 @@
                                            MPFROMSHORT(CRA_CURSORED));
         if (pci && (INT) pci != -1)
-          strcpy(data->dirname, pci->szFileName);
+          strcpy(data->dirname, pci->pszFileName);
         WinDismissDlg(hwnd, 1);
       }