Changeset 21600 for trunk/src/shell32/systray.c

Timestamp:

Mar 23, 2011, 5:52:24 PM (14 years ago)

Author:

dmik

Message:

shell32: systray: Fixed non-working systray notifications in modern Java apps by maintaining the xsystray proxy window on a dedicated thread that is never suspended by Java. Also added support for context menu (normally, RMB) notifications used in many Java applications.

File:

• trunk/src/shell32/systray.c (modified) (3 diffs)

trunk/src/shell32/systray.c

@@ -27 +27 @@
 #include "config.h"
 #include "winuser32.h"
+#include "auxthread.h"
 
 #include "systray.h"
@@ -227 +228 @@
 }
 
-/*************************************************************************
- * Shell_NotifyIconA            [SHELL32.297][SHELL32.296]
- */
-BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid )
-{
+static PVOID Do_Shell_NotifyIconA(PVOID arg1, PVOID arg2,
+                                  PVOID arg3, PVOID arg4)
+{
+    DWORD dwMessage = (DWORD)arg1;
+    PNOTIFYICONDATAA pnid = (PNOTIFYICONDATAA)arg2;
+
     BOOL flag = FALSE;
     switch(dwMessage)
@@ -245 +247 @@
             break;
     }
-    return flag;
+    return (PVOID)flag;
+}
+
+/*************************************************************************
+ * Shell_NotifyIconA            [SHELL32.297][SHELL32.296]
+ */
+BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid )
+{
+    PVOID ret;
+    BOOL brc = RunOnAuxThreadAndWait(Do_Shell_NotifyIconA,
+                                     (PVOID)dwMessage, (PVOID)pnid,
+                                     NULL, NULL, &ret);
+    if (brc)
+        brc = (BOOL)ret;
+    return brc;
 }