Changeset 347 for trunk/src

Timestamp:

Nov 24, 2009, 3:02:54 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: mime: Unregister clipboard format atoms registered on behalf of mime converters upon destruction.

Location:

trunk/src/gui/kernel

Files:

• qmime.h (modified) (1 diff)
• qmime_pm.cpp (modified) (6 diffs)

trunk/src/gui/kernel/qmime.h

@@ -142 +142 @@
 
     static ULONG registerMimeType(const QString &mime);
+    static void unregisterMimeType(ULONG mimeId);
 
     static ULONG allocateMemory(size_t size);

trunk/src/gui/kernel/qmime_pm.cpp

@@ -169 +169 @@
 
 /*!
+    Unregisters the MIME type identified by \a id which was previously
+    registered with registerMimeType().
+*/
+// static
+void QPMMime::unregisterMimeType(ULONG mimeId)
+{
+    WinDeleteAtom(WinQuerySystemAtomTable(), mimeId);
+}
+
+/*!
     Allocates a block of shared memory of the given size and returns the address
     of this block. This memory block may be then filled with data and returned
@@ -366 +376 @@
 public:
     QPMMimeText();
+    ~QPMMimeText();
 
     // for converting from Qt
@@ -388 +399 @@
     , CF_TextHtml (registerMimeType(QLatin1String("text/html")))
 {
+}
+
+QPMMimeText::~QPMMimeText()
+{
+    unregisterMimeType(CF_TextHtml);
+    unregisterMimeType(CF_TextUnicode);
 }
 
@@ -645 +662 @@
 public:
     QPMMimeAnyMime();
+    ~QPMMimeAnyMime();
 
     // for converting from Qt
@@ -692 +710 @@
 }
 
+QPMMimeAnyMime::~QPMMimeAnyMime()
+{
+    foreach(ULONG cf, cfMap.values())
+        unregisterMimeType(cf);
+}
+
 QList<QPMMime::MimeCFPair> QPMMimeAnyMime::formatsForMimeData(const QMimeData *mimeData) const
 {
@@ -819 +843 @@
     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] = format;
-            mimeMap[format] = mime;
+            cfMap[mime] = cf;
+            mimeMap[cf] = mime;
         }
     }