Changeset 603 for trunk/dll/inis.c

Timestamp:

Apr 6, 2007, 11:57:45 PM (18 years ago)

Author:

Gregg Young

Message:

Work around for PM drag/drop limit; more drag/drop error checking

File:

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

trunk/dll/inis.c

@@ -16 +16 @@
   22 Mar 07 GKY Use QWL_USER
   30 Mar 07 GKY Remove GetPString for window class names
+  06 Apr 07 GKY Work around PM DragInfo and DrgFreeDISH limits
+  06 Apr 07 GKY Add some error checking in drag/drop
 
 ***********************************************************************/
@@ -1484 +1486 @@
   PFNWP oldproc = (PFNWP) WinQueryWindowPtr(hwnd, QWL_USER);
   static HWND hwndPopup = (HWND) 0;
+  APIRET rc;
 
   switch (msg) {
@@ -1534 +1537 @@
       HPOINTER hptrINI;
       USHORT id;
+      HWND hDrop = 0;
 
       id = WinQueryWindowUShort(hwnd, QWS_ID);
@@ -1567 +1571 @@
       pDInfo = DrgAllocDraginfo(1L);
       DrgSetDragitem(pDInfo, &DItem, sizeof(DRAGITEM), 0L);
-      DrgDrag(hwnd, pDInfo, &DIcon, 1L, VK_ENDDRAG, (PVOID) NULL);
+      hDrop = DrgDrag(hwnd, pDInfo, &DIcon, 1L, VK_ENDDRAG, (PVOID) NULL);
+      DeleteDragitemStrHandles(pDInfo); //
+      DrgDeleteDraginfoStrHandles (pDInfo);
       DrgFreeDraginfo(pDInfo);
       WinDestroyPointer(hptrINI);
@@ -1673 +1679 @@
         curitem++;
       }
+      rc = DeleteDragitemStrHandles(pDInfo); //
+
+      if(!rc)
+          Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                    "DrgDeleteDraginfoStrHandles");
       DrgDeleteDraginfoStrHandles(pDInfo);
-      DrgFreeDraginfo(pDInfo);
+      rc = DrgFreeDraginfo(pDInfo);
+      if(!rc)
+          Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                 "DrgFreeDraginfo");
     }
     return 0;