[User32]

- Patch by Michael Müller : Also set cch member in GetMenuItemInfo when passing a null pointer.
- Fix two menu tests.

svn path=/trunk/; revision=64788

diff --git a/reactos/win32ss/user/user32/windows/menu.c b/reactos/win32ss/user/user32/windows/menu.c
index 0311153..8241379 100644 (file)
--- a/reactos/win32ss/user/user32/windows/menu.c
+++ b/reactos/win32ss/user/user32/windows/menu.c
@@ -295,12 +295,12 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu,
          {                                         // Very strange this fixes a wine test with a crash.
                 if(lpmii->dwTypeData && lpmii->cch && !(GdiValidateHandle((HGDIOBJ)lpmii->dwTypeData)) )
                 {
-                    lpmii->cch = 0;
                     if( unicode)
                         *((WCHAR *)lpmii->dwTypeData) = 0;
                     else
                         *((CHAR *)lpmii->dwTypeData) = 0;
                 }
+                lpmii->cch = 0;
          }
          else
          {