Changeset 618 for trunk/dll/inis.c

Timestamp:

Apr 20, 2007, 9:19:03 PM (18 years ago)

Author:

Steven Levine

Message:

Add more drag/drop error checking
Use FreeDragInfoData
Sync with NumItemsToUnhilite AcceptOneDrop GetOneDrop mods

File:

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

trunk/dll/inis.c

@@ -18 +18 @@
   06 Apr 07 GKY Work around PM DragInfo and DrgFreeDISH limits
   06 Apr 07 GKY Add some error checking in drag/drop
+  19 Apr 07 SHL Use FreeDragInfoData.  Add more drag/drop error checks.
 
 ***********************************************************************/
@@ -1572 +1573 @@
       DrgSetDragitem(pDInfo, &DItem, sizeof(DRAGITEM), 0L);
       hDrop = DrgDrag(hwnd, pDInfo, &DIcon, 1L, VK_ENDDRAG, (PVOID) NULL);
-      DeleteDragitemStrHandles(pDInfo); //
-      DrgDeleteDraginfoStrHandles (pDInfo);
-      DrgFreeDraginfo(pDInfo);
+      if (hDrop == NULLHANDLE)
+        FreeDragInfoData(hwnd, pDInfo);
       WinDestroyPointer(hptrINI);
     }
@@ -1582 +1582 @@
     {
       PDRAGINFO pDInfo = (PDRAGINFO) mp1;
-      PDRAGITEM pDItem;         /* Pointer to DRAGITEM   */
-
-      DrgAccessDraginfo(pDInfo);        /* Access DRAGINFO       */
-      pDItem = DrgQueryDragitemPtr(pDInfo,      /* Access DRAGITEM       */
-                                   0);  /* Index to DRAGITEM     */
-      if (DrgVerifyRMF(pDItem,          /* Check valid rendering */
-                       DRM_OS2FILE,     /* mechanisms and data   */
-                       NULL)) {
-        DrgFreeDraginfo(pDInfo);        /* Free DRAGINFO         */
-        return (MRFROM2SHORT(DOR_DROP,  /* Return okay to drop   */
-                             DO_LINK));
-      }
-      else if (DrgVerifyRMF(pDItem, DRM_FM2INIRECORD, DRF_FM2INI)) {
-        if (WinQueryWindow(pDInfo->hwndSource, QW_PARENT) ==
-            WinQueryWindow(hwnd, QW_PARENT)) {
+      PDRAGITEM pDItem;
+
+      if (!DrgAccessDraginfo(pDInfo)) {
+        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  "DrgAccessDraginfo");
+      }
+      else {
+        pDItem = DrgQueryDragitemPtr(pDInfo,0);
+        /* Check valid rendering mechanisms and data */
+        if (DrgVerifyRMF(pDItem, DRM_OS2FILE, NULL)) {
           DrgFreeDraginfo(pDInfo);
-          return MRFROM2SHORT(DOR_NEVERDROP, 0);
-        }
-        DrgFreeDraginfo(pDInfo);        /* Free DRAGINFO         */
-        return (MRFROM2SHORT(DOR_DROP, ((fCopyDefault) ? DO_COPY : DO_MOVE)));
-      }
-      DrgFreeDraginfo(pDInfo);          /* Free DRAGINFO         */
-      return MRFROM2SHORT(DOR_NEVERDROP, 0);
-    }
+          return (MRFROM2SHORT(DOR_DROP, DO_LINK));     /* OK to drop */
+        }
+        else if (DrgVerifyRMF(pDItem, DRM_FM2INIRECORD, DRF_FM2INI)) {
+          if (WinQueryWindow(pDInfo->hwndSource, QW_PARENT) !=
+              WinQueryWindow(hwnd, QW_PARENT))
+          {
+            DrgFreeDraginfo(pDInfo);
+            return (MRFROM2SHORT(DOR_DROP, ((fCopyDefault) ? DO_COPY : DO_MOVE)));
+          }
+        }
+        DrgFreeDraginfo(pDInfo);
+      }
+    }
+    return MRFROM2SHORT(DOR_NEVERDROP, 0);
 
   case DM_DRAGLEAVE:
@@ -1615 +1616 @@
       PDRAGINFO pDInfo = (PDRAGINFO) mp1;
       PDRAGITEM pDItem;         /* Pointer to DRAGITEM   */
-      ULONG numitems, curitem = 0L, len;
+      ULONG numitems, curitem, len;
       USHORT action;
       CHAR szFrom[CCHMAXPATH + 2], szDir[CCHMAXPATH + 1],
@@ -1622 +1623 @@
       INIREC inirec;
 
-      DrgAccessDraginfo(pDInfo);        /* Access DRAGINFO       */
+      if (!DrgAccessDraginfo(pDInfo)) {
+        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  "DrgAccessDraginfo");
+        return 0;
+      }
       numitems = DrgQueryDragitemCount(pDInfo);
-      while (curitem < numitems) {
+      for (curitem = 0; curitem < numitems; curitem++) {
         pDItem = DrgQueryDragitemPtr(pDInfo, curitem);
         if (DrgVerifyRMF(pDItem, DRM_OS2FILE, NULL)) {
@@ -1677 +1682 @@
                              MPFROMLONG(DMFL_TARGETFAIL));
         }
-        curitem++;
-      }
-      rc = DeleteDragitemStrHandles(pDInfo); //
-
-      if(!rc)
-          Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                    "DrgDeleteDraginfoStrHandles");
-      DrgDeleteDraginfoStrHandles(pDInfo);
-      rc = DrgFreeDraginfo(pDInfo);
-      if(!rc)
-          Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                 "DrgFreeDraginfo");
+      } // for
+      FreeDragInfoData(hwnd, pDInfo);
     }
     return 0;
@@ -1697 +1692 @@
     hwndPopup = (HWND) 0;
     break;
-  }
+  } // switch
   if (oldproc)
     return oldproc(hwnd, msg, mp1, mp2);