Changeset 561 for trunk/src/gui/image/qpixmap_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/image/qpixmap_win.cpp (modified) (16 diffs)

trunk/src/gui/image/qpixmap_win.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -60 +60 @@
 #include "qt_windows.h"
 
-#if defined(Q_OS_WINCE)
+#if defined(Q_S_WINCE)
 #include <winbase.h>
 #include "qguifunctions_wince.h"
@@ -81 +81 @@
     if (h < 0) h = r.bottom - r.top;
 
-#ifdef Q_OS_WINCE_WM
+#ifdef Q_S_WINCE_WM
     if (qt_wince_is_pocket_pc()) {
         QWidget *widget = QWidget::find(winId);
@@ -102 +102 @@
     HDC window_dc = GetDC(winId);
     BitBlt(bitmap_dc, 0, 0, w, h, window_dc, x, y, SRCCOPY
-#ifndef Q_OS_WINCE
+#ifndef Q_S_WINCE
                                     | CAPTUREBLT
 #endif
@@ -120 +120 @@
 }
 
-
-
-/*!
-    \enum QPixmap::HBitmapFormat
-
-    This enum defines how the conversion between \c HBITMAP
-    and QPixmap is performed.
-
-    \warning This enum is only available on Windows.
-
-    \value NoAlpha The alpha channel is ignored and always treated as
-    being set to fully opaque. This is preferred if the \c HBITMAP is
-    used with standard GDI calls, such as \c BitBlt().
-
-    \value PremultipliedAlpha The \c HBITMAP is treated as having an
-    alpha channel and premultiplied colors. This is preferred if the
-    \c HBITMAP is accessed through the \c AlphaBlend() GDI function.
-
-    \value Alpha The \c HBITMAP is treated as having a plain alpha
-    channel. This is the preferred format if the \c HBITMAP is going
-    to be used as an application icon or systray icon.
-
-    \sa fromWinHBITMAP(), toWinHBITMAP()
-*/
-
-/*!
-    Creates a \c HBITMAP equivalent to the QPixmap, based on the given
-    \a format. Returns the \c HBITMAP handle.
-
-    It is the caller's responsibility to free the \c HBITMAP data
-    after use.
-
-    \warning This function is only available on Windows.
-
-    \sa fromWinHBITMAP()
-*/
 HBITMAP QPixmap::toWinHBITMAP(HBitmapFormat format) const
 {
+
+
+
     HBITMAP bitmap = 0;
     if (data->classId() == QPixmapData::RasterClass) {
-        QRasterPixmapData* d = static_cast<QRasterPixmapData*>(data);
+        QRasterPixmapData* d = static_cast<QRasterPixmapData*>(data);
         int w = d->image.width();
         int h = d->image.height();
@@ -210 +177 @@
 }
 
-/*!
-    Returns a QPixmap that is equivalent to the given \a bitmap. The
-    conversion is based on the specified \a format.
-
-    \warning This function is only available on Windows.
-
-    \sa toWinHBITMAP(), {QPixmap#Pixmap Conversion}{Pixmap Conversion}
-
-*/
 QPixmap QPixmap::fromWinHBITMAP(HBITMAP bitmap, HBitmapFormat format)
 {
@@ -225 +183 @@
     memset(&bitmap_info, 0, sizeof(BITMAP));
 
-    int res;
-    QT_WA({
-            res = GetObjectW(bitmap, sizeof(BITMAP), &bitmap_info);
-        } , {
-              res = GetObjectA(bitmap, sizeof(BITMAP), &bitmap_info);
-          });
-
+    int res = GetObject(bitmap, sizeof(BITMAP), &bitmap_info);
     if (!res) {
         qErrnoWarning("QPixmap::fromWinHBITMAP(), failed to get bitmap info");
@@ -288 +240 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #ifdef Q_WS_WIN
-#ifndef Q_OS_WINCE
+#ifndef Q_S_WINCE
 
 static QImage qt_fromWinHBITMAP(HDC hdc, HBITMAP bitmap, int w, int h)
@@ -320 +310 @@
         qWarning("qt_fromWinHBITMAP(), failed to get bitmap bits");
     }
+
 
     return image;
 }
 
-QPixmap convertHIconToPixmap( const HICON icon)
+QPixmap HICON icon)
 {
     bool foundAlpha = false;
@@ -334 +325 @@
     bool result = GetIconInfo(icon, &iconinfo); //x and y Hotspot describes the icon center
     if (!result)
-        qWarning("convertHIconToPixmap(), failed to GetIconInfo()");
+        qWarning("(), failed to GetIconInfo()");
 
     int w = iconinfo.xHotspot * 2;
@@ -392 +383 @@
     return QPixmap::fromImage(image);
 }
-#else //ifndef Q_OS_WINCE
-QPixmap convertHIconToPixmap( const HICON icon, bool large)
+#else //ifndef Q_S_WINCE
+QPixmap )
 {
     HDC screenDevice = GetDC(0);
@@ -399 +390 @@
     ReleaseDC(0, screenDevice);
 
-    int size = large ? 64 : 32;
+    ICONINFO iconinfo;
+    bool result = GetIconInfo(icon, &iconinfo);
+    if (!result)
+        qWarning("QPixmap::fromWinHICON(), failed to GetIconInfo()");
+
+    int w = 0;
+    int h = 0;
+    if (!iconinfo.xHotspot || !iconinfo.yHotspot) {
+        // We could not retrieve the icon size via GetIconInfo,
+        // so we try again using the icon bitmap.
+        BITMAP bm;
+        int result = GetObject(iconinfo.hbmColor, sizeof(BITMAP), &bm);
+        if (!result) result = GetObject(iconinfo.hbmMask, sizeof(BITMAP), &bm);
+        if (!result) {
+            qWarning("QPixmap::fromWinHICON(), failed to retrieve icon size");
+            return QPixmap();
+        }
+        w = bm.bmWidth;
+        h = bm.bmHeight;
+    } else {
+        // x and y Hotspot describes the icon center
+        w = iconinfo.xHotspot * 2;
+        h = iconinfo.yHotspot * 2;
+    }
+    const DWORD dwImageSize = w * h * 4;
 
     BITMAPINFO bmi;
     memset(&bmi, 0, sizeof(bmi));
     bmi.bmiHeader.biSize        = sizeof(BITMAPINFO);
-    bmi.bmiHeader.biWidth       = size;
-    bmi.bmiHeader.biHeight      = -size;
+    bmi.bmiHeader.biWidth       = ;
+    bmi.bmiHeader.biHeight      = -;
     bmi.bmiHeader.biPlanes      = 1;
     bmi.bmiHeader.biBitCount    = 32;
     bmi.bmiHeader.biCompression = BI_RGB;
-    bmi.bmiHeader.biSizeImage   = size*size*4;
+    bmi.bmiHeader.biSizeImage   = ;
 
     uchar* bits;
@@ -415 +430 @@
     HBITMAP winBitmap = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, (void**) &bits, 0, 0);
     if (winBitmap )
-        memset(bits, 0xff, size*size*4);
+        memset(bits, 0xff, );
     if (!winBitmap) {
-        qWarning("convertHIconToPixmap(), failed to CreateDIBSection()");
+        qWarning("(), failed to CreateDIBSection()");
         return QPixmap();
     }
 
     HGDIOBJ oldhdc = (HBITMAP)SelectObject(hdc, winBitmap);
-    if (!DrawIconEx( hdc, 0, 0, icon, size, size, 0, 0, DI_NORMAL))
-        qWarning("convertHIconToPixmap(), failed to DrawIcon()");
+    if (!DrawIconEx( hdc, 0, 0, icon, , 0, 0, DI_NORMAL))
+        qWarning("(), failed to DrawIcon()");
 
     uint mask = 0xff000000;
     // Create image and copy data into image.
-    QImage image(size, size, QImage::Format_ARGB32);
+    QImage image(, QImage::Format_ARGB32);
 
     if (!image.isNull()) { // failed to alloc?
-        int bytes_per_line = size * sizeof(QRgb);
-        for (int y=0; y<size; ++y) {
+        int bytes_per_line =  * sizeof(QRgb);
+        for (int y=0; y; ++y) {
             QRgb *dest = (QRgb *) image.scanLine(y);
             const QRgb *src = (const QRgb *) (bits + y * bytes_per_line);
-            for (int x=0; x<size; ++x) {
+            for (int x=0; x; ++x) {
                 dest[x] = src[x];
             }
         }
     }
-    if (!DrawIconEx( hdc, 0, 0, icon, size, size, 0, 0, DI_MASK))
-        qWarning("convertHIconToPixmap(), failed to DrawIcon()");
+    if (!DrawIconEx( hdc, 0, 0, icon, , 0, 0, DI_MASK))
+        qWarning("(), failed to DrawIcon()");
     if (!image.isNull()) { // failed to alloc?
-        int bytes_per_line = size * sizeof(QRgb);
-        for (int y=0; y<size; ++y) {
+        int bytes_per_line =  * sizeof(QRgb);
+        for (int y=0; y; ++y) {
             QRgb *dest = (QRgb *) image.scanLine(y);
             const QRgb *src = (const QRgb *) (bits + y * bytes_per_line);
-            for (int x=0; x<size; ++x) {
+            for (int x=0; x; ++x) {
                 if (!src[x])
                     dest[x] = dest[x] | mask;
@@ -457 +472 @@
     return QPixmap::fromImage(image);
 }
-#endif //ifndef Q_OS_WINCE
-
-QPixmap loadIconFromShell32( int resourceId, int size )
-{
-#ifdef Q_OS_WINCE
-    HMODULE hmod = LoadLibrary((const wchar_t *) QString::fromLatin1("ceshell.dll").utf16());
-#else
-    HMODULE hmod = LoadLibraryA("shell32.dll");
-#endif
-    if( hmod ) {
-        HICON iconHandle = (HICON)LoadImage(hmod, MAKEINTRESOURCE(resourceId), IMAGE_ICON, size, size, 0);
-        if( iconHandle ) {
-            QPixmap iconpixmap = convertHIconToPixmap( iconHandle );
-            DestroyIcon(iconHandle);
-            return iconpixmap;
-        }
-    }
-    return QPixmap();
-}
-
-#endif
+#endif //ifndef Q_WS_WINCE
+#endif //ifdef Q_WS_WIN
 
 QT_END_NAMESPACE