1 files changed, 32 insertions, 14 deletions

diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp
index a9bcca2..1b61484 100644
--- a/src/gui/image/qpixmap_win.cpp
+++ b/src/gui/image/qpixmap_win.cpp
@@ -387,12 +387,30 @@ QPixmap QPixmap::fromWinHICON(HICON icon)
     ReleaseDC(0, screenDevice);
 
     ICONINFO iconinfo;
-    bool result = GetIconInfo(icon, &iconinfo); //x and y Hotspot describes the icon center
+    bool result = GetIconInfo(icon, &iconinfo);
     if (!result)
         qWarning("QPixmap::fromWinHICON(), failed to GetIconInfo()");
 
-    int w = iconinfo.xHotspot * 2;
-    int h = iconinfo.yHotspot * 2;
+    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));
@@ -402,44 +420,44 @@ QPixmap QPixmap::fromWinHICON(HICON icon)
     bmi.bmiHeader.biPlanes      = 1;
     bmi.bmiHeader.biBitCount    = 32;
     bmi.bmiHeader.biCompression = BI_RGB;
-    bmi.bmiHeader.biSizeImage   = size*size*4;
+    bmi.bmiHeader.biSizeImage   = dwImageSize;
 
     uchar* bits;
 
     HBITMAP winBitmap = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, (void**) &bits, 0, 0);
     if (winBitmap )
-        memset(bits, 0xff, size*size*4);
+        memset(bits, 0xff, dwImageSize);
     if (!winBitmap) {
         qWarning("QPixmap::fromWinHICON(), failed to CreateDIBSection()");
         return QPixmap();
     }
 
     HGDIOBJ oldhdc = (HBITMAP)SelectObject(hdc, winBitmap);
-    if (!DrawIconEx( hdc, 0, 0, icon, size, size, 0, 0, DI_NORMAL))
+    if (!DrawIconEx( hdc, 0, 0, icon, w, h, 0, 0, DI_NORMAL))
         qWarning("QPixmap::fromWinHICON(), failed to DrawIcon()");
 
     uint mask = 0xff000000;
     // Create image and copy data into image.
-    QImage image(size, size, QImage::Format_ARGB32);
+    QImage image(w, h, 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 = w * sizeof(QRgb);
+        for (int y=0; y < h; ++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 < w; ++x) {
                 dest[x] = src[x];
             }
         }
     }
-    if (!DrawIconEx( hdc, 0, 0, icon, size, size, 0, 0, DI_MASK))
+    if (!DrawIconEx( hdc, 0, 0, icon, w, h, 0, 0, DI_MASK))
         qWarning("QPixmap::fromWinHICON(), 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 = w * sizeof(QRgb);
+        for (int y=0; y < h; ++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 < w; ++x) {
                 if (!src[x])
                     dest[x] = dest[x] | mask;
             }