Changeset 730 for trunk/dll/draglist.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/draglist.c (modified) (8 diffs)

trunk/dll/draglist.c

@@ -256 +256 @@
   while (pci && (INT) pci > -1) {
     if (!(pci->rc.flRecordAttr & CRA_FILTERED)) {
-      if (IsRoot(pci->szFileName) && !IsValidDrive(*pci->szFileName))
+      if (IsRoot(pci->pszFileName) && !IsValidDrive(*pci->pszFileName))
         goto Continuing;
       if (!arcfile) {
-        strcpy(szBuffer, pci->szFileName);
+        strcpy(szBuffer, pci->pszFileName);
         p = strrchr(szBuffer, '\\');
         if (p) {
@@ -270 +270 @@
       }
       else
-        strcpy(szFile, pci->szFileName);
+        strcpy(szFile, pci->pszFileName);
     }
     if (!arcfile) {
@@ -369 +369 @@
       }
       pDItem->fsControl = isdir ? DC_CONTAINER : 0;
-      if (IsFullName(pci->szFileName) &&
-          (driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_REMOVABLE))
+      if (IsFullName(pci->pszFileName) &&
+          (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_REMOVABLE))
         pDItem->fsControl |= DC_REMOVEABLEMEDIA;
       pDItem->fsSupportedOps = DO_COPYABLE | DO_LINKABLE;
-      if (moveok && IsFullName(pci->szFileName) &&
-          !(driveflags[toupper(*pci->szFileName) - 'A'] &
+      if (moveok && IsFullName(pci->pszFileName) &&
+          !(driveflags[toupper(*pci->pszFileName) - 'A'] &
             DRIVE_NOTWRITEABLE))
         pDItem->fsSupportedOps |= DO_MOVEABLE;
-      if (IsRoot(pci->szFileName)) {
+      if (IsRoot(pci->pszFileName)) {
         pDItem->fsSupportedOps = DO_LINKABLE;
         rooting = TRUE;
@@ -774 +774 @@
                        MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_SELECTED));
     }
-    while (pci && (INT) pci != -1 && *pci->szFileName) {
+    while (pci && (INT) pci != -1 && *pci->pszFileName) {
       if (pdinfoOld || DrgQueryDragStatus() & DGS_LAZYDRAGINPROGRESS) {
         if (!pdinfoOld)
@@ -787 +787 @@
         pdinfoCurrent = pdinfoOld = DrgAllocDraginfo(1);
       if (pdinfoCurrent) {
-        strcpy(szDir, pci->szFileName);
+        strcpy(szDir, pci->pszFileName);
         p = szDir;
         while (*p) {
@@ -802 +802 @@
         }
         else {
-          strcpy(szFile, pci->szFileName);
+          strcpy(szFile, pci->pszFileName);
           *szDir = 0;
         }
@@ -818 +818 @@
         ditem.hstrTargetName = DrgAddStrHandle(szFile);
         ditem.fsControl = 0;
-        if (IsRoot(pci->szFileName) || (pci->attrFile & FILE_DIRECTORY) != 0)
+        if (IsRoot(pci->pszFileName) || (pci->attrFile & FILE_DIRECTORY) != 0)
           ditem.fsControl |= DC_CONTAINER;
-        if (IsFullName(pci->szFileName) &&
-            (driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_REMOVABLE))
+        if (IsFullName(pci->pszFileName) &&
+            (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_REMOVABLE))
           ditem.fsControl |= DC_REMOVEABLEMEDIA;
         ditem.fsSupportedOps = DO_COPYABLE | DO_LINKABLE;
-        if (IsFullName(pci->szFileName) &&
-            !(driveflags[toupper(*pci->szFileName) - 'A'] &
+        if (IsFullName(pci->pszFileName) &&
+            !(driveflags[toupper(*pci->pszFileName) - 'A'] &
               DRIVE_NOTWRITEABLE))
           ditem.fsSupportedOps |= DO_MOVEABLE;
-        if (IsRoot(pci->szFileName))
+        if (IsRoot(pci->pszFileName))
           ditem.fsSupportedOps = DO_LINKABLE;
         memset(&dimgFakeIcon, 0, sizeof(DRAGIMAGE));
@@ -839 +839 @@
         dimgFakeIcon.cxOffset = -16;
         dimgFakeIcon.cyOffset = 0;
-        if (IsFullName(pci->szFileName) &&
-            (driveflags[toupper(*pci->szFileName) - 'A'] &
+        if (IsFullName(pci->pszFileName) &&
+            (driveflags[toupper(*pci->pszFileName) - 'A'] &
              DRIVE_NOTWRITEABLE))
           pdinfoCurrent->usOperation = DO_COPY;
         else
           pdinfoCurrent->usOperation = DO_DEFAULT;
-        if (IsRoot(pci->szFileName))
+        if (IsRoot(pci->pszFileName))
           pdinfoCurrent->usOperation = DO_LINK;
         pdinfoCurrent->hwndSource = (hwndObj) ? hwndObj : hwndCnr;