Changeset 21602 for trunk/src/shell32/systray_os2ex.c

Timestamp:

Mar 23, 2011, 11:44:45 PM (14 years ago)

Author:

dmik

Message:

shell32: systray: Added support for the "TaskbarCreated" system notificaiton message that Windows broadcasts to all top-level windows when the taskbar (xcenter in case of OS/2) is (re)started. This allows applications supporting this message (including Java applications) recreate their taskbar icons.

File:

• trunk/src/shell32/systray_os2ex.c (modified) (5 diffs)

trunk/src/shell32/systray_os2ex.c

@@ -26 +26 @@
 
 static ULONG WM_XST_CREATED = 0;
+static ULONG WM_TASKBARCREATED_W = 0;
 
 static HWND hwndProxy = NULLHANDLE;
@@ -68 +69 @@
             if (winMsg)
             {
-                DoWin32PostMessage(ptrayItem->notifyIcon.hWnd,
-                                   ptrayItem->notifyIcon.uCallbackMessage,
-                                   (MPARAM)ptrayItem->notifyIcon.uID,
-                                   (MPARAM)winMsg);
+                PostMessageA(ptrayItem->notifyIcon.hWnd,
+                             ptrayItem->notifyIcon.uCallbackMessage,
+                             (WPARAM)ptrayItem->notifyIcon.uID,
+                             (LPARAM)winMsg);
                 return (MRESULT)TRUE;
             }
@@ -78 +79 @@
         case XST_IN_CONTEXT:
         {
-            DoWin32PostMessage(ptrayItem->notifyIcon.hWnd,
-                               ptrayItem->notifyIcon.uCallbackMessage,
-                               (MPARAM)ptrayItem->notifyIcon.uID,
-                               (MPARAM)WM_CONTEXTMENU_W);
+            PostMessageA(ptrayItem->notifyIcon.hWnd,
+                         ptrayItem->notifyIcon.uCallbackMessage,
+                         (WPARAM)ptrayItem->notifyIcon.uID,
+                         (LPARAM)WM_CONTEXTMENU_W);
             return (MRESULT)TRUE;
         }
@@ -94 +95 @@
         if (msg == WM_XST_CREATED)
         {
+            // xCenter was restarted, no icons are shown; remove all items
+            // and broadcast TaskbarCreated to let applications recreate them
+            SYSTRAY_PruneAllItems();
+
+            dprintf(("SHELL32: SYSTRAY: Broadcasting \"TaskbarCreated\" (%x)",
+                     WM_TASKBARCREATED_W));
+            PostMessageA(HWND_BROADCAST_W, WM_TASKBARCREATED_W,
+                         (WPARAM)0, (LPARAM)0);
             return (MRESULT)TRUE;
         }
@@ -204 +213 @@
     WM_XST_CREATED = xstGetSysTrayCreatedMsgId();
 
+    WM_TASKBARCREATED_W = RegisterWindowMessageA("TaskbarCreated");
+
     SYSTRAY_ItemInit = SYSTRAY_Ex_ItemInit;
     SYSTRAY_ItemTerm = SYSTRAY_Ex_ItemTerm;