[tfaber] 69491: [WIN32K:NTUSER] - Don't call IntGetProp from outside prop.c

Author: tfaber
Date: Sat Oct 10 16:43:47 2015
New Revision: 69491

URL: http://svn.reactos.org/svn/reactos?rev=69491&view=rev
Log:
[WIN32K:NTUSER]
- Don't call IntGetProp from outside prop.c

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

Modified: trunk/reactos/win32ss/user/ntuser/prop.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.h?...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/prop.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/prop.h	[iso-8859-1] Sat Oct 10 16:43:47 2015
@@ -1,10 +1,4 @@
 #pragma once
-
-PPROPERTY
-FASTCALL
-IntGetProp(
-    _In_ PWND Window,
-    _In_ ATOM Atom);

HANDLE
 FASTCALL

Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simplec...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/simplecall.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/simplecall.c	[iso-8859-1] Sat Oct 10 16:43:47 2015
@@ -600,7 +600,7 @@
       case HWND_ROUTINE_GETWNDCONTEXTHLPID:
       {
          PWND Window;
-         PPROPERTY HelpId;
+         DWORD HelpId;
          USER_REFERENCE_ENTRY Ref;

UserEnterExclusive();
@@ -612,11 +612,11 @@
          }
          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))

Modified: trunk/reactos/win32ss/user/ntuser/windc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.c...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/windc.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/windc.c	[iso-8859-1] Sat Oct 10 16:43:47 2015
@@ -962,15 +962,12 @@
   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 )
      {

Modified: trunk/reactos/win32ss/user/ntuser/window.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window....
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/window.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/window.c	[iso-8859-1] Sat Oct 10 16:43:47 2015
@@ -369,16 +369,16 @@

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;
 }

/***********************************************************************