[ros-diffs] [weiden] 27943: The menu names are on the user heaps now

[weiden at svn.reactos.org]

Author: weiden
Date: Sat Jul 28 15:35:08 2007
New Revision: 27943

URL: http://svn.reactos.org/svn/reactos?rev=27943&view=rev
Log:
The menu names are on the user heaps now

Modified:
    trunk/reactos/subsystems/win32/win32k/ntuser/class.c

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/class.c?rev=27943&r1=27942&r2=27943&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Sat Jul 28 15:35:08 2007
@@ -1961,8 +1961,7 @@
 
         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 @@
 
                 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! */