[PATCH 0/2] MR2875: shell32: add support for balloon icon copying

[Cherser-s (＠Cherser-s)]

Currently shell32 only transfers the plain icon for `Shell_NotifyIcon` calls, ignoring balloon icons. This patch allows transferring both images to explorer.exe tray.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2875

[PATCH 1/2] shell32: refactor notify_icon for multiple icons

[Sergei Chernyadyev]

From: Sergei Chernyadyev <1892-Cherser-s(a)users.noreply.gitlab.winehq.org>

---
 dlls/shell32/systray.c      | 40 ++++++++++++++++++++-----------------
 programs/explorer/systray.c | 30 ++++++++++++++++++----------
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c
index 7863c4de177..04728e4bd29 100644
--- a/dlls/shell32/systray.c
+++ b/dlls/shell32/systray.c
@@ -37,6 +37,15 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(systray);
 
+struct notify_data_icon {
+    /* data for the icon bitmap */
+    UINT width;
+    UINT height;
+    UINT planes;
+    UINT bpp;
+    char buffer[];
+};
+
 struct notify_data  /* platform-independent format for NOTIFYICONDATA */
 {
     LONG  hWnd;
@@ -54,13 +63,10 @@ struct notify_data  /* platform-independent format for NOTIFYICONDATA */
     WCHAR szInfoTitle[64];
     DWORD dwInfoFlags;
     GUID  guidItem;
-    /* data for the icon bitmap */
-    UINT width;
-    UINT height;
-    UINT planes;
-    UINT bpp;
+    struct notify_data_icon icons[];
 };
 
+
 /*************************************************************************
  * Shell_NotifyIcon			[SHELL32.296]
  * Shell_NotifyIconA			[SHELL32.297]
@@ -183,7 +189,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid)
         cbMaskBits = (bmMask.bmPlanes * bmMask.bmWidth * bmMask.bmHeight * bmMask.bmBitsPixel + 15) / 16 * 2;
         if (iconinfo.hbmColor)
             cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel + 15) / 16 * 2;
-        cds.cbData = sizeof(*data) + cbMaskBits + cbColourBits;
+        cds.cbData = sizeof(*data) + sizeof(struct notify_data_icon) + cbMaskBits + cbColourBits;
         buffer = heap_alloc(cds.cbData);
         if (!buffer)
         {
@@ -195,23 +201,21 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid)
 
         data = (struct notify_data *)buffer;
         memset( data, 0, sizeof(*data) );
-        buffer += sizeof(*data);
-        GetBitmapBits(iconinfo.hbmMask, cbMaskBits, buffer);
+        GetBitmapBits(iconinfo.hbmMask, cbMaskBits, &data->icons[0].buffer);
         if (!iconinfo.hbmColor)
         {
-            data->width  = bmMask.bmWidth;
-            data->height = bmMask.bmHeight / 2;
-            data->planes = 1;
-            data->bpp    = 1;
+            data->icons[0].width  = bmMask.bmWidth;
+            data->icons[0].height = bmMask.bmHeight / 2;
+            data->icons[0].planes = 1;
+            data->icons[0].bpp    = 1;
         }
         else
         {
-            data->width  = bmColour.bmWidth;
-            data->height = bmColour.bmHeight;
-            data->planes = bmColour.bmPlanes;
-            data->bpp    = bmColour.bmBitsPixel;
-            buffer += cbMaskBits;
-            GetBitmapBits(iconinfo.hbmColor, cbColourBits, buffer);
+            data->icons[0].width  = bmColour.bmWidth;
+            data->icons[0].height = bmColour.bmHeight;
+            data->icons[0].planes = bmColour.bmPlanes;
+            data->icons[0].bpp    = bmColour.bmBitsPixel;
+            GetBitmapBits(iconinfo.hbmColor, cbColourBits, &data->icons[0].buffer[cbMaskBits]);
             DeleteObject(iconinfo.hbmColor);
         }
         DeleteObject(iconinfo.hbmMask);
diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c
index 7790648d021..cabc1568b2f 100644
--- a/programs/explorer/systray.c
+++ b/programs/explorer/systray.c
@@ -33,6 +33,15 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(systray);
 
+struct notify_data_icon {
+    /* data for the icon bitmap */
+    UINT width;
+    UINT height;
+    UINT planes;
+    UINT bpp;
+    char buffer[];
+};
+
 struct notify_data  /* platform-independent format for NOTIFYICONDATA */
 {
     LONG  hWnd;
@@ -51,10 +60,7 @@ struct notify_data  /* platform-independent format for NOTIFYICONDATA */
     DWORD dwInfoFlags;
     GUID  guidItem;
     /* data for the icon bitmap */
-    UINT width;
-    UINT height;
-    UINT planes;
-    UINT bpp;
+    struct notify_data_icon icons[];
 };
 
 static int (CDECL *wine_notify_icon)(DWORD,NOTIFYICONDATAW *);
@@ -522,6 +528,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds)
 {
     struct icon *icon = NULL;
     const struct notify_data *data;
+    const struct notify_data_icon *data_icon;
     NOTIFYICONDATAW nid;
     int ret = FALSE;
 
@@ -546,22 +553,23 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds)
 
     /* FIXME: if statement only needed because we don't support interprocess
      * icon handles */
-    if ((nid.uFlags & NIF_ICON) && cds->cbData > sizeof(*data))
+    if ((nid.uFlags & NIF_ICON) && cds->cbData > (sizeof(*data) + sizeof(struct notify_data_icon)))
     {
         LONG cbMaskBits;
         LONG cbColourBits;
-        const char *buffer = (const char *)(data + 1);
+        data_icon = &data->icons[0];
 
-        cbMaskBits = (data->width * data->height + 15) / 16 * 2;
-        cbColourBits = (data->planes * data->width * data->height * data->bpp + 15) / 16 * 2;
+        cbMaskBits = (data_icon->width * data_icon->height + 15) / 16 * 2;
+        cbColourBits = (data_icon->planes * data_icon->width * data_icon->height * data_icon->bpp + 15) / 16 * 2;
 
-        if (cds->cbData < sizeof(*data) + cbMaskBits + cbColourBits)
+        if (cds->cbData < sizeof(*data) + sizeof(*data_icon) + cbMaskBits + cbColourBits)
         {
             WINE_ERR("buffer underflow\n");
             return FALSE;
         }
-        nid.hIcon = CreateIcon(NULL, data->width, data->height, data->planes, data->bpp,
-                               buffer, buffer + cbMaskBits);
+        nid.hIcon = CreateIcon(NULL, data_icon->width, data_icon->height, data_icon->planes, data_icon->bpp,
+                               &data_icon->buffer[0], &data_icon->buffer[cbMaskBits]);
+        data_icon = &data_icon->buffer[cbMaskBits + cbColourBits];
     }
 
     /* try forwarding to the display driver first */
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2875

[PATCH 2/2] shell32: add support for balloon icon copying

[Sergei Chernyadyev]

From: Sergei Chernyadyev <1892-Cherser-s(a)users.noreply.gitlab.winehq.org>

---
 dlls/shell32/systray.c      | 99 +++++++++++++++++++++++--------------
 programs/explorer/systray.c | 23 +++++++--
 2 files changed, 83 insertions(+), 39 deletions(-)

diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c
index 04728e4bd29..c74fde4ed2f 100644
--- a/dlls/shell32/systray.c
+++ b/dlls/shell32/systray.c
@@ -134,6 +134,12 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid)
     COPYDATASTRUCT cds;
     struct notify_data data_buffer;
     struct notify_data *data = &data_buffer;
+    ICONINFO iconinfo[2] = { { 0 }, { 0 } };
+    BITMAP bmMask[2];
+    BITMAP bmColour[2];
+    LONG cbMaskBits[2] = { 0, 0};
+    LONG cbColourBits[2] = { 0, 0 };
+    LONG iconCount = 0;
     BOOL ret;
 
     TRACE("dwMessage = %ld, nid->cbSize=%ld\n", dwMessage, nid->cbSize);
@@ -168,60 +174,81 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid)
      * icon handles */
     if (nid->uFlags & NIF_ICON)
     {
-        ICONINFO iconinfo;
-        BITMAP bmMask;
-        BITMAP bmColour;
-        LONG cbMaskBits;
-        LONG cbColourBits = 0;
-        char *buffer;
-
-        if (!GetIconInfo(nid->hIcon, &iconinfo))
+        if (!GetIconInfo(nid->hIcon, &iconinfo[iconCount]))
             goto noicon;
 
-        if (!GetObjectW(iconinfo.hbmMask, sizeof(bmMask), &bmMask) ||
-            (iconinfo.hbmColor && !GetObjectW(iconinfo.hbmColor, sizeof(bmColour), &bmColour)))
+        if (!GetObjectW(iconinfo[iconCount].hbmMask, sizeof(bmMask), &bmMask[iconCount]) ||
+            (iconinfo[iconCount].hbmColor && !GetObjectW(iconinfo[iconCount].hbmColor, sizeof(bmColour), &bmColour[iconCount])))
         {
-            DeleteObject(iconinfo.hbmMask);
-            if (iconinfo.hbmColor) DeleteObject(iconinfo.hbmColor);
+            DeleteObject(iconinfo[iconCount].hbmMask);
+            if (iconinfo[iconCount].hbmColor) DeleteObject(iconinfo[iconCount].hbmColor);
             goto noicon;
         }
+        cbMaskBits[iconCount] = (bmMask[iconCount].bmPlanes * bmMask[iconCount].bmWidth * bmMask[iconCount].bmHeight * bmMask[iconCount].bmBitsPixel + 15) / 16 * 2;
+        if (iconinfo[iconCount].hbmColor)
+            cbColourBits[iconCount] = (bmColour[iconCount].bmPlanes * bmColour[iconCount].bmWidth * bmColour[iconCount].bmHeight * bmColour[iconCount].bmBitsPixel + 15) / 16 * 2;
+        iconCount++;
+    }
+noicon:
+    if (nid->uFlags & NIF_INFO)
+    {
+        if (!GetIconInfo(nid->hBalloonIcon, &iconinfo[iconCount]))
+            goto noballoon;
 
-        cbMaskBits = (bmMask.bmPlanes * bmMask.bmWidth * bmMask.bmHeight * bmMask.bmBitsPixel + 15) / 16 * 2;
-        if (iconinfo.hbmColor)
-            cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel + 15) / 16 * 2;
-        cds.cbData = sizeof(*data) + sizeof(struct notify_data_icon) + cbMaskBits + cbColourBits;
+        if (!GetObjectW(iconinfo[iconCount].hbmMask, sizeof(bmMask), &bmMask[iconCount]) ||
+            (iconinfo[iconCount].hbmColor && !GetObjectW(iconinfo[iconCount].hbmColor, sizeof(bmColour), &bmColour[iconCount])))
+        {
+            DeleteObject(iconinfo[iconCount].hbmMask);
+            if (iconinfo[iconCount].hbmColor) DeleteObject(iconinfo[iconCount].hbmColor);
+            goto noballoon;
+        }
+        cbMaskBits[iconCount] = (bmMask[iconCount].bmPlanes * bmMask[iconCount].bmWidth * bmMask[iconCount].bmHeight * bmMask[iconCount].bmBitsPixel + 15) / 16 * 2;
+        if (iconinfo[iconCount].hbmColor)
+            cbColourBits[iconCount] = (bmColour[iconCount].bmPlanes * bmColour[iconCount].bmWidth * bmColour[iconCount].bmHeight * bmColour[iconCount].bmBitsPixel + 15) / 16 * 2;
+        iconCount++;
+    }
+noballoon:
+    if (iconCount > 0) {
+        char *buffer;
+        struct notify_data_icon *data_icon;
+        cds.cbData = sizeof(*data) + sizeof(struct notify_data_icon) * iconCount + cbMaskBits[0] + cbMaskBits[1] + cbColourBits[0] + cbColourBits[1];
         buffer = heap_alloc(cds.cbData);
         if (!buffer)
         {
-            DeleteObject(iconinfo.hbmMask);
-            if (iconinfo.hbmColor) DeleteObject(iconinfo.hbmColor);
+            for (unsigned int i = 0; i < iconCount; i++) {
+                if (iconinfo[i].hbmMask) DeleteObject(iconinfo[i].hbmMask);
+                if (iconinfo[i].hbmColor) DeleteObject(iconinfo[i].hbmColor);
+            }
             SetLastError(E_OUTOFMEMORY);
             return FALSE;
         }
 
         data = (struct notify_data *)buffer;
+        data_icon = &data->icons[0];
         memset( data, 0, sizeof(*data) );
-        GetBitmapBits(iconinfo.hbmMask, cbMaskBits, &data->icons[0].buffer);
-        if (!iconinfo.hbmColor)
-        {
-            data->icons[0].width  = bmMask.bmWidth;
-            data->icons[0].height = bmMask.bmHeight / 2;
-            data->icons[0].planes = 1;
-            data->icons[0].bpp    = 1;
+        for (unsigned int i = 0; i < iconCount; i++) {
+            GetBitmapBits(iconinfo[i].hbmMask, cbMaskBits[i], &data_icon->buffer);
+            if (!iconinfo[i].hbmColor)
+            {
+                data_icon->width  = bmMask[i].bmWidth;
+                data_icon->height = bmMask[i].bmHeight / 2;
+                data_icon->planes = 1;
+                data_icon->bpp    = 1;
+            }
+            else
+            {
+                data_icon->width  = bmColour[i].bmWidth;
+                data_icon->height = bmColour[i].bmHeight;
+                data_icon->planes = bmColour[i].bmPlanes;
+                data_icon->bpp    = bmColour[i].bmBitsPixel;
+                GetBitmapBits(iconinfo[i].hbmColor, cbColourBits[i], &data_icon->buffer[cbMaskBits[i]]);
+                DeleteObject(iconinfo[i].hbmColor);
+            }
+            DeleteObject(iconinfo[i].hbmMask);
+            data_icon = (struct notify_data_icon*)&data_icon->buffer[cbMaskBits[i] + cbColourBits[i]];
         }
-        else
-        {
-            data->icons[0].width  = bmColour.bmWidth;
-            data->icons[0].height = bmColour.bmHeight;
-            data->icons[0].planes = bmColour.bmPlanes;
-            data->icons[0].bpp    = bmColour.bmBitsPixel;
-            GetBitmapBits(iconinfo.hbmColor, cbColourBits, &data->icons[0].buffer[cbMaskBits]);
-            DeleteObject(iconinfo.hbmColor);
-        }
-        DeleteObject(iconinfo.hbmMask);
     }
 
-noicon:
     data->hWnd   = HandleToLong( nid->hWnd );
     data->uID    = nid->uID;
     data->uFlags = nid->uFlags;
diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c
index cabc1568b2f..1f80135364a 100644
--- a/programs/explorer/systray.c
+++ b/programs/explorer/systray.c
@@ -534,6 +534,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds)
 
     if (cds->cbData < sizeof(*data)) return FALSE;
     data = cds->lpData;
+    data_icon = &data->icons[0];
 
     nid.cbSize           = sizeof(nid);
     nid.hWnd             = LongToHandle( data->hWnd );
@@ -553,11 +554,10 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds)
 
     /* FIXME: if statement only needed because we don't support interprocess
      * icon handles */
-    if ((nid.uFlags & NIF_ICON) && cds->cbData > (sizeof(*data) + sizeof(struct notify_data_icon)))
+    if ((nid.uFlags & NIF_ICON) && cds->cbData > ((char*)data_icon - (char*)data) + sizeof(struct notify_data_icon))
     {
         LONG cbMaskBits;
         LONG cbColourBits;
-        data_icon = &data->icons[0];
 
         cbMaskBits = (data_icon->width * data_icon->height + 15) / 16 * 2;
         cbColourBits = (data_icon->planes * data_icon->width * data_icon->height * data_icon->bpp + 15) / 16 * 2;
@@ -569,9 +569,25 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds)
         }
         nid.hIcon = CreateIcon(NULL, data_icon->width, data_icon->height, data_icon->planes, data_icon->bpp,
                                &data_icon->buffer[0], &data_icon->buffer[cbMaskBits]);
-        data_icon = &data_icon->buffer[cbMaskBits + cbColourBits];
+        data_icon = (const struct notify_data_icon*)&data_icon->buffer[cbMaskBits + cbColourBits];
     }
 
+    if ((nid.uFlags & NIF_INFO) && cds->cbData > ((char*)data_icon - (char*)data) + sizeof(struct notify_data_icon)) {
+        /* Balloon icon */
+        LONG cbMaskBits;
+        LONG cbColourBits;
+
+        cbMaskBits = (data_icon->width * data_icon->height + 15) / 16 * 2;
+        cbColourBits = (data_icon->planes * data_icon->width * data_icon->height * data_icon->bpp + 15) / 16 * 2;
+
+        if (cds->cbData < sizeof(*data) + sizeof(*data_icon) + cbMaskBits + cbColourBits)
+        {
+            WINE_ERR("buffer underflow\n");
+            return FALSE;
+        }
+        nid.hBalloonIcon = CreateIcon(NULL, data_icon->width, data_icon->height, data_icon->planes, data_icon->bpp,
+                               &data_icon->buffer[0], &data_icon->buffer[cbMaskBits]);
+    }
     /* try forwarding to the display driver first */
     if (cds->dwData == NIM_ADD || !(icon = get_icon( nid.hWnd, nid.uID )))
     {
@@ -607,6 +623,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds)
     }
 
     if (nid.hIcon) DestroyIcon( nid.hIcon );
+    if (nid.hBalloonIcon) DestroyIcon( nid.hBalloonIcon );
     sync_taskbar_buttons();
     return ret;
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2875