Changeset 21634 for trunk/src

Timestamp:

Jun 11, 2011, 1:18:08 PM (14 years ago)

Author:

dmik

Message:

ole32: Fixed a crash when dragging an object that doesn't support CF_TEXT or CF_HDROP over an OS/2 (non-Odin) window (#107).

File:

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

trunk/src/ole32/ole2.c

@@ -3537 +3537 @@
     if(ret != S_OK) {
         dprintf(("IDataObject_GetData failed (fatal) with %x", ret));
+        if(pdwEffect) {
+            *pdwEffect = DROPEFFECT_NONE;
+        }
         return ret;
     }
@@ -3555 +3558 @@
     dprintf(("IDropTarget_fnDragOver %x (%d,%d)", grfKeyState, pt.x, pt.y));
 
+    if (!This->lpDragStruct) {
+        dprintf(("IDropTarget_fnDragOver: fnDragEnter failed"));
+        if(pdwEffect) {
+            *pdwEffect = DROPEFFECT_NONE;
+        }
+        return S_OK;
+    }
+
     dwEffect = OSLibDragOver(This->lpDragStruct, pt.x, pt.y);
     if(pdwEffect) {
@@ -3568 +3579 @@
 
     dprintf(("IDropTarget_fnDragLeave"));
+
+    if (!This->lpDragStruct) {
+        dprintf(("IDropTarget_fnDragLeave: fnDragEnter failed"));
+        return S_OK;
+    }
 
     OSLibDragLeave(This->lpDragStruct);
@@ -3583 +3599 @@
 
     dprintf(("IDropTarget_fnDrop %x (%d,%d) %s", grfKeyState, pt.x, pt.y, This->lpOS2StringData));
+
+    if (!This->lpDragStruct) {
+        dprintf(("IDropTarget_fnDrop: fnDragEnter failed"));
+        if(pdwEffect) {
+            *pdwEffect = DROPEFFECT_NONE;
+        }
+        return S_OK;
+    }
 
     dwEffect = OSLibDragDrop(This->lpDragStruct, pt.x, pt.y, This->lpOS2StringData);