Changeset 8555 for trunk/src

Timestamp:

Jun 3, 2002, 9:25:41 AM (23 years ago)

Author:

sandervl

Message:

Drag and drop fixes

Location:

trunk/src

Files:

• ole32/ole2.c (modified) (1 diff)
• user32/pmwindow.cpp (modified) (2 diffs)

trunk/src/ole32/ole2.c

@@ -402 +402 @@
   if (dropTargetInfo==NULL)
     return DRAGDROP_E_NOTREGISTERED;
+
+#ifdef __WIN32OS2__
+  //just in case dragleave wasn't called...
+  if(dropTargetInfo->hDrop) {
+      GlobalFree(dropTargetInfo->hDrop);
+  }
+  if(dropTargetInfo->pDataObject) {
+      IDataObject_Release(dropTargetInfo->pDataObject);
+  }
+#endif
 
   /*

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.176 2002-06-02 19:34:28 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.177 2002-06-03 07:25:13 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -862 +862 @@
             POINT point = {sxDrop, syDrop};
             if(DragDropFiles(win32wnd->getWindowHandle(), point, cItems, pszFiles, ulBytes) == FALSE) {
-                    rc = (MRFROM2SHORT (DOR_NEVERDROP, 0));
-            }
-            else    rc = (MRFROM2SHORT(DOR_DROP, DO_MOVE));
+                rc = (MRFROM2SHORT (DOR_NEVERDROP, 0));
+            }
+            else {
+                rc = (MRFROM2SHORT(DOR_DROP, DO_MOVE));
+                win32wnd->setDragDropActive(FALSE);
+            }
             free(pszFiles);
         }