[NTDLL] Allow shimdata to override the process manifest.

[reactos.git] / dll / shellext / stobject / csystray.cpp

diff --git a/dll/shellext/stobject/csystray.cpp b/dll/shellext/stobject/csystray.cpp
index e4a2afe..d73e67e 100644 (file)
--- a/dll/shellext/stobject/csystray.cpp
+++ b/dll/shellext/stobject/csystray.cpp
@@ -9,7 +9,8 @@
 
 #include "precomp.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(stobject);
+#include <undocshell.h>
+#include <shellutils.h>
 
 SysTrayIconHandlers_t g_IconHandlers [] = {
         { Volume_Init, Volume_Shutdown, Volume_Update, Volume_Message },
@@ -124,7 +125,7 @@ HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip, DWO
 
     TRACE("NotifyIcon code=%d, uId=%d, hIcon=%p, szTip=%S\n", code, uId, hIcon, szTip);
 
-    nim.cbSize = sizeof(NOTIFYICONDATA);
+    nim.cbSize = sizeof(nim);
     nim.uFlags = NIF_MESSAGE | NIF_ICON | NIF_STATE | NIF_TIP;
     nim.hIcon = hIcon;
     nim.uID = uId;
@@ -240,8 +241,12 @@ BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
         return TRUE;
 
     case WM_TIMER:
-        UpdateIcons();
+        if (wParam == 1)
+            UpdateIcons();
+        else
+            ProcessIconMessage(uMsg, wParam, lParam, lResult);
         return TRUE;
+
     case WM_DESTROY:
         KillTimer(1);
         ShutdownIcons();