Changeset 470 for trunk/src/gui/kernel

Timestamp:

Jan 23, 2010, 3:44:11 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Added support for dragging empty QMimeData with no formats (used in particular by QDesigner for in-process drag and drop).

Location:

trunk/src/gui/kernel

Files:

• qdnd_pm.cpp (modified) (1 diff)
• qmime_pm.cpp (modified) (10 diffs)

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -913 +913 @@
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #if defined(QDND_DEBUG)
     foreach (DragWorker *wrk, workers) {

trunk/src/gui/kernel/qmime_pm.cpp

@@ -365 +365 @@
         return formats;
 
-    // DRM_SHAREDMEM comes first to prevent native DRM_OS2FILE
-    // rendering on the target side w/o involving the source.
-    // Also, we add <DRM_SHAREDMEM,DRF_POINTERDATA> just like WPS does it
-    // (however, it doesn't help when dropping objects to it -- WPS still
-    // chooses DRM_OS2FILE).
-    formats = "(DRM_SHAREDMEM,DRM_OS2FILE)x(" + formats + "),"
-              "<DRM_SHAREDMEM,DRF_POINTERDATA>";
+    if (qstrcmp(formats, "DRF_NULL") == 0) {
+        // special case, see QPMMimeAnyMime::dragWorkerFor()
+        formats = "<DRM_NULL," + formats + ">";
+    } else {
+        // DRM_SHAREDMEM comes first to prevent native DRM_OS2FILE
+        // rendering on the target side w/o involving the source.
+        // Also, we add <DRM_SHAREDMEM,DRF_POINTERDATA> just like WPS does it
+        // (however, it doesn't help when dropping objects to it -- WPS still
+        // chooses DRM_OS2FILE).
+        formats = "(DRM_SHAREDMEM,DRM_OS2FILE)x(" + formats + "),"
+                  "<DRM_SHAREDMEM,DRF_POINTERDATA>";
+    }
 
     DEBUG(() << "DefaultDragWorker: formats" << formats
@@ -477 +482 @@
                  << req->provider);
 
-        // We would lile to post WM_USER to ourselves to do actual rendering
+        // We would lie to post WM_USER to ourselves to do actual rendering
         // after we return from DM_RENDER. But we are inside DrgDrag() at this
         // point (our DND implementation is fully synchronous by design), so
@@ -483 +488 @@
         // DrgDrag(). Thus, we have to send it.
 
-        WinSendMsg(hwnd(), WM_USER, MPFROMLONG(xfer->pditem->ulItemID),
-                                     MPFROMP(req));
+        WinSendMsg(hwnd(), WM_USER,
+                    MPFROMP(req));
 
         return (MRESULT)TRUE;
@@ -827 +832 @@
     if (!provider)
         return ret;
+
+
+
+
+
 
     QByteArray drf = provider->drf(mimeType);
@@ -1117 +1127 @@
                                              Provider *provider)
 {
-    Q_ASSERT(!mimeType.isEmpty() && provider);
-    if (!mimeType.isEmpty() && provider && !d->exclusive) {
+    // note: as a special case, mimeType may be null (see
+    // QPMCoopDragWorker::collectWorkers())
+
+    Q_ASSERT(provider);
+    if (provider && !d->exclusive) {
         // ensure there are no dups (several providers for the same mime)
         if (!d->providerFor(mimeType))
@@ -1291 +1304 @@
 {
     ULONG cf = WinAddAtom(WinQuerySystemAtomTable(), mime.toLocal8Bit());
-    if (!cf) {
 #ifndef QT_NO_DEBUG
+
         qWarning("QPMMime: WinAddAtom failed with 0x%lX",
                  WinGetLastError(NULLHANDLE));
 #endif
-        return 0;
-    }
 
     return cf;
@@ -2723 +2734 @@
                                                QString &type, QString &ext)
 {
-    // file type = mime
-    type = format(drf);
-    Q_ASSERT(!type.isEmpty());
+    if (qstrcmp(drf, "DRF_NULL") == 0) {
+        // special case (see QPMMimeAnyMime::dragWorkerFor())
+        type = QString::null;
+    } else {
+        // file type = mime
+        type = format(drf);
+        Q_ASSERT(!type.isEmpty());
+    }
 
     // no way to determine the extension
@@ -2759 +2775 @@
                                                    QMimeData *mimeData)
 {
+
+
+
+
+
+
+
+
+
+
+
+
     ULONG cf = cfMap.value(mimeType);
     if (!cf)
@@ -2788 +2816 @@
         DefaultDropWorker *defWorker = defaultDropWorker();
         bool atLeastOneSupported = false;
+
+
+
+
+
+
+
+
+
+
 
         // check that we support one of DRMs and the format is CF_hhhhhhh
@@ -2864 +2902 @@
     if (atomStr.startsWith(mimePrefix)) {
         // the format represents the mime type we can recognize
-        // increase the reference count
-        ULONG cf = QPMMime::registerMimeType(atomStr);
-        Q_ASSERT(cf == format);
         // extract the real mime type (w/o our prefix)
         mime = atomStr.mid(mimePrefix.size());
+
         if (!mime.isEmpty()) {
+
+
+
             cfMap[mime] = cf;
             mimeMap[cf] = mime;