Marcus Meissner : shell32: Pass number of wide chars, not bytes as last argument to MBtoWC().

Alexandre Julliard julliard at wine.codeweavers.com
Wed Nov 22 05:21:15 CST 2006


Module: wine
Branch: master
Commit: 267e660bd69667f8042b3c4bc25a01b50f972aab
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=267e660bd69667f8042b3c4bc25a01b50f972aab

Author: Marcus Meissner <marcus at jet.franken.de>
Date:   Tue Nov 21 20:29:06 2006 +0100

shell32: Pass number of wide chars, not bytes as last argument to MBtoWC().

---

 dlls/shell32/systray.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c
index 29078de..119f17f 100644
--- a/dlls/shell32/systray.c
+++ b/dlls/shell32/systray.c
@@ -54,18 +54,18 @@ BOOL WINAPI Shell_NotifyIconA(DWORD dwMe
     nidW.hIcon  = pnid->hIcon;
 
     /* szTip */
-    MultiByteToWideChar(CP_ACP, 0, pnid->szTip, sizeof(pnid->szTip), nidW.szTip, sizeof(nidW.szTip));
+    MultiByteToWideChar(CP_ACP, 0, pnid->szTip, -1, nidW.szTip, sizeof(nidW.szTip)/sizeof(WCHAR));
 
     nidW.dwState      = pnid->dwState;
     nidW.dwStateMask  = pnid->dwStateMask;
 
     /* szInfo */
-    MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, sizeof(pnid->szInfo),  nidW.szInfo, sizeof(nidW.szInfo));
+    MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, -1,  nidW.szInfo, sizeof(nidW.szInfo)/sizeof(WCHAR));
 
     nidW.u.uTimeout = pnid->u.uTimeout;
 
     /* szInfoTitle */
-    MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, sizeof(pnid->szInfoTitle), nidW.szInfoTitle, sizeof(nidW.szInfoTitle));
+    MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, -1, nidW.szInfoTitle, sizeof(nidW.szInfoTitle)/sizeof(WCHAR));
     
     nidW.dwInfoFlags = pnid->dwInfoFlags;
 




More information about the wine-cvs mailing list