Win32k/User32:

- Moved NtUserGetCursorIconInfo to NtUserGetIconInfo, update header.
- GetIconInfo is correctly called now.

svn path=/trunk/; revision=29348

diff --git a/reactos/dll/win32/user32/windows/cursor.c b/reactos/dll/win32/user32/windows/cursor.c
index e47e242..a5235ca 100644 (file)
--- a/reactos/dll/win32/user32/windows/cursor.c
+++ b/reactos/dll/win32/user32/windows/cursor.c
@@ -72,7 +72,7 @@ CopyCursor(HCURSOR pcur)
 {
   ICONINFO IconInfo;
 
-  if(NtUserGetCursorIconInfo((HANDLE)pcur, &IconInfo))
+  if(GetIconInfo((HANDLE)pcur, &IconInfo))
   {
     return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE);
   }

diff --git a/reactos/dll/win32/user32/windows/icon.c b/reactos/dll/win32/user32/windows/icon.c
index 397f5f2..7d24e3d 100644 (file)
--- a/reactos/dll/win32/user32/windows/icon.c
+++ b/reactos/dll/win32/user32/windows/icon.c
@@ -152,7 +152,7 @@ CopyIcon(
 {
   ICONINFO IconInfo;
 
-  if(NtUserGetCursorIconInfo((HANDLE)hIcon, &IconInfo))
+  if(GetIconInfo((HANDLE)hIcon, &IconInfo))
   {
     return NtUserCreateCursorIconHandle(&IconInfo, FALSE);
   }
@@ -400,8 +400,7 @@ GetIconInfo(
   HICON hIcon,
   PICONINFO IconInfo)
 {
-  /* FIXME - copy bitmaps */
-  return (BOOL)NtUserGetCursorIconInfo((HANDLE)hIcon, IconInfo);
+  return NtUserGetIconInfo((HANDLE)hIcon, IconInfo, 0, 0, 0, 0);
 }
 
 

diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h
index c89af68..480d008 100644 (file)
--- a/reactos/include/reactos/win32k/ntuser.h
+++ b/reactos/include/reactos/win32k/ntuser.h
@@ -1064,12 +1064,6 @@ NtUserGetGUIThreadInfo(
   DWORD idThread,
   LPGUITHREADINFO lpgui);
 
-BOOL
-NTAPI
-NtUserGetCursorIconInfo(
-  HANDLE Handle,
-  PICONINFO IconInfo);
-
 BOOL
 NTAPI
 NtUserGetCursorIconSize(
@@ -1077,11 +1071,11 @@ NtUserGetCursorIconSize(
   BOOL *fIcon,
   SIZE *Size);
 
-DWORD
+BOOL
 NTAPI
 NtUserGetIconInfo(
-    DWORD dwUnknown1,
-    DWORD dwUnknown2,
+    HANDLE Handle,
+    PICONINFO IconInfo,
     DWORD dwUnknown3,
     DWORD dwUnknown4,
     DWORD dwUnknown5,

diff --git a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c b/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
index 25bb278..5b71f47 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
+++ b/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
@@ -621,9 +621,9 @@ CLEANUP:
  */
 BOOL
 STDCALL
-NtUserGetCursorIconInfo(
+NtUserGetIconInfo(
    HANDLE hCurIcon,
-   PICONINFO IconInfo)
+   PICONINFO IconInfo, DWORD UnkOne, DWORD UnkTwo, DWORD UnkThree, DWORD UnkFour )
 {
    ICONINFO ii;
    PCURICON_OBJECT CurIcon;
@@ -632,7 +632,7 @@ NtUserGetCursorIconInfo(
    BOOL Ret = FALSE;
    DECLARE_RETURN(BOOL);
 
-   DPRINT("Enter NtUserGetCursorIconInfo\n");
+   DPRINT("Enter NtUserGetIconInfo\n");
    UserEnterExclusive();
 
    if(!IconInfo)
@@ -670,7 +670,7 @@ NtUserGetCursorIconInfo(
    RETURN( Ret);
 
 CLEANUP:
-   DPRINT("Leave NtUserGetCursorIconInfo, ret=%i\n",_ret_);
+   DPRINT("Leave NtUserGetIconInfo, ret=%i\n",_ret_);
    UserLeave();
    END_CLEANUP;
 }

diff --git a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
index 5f15f00..572fd38 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
+++ b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
@@ -774,20 +774,6 @@ NtUserGetAtomName(
     return 0;
 }
 
-DWORD
-NTAPI
-NtUserGetIconInfo(
-    DWORD dwUnknown1,
-    DWORD dwUnknown2,
-    DWORD dwUnknown3,
-    DWORD dwUnknown4,
-    DWORD dwUnknown5,
-    DWORD dwUnknown6)
-{
-    UNIMPLEMENTED;
-    return 0;
-}
-
 /* for hints how the prototype might be, see
    http://forum.grafika.cz/read.php?23,1816012,1816139,quote=1 
    http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634ccb2c30630da7e3666d3d07/b47155634ccb2c30630da7e3666d3d07.trace.html#NtUserGetIconSize */

diff --git a/reactos/subsystems/win32/win32k/w32ksvc.db b/reactos/subsystems/win32/win32k/w32ksvc.db
index 0c16ecf..801e8e3 100644 (file)
--- a/reactos/subsystems/win32/win32k/w32ksvc.db
+++ b/reactos/subsystems/win32/win32k/w32ksvc.db
@@ -711,7 +711,6 @@ NtUserGetClassLong                      3
 NtUserGetClientOrigin                   2
 NtUserGetClientRect                     2
 NtUserGetMenuDefaultItem                3
-NtUserGetCursorIconInfo                 2
 NtUserGetCursorIconSize                 3
 NtUserGetLastInputInfo                  1
 NtUserGetMinMaxInfo                     3