Changeset 672 for trunk/dll/draglist.c

Timestamp:

May 13, 2007, 7:57:48 AM (18 years ago)

Author:

Steven Levine

Message:

Use dcd->ulItemsToUnHilite
Sync UnHilite calls with arg mods

File:

• trunk/dll/draglist.c (modified) (11 diffs)

trunk/dll/draglist.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2002 Steven H.Levine
+  Copyright (c) 2001, 2007 Steven H.Levine
 
   16 Oct 02 SHL DoFileDrag: don't free stack
@@ -18 +18 @@
   19 Apr 07 SHL Optimize DRAGITEM DRAGIMAGE array access
   21 Apr 07 SHL Avoid odd first time drag failure
+  12 May 07 SHL Use dcd->ulItemsToUnHilite
 
 ***********************************************************************/
@@ -97 +98 @@
 # endif
   if (!DrgFreeDraginfo(pDInfo)) {
-    // fixme to find callers responsible for PMERR_SOURCE_SAME_AS_TARGET
-    if ((WinGetLastError(WinQueryAnchorBlock(hwnd)) & 0xffff) != PMERR_SOURCE_SAME_AS_TARGET) {
-      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-               "DrgFreeDraginfo");
+    if ((WinGetLastError(WinQueryAnchorBlock(hwnd)) & 0xffff) == PMERR_SOURCE_SAME_AS_TARGET) {
+      // fixme to find caller responsible for PMERR_SOURCE_SAME_AS_TARGET
+      Win_Error_NoMsgBox(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                         "DrgFreeDraginfo failed with PMERR_SOURCE_SAME_AS_TARGET");
     }
     else
-      DbgMsg(pszSrcFile, __LINE__, "DrgFreeDraginfo PMERR_SOURCE_SAME_AS_TARGET");
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__, "DrgFreeDraginfo");
   }
 }
@@ -220 +221 @@
   BOOL ok;
   UINT c;
+  DIRCNRDATA *dcd;
 
   static BOOL first_drag = TRUE;
 
-  // fixme to be multi-drag safe - count needs to be in DCD etc. and passed to UnHilite
-  NumItemsToUnhilite = 0;
+  // Count items to unhilite, pass to UnHilite when partial unhilite required
+  dcd = INSTDATA(hwndCnr);
+  dcd->ulItemsToUnHilite = 0;
   if (!pciRec && directory && *directory)
     return DragOne(hwndCnr, hwndObj, directory, moveok);
@@ -362 +365 @@
         }
         // Set count to actual count + 1 to ensure count non-zero on any failure
-        NumItemsToUnhilite = ulNumfiles + 1;
+        dcd->ulItemsToUnHilite = ulNumfiles + 1;
         break;
       }
@@ -424 +427 @@
           DrgDeleteStrHandle(pDItem->hstrTargetName);
         xfree(pDItem);
-        NumItemsToUnhilite = ulNumfiles + 1;    // +1 to ensure non-zero
+        dcd->ulItemsToUnHilite = ulNumfiles + 1;        // +1 to ensure non-zero
         break;
      }
@@ -480 +483 @@
           // Set count to actual count + 1 to ensure count non-zero on any failure
           // Unhilite code will adjust this when unhighliting
-          NumItemsToUnhilite = ulNumfiles + 1;
+          dcd->ulItemsToUnHilite = ulNumfiles + 1;
           break;
         }
@@ -558 +561 @@
 
   if (hDrop == NULLHANDLE ) {
-    NumItemsToUnhilite = 0;
+    dcd->ulItemsToUnHilite = 0;
     if (pDInfo)
       FreeDragInfoData(hwndCnr, pDInfo);
@@ -587 +590 @@
   FILESTATUS3 fs3;
   BOOL ok;
+  DIRCNRDATA *dcd;
 
   if (!list || !list[0])
     return hDrop;
+
+  dcd = INSTDATA(hwnd);
+
   for (ulSelect = 0; list[ulSelect]; ulSelect++) {
     if ((!IsRoot(list[ulSelect]) || !IsValidDrive(*list[ulSelect])) &&
@@ -677 +684 @@
         xfree(pDItem);
         // pDItem = NULL;       // Why bother, we can count - fixme to be gone
-        NumItemsToUnhilite = ulNumfiles + 1;
+        dcd->ulItemsToUnHilite = ulNumfiles + 1;
         break;
       }
@@ -731 +738 @@
                       (PVOID) NULL);
       if (hDrop == NULLHANDLE) {
-        NumItemsToUnhilite = 0;
+        dcd->ulItemsToUnHilite = 0;
         FreeDragInfoData(hwnd, pDInfo);
       }