Changeset 561 for trunk/src/gui/kernel/qmime_win.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/kernel/qmime_win.cpp (modified) (22 diffs)

trunk/src/gui/kernel/qmime_win.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -171 +171 @@
             char szBuffer[4096];
             ULONG actualRead = 0;
-            LARGE_INTEGER pos = {0, 0};
+            LARGE_INTEGER pos = {{0, 0}};
             //Move to front (can fail depending on the data model implemented)
             HRESULT hr = s.pstm->Seek(pos, STREAM_SEEK_SET, NULL);
@@ -220 +220 @@
     \class QWindowsMime
     \brief The QWindowsMime class maps open-standard MIME to Window Clipboard formats.
-    \ingroup io
     \ingroup draganddrop
-    \ingroup misc
 
     Qt's drag-and-drop and clipboard facilities use the MIME standard.
@@ -282 +280 @@
 int QWindowsMime::registerMimeType(const QString &mime)
 {
-#ifdef Q_OS_WINCE
     int f = RegisterClipboardFormat(reinterpret_cast<const wchar_t *> (mime.utf16()));
-#else
-    int f = RegisterClipboardFormatA(mime.toLocal8Bit());
-#endif
     if (!f)
         qErrnoWarning("QWindowsMime::registerMimeType: Failed to register clipboard format");
@@ -402 +396 @@
 #if defined(QMIME_DEBUG) && !defined(Q_OS_WINCE)
             qDebug("QWindowsMime::allMimesForFormats()");
-            char buf[256] = {0};
-            GetClipboardFormatNameA(fmtetc.cfFormat, buf, 255);
-            qDebug("CF = %d : %s", fmtetc.cfFormat, buf);
+            wchar_t buf[256] = {0};
+            GetClipboardFormatName(fmtetc.cfFormat, buf, 255);
+            qDebug("CF = %d : %s", fmtetc.cfFormat, QString::fromWCharArray(buf));
 #endif
             for (int i=mimes.size()-1; i>=0; --i) {
@@ -505 +499 @@
             }
             res.truncate(ri);
-            const int byteLength = res.length()*2;
+            const int byteLength = res.length() * sizeof(ushort);
             QByteArray r(byteLength + 2, '\0');
             memcpy(r.data(), res.unicode(), byteLength);
@@ -550 +544 @@
         QByteArray data = getData(CF_UNICODETEXT, pDataObj);
         if (!data.isEmpty()) {
-            str = QString::fromUtf16((const unsigned short *)data.data());
+            str = QString::fromWCharArray((const wchar_t *)data.data());
             str.replace(QLatin1String("\r\n"), QLatin1String("\n"));
         } else {
@@ -621 +615 @@
                 QString fn = QDir::toNativeSeparators(urls.at(i).toLocalFile());
                 if (!fn.isEmpty()) {
-                    QT_WA({
-                        size += sizeof(TCHAR)*(fn.length()+1);
-                    } , {
-                        size += fn.toLocal8Bit().length()+1;
-                    });
+                    size += sizeof(ushort) * (fn.length() + 1);
                     fileNames.append(fn);
                 }
@@ -637 +627 @@
             char* files = ((char*)d) + d->pFiles;
 
-            QT_WA({
-                d->fWide = true;
-                TCHAR* f = (TCHAR*)files;
-                for (int i=0; i<fileNames.size(); i++) {
-                    int l = fileNames.at(i).length();
-                    memcpy(f, fileNames.at(i).utf16(), l*sizeof(TCHAR));
-                    f += l;
-                    *f++ = 0;
-                }
-                *f = 0;
-            } , {
-                d->fWide = false;
-                char* f = files;
-                for (int i=0; i<fileNames.size(); i++) {
-                    QByteArray c = fileNames.at(i).toLocal8Bit();
-                    if (!c.isEmpty()) {
-                        int l = c.length();
-                        memcpy(f, c.constData(), l);
-                        f += l;
-                        *f++ = 0;
-                    }
-                }
-                *f = 0;
-            });
+            d->fWide = true;
+            wchar_t* f = (wchar_t*)files;
+            for (int i=0; i<fileNames.size(); i++) {
+                int l = fileNames.at(i).length();
+                memcpy(f, fileNames.at(i).utf16(), l * sizeof(ushort));
+                f += l;
+                *f++ = 0;
+            }
+            *f = 0;
+
             return setData(result, pmedium);
         } else if (getCf(formatetc) == CF_INETURL_W) {
@@ -666 +642 @@
             QByteArray result;
             QString url = urls.at(0).toString();
-            result = QByteArray((const char *)url.utf16(), url.length() * 2);
+            result = QByteArray((const char *)url.utf16(), url.length() * sizeof(ushort));
             result.append('\0');
             result.append('\0');
@@ -721 +697 @@
             LPDROPFILES hdrop = (LPDROPFILES)data.data();
             if (hdrop->fWide) {
-                const ushort* filesw = (const ushort*)(data.data() + hdrop->pFiles);
-                int i=0;
+                const wchar_t* filesw = (const wchar_t *)(data.data() + hdrop->pFiles);
+                int i = 0;
                 while (filesw[i]) {
-                    QString fileurl = QString::fromUtf16(filesw+i);
+                    QString fileurl = QString::fromWCharArray(filesw + i);
                     urls += QUrl::fromLocalFile(fileurl);
                     i += fileurl.length()+1;
                 }
             } else {
-                const char* files = (const char*)data.data() + hdrop->pFiles;
+                const char* files = (const char *)data.data() + hdrop->pFiles;
                 int i=0;
                 while (files[i]) {
@@ -745 +721 @@
             if (data.isEmpty())
                 return QVariant();
-            return QUrl(QString::fromUtf16((const unsigned short *)data.constData()));
+            return QUrl(QString::fromWCharArray((const wchar_t *)data.constData()));
          } else if (canGetData(CF_INETURL, pDataObj)) {
             QByteArray data = getData(CF_INETURL, pDataObj);
@@ -853 +829 @@
             html = "<!--StartFragment-->" + html.mid(start, end - start);
             html += "<!--EndFragment-->";
-            html.replace("\r", "");
+            html.replace('\r', "");
             result = QString::fromUtf8(html);
         }
@@ -914 +890 @@
 QWindowsMimeImage::QWindowsMimeImage()
 {
-#ifdef Q_OS_WINCE
-    CF_PNG = RegisterClipboardFormat(reinterpret_cast<const wchar_t *> (QString::fromLatin1("PNG").utf16()));
-#else
-    CF_PNG = RegisterClipboardFormatA("PNG");
-#endif
+    CF_PNG = RegisterClipboardFormat(L"PNG");
 }
 
@@ -1115 +1087 @@
             }
             res.truncate(ri);
-            const int byteLength = res.length()*2;
+            const int byteLength = res.length() * sizeof(ushort);
             QByteArray r(byteLength + 2, '\0');
             memcpy(r.data(), res.unicode(), byteLength);
@@ -1155 +1127 @@
 #endif
             if (mimeType == QLatin1String("text/html") && preferredType == QVariant::String) {
-                // text/html is in wide chars on windows (compatible with mozillia)
-                val = QString::fromUtf16((const unsigned short *)data.data());
+                // text/html is in wide chars on windows (compatible with Mozilla)
+                val = QString::fromWCharArray((const wchar_t *)data.data());
             } else {
                 val = data; // it should be enough to return the data and let QMimeData do the rest.
@@ -1263 +1235 @@
     return formatetcs;
 }
-static const char *x_qt_windows_mime = "application/x-qt-windows-mime;value=\"";
-
-bool isCustomMimeType(const QString &mimeType)
+static const char x_qt_windows_mime[] = "application/x-qt-windows-mime;value=\"";
+
+static bool isCustomMimeType(const QString &mimeType)
 {
     return mimeType.startsWith(QLatin1String(x_qt_windows_mime), Qt::CaseInsensitive);
 }
 
-QString customMimeType(const QString &mimeType)
-{
-    int len = QString(QLatin1String(x_qt_windows_mime)).length();
+static QString customMimeType(const QString &mimeType)
+{
+    int len = sizeof(x_qt_windows_mime) - 1;
     int n = mimeType.lastIndexOf(QLatin1Char('\"'))-len;
     return mimeType.mid(len, n);
@@ -1281 +1253 @@
     if (isCustomMimeType(mimeType)) {
         QString clipFormat = customMimeType(mimeType);
-#ifdef Q_OS_WINCE
         int cf = RegisterClipboardFormat(reinterpret_cast<const wchar_t *> (clipFormat.utf16()));
-#else
-        int cf = RegisterClipboardFormatA(clipFormat.toLocal8Bit());
-#endif
         return canGetData(cf, pDataObj);
     } else if (formats.keys(mimeType).isEmpty()) {
@@ -1305 +1273 @@
         if (isCustomMimeType(mimeType)) {
             QString clipFormat = customMimeType(mimeType);
-#ifdef Q_OS_WINCE
             int cf = RegisterClipboardFormat(reinterpret_cast<const wchar_t *> (clipFormat.utf16()));
-#else
-            int cf = RegisterClipboardFormatA(clipFormat.toLocal8Bit());
-#endif
             data = getData(cf, pDataObj);
         } else if (formats.keys(mimeType).isEmpty()) {
@@ -1326 +1290 @@
 {
     QString format = formats.value(getCf(formatetc));
-    if (format.isEmpty()) {
-        QByteArray ba;
-        QString clipFormat;
-        int len;
-        QT_WA({
-            ba.resize(256*2);
-            len = GetClipboardFormatNameW(getCf(formatetc), (TCHAR*)ba.data(), 255);
-            if (len) 
-                clipFormat = QString::fromUtf16((ushort *)ba.data(), len);
-        } , {
-            ba.resize(256);
-            len = GetClipboardFormatNameA(getCf(formatetc), ba.data(), 255);
-            if (len)
-                clipFormat = QString::fromLocal8Bit(ba.data(), len);
-       });
-        if (len) {
+    if (!format.isEmpty())
+        return format;
+
+    wchar_t buffer[256];
+    int len = GetClipboardFormatName(getCf(formatetc), buffer, 256);
+
+    if (len) {
+        QString clipFormat = QString::fromWCharArray(buffer, len);
 #ifndef QT_NO_DRAGANDDROP
-            if (QInternalMimeData::canReadData(clipFormat))
-                format = clipFormat;
-            else if((formatetc.cfFormat >= 0xC000)){
-                //create the mime as custom. not registered.
-                if (!excludeList.contains(clipFormat, Qt::CaseInsensitive)) {
-                    //check if this is a mime type
-                    bool ianaType = false;
-                    int sz = ianaTypes.size();
-                    for (int i = 0; i < sz; i++) {
-                        if (clipFormat.startsWith(ianaTypes[i], Qt::CaseInsensitive)) {
-                            ianaType =  true;
-                            break;
-                        }
+        if (QInternalMimeData::canReadData(clipFormat))
+            format = clipFormat;
+        else if((formatetc.cfFormat >= 0xC000)){
+            //create the mime as custom. not registered.
+            if (!excludeList.contains(clipFormat, Qt::CaseInsensitive)) {
+                //check if this is a mime type
+                bool ianaType = false;
+                int sz = ianaTypes.size();
+                for (int i = 0; i < sz; i++) {
+                    if (clipFormat.startsWith(ianaTypes[i], Qt::CaseInsensitive)) {
+                        ianaType =  true;
+                        break;
                     }
-                    if (!ianaType)
-                        format = QLatin1String(x_qt_windows_mime) + clipFormat + QLatin1Char('\"');
-                    else
-                        format = clipFormat;
                 }
+                if (!ianaType)
+                    format = QLatin1String(x_qt_windows_mime) + clipFormat + QLatin1Char('\"');
+                else
+                    format = clipFormat;
             }
+        }
 #endif //QT_NO_DRAGANDDROP
-        }
-    }
+    }
+
     return format;
 }