From 7bf577c9ba6c94f4b9ee9f63c911eacc71b2d45f Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Sat, 28 Jul 2007 11:35:08 +0000 Subject: [PATCH] The menu names are on the user heaps now svn path=/trunk/; revision=27943 --- reactos/subsystems/win32/win32k/ntuser/class.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/reactos/subsystems/win32/win32k/ntuser/class.c b/reactos/subsystems/win32/win32k/ntuser/class.c index 669661fbf86..93634727111 100644 --- a/reactos/subsystems/win32/win32k/ntuser/class.c +++ b/reactos/subsystems/win32/win32k/ntuser/class.c @@ -1961,8 +1961,7 @@ NtUserGetClassLong(IN HWND hWnd, if (Ret != 0 && Offset == GCLP_MENUNAME && Window->Class->MenuNameIsString) { - Ret = (ULONG_PTR)DesktopHeapAddressToUser(Window->Class->Desktop, - (PVOID)Ret); + Ret = (ULONG_PTR)UserHeapAddressToUser((PVOID)Ret); } } @@ -2196,10 +2195,9 @@ InvalidParameter: if (Class->MenuName != NULL && Class->MenuNameIsString) { - lpWndClassEx->lpszMenuName = DesktopHeapAddressToUser(Class->Desktop, - (Ansi ? - (PVOID)Class->AnsiMenuName : - (PVOID)Class->MenuName)); + lpWndClassEx->lpszMenuName = UserHeapAddressToUser(Ansi ? + (PVOID)Class->AnsiMenuName : + (PVOID)Class->MenuName); } /* Undocumented behavior! Return the class atom as a BOOL! */