Changeset 21600 for trunk/src

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.

Location:

trunk/src/shell32

Files:

• systray.c (modified) (3 diffs)
• systray_os2.h (modified) (1 diff)
• systray_os2ex.c (modified) (5 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;
 }
 

trunk/src/shell32/systray_os2.h

@@ -8 +8 @@
 #define __WINE_SYSTRAY_OS2_H
 
-// map some Win32 types used in systray.h to OS/2 types
-// to avoid Win32 header inclusion and conflicts
-
-#define HICON HPOINTER
-
 #include "systray.h"
 
-// define some Win32 structs in terms of OS/2 types
-// to avoid Win32 header inclusion and conflicts
+// define some Win32 structs and types in terms of OS/2 types
+// to avoid inclusion of shellapi.h that would create conflicts
 
 #define NIF_MESSAGE             0x00000001

trunk/src/shell32/systray_os2ex.c

@@ -6 +6 @@
  */
 
-#define  INCL_WIN
-#define  INCL_DOS
-#define  INCL_DOSERRORS
-#include <os2wrap.h>
+#define INCL_PM
+#define INCL_DOS
+#define INCL_DOSERRORS
+#include <os2wrap.h> // Odin32 OS/2 api wrappers
+
+#include <win32api.h>
 
 #include <string.h>
-
-#include <odin.h>
-#include <winconst.h>
 
 // declare function pointers for dynamic linking to xsystray DLL
@@ -22 +21 @@
 #include "systray_os2.h"
 
+#include "dbglog.h"
+
 #define WM_XST_MYNOTIFY (WM_USER + 1000)
+
+static ULONG WM_XST_CREATED = 0;
 
 static HWND hwndProxy = NULLHANDLE;
@@ -69 +72 @@
                                    (MPARAM)ptrayItem->notifyIcon.uID,
                                    (MPARAM)winMsg);
+                return (MRESULT)TRUE;
             }
-
-            return (MRESULT)FALSE;
+            break;
+        }
+        case XST_IN_CONTEXT:
+        {
+            DoWin32PostMessage(ptrayItem->notifyIcon.hWnd,
+                               ptrayItem->notifyIcon.uCallbackMessage,
+                               (MPARAM)ptrayItem->notifyIcon.uID,
+                               (MPARAM)WM_CONTEXTMENU_W);
+            return (MRESULT)TRUE;
         }
         default:
             break;
         }
-    }
-
+
+        return (MRESULT)FALSE;
+    }
     default:
+    {
+        if (msg == WM_XST_CREATED)
+        {
+            return (MRESULT)TRUE;
+        }
         break;
     }
-
-    return OldProxyWndProc(hWnd, msg, mp1, mp2);
+    }
+
+    return WinDefWindowProc(hWnd, msg, mp1, mp2);
 }
 
@@ -89 +107 @@
     if (hwndProxyRefs == 0)
     {
-        ULONG fcf = 0;
-        hwndProxy = WinCreateStdWindow(HWND_DESKTOP, 0, &fcf, NULL,
-                                       NULL, 0, NULLHANDLE, 0, NULL);
+        if (!WinRegisterClass(NULLHANDLE, "OdinXSysTrayProxy", ProxyWndProc,
+                              0, 0))
+        {
+            dprintf(("SHELL32: SYSTRAY: WinRegisterClass() failed with %x",
+                     WinGetLastError(0)));
+            return FALSE;
+        }
+
+        hwndProxy = WinCreateWindow(HWND_DESKTOP, "OdinXSysTrayProxy", NULL,
+                                    0, 0, 0, 0, 0, NULLHANDLE, HWND_BOTTOM, 0,
+                                    NULL, NULL);
+
         if (hwndProxy == NULLHANDLE)
+        {
+            dprintf(("SHELL32: SYSTRAY: WinCreateWindow() failed with %x",
+                     WinGetLastError(0)));
             return FALSE;
-
-        OldProxyWndProc = WinSubclassWindow(hwndProxy, ProxyWndProc);
-    }
+        }
+    }
+
     ++ hwndProxyRefs;
 
@@ -171 +201 @@
         return FALSE;
 
+    // initialize some constants
+    WM_XST_CREATED = xstGetSysTrayCreatedMsgId();
+
     SYSTRAY_ItemInit = SYSTRAY_Ex_ItemInit;
     SYSTRAY_ItemTerm = SYSTRAY_Ex_ItemTerm;