From d61b5efe6c6da325ae79fdf6995e761395af6d52 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Wed, 14 Jul 2010 15:01:02 +0000 Subject: [PATCH] [WIN32K, USER32] - Get rid of ONEPARAM_ROUTINE_CREATECURICONHANDLE svn path=/trunk/; revision=48040 --- reactos/dll/win32/user32/windows/cursoricon.c | 4 ++-- reactos/include/reactos/win32k/ntuser.h | 1 - reactos/subsystems/win32/win32k/ntuser/simplecall.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/user32/windows/cursoricon.c b/reactos/dll/win32/user32/windows/cursoricon.c index 52a22a47c18..d0936a93b1c 100644 --- 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 fec4e9b437d..f07263a6f1d 100644 --- 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 d25ead5dc46..bf26bc27962 100644 --- 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 ; -- 2.17.1