[Win32k|User32]

[reactos.git] / reactos / subsystems / win32 / win32k / ntuser / callproc.c

diff --git a/reactos/subsystems/win32/win32k/ntuser/callproc.c b/reactos/subsystems/win32/win32k/ntuser/callproc.c
index 8215136..866bac1 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/callproc.c
+++ b/reactos/subsystems/win32/win32k/ntuser/callproc.c
@@ -20,35 +20,30 @@ WNDPROC
 GetCallProcHandle(IN PCALLPROCDATA CallProc)
 {
     /* FIXME - check for 64 bit architectures... */
-    return (WNDPROC)((ULONG_PTR)UserObjectToHandle(CallProc) | 0xFFFF0000);
+    return (WNDPROC)((ULONG_PTR)UserHMGetHandle(CallProc) | 0xFFFF0000);
 }
 
 VOID
 DestroyCallProc(IN PDESKTOPINFO Desktop,
                 IN OUT PCALLPROCDATA CallProc)
 {
-    /* FIXME - use new object manager! */
-    HANDLE Handle = UserObjectToHandle(CallProc);
-
-    UserDeleteObject(Handle,
-                    otCallProc);
+    UserDeleteObject(UserHMGetHandle(CallProc), otCallProc);
 }
 
 PCALLPROCDATA
-CloneCallProc(IN PDESKTOPINFO Desktop,
+CloneCallProc(IN PDESKTOP Desktop,
               IN PCALLPROCDATA CallProc)
 {
     PCALLPROCDATA NewCallProc;
     HANDLE Handle;
 
-    /* FIXME - use new object manager! */
     NewCallProc = (PCALLPROCDATA)UserCreateObject(gHandleTable,
+                                             Desktop,
                                              &Handle,
                                              otCallProc,
                                              sizeof(CALLPROCDATA));
     if (NewCallProc != NULL)
     {
-        NewCallProc->head.h = Handle;
         NewCallProc->pfnClientPrevious = CallProc->pfnClientPrevious;
         NewCallProc->wType = CallProc->wType;
         NewCallProc->spcpdNext = NULL;
@@ -58,7 +53,7 @@ CloneCallProc(IN PDESKTOPINFO Desktop,
 }
 
 PCALLPROCDATA
-CreateCallProc(IN PDESKTOPINFO Desktop,
+CreateCallProc(IN PDESKTOP Desktop,
                IN WNDPROC WndProc,
                IN BOOL Unicode,
                IN PPROCESSINFO pi)
@@ -66,14 +61,13 @@ CreateCallProc(IN PDESKTOPINFO Desktop,
     PCALLPROCDATA NewCallProc;
     HANDLE Handle;
 
-    /* FIXME - use new object manager! */
     NewCallProc = (PCALLPROCDATA)UserCreateObject(gHandleTable,
+                                             Desktop,
                                              &Handle,
                                              otCallProc,
                                              sizeof(CALLPROCDATA));
     if (NewCallProc != NULL)
     {
-        NewCallProc->head.h = Handle;
         NewCallProc->pfnClientPrevious = WndProc;
         NewCallProc->wType |= Unicode ? UserGetCPDA2U : UserGetCPDU2A ;
         NewCallProc->spcpdNext = NULL;
@@ -90,7 +84,6 @@ UserGetCallProcInfo(IN HANDLE hCallProc,
 
     /* NOTE: Accessing the WNDPROC_INFO structure may raise an exception! */
 
-    /* FIXME - use new object manager! */
     CallProc = UserGetObject(gHandleTable,
                              hCallProc,
                              otCallProc);