From b2bf468fad93cd07acad87180e8da5da04241270 Mon Sep 17 00:00:00 2001 From: James Tabor Date: Sat, 9 Jul 2005 04:19:35 +0000 Subject: [PATCH] Implement GetMenuString A & W. Not fully tested. svn path=/trunk/; revision=16516 --- reactos/lib/user32/windows/menu.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/reactos/lib/user32/windows/menu.c b/reactos/lib/user32/windows/menu.c index b181c3c0801..1f7c1dccc7b 100644 --- a/reactos/lib/user32/windows/menu.c +++ b/reactos/lib/user32/windows/menu.c @@ -3850,7 +3850,7 @@ GetMenuState( /* - * @unimplemented + * @implemented */ int STDCALL @@ -3861,13 +3861,22 @@ GetMenuStringA( int nMaxCount, UINT uFlag) { + MENUITEMINFOA mii; + mii.dwTypeData = lpString; + mii.fMask = MIIM_STRING; + mii.cbSize = sizeof(MENUITEMINFOA); + mii.cch = nMaxCount; + UNIMPLEMENTED; - return 0; + if(!(GetMenuItemInfoA( hMenu, uIDItem, (BOOL)!(MF_BYPOSITION & uFlag),&mii))) + return 0; + else + return mii.cch; } /* - * @unimplemented + * @implemented */ int STDCALL @@ -3878,8 +3887,17 @@ GetMenuStringW( int nMaxCount, UINT uFlag) { + MENUITEMINFOW miiW; + miiW.dwTypeData = lpString; + miiW.fMask = MIIM_STRING; + miiW.cbSize = sizeof(MENUITEMINFOW); + miiW.cch = nMaxCount; + UNIMPLEMENTED; - return 0; + if(!(GetMenuItemInfoW( hMenu, uIDItem, (BOOL)!(MF_BYPOSITION & uFlag),&miiW))) + return 0; + else + return miiW.cch; }