user32: Also set cch member in GetMenuItemInfo when passing a null pointer.

997e197f · Michael Müller · Alexandre Julliard · 4b1901d8 · 997e197f
Commit 997e197f authored Sep 07, 2014 by Michael Müller Committed by Alexandre Julliard Sep 09, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

menu.c dlls/user32/menu.c +1 -1

No files found.
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -4583,12 +4583,12 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos,
    if ((lpmii->fMask & (MIIM_TYPE|MIIM_STRING))) {
         if( !menu->text ) {
                if(lpmii->dwTypeData && lpmii->cch) {
-                    lpmii->cch = 0;
                    if( unicode)
                        *((WCHAR *)lpmii->dwTypeData) = 0;
                    else
                        *((CHAR *)lpmii->dwTypeData) = 0;
                }
+                lpmii->cch = 0;
         } else {
            int len;
            if (unicode)