Changeset 8720 for trunk/src

Timestamp:

Jun 19, 2002, 7:37:20 PM (23 years ago)

Author:

sandervl

Message:

drag 'n drop fixes

File:

• trunk/src/ole32/ole2.c (modified) (6 diffs)

trunk/src/ole32/ole2.c

@@ -61 +61 @@
   DWORD         dwEffect;
   IDataObject * pDataObject;
-  HDROP         hDrop;
 #endif
   struct tagDropTargetNode* prevDropTarget;
@@ -361 +360 @@
 
 #ifdef __WIN32OS2__
-  dropTargetInfo->hDrop          = 0;
   dropTargetInfo->pDataObject    = NULL;
   dropTargetInfo->fDragEnter     = FALSE;
@@ -410 +408 @@
 
 #ifdef __WIN32OS2__
-  //just in case dragleave wasn't called...
-  if(dropTargetInfo->hDrop) {
-      GlobalFree(dropTargetInfo->hDrop);
-  }
   if(dropTargetInfo->pDataObject) {
       IDataObject_Release(dropTargetInfo->pDataObject);
@@ -2837 +2831 @@
     if(GetKeyState(VK_MBUTTON) & 0x8000) keyState |= MK_MBUTTON;
 
+    /* Note: It's the application's responsibility to free hDrop */
+    /* TODO: Possible memory leak if app never calls GetData */
     fe.cfFormat = CF_HDROP;
     fe.ptd      = NULL;
@@ -2850 +2846 @@
     pTarget->dwEffect   = dwEffect;
 
-    //just in case dragleave wasn't called...
-    if(pTarget->hDrop) {
-        GlobalFree(pTarget->hDrop);
-    }
     if(pTarget->pDataObject) {
         IDataObject_Release(pTarget->pDataObject);
     }
 
-    pTarget->hDrop      = hDrop;
     pTarget->pDataObject = IDataObject_Constructor();
     IDataObject_SetData(pTarget->pDataObject, &fe, &medium, TRUE);
@@ -2876 +2867 @@
     }
     pTarget->fDragEnter = FALSE;
-    if(pTarget->hDrop) {
-        GlobalFree(pTarget->hDrop);
-        pTarget->hDrop = 0;
-    }
     if(pTarget->pDataObject) {
         IDataObject_Release(pTarget->pDataObject);