[WIN32K:NTUSER]
authorThomas Faber <thomas.faber@reactos.org>
Sat, 10 Oct 2015 16:43:47 +0000 (16:43 +0000)
committerThomas Faber <thomas.faber@reactos.org>
Sat, 10 Oct 2015 16:43:47 +0000 (16:43 +0000)
- Don't call IntGetProp from outside prop.c

svn path=/trunk/; revision=69491

reactos/win32ss/user/ntuser/prop.h
reactos/win32ss/user/ntuser/simplecall.c
reactos/win32ss/user/ntuser/windc.c
reactos/win32ss/user/ntuser/window.c

index 76087f7..bd10040 100644 (file)
@@ -1,11 +1,5 @@
 #pragma once
 
-PPROPERTY
-FASTCALL
-IntGetProp(
-    _In_ PWND Window,
-    _In_ ATOM Atom);
-
 HANDLE
 FASTCALL
 UserGetProp(
index a447c4b..7d7d8f6 100644 (file)
@@ -600,7 +600,7 @@ NtUserCallHwnd(
       case HWND_ROUTINE_GETWNDCONTEXTHLPID:
       {
          PWND Window;
-         PPROPERTY HelpId;
+         DWORD HelpId;
          USER_REFERENCE_ENTRY Ref;
 
          UserEnterExclusive();
@@ -612,11 +612,11 @@ NtUserCallHwnd(
          }
          UserRefObjectCo(Window, &Ref);
 
-         HelpId = IntGetProp(Window, gpsi->atomContextHelpIdProp);
+         HelpId = (DWORD)(DWORD_PTR)UserGetProp(Window, gpsi->atomContextHelpIdProp);
 
          UserDerefObjectCo(Window);
          UserLeave();
-         return (DWORD)HelpId->Data;
+         return HelpId;
       }
       case HWND_ROUTINE_REGISTERSHELLHOOKWINDOW:
          if (IntIsWindow(hWnd))
index cc3d775..521a312 100644 (file)
@@ -962,15 +962,12 @@ UserGethWnd( HDC hdc, PWNDOBJ *pwndo)
   XCLIPOBJ* Clip;
   PWND Wnd;
   HWND hWnd;
-  PPROPERTY pprop;
 
   hWnd = IntWindowFromDC(hdc);
 
   if (hWnd && (Wnd = UserGetWindowObject(hWnd)))
   {
-     pprop = IntGetProp(Wnd, AtomWndObj);
-
-     Clip = (XCLIPOBJ*)pprop->Data;
+     Clip = (XCLIPOBJ*)UserGetProp(Wnd, AtomWndObj);
 
      if ( Clip && Clip->Hwnd == hWnd )
      {
index d04475f..8857b7c 100644 (file)
@@ -369,16 +369,16 @@ IntGetWindow(HWND hWnd,
 
 DWORD FASTCALL IntGetWindowContextHelpId( PWND pWnd )
 {
-   PPROPERTY HelpId;
+   DWORD HelpId;
 
    do
    {
-      HelpId = IntGetProp(pWnd, gpsi->atomContextHelpIdProp);
+      HelpId = (DWORD)(DWORD_PTR)UserGetProp(pWnd, gpsi->atomContextHelpIdProp);
       if (!HelpId) break;
       pWnd = IntGetParent(pWnd);
    }
    while (pWnd && pWnd->fnid != FNID_DESKTOP);
-   return (DWORD) (HelpId ? HelpId->Data : 0 );
+   return HelpId;
 }
 
 /***********************************************************************