[WIN32K, USER32]

  - Get rid of ONEPARAM_ROUTINE_CREATECURICONHANDLE

svn path=/trunk/; revision=48040

diff --git a/reactos/dll/win32/user32/windows/cursoricon.c b/reactos/dll/win32/user32/windows/cursoricon.c
index 52a22a4..d0936a9 100644 (file)
--- a/reactos/dll/win32/user32/windows/cursoricon.c
+++ b/reactos/dll/win32/user32/windows/cursoricon.c
@@ -76,8 +76,8 @@ static
 HICON
 CreateCursorIconHandle( PICONINFO IconInfo )
 {
-       HICON hIcon = (HICON)NtUserCallOneParam(0, //FIXME ?
-                                                                        ONEPARAM_ROUTINE_CREATECURICONHANDLE);
+       HICON hIcon = (HICON)NtUserCallOneParam(0,
+                                                                        ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT);
        if(!hIcon)
                return NULL;
 

diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h
index fec4e9b..f07263a 100644 (file)
--- a/reactos/include/reactos/win32k/ntuser.h
+++ b/reactos/include/reactos/win32k/ntuser.h
@@ -3140,7 +3140,6 @@ typedef struct tagKMDDELPARAM
 #define ONEPARAM_ROUTINE_ISWINDOWINDESTROY    0xfffe000c
 #define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d
 #define ONEPARAM_ROUTINE_GETDESKTOPMAPPING    0xfffe000e
-#define ONEPARAM_ROUTINE_CREATECURICONHANDLE  0xfffe0025 // CREATE_EMPTY_CURSOR_OBJECT ?
 #define ONEPARAM_ROUTINE_MSQSETWAKEMASK       0xfffe0027
 #define ONEPARAM_ROUTINE_GETCURSORPOSITION    0xfffe0048 // use ONEPARAM_ or TWOPARAM routine ?
 #define TWOPARAM_ROUTINE_GETWINDOWRGNBOX    0xfffd0048 // user mode

diff --git a/reactos/subsystems/win32/win32k/ntuser/simplecall.c b/reactos/subsystems/win32/win32k/ntuser/simplecall.c
index d25ead5..bf26bc2 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/simplecall.c
+++ b/reactos/subsystems/win32/win32k/ntuser/simplecall.c
@@ -192,7 +192,7 @@ NtUserCallOneParam(
       case ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO:
          RETURN( (DWORD_PTR)MsqSetMessageExtraInfo((LPARAM)Param));
 
-      case ONEPARAM_ROUTINE_CREATECURICONHANDLE:
+      case ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT:
          {
             PCURICON_OBJECT CurIcon;
                        DWORD_PTR Result ;