Author: tfaber
Date: Sat Oct 10 17:56:09 2015
New Revision: 69493
URL:
http://svn.reactos.org/svn/reactos?rev=69493&view=rev
Log:
[WIN32K]
- Rename IntSetProp to UserSetProp, IntRemoveProp to UserRemoveProp and
IntRemoveWindowProp to UserRemoveWindowProps
Modified:
trunk/reactos/win32ss/gdi/eng/engwindow.c
trunk/reactos/win32ss/user/ntuser/dde.c
trunk/reactos/win32ss/user/ntuser/defwnd.c
trunk/reactos/win32ss/user/ntuser/layered.c
trunk/reactos/win32ss/user/ntuser/painting.c
trunk/reactos/win32ss/user/ntuser/prop.c
trunk/reactos/win32ss/user/ntuser/prop.h
trunk/reactos/win32ss/user/ntuser/simplecall.c
trunk/reactos/win32ss/user/ntuser/window.c
Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engwindow.…
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] Sat Oct 10 17:56:09 2015
@@ -208,7 +208,7 @@
Clip->PixelFormat = iPixelFormat;
/* associate object with window */
- IntSetProp(Window, AtomWndObj, Clip);
+ UserSetProp(Window, AtomWndObj, Clip);
++gcountPWO;
TRACE("EngCreateWnd: SUCCESS: %p!\n", WndObjUser);
@@ -253,7 +253,7 @@
else
{
/* Remove object from window */
- IntRemoveProp(Window, AtomWndObj);
+ UserRemoveProp(Window, AtomWndObj);
}
--gcountPWO;
Modified: trunk/reactos/win32ss/user/ntuser/dde.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/dde.c?…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] Sat Oct 10 17:56:09 2015
@@ -348,7 +348,7 @@
ERR("DDE Get Client WM_DDE_TERMINATE\n");
}
- IntRemoveProp(pWnd, AtomDDETrack);
+ UserRemoveProp(pWnd, AtomDDETrack);
ExFreePoolWithTag(pddeProp, USERTAG_DDE1);
}
return TRUE;
@@ -419,7 +419,7 @@
pddeProp->spwnd = pWndServer;
pddeProp->spwndPartner = pWnd;
- IntSetProp(pWndServer, AtomDDETrack, (HANDLE)pddeProp);
+ UserSetProp(pWndServer, AtomDDETrack, (HANDLE)pddeProp);
}
return TRUE;
}
Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Sat Oct 10 17:56:09 2015
@@ -460,8 +460,8 @@
break;
}
- IntSetProp(pWnd, gpsi->atomIconProp, hIcon);
- IntSetProp(pWnd, gpsi->atomIconSmProp, hIconSmall);
+ UserSetProp(pWnd, gpsi->atomIconProp, hIcon);
+ UserSetProp(pWnd, gpsi->atomIconSmProp, hIconSmall);
if ((pWnd->style & WS_CAPTION ) == WS_CAPTION)
UserPaintCaption(pWnd, DC_ICON);
Modified: trunk/reactos/win32ss/user/ntuser/layered.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/layere…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/layered.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/layered.c [iso-8859-1] Sat Oct 10 17:56:09 2015
@@ -68,7 +68,7 @@
return FALSE;
}
RtlZeroMemory(pLrdProp, sizeof(LRD_PROP));
- IntSetProp(pWnd, AtomLayer, (HANDLE)pLrdProp);
+ UserSetProp(pWnd, AtomLayer, (HANDLE)pLrdProp);
}
if (pLrdProp)
Modified: trunk/reactos/win32ss/user/ntuser/painting.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Sat Oct 10 17:56:09 2015
@@ -1267,7 +1267,7 @@
IntKillTimer(pWnd, ID_EVENT_SYSTIMER_FLASHWIN, TRUE);
}
- IntRemoveProp(pWnd, AtomFlashWndState);
+ UserRemoveProp(pWnd, AtomFlashWndState);
}
else
{ // Have a count and started, set timer.
@@ -1305,7 +1305,7 @@
FlashState ^= (FlashState ^ pfwi->dwFlags) & (FLASHW_MASK &
~FLASHW_TIMER);
}
FlashState = MAKELONG(LOWORD(FlashState),uCount);
- IntSetProp(pWnd, AtomFlashWndState, (HANDLE) FlashState);
+ UserSetProp(pWnd, AtomFlashWndState, (HANDLE) FlashState);
}
return Ret;
}
Modified: trunk/reactos/win32ss/user/ntuser/prop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Sat Oct 10 17:56:09 2015
@@ -60,7 +60,7 @@
_Success_(return)
HANDLE
FASTCALL
-IntRemoveProp(
+UserRemoveProp(
_In_ PWND Window,
_In_ ATOM Atom)
{
@@ -84,7 +84,7 @@
_Success_(return)
BOOL
FASTCALL
-IntSetProp(
+UserSetProp(
_In_ PWND Window,
_In_ ATOM Atom,
_In_ HANDLE Data)
@@ -111,7 +111,7 @@
VOID
FASTCALL
-IntRemoveWindowProp(
+UserRemoveWindowProps(
_In_ PWND Window)
{
PLIST_ENTRY ListEntry;
@@ -228,7 +228,7 @@
goto Exit;
}
- Data = IntRemoveProp(Window, Atom);
+ Data = UserRemoveProp(Window, Atom);
Exit:
TRACE("Leave NtUserRemoveProp, ret=%p\n", Data);
@@ -257,7 +257,7 @@
goto Exit;
}
- Ret = IntSetProp(Window, Atom, Data);
+ Ret = UserSetProp(Window, Atom, Data);
Exit:
TRACE("Leave NtUserSetProp, ret=%i\n", Ret);
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 17:56:09 2015
@@ -8,19 +8,19 @@
HANDLE
FASTCALL
-IntRemoveProp(
+UserRemoveProp(
_In_ PWND Window,
_In_ ATOM Atom);
_Success_(return)
BOOL
FASTCALL
-IntSetProp(
+UserSetProp(
_In_ PWND Window,
_In_ ATOM Atom,
_In_ HANDLE Data);
VOID
FASTCALL
-IntRemoveWindowProp(
+UserRemoveWindowProps(
_In_ PWND Window);
Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat Oct 10 17:56:09 2015
@@ -666,9 +666,9 @@
}
if ( Param )
- IntSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param);
+ UserSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param);
else
- IntRemoveProp(Window, gpsi->atomContextHelpIdProp);
+ UserRemoveProp(Window, gpsi->atomContextHelpIdProp);
UserLeave();
return TRUE;
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 17:56:09 2015
@@ -630,7 +630,7 @@
if (Window->PropListItems)
{
- IntRemoveWindowProp(Window);
+ UserRemoveWindowProps(Window);
TRACE("Window->PropListItems %lu\n",Window->PropListItems);
ASSERT(Window->PropListItems==0);
}