[ros-diffs] [gedmurphy] 31289: - Add a new routine to NtUSerCallOneParam which returns newly created handles for icons and cursors - Fix the NtUserGetIconSize prototype

[gedmurphy at svn.reactos.org]

Author: gedmurphy
Date: Mon Dec 17 12:40:48 2007
New Revision: 31289

URL: http://svn.reactos.org/svn/reactos?rev=31289&view=rev
Log:
- Add a new routine to NtUSerCallOneParam which returns newly created handles for icons and cursors
- Fix the NtUserGetIconSize prototype

Modified:
    trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
    trunk/reactos/subsystems/win32/win32k/ntuser/misc.c

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c?rev=31289&r1=31288&r2=31289&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Mon Dec 17 12:40:48 2007
@@ -676,9 +676,6 @@
 }
 
 
-/* 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 */
 /*
  * @implemented
  */
@@ -686,7 +683,7 @@
 NTAPI
 NtUserGetIconSize(
     HANDLE hCurIcon,
-    DWORD dwUnknown2, // Most of the time Zero.
+    UINT istepIfAniCur,
     PLONG plcx,       // &size.cx
     PLONG plcy)       // &size.cy
 {

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/misc.c?rev=31289&r1=31288&r2=31289&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Mon Dec 17 12:40:48 2007
@@ -352,6 +352,28 @@
 
       case ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO:
          RETURN( (DWORD)MsqSetMessageExtraInfo((LPARAM)Param));
+
+      case ONEPARAM_ROUTINE_CREATECURICONHANDLE:
+         {
+            PCURICON_OBJECT CurIcon;
+            PWINSTATION_OBJECT WinSta;
+
+            WinSta = IntGetWinStaObj();
+            if(WinSta == NULL)
+            {
+               RETURN(0);
+            }
+
+            if (!(CurIcon = IntCreateCurIconHandle(WinSta)))
+            {
+               SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
+               ObDereferenceObject(WinSta);
+               RETURN(0);
+            }
+
+            ObDereferenceObject(WinSta);
+            RETURN((DWORD)CurIcon->Self);
+         }
 
       case ONEPARAM_ROUTINE_GETCURSORPOSITION:
          {