Changeset 21590 for trunk/src

Timestamp:

Mar 15, 2011, 4:34:07 PM (14 years ago)

Author:

dmik

Message:

shell32: Shell_NotifyIcon(): Create a copy of the supplied icon because the caller may DestroyIcon() on it at any time (which would cause systray to display an empty rectangle). This matches Windows behavior.

Location:

trunk/src/shell32

Files:

• systray.c (modified) (1 diff)
• systray_os2.c (modified) (2 diffs)

trunk/src/shell32/systray.c

@@ -78 +78 @@
   SYSTRAY_ItemSetTip    (*ptrayItem, (pnid->uFlags&NIF_TIP)    ?pnid->szTip           :"", FALSE);
 
-  TRACE("SYSTRAY_Add %p: 0x%08x 0x%08x 0x%08x %s\n",  (*ptrayItem), (*ptrayItem)->notifyIcon.hWnd,
+  TRACE("SYSTRAY_Add %p: 0x%08x 0x%08x 0x%08x 0x%08x %s\n",  (*ptrayItem),
+        (*ptrayItem)->notifyIcon.hWnd, (*ptrayItem)->notifyIcon.hIcon,
         pnid->uCallbackMessage, (*ptrayItem)->notifyIcon.uCallbackMessage,
         pnid->szTip );

trunk/src/shell32/systray_os2.c

@@ -154 +154 @@
 void SYSTRAY_ItemTerm(SystrayItem *ptrayItem)
 {
+    HPOINTER hIcon = (HPOINTER)WinSendMsg(ptrayItem->hWndFrame, WM_QUERYICON, NULL, NULL);
+    if (hIcon != NULLHANDLE)
+        WinDestroyPointer(hIcon);
+
     WinDestroyWindow(ptrayItem->hWndFrame);
 }
@@ -166 +170 @@
 void SYSTRAY_ItemSetIcon(SystrayItem *ptrayItem, HPOINTER hIcon)
 {
+    // Windows seems to make a copy of icons displayed in the tray area. At
+    // least, calling DestroyIcon() after passing the icon handle to
+    // Shell_NotifyIcon() doesn't harm the icon displayed in the tray. Behave
+    // similarly on OS/2 (some applications do call DestroyIcon()). The copy is
+    // deleted in SYSTRAY_ItemTerm().
+
+    POINTERINFO Info;
+    HPOINTER hIcon2 = NULLHANDLE;
+    APIRET arc;
+    arc = WinQueryPointerInfo(hIcon, &Info);
+    if (!arc)
+        return;
+    hIcon2 = WinCreatePointerIndirect(HWND_DESKTOP, &Info);
+    if (hIcon2 == NULLHANDLE)
+        return;
+    hIcon = hIcon2;
+
     WinSendMsg( ptrayItem->hWndFrame, WM_SETICON, MPFROMLONG( hIcon ), MPVOID );
     if (hwndTrayServer)