Aric Stewart : user32: Correct buffer calculation for GetMenuStringA.

Alexandre Julliard julliard at winehq.org
Mon Mar 3 13:20:10 CST 2014


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

Author: Aric Stewart <aric at codeweavers.com>
Date:   Mon Mar  3 14:10:05 2014 +0900

user32: Correct buffer calculation for GetMenuStringA.

---

 dlls/user32/menu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index bbaa5f3..915b1c5 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -3687,7 +3687,7 @@ INT WINAPI GetMenuStringA(
         return 0;
     }
     if (!item->text) return 0;
-    if (!str || !nMaxSiz) return strlenW(item->text);
+    if (!str || !nMaxSiz) return WideCharToMultiByte( CP_ACP, 0, item->text, -1, NULL, 0, NULL, NULL );
     if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, str, nMaxSiz, NULL, NULL ))
         str[nMaxSiz-1] = 0;
     TRACE("returning %s\n", debugstr_a(str));




More information about the wine-cvs mailing list