Changeset 473

Timestamp:

Jan 25, 2010, 8:52:56 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Fixed: Dropping from Qt apps to some bogus apps (e.g. EPM) didn't work because of the wrong message flow.

File:

• trunk/src/gui/kernel/qdnd_pm.cpp (modified) (6 diffs)

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -799 +799 @@
     bool isExclusive() const { return true; }
     ULONG itemCount() const { return 0; }
-    HWND hwnd() const;
+    HWND hwnd() const
     DRAGINFO *createDragInfo(const QString &targetName, USHORT supportedOps);
 
@@ -807 +807 @@
 private:
     QList<DragWorker*> workers;
-    // todo check workers!
-    //QPtrList<DragWorker> workers;
     DRAGINFO *info;
 };
@@ -944 +942 @@
 }
 
-HWND QPMCoopDragWorker::hwnd() const
-{
-    if (!workers.count()) {
-        // The drag source doesn't provide any format; will handle it ourselves
-    } else {
-        DragWorker *firstWorker = workers.first();
-        if (firstWorker->isExclusive() && firstWorker->itemCount() == 0) {
-            // this is a super exclusive worker that will do everything on its own
-            return firstWorker->hwnd();
-        }
-    }
-
-    return QPMObjectWindow::hwnd();
-}
-
 void QPMCoopDragWorker::init()
 {
@@ -1005 +988 @@
         }
 
-        item->hwndItem = hwnd();
+        item->hwndItem = ;
         item->ulItemID = 0;
         item->hstrType = 0;
@@ -1140 +1123 @@
         ULONG itemCnt = DrgQueryDragitemCount(info);
         ULONG index = 0;
-        for (; index <  itemCnt; ++index)
+        for (; index < itemCnt; ++index)
             if (DrgQueryDragitemPtr(info, index) == xfer->pditem)
                 break;
@@ -1172 +1155 @@
     }
 
-    if (msg == DM_RENDER || msg == DM_ENDCONVERSATION) {
-        DEBUG(() << "Drop target sent DM_RENDER or DM_ENDCONVERSATION to the "
-                    "drag source window instead of the drag item window!");
-        if (msg == DM_RENDER) {
-            // free the given DRAGTRANSFER structure to avoud memory leak
-            DRAGTRANSFER *xfer = (DRAGTRANSFER *)mp1;
-            if (xfer)
-                qt_DrgFreeDragtransfer(xfer);
+    if (msg == DM_RENDER) {
+        DEBUG(() << "Drop target sent DM_RENDER to the drag source window "
+                    "instead of the drag item window, will try to forward!");
+        DRAGTRANSFER *xfer = (DRAGTRANSFER *)mp1;
+        Q_ASSERT(xfer && xfer->pditem);
+        if (xfer && xfer->pditem &&
+            xfer->pditem->hwndItem && xfer->pditem->hwndItem != hwnd())
+            return WinSendMsg(xfer->pditem->hwndItem, msg, mp1, mp2);
+    }
+    else
+    if (msg == DM_ENDCONVERSATION) {
+        DEBUG(() << "Drop target sent DM_CONVERSATION to the drag source window "
+                    "instead of the drag item window, will try to forward!");
+        if (info) {
+            ULONG itemId = LONGFROMMP(mp1);
+            // find the item by ID
+            ULONG itemCnt = DrgQueryDragitemCount(info);
+            for (ULONG index = 0; index < itemCnt; ++index) {
+                PDRAGITEM item = DrgQueryDragitemPtr(info, index);
+                if (item->ulItemID == itemId &&
+                    item->hwndItem && item->hwndItem != hwnd())
+                    return WinSendMsg(item->hwndItem, msg, mp1, mp2);
+            }
         }
     }