Changeset 331 for trunk/src/gui/kernel

Timestamp:

Nov 20, 2009, 2:50:32 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: QClipboard: Don't open clipboard in response to WM_RENDERFORMAT and WM_RENDERALLFMTS as it obviously causes a deadlock. Simplify the code by reducing the number of methods.

File:

• trunk/src/gui/kernel/qclipboard_pm.cpp (modified) (15 diffs)

trunk/src/gui/kernel/qclipboard_pm.cpp

@@ -58 +58 @@
 #include "private/qpmobjectwindow_pm_p.h"
 
-#define QCLIPBOARD_DEBUG
+#define QCLIPBOARD_DEBUG
 
 #ifdef QCLIPBOARD_DEBUG
-#include "qdebug.h"
+#   include "qdebug.h"
+#   define DEBUG(a) qDebug a
+#else
+#   define DEBUG(a) do {} while(0)
 #endif
 
@@ -173 +176 @@
     void setAsClipboardViewer();
     bool ownsClipboard();
-    void renderAllFormats(bool isDelayed);
+    void putAllMimeToClipboard(bool isDelayed);
+    void flushClipboard();
 
     static QClipboardData *instance()
@@ -191 +195 @@
 
 private:
-    bool openClipboard();
-    void closeClipboard();
     bool setClipboard(QPMMime *converter, ULONG format, bool isDelayed);
-    void renderFormat(ULONG format);
 
     MRESULT message(ULONG msg, MPARAM mp1, MPARAM mp2);
@@ -218 +219 @@
 QClipboardData::~QClipboardData()
 {
-    renderAllFormats(false);
     setSource(0);
 
@@ -237 +237 @@
     if (src)
         matches = QPMMime::allConvertersFromMimeData(src);
+
+
+
+
+
+
+
+
+
 }
 
 void QClipboardData::setAsClipboardViewer()
 {
+
+
     HWND clipboardViewer = WinQueryClipbrdViewer(NULLHANDLE);
     if (hwnd() != clipboardViewer) {
@@ -259 +270 @@
 }
 
-bool QClipboardData::openClipboard()
-{
-    if (!WinOpenClipbrd(NULLHANDLE)) {
-#ifndef QT_NO_DEBUG
-        qWarning("QClipboardData::openClipboard: WinOpenClipbrd "
-                 "failed with 0x%lX", WinGetLastError(NULLHANDLE));
-#endif
-        return false;
-    }
-    return true;
-}
-
-void QClipboardData::closeClipboard()
-{
-    WinCloseClipbrd(NULLHANDLE);
-}
-
 bool QClipboardData::setClipboard(QPMMime *converter, ULONG format,
                                   bool isDelayed)
@@ -283 +277 @@
         return false;
 
-    bool ok;
+    bool ok;
     ULONG flags = 0, data = 0;
 
@@ -291 +285 @@
         if (ok) {
             WinSetClipbrdOwner(NULLHANDLE, hwnd());
-            WinSetClipbrdData(NULLHANDLE, 0, format, flags);
+            WinSetClipbrdData(NULLHANDLE, 0, format, flags);
         }
     } else {
@@ -297 +291 @@
         ok = converter->convertFromMimeData(src, format, flags, &data);
         if (ok)
-            WinSetClipbrdData(NULLHANDLE, data, format, flags);
-    }
-#ifdef QCLIPBOARD_DEBUG
-    qDebug("QClipboardData::setClipboard: convert to CF 0x%lX, flags 0x%lX,"
-           "data 0x%lX, delayed %d, ok %d", format, flags, data, isDelayed, ok);
-#endif
-
-    return ok;
-}
-
-void QClipboardData::renderFormat(ULONG format)
-{
-#ifdef QCLIPBOARD_DEBUG
-    qDebug("QClipboardData::renderFormat: CF 0x%lX", format);
-#endif
-
-    if (!src)
+            ok2 = WinSetClipbrdData(NULLHANDLE, data, format, flags);
+    }
+    DEBUG(("QClipboardData::setClipboard: convert to CF 0x%lX flags 0x%lX "
+           "data 0x%lX delayed %d ok %d", format, flags, data, isDelayed, ok));
+#ifndef QT_NO_DEBUG
+    if (!ok2) {
+        qWarning("QClipboardData::setClipboard: WinSetClipbrdData "
+                 "failed with 0x%lX", WinGetLastError(NULLHANDLE));
+    }
+#endif
+
+    return ok && ok2;
+}
+
+void QClipboardData::putAllMimeToClipboard(bool isDelayed)
+{
+    DEBUG(() << "QClipboardData::putAllMimeToClipboard: isDelayed" << isDelayed);
+
+    if (!WinOpenClipbrd(NULLHANDLE)) {
+#ifndef QT_NO_DEBUG
+        qWarning("QClipboardData::putAllMimeToClipboard: WinOpenClipbrd "
+                 "failed with 0x%lX", WinGetLastError(NULLHANDLE));
+#endif
         return;
-
-    if (!openClipboard())
-        return;
-
-    foreach(QPMMime::Match match, matches) {
-        if (match.format == format) {
-            setClipboard(match.converter, match.format, false);
-            break;
-        }
-    }
-
-    closeClipboard();
-}
-
-void QClipboardData::renderAllFormats(bool isDelayed)
-{
-#ifdef QCLIPBOARD_DEBUG
-    qDebug() << "QClipboardData::renderAllFormats: isDelayed" << isDelayed;
-#endif
-
-    if (!openClipboard())
-        return;
+    }
 
     // delete the clipboard contents before we render everything to make sure
@@ -345 +324 @@
     if (!ok) {
 #ifndef QT_NO_DEBUG
-        qWarning("QClipboardData::renderAllFormats: WinEmptyClipbrd "
+        qWarning("QClipboardData::: WinEmptyClipbrd "
                  "failed with 0x%lX", WinGetLastError(NULLHANDLE));
 #endif
+
         return;
     }
 
     if (src) {
-#ifdef QCLIPBOARD_DEBUG
-        qDebug() << "QClipboardData::renderAllFormats: mimes" << src->formats();
-#endif
         foreach(QPMMime::Match match, matches)
             setClipboard(match.converter, match.format, isDelayed);
     }
 
-    closeClipboard();
+    WinCloseClipbrd(NULLHANDLE);
+}
+
+void QClipboardData::flushClipboard()
+{
+    if (ownsClipboard()) {
+        putAllMimeToClipboard(false);
+        // make sure we won't be doing this again if asked in WM_RENDERALLFMTS
+        setSource(0);
+    }
 }
 
 MRESULT QClipboardData::message(ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-#ifdef QCLIPBOARD_DEBUG
-    qDebug("QClipboardData::message: msg %08lX, mp1 %p, mp2 %p",
-           msg, mp1, mp2);
-#endif
+    DEBUG(("QClipboardData::message: msg %08lX, mp1 %p, mp2 %p",
+           msg, mp1, mp2));
 
     switch (msg) {
 
         case WM_DRAWCLIPBOARD: {
+
+
             // ask QClipboard to emit changed() signals
             QClipboardEvent e(reinterpret_cast<QEventPrivate *>(1));
@@ -391 +377 @@
                     prevClipboardViewer = NULLHANDLE;
             }
-            break;
-        }
-
-        case WM_DESTROYCLIPBOARD:
+        }
+        break;
+
+        case WM_DESTROYCLIPBOARD: {
+            DEBUG(("QClipboardData::message: WM_DESTROYCLIPBOARD:"));
             if (!ignore_WM_DESTROYCLIPBOARD)
                 setSource(0);
-            break;
-
-        case WM_RENDERFMT:
-            renderFormat((ULONG)mp1);
-            break;
-
-        case WM_RENDERALLFMTS:
-            renderAllFormats(false);
-            break;
+        }
+        break;
+
+        case WM_RENDERFMT: {
+            DEBUG(("QClipboardData::message: WM_RENDERFMT: CF 0x%lX", (ULONG)mp1));
+            if (src) {
+                foreach(QPMMime::Match match, matches) {
+                    if (match.format == (ULONG)mp1) {
+                        setClipboard(match.converter, match.format, false);
+                        break;
+                    }
+                }
+            }
+        }
+        break;
+
+        case WM_RENDERALLFMTS: {
+            DEBUG(("QClipboardData::message: WM_RENDERALLFMTS:"));
+            if (src) {
+                foreach(QPMMime::Match match, matches)
+                    setClipboard(match.converter, match.format, false);
+            }
+        }
+        break;
 
         default:
@@ -411 +413 @@
     }
 
-    return (MRESULT)TRUE;
+    DEBUG(("QClipboardData::message: END"));
+    return FALSE;
 }
 
@@ -423 +426 @@
 void QClipboard::setMimeData(QMimeData *src, Mode mode)
 {
-#ifdef QCLIPBOARD_DEBUG
-    qDebug() << "QClipboard::setMimeData: src" << src << "mode" << mode;
-#endif
+    DEBUG(() << "QClipboard::setMimeData: src" << src << "mode" << mode);
 
     if (mode != Clipboard) {
@@ -441 +442 @@
     bool runsEventLoop = d_func()->threadData->loopLevel != 0;
 
-    d->renderAllFormats(runsEventLoop);
+    d->(runsEventLoop);
 }
 
@@ -456 +457 @@
     if (!((QClipboardEvent*)e)->data()) {
         // this is sent by QApplication to render all formats at app shut down
-        QClipboardData::instance()->renderAllFormats(false);
+        QClipboardData::instance()->);
     } else {
         // this is sent by QClipboardData to notify about clipboard data change