[jimtabor] 29348: Win32k/User32: - Moved NtUserGetCursorIconInfo to NtUserGetIconInfo, update header. - GetIconInfo is correctly called now.

Author: jimtabor
Date: Tue Oct  2 03:15:02 2007
New Revision: 29348

URL: http://svn.reactos.org/svn/reactos?rev=29348&view=rev
Log:
Win32k/User32:
- Moved NtUserGetCursorIconInfo to NtUserGetIconInfo, update header.
- GetIconInfo is correctly called now.

Modified:
    trunk/reactos/dll/win32/user32/windows/cursor.c
    trunk/reactos/dll/win32/user32/windows/icon.c
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
    trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
    trunk/reactos/subsystems/win32/win32k/w32ksvc.db

Modified: trunk/reactos/dll/win32/user32/windows/cursor.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/cu...
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/cursor.c (original)
+++ trunk/reactos/dll/win32/user32/windows/cursor.c Tue Oct  2 03:15:02 2007
@@ -72,7 +72,7 @@
 {
   ICONINFO IconInfo;

-  if(NtUserGetCursorIconInfo((HANDLE)pcur, &IconInfo))
+  if(GetIconInfo((HANDLE)pcur, &IconInfo))
   {
     return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE);
   }

Modified: trunk/reactos/dll/win32/user32/windows/icon.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/ic...
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/icon.c (original)
+++ trunk/reactos/dll/win32/user32/windows/icon.c Tue Oct  2 03:15:02 2007
@@ -152,7 +152,7 @@
 {
   ICONINFO IconInfo;

-  if(NtUserGetCursorIconInfo((HANDLE)hIcon, &IconInfo))
+  if(GetIconInfo((HANDLE)hIcon, &IconInfo))
   {
     return NtUserCreateCursorIconHandle(&IconInfo, FALSE);
   }
@@ -400,8 +400,7 @@
   HICON hIcon,
   PICONINFO IconInfo)
 {
-  /* FIXME - copy bitmaps */
-  return (BOOL)NtUserGetCursorIconInfo((HANDLE)hIcon, IconInfo);
+  return NtUserGetIconInfo((HANDLE)hIcon, IconInfo, 0, 0, 0, 0);
 }

Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntus...
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Oct  2 03:15:02 2007
@@ -1066,22 +1066,16 @@

BOOL
 NTAPI
-NtUserGetCursorIconInfo(
-  HANDLE Handle,
-  PICONINFO IconInfo);
-
-BOOL
-NTAPI
 NtUserGetCursorIconSize(
   HANDLE Handle,
   BOOL *fIcon,
   SIZE *Size);

-DWORD
+BOOL
 NTAPI
 NtUserGetIconInfo(
-    DWORD dwUnknown1,
-    DWORD dwUnknown2,
+    HANDLE Handle,
+    PICONINFO IconInfo,
     DWORD dwUnknown3,
     DWORD dwUnknown4,
     DWORD dwUnknown5,

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Tue Oct  2 03:15:02 2007
@@ -621,9 +621,9 @@
  */
 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 @@
    BOOL Ret = FALSE;
    DECLARE_RETURN(BOOL);

-   DPRINT("Enter NtUserGetCursorIconInfo\n");
+   DPRINT("Enter NtUserGetIconInfo\n");
    UserEnterExclusive();

if(!IconInfo)
@@ -670,7 +670,7 @@
    RETURN( Ret);

CLEANUP:
-   DPRINT("Leave NtUserGetCursorIconInfo, ret=%i\n",_ret_);
+   DPRINT("Leave NtUserGetIconInfo, ret=%i\n",_ret_);
    UserLeave();
    END_CLEANUP;
 }

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Tue Oct  2 03:15:02 2007
@@ -774,20 +774,6 @@
     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/b47155634cc... */

Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w32...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original)
+++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Tue Oct  2 03:15:02 2007
@@ -711,7 +711,6 @@
 NtUserGetClientOrigin                   2
 NtUserGetClientRect                     2
 NtUserGetMenuDefaultItem                3
-NtUserGetCursorIconInfo                 2
 NtUserGetCursorIconSize                 3
 NtUserGetLastInputInfo                  1
 NtUserGetMinMaxInfo                     3