Changeset 672 for trunk/dll/dircnrs.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/dircnrs.c (modified) (10 diffs)

trunk/dll/dircnrs.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2006 Steven H. Levine
+  Copyright (c) 2001, 2007 Steven H. Levine
 
   16 Oct 02 SHL Handle large partitions
@@ -25 +25 @@
   06 Apr 07 GKY Add some error checking in drag/drop
   19 Apr 07 SHL Use FreeDragInfoData.  Add more drag/drop error checking.
+  12 May 07 SHL Use dcd->ulItemsToUnHilite; sync with UnHilite arg mods
 
 ***********************************************************************/
@@ -570 +571 @@
 {
   DIRCNRDATA *dcd;
+  DIRCNRDATA *dcdsrc;
 
   switch (msg) {
@@ -587 +589 @@
       cni.pRecord = NULL;
       cni.pDragInfo = (PDRAGINFO) mp1;
+      DbgMsg(pszSrcFile, __LINE__, "calling DoFileDrop");
       li =
         DoFileDrop(dcd->hwndCnr, dcd->directory, FALSE, MPVOID,
                    MPFROMP(&cni));
-      if (NumItemsToUnhilite)
+      dcdsrc = INSTDATA(cni.pDragInfo->hwndSource);
+      if (dcdsrc->ulItemsToUnHilite) {
         saymsg(MB_CANCEL | MB_ICONEXCLAMATION,
-                             hwnd,
-                             GetPString(IDS_ERRORTEXT),
-                   GetPString(IDS_EXCEEDPMDRGLMT));
+               hwnd,
+               GetPString(IDS_ERRORTEXT),
+               GetPString(IDS_EXCEEDPMDRGLMT));
+      }
       if (li) {
         li->type = (fDefaultDeletePerm) ? IDM_PERMDELETE : IDM_DELETE;
@@ -1057 +1062 @@
 MRESULT EXPENTRY DirCnrWndProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-  DIRCNRDATA *dcd = WinQueryWindowPtr(hwnd, QWL_USER);
-    APIRET rc;
+  DIRCNRDATA *dcd = INSTDATA(hwnd);
+  DIRCNRDATA *dcdsrc;
+  APIRET rc;
 
   switch (msg) {
@@ -1985 +1991 @@
                 FreeList(list);
               else if (fUnHilite)
-                UnHilite(hwnd, TRUE, &dcd->lastselection);
+                UnHilite(hwnd, TRUE, &dcd->lastselection, 0);
             }
             else
@@ -2513 +2519 @@
               }
               else if (fUnHilite)
-                UnHilite(hwnd, TRUE, &dcd->lastselection);
+                UnHilite(hwnd, TRUE, &dcd->lastselection, 0);
             }
             else
@@ -2542 +2548 @@
               RunCommand(hwnd, x);
               if (fUnHilite)
-                UnHilite(hwnd, TRUE, &dcd->lastselection);
+                UnHilite(hwnd, TRUE, &dcd->lastselection, 0);
             }
           }
@@ -2834 +2840 @@
                            pci ? NULL : dcd->directory,
                            pci ? TRUE : FALSE)) {
-              if ((pci && fUnHilite && wasemphasized) || NumItemsToUnhilite) {
-                UnHilite(hwnd, TRUE, &dcd->lastselection);
+              if ((pci && fUnHilite && wasemphasized) || dcd->ulItemsToUnHilite) {
+                UnHilite(hwnd, TRUE, &dcd->lastselection, dcd->ulItemsToUnHilite);
               }
             }
@@ -2852 +2858 @@
           ULONG action = UM_ACTION;
 
+          DbgMsg(pszSrcFile, __LINE__, "calling DoFileDrop");
           li = DoFileDrop(hwnd, dcd->directory, TRUE, mp1, mp2);
-          if (NumItemsToUnhilite) {
+          dcdsrc = INSTDATA(((PCNRDRAGINFO)mp2)->pDragInfo->hwndSource);
+
+          if (dcdsrc->ulItemsToUnHilite) {
             saymsg(MB_CANCEL | MB_ICONEXCLAMATION,
-                                 hwnd,
-                                 GetPString(IDS_ERRORTEXT),
-                                 GetPString(IDS_EXCEEDPMDRGLMT));
-          }
+                   hwnd,
+                   GetPString(IDS_ERRORTEXT),
+                   GetPString(IDS_EXCEEDPMDRGLMT));
+          }
+
           if (li) {
             if (li->list && li->list[0] && IsRoot(li->list[0]))