[khornicek] 67436: [W32KNAPI] - NEW_CURSORICON is no more

Author: khornicek
Date: Sun Apr 26 13:17:24 2015
New Revision: 67436

URL: http://svn.reactos.org/svn/reactos?rev=67436&view=rev
Log:
[W32KNAPI]
- NEW_CURSORICON is no more

Modified:
    trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec
    trunk/rostests/apitests/w32kdll/w32kdll_ros/win32ksvc-ros.h

Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_…
==============================================================================
--- trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec	[iso-8859-1] (original)
+++ trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec	[iso-8859-1] Sun Apr 26
13:17:24 2015
@@ -382,7 +382,7 @@
 @ stdcall NtUserEvent(long)
 @ stdcall NtUserExcludeUpdateRgn(ptr ptr)
 @ stdcall NtUserFillWindow(ptr ptr ptr ptr)
-@ stdcall NtUserFindExistingCursorIcon(ptr ptr ptr ptr) # FIXME: 3 on XP
+@ stdcall NtUserFindExistingCursorIcon(ptr ptr ptr)
 @ stdcall NtUserFindWindowEx(ptr ptr ptr ptr long)
 @ stdcall NtUserFlashWindowEx(ptr)
 @ stdcall NtUserGetAltTabInfo(ptr long ptr wstr long long)
@@ -518,7 +518,7 @@
 @ stdcall NtUserSetConsoleReserveKeys(long long)
 @ stdcall NtUserSetCursor(ptr)
 @ stdcall NtUserSetCursorContents(ptr ptr)
-; @ stdcall NtUserSetCursorIconData(ptr ptr ptr ptr) # FIXME 4 with new iconcursor / XP
+@ stdcall NtUserSetCursorIconData(ptr ptr ptr ptr)
 @ stdcall NtUserSetDbgTag(long long)
 @ stdcall NtUserSetFocus(ptr)
 @ stdcall NtUserSetImeHotKey(long long long long long)

Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/win32ksvc-ros.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_…
==============================================================================
--- trunk/rostests/apitests/w32kdll/w32kdll_ros/win32ksvc-ros.h	[iso-8859-1] (original)
+++ trunk/rostests/apitests/w32kdll/w32kdll_ros/win32ksvc-ros.h	[iso-8859-1] Sun Apr 26
13:17:24 2015
@@ -379,11 +379,7 @@
 SVC_(UserEvent, 1)
 SVC_(UserExcludeUpdateRgn, 2)
 SVC_(UserFillWindow, 4)
-#ifdef NEW_CURSORICON
 SVC_(UserFindExistingCursorIcon, 3)
-#else
-SVC_(UserFindExistingCursorIcon, 4)
-#endif
 SVC_(UserFindWindowEx, 5)
 SVC_(UserFlashWindowEx, 1)
 SVC_(UserGetAltTabInfo, 6)
@@ -519,11 +515,7 @@
 SVC_(UserSetConsoleReserveKeys, 2)
 SVC_(UserSetCursor, 1)
 SVC_(UserSetCursorContents, 2)
-#ifdef NEW_CURSORICON
 SVC_(UserSetCursorIconData, 4)
-#else
-SVC_(UserSetCursorIconData, 6)
-#endif
 SVC_(UserSetDbgTag, 2)
 SVC_(UserSetFocus, 1)
 SVC_(UserSetImeHotKey, 5)