[akhaldi] 70362: [0.4.0] * Merge VBoxTray tooltip text fix by Mark Jansen and David Quintana in r70360. CORE-10497

Author: akhaldi
Date: Wed Dec 16 14:53:50 2015
New Revision: 70362

URL: http://svn.reactos.org/svn/reactos?rev=70362&view=rev
Log:
[0.4.0] * Merge VBoxTray tooltip text fix by Mark Jansen and David Quintana in r70360. CORE-10497

Modified:
    branches/ros-branch-0_4_0/   (props changed)
    branches/ros-branch-0_4_0/reactos/   (props changed)
    branches/ros-branch-0_4_0/reactos/dll/win32/shell32/systray.cpp

Propchange: branches/ros-branch-0_4_0/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed Dec 16 14:53:50 2015
@@ -1 +1 @@
-/trunk:70000-70321,70323-70324,70335-70337,70357-70358
+/trunk:70000-70321,70323-70324,70335-70337,70357-70358,70360

Propchange: branches/ros-branch-0_4_0/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed Dec 16 14:53:50 2015
@@ -20,4 +20,4 @@
 /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:70000-70321,70323-70324,70335-70337,70357-70358
+/trunk/reactos:70000-70321,70323-70324,70335-70337,70357-70358,70360

Modified: branches/ros-branch-0_4_0/reactos/dll/win32/shell32/systray.cpp
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/win...
==============================================================================
--- branches/ros-branch-0_4_0/reactos/dll/win32/shell32/systray.cpp	[iso-8859-1] (original)
+++ branches/ros-branch-0_4_0/reactos/dll/win32/shell32/systray.cpp	[iso-8859-1] Wed Dec 16 14:53:50 2015
@@ -63,6 +63,7 @@
  */
 BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid)
 {
+    NOTIFYICONDATAW nidW;
     DWORD cbSize;

/* Validate the cbSize as Windows XP does */
@@ -77,7 +78,37 @@
     else
         cbSize = pnid->cbSize;

-    return SHELL_NotifyIcon(dwMessage, pnid, pnid->hWnd, cbSize, FALSE);
+    ZeroMemory(&nidW, sizeof(nidW));
+    nidW.cbSize = sizeof(nidW);
+    nidW.hWnd   = pnid->hWnd;
+    nidW.uID    = pnid->uID;
+    nidW.uFlags = pnid->uFlags;
+    nidW.uCallbackMessage = pnid->uCallbackMessage;
+    nidW.hIcon  = pnid->hIcon;
+
+    /* szTip */
+    if (pnid->uFlags & NIF_TIP)
+        MultiByteToWideChar(CP_ACP, 0, pnid->szTip, -1, nidW.szTip, _countof(nidW.szTip));
+
+    if (cbSize >= NOTIFYICONDATAA_V2_SIZE)
+    {
+        nidW.dwState      = pnid->dwState;
+        nidW.dwStateMask  = pnid->dwStateMask;
+
+        /* szInfo, szInfoTitle */
+        if (pnid->uFlags & NIF_INFO)
+        {
+            MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, -1,  nidW.szInfo, _countof(nidW.szTip));
+            MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, -1, nidW.szInfoTitle, _countof(nidW.szTip));
+        }
+
+        nidW.uTimeout = pnid->uTimeout;
+        nidW.dwInfoFlags = pnid->dwInfoFlags;
+    }
+
+    if (cbSize >= sizeof(NOTIFYICONDATAA))
+        nidW.hBalloonIcon = pnid->hBalloonIcon;
+    return Shell_NotifyIconW(dwMessage, &nidW);
 }

/*************************************************************************