[PATCH 1/4] include: Fix the definition of NOTIFYICON_VERSION[_4].

[Zebediah Figura]

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
 dlls/winemac.drv/systray.c  | 2 +-
 dlls/winex11.drv/systray.c  | 2 +-
 include/shellapi.h          | 4 ++--
 programs/explorer/systray.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c
index 75bca5e3d51..90d2430869d 100644
--- a/dlls/winemac.drv/systray.c
+++ b/dlls/winemac.drv/systray.c
@@ -283,7 +283,7 @@ static BOOL notify_owner(struct tray_icon *icon, UINT msg, int x, int y)
     WPARAM wp = icon->id;
     LPARAM lp = msg;
 
-    if (icon->version >= NOTIFY_VERSION_4)
+    if (icon->version >= NOTIFYICON_VERSION_4)
     {
         wp = MAKEWPARAM(x, y);
         lp = MAKELPARAM(msg, icon->id);
diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c
index 3be4bd65347..952bc1ef266 100644
--- a/dlls/winex11.drv/systray.c
+++ b/dlls/winex11.drv/systray.c
@@ -441,7 +441,7 @@ static BOOL notify_owner( struct tray_icon *icon, UINT msg, LPARAM lparam )
     WPARAM wp = icon->id;
     LPARAM lp = msg;
 
-    if (icon->version >= NOTIFY_VERSION_4)
+    if (icon->version >= NOTIFYICON_VERSION_4)
     {
         POINT pt = { (short)LOWORD(lparam), (short)HIWORD(lparam) };
 
diff --git a/include/shellapi.h b/include/shellapi.h
index 0f10690f7e0..e02869f14e8 100644
--- a/include/shellapi.h
+++ b/include/shellapi.h
@@ -378,8 +378,8 @@ void WINAPI WinExecErrorW(HWND hwnd,INT error, LPCWSTR lpstrFileName, LPCWSTR lp
 #define NIM_SETFOCUS            0x00000003
 #define NIM_SETVERSION          0x00000004
 
-#define NOTIFY_VERSION   3     /* supported by Windows 2000 and later */
-#define NOTIFY_VERSION_4 4     /* supported by Windows Vista */
+#define NOTIFYICON_VERSION   3
+#define NOTIFYICON_VERSION_4 4
 
 /* callback message lParam values */
 #define NIN_SELECT              (WM_USER+0)
diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c
index dcd75f4e763..5f4fc60dbf3 100644
--- a/programs/explorer/systray.c
+++ b/programs/explorer/systray.c
@@ -723,7 +723,7 @@ static BOOL notify_owner( struct icon *icon, UINT msg, POINT pt )
     WPARAM wp = icon->id;
     LPARAM lp = msg;
 
-    if (icon->version >= NOTIFY_VERSION_4)
+    if (icon->version >= NOTIFYICON_VERSION_4)
     {
         ClientToScreen( tray_window, &pt );
         wp = MAKEWPARAM( pt.x, pt.y );
-- 
2.30.0

[PATCH 2/4] explorer: Send systray messages with SendNotifyMessage().

[Zebediah Figura]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50441
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
 programs/explorer/systray.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c
index 5f4fc60dbf3..161b4b57e58 100644
--- a/programs/explorer/systray.c
+++ b/programs/explorer/systray.c
@@ -731,7 +731,7 @@ static BOOL notify_owner( struct icon *icon, UINT msg, POINT pt )
     }
 
     TRACE( "relaying 0x%x\n", msg );
-    if (!PostMessageW( icon->owner, icon->callback_message, wp, lp ) &&
+    if (!SendNotifyMessageW( icon->owner, icon->callback_message, wp, lp ) &&
         (GetLastError() == ERROR_INVALID_WINDOW_HANDLE))
     {
         WARN( "application window was destroyed, removing icon %u\n", icon->id );
-- 
2.30.0

[PATCH 3/4] winemac: Send systray messages with SendNotifyMessage().

[Zebediah Figura]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50441
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
 dlls/winemac.drv/systray.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c
index 90d2430869d..dbddbddff9a 100644
--- a/dlls/winemac.drv/systray.c
+++ b/dlls/winemac.drv/systray.c
@@ -290,7 +290,7 @@ static BOOL notify_owner(struct tray_icon *icon, UINT msg, int x, int y)
     }
 
     TRACE("posting msg 0x%04x to hwnd %p id 0x%x\n", msg, icon->owner, icon->id);
-    if (!PostMessageW(icon->owner, icon->callback_message, wp, lp) &&
+    if (!SendNotifyMessageW(icon->owner, icon->callback_message, wp, lp) &&
         (GetLastError() == ERROR_INVALID_WINDOW_HANDLE))
     {
         WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id);
-- 
2.30.0

[PATCH 4/4] winex11: Send systray messages with SendNotifyMessage().

[Zebediah Figura]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50441
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
 dlls/winex11.drv/systray.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c
index 952bc1ef266..5522b229836 100644
--- a/dlls/winex11.drv/systray.c
+++ b/dlls/winex11.drv/systray.c
@@ -451,7 +451,7 @@ static BOOL notify_owner( struct tray_icon *icon, UINT msg, LPARAM lparam )
     }
 
     TRACE( "relaying 0x%x\n", msg );
-    if (!PostMessageW( icon->owner, icon->callback_message, wp, lp ) &&
+    if (!SendNotifyMessageW( icon->owner, icon->callback_message, wp, lp ) &&
         (GetLastError() == ERROR_INVALID_WINDOW_HANDLE))
     {
         WARN( "application window was destroyed, removing icon %u\n", icon->id );
-- 
2.30.0