allow caching icons/cursors with different sizes

svn path=/trunk/; revision=6939

reactos/iface/addsys/w32ksvc.db

@@ -326,7 +326,7 @@ NtUserDeferWindowPos                    8
 NtUserDefSetText                        2
 NtUserDeleteMenu                        3
 NtUserDestroyAcceleratorTable           1
-NtUserDestroyCursor                     2
+NtUserDestroyCursorIcon                 2
 NtUserDestroyMenu                       1
 NtUserDestroyWindow                     1
 NtUserDispatchMessage                   1
@@ -349,7 +349,7 @@ NtUserEnumDisplaySettings               4
 NtUserEvent                             1
 NtUserExcludeUpdateRgn                  2
 NtUserFillWindow                        4
-NtUserFindExistingCursorIcon            2
+NtUserFindExistingCursorIcon            4
 NtUserFindWindowEx                      4
 NtUserFlashWindowEx                     1
 NtUserGetActiveWindow			0
@@ -383,8 +383,8 @@ NtUserGetDoubleClickTime                0
 NtUserGetForegroundWindow               0
 NtUserGetGuiResources                   2
 NtUserGetGUIThreadInfo                  2
-NtUserGetIconInfo                       2
-NtUserGetIconSize                       3
+NtUserGetCursorIconInfo                 2
+NtUserGetCursorIconSize                 3
 NtUserGetImeHotKey                      4
 NtUserGetInternalWindowPos              3
 NtUserGetKeyboardLayoutList             2

reactos/include/win32k/ntuser.h

@@ -276,7 +276,7 @@ NtUserCreateCaret(
   int nWidth,
   int nHeight);
 
-HICON
+HANDLE
 STDCALL
 NtUserCreateCursorIconHandle(
   PICONINFO IconInfo,
@@ -380,8 +380,8 @@ NtUserDestroyAcceleratorTable(
 
 BOOL
 STDCALL
-NtUserDestroyCursor(
-  HCURSOR hCursor,
+NtUserDestroyCursorIcon(
+  HANDLE Handle,
   DWORD Unknown);
 
 BOOL
@@ -551,7 +551,9 @@ HICON
 STDCALL
 NtUserFindExistingCursorIcon(
   HMODULE hModule,
-  HRSRC hRsrc);
+  HRSRC hRsrc,
+  LONG cx,
+  LONG cy);
 
 HWND
 STDCALL
@@ -712,14 +714,14 @@ NtUserGetGUIThreadInfo(
 
 BOOL
 STDCALL
-NtUserGetIconInfo(
-  HICON hIcon,
+NtUserGetCursorIconInfo(
+  HANDLE Handle,
   PICONINFO IconInfo);
 
 BOOL
 STDCALL
-NtUserGetIconSize(
-  HICON hIcon,
+NtUserGetCursorIconSize(
+  HANDLE Handle,
   BOOL *fIcon,
   SIZE *Size);
 
@@ -1332,13 +1334,13 @@ NtUserSetCursor(
 BOOL
 STDCALL
 NtUserSetCursorIconContents(
-  HCURSOR hCursor,
+  HANDLE Handle,
   PICONINFO IconInfo);
 
 BOOL
 STDCALL
 NtUserSetCursorIconData(
-  HICON hIcon,
+  HANDLE Handle,
   PBOOL fIcon,
   POINT *Hotspot,
   HMODULE hModule,

reactos/lib/user32/windows/bitmap.c

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bitmap.c,v 1.22 2003/12/09 19:43:38 gvg Exp $
+/* $Id: bitmap.c,v 1.23 2003/12/09 20:58:16 weiden Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
@@ -109,7 +109,8 @@ LoadCursorImage(HINSTANCE hinst, LPCWSTR lpszName, UINT fuLoad)
 	  
 	  if (fuLoad & LR_SHARED)
       {
-        hIcon = (HANDLE)NtUserFindExistingCursorIcon(hinst, (HRSRC)hfRes);
+        /* FIXME - pass size! */
+        hIcon = (HANDLE)NtUserFindExistingCursorIcon(hinst, (HRSRC)hfRes, 0, 0);
         if(hIcon)
           return hIcon;
       }

reactos/lib/user32/windows/cursor.c

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cursor.c,v 1.16 2003/11/21 16:36:26 weiden Exp $
+/* $Id: cursor.c,v 1.17 2003/12/09 20:58:16 weiden Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/cursor.c
@@ -71,7 +71,7 @@ CopyCursor(HCURSOR pcur)
 {
   ICONINFO IconInfo;
   
-  if(NtUserGetIconInfo((HICON)pcur, &IconInfo))
+  if(NtUserGetCursorIconInfo((HANDLE)pcur, &IconInfo))
   {
     return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE);
   }
@@ -118,7 +118,7 @@ CreateCursor(HINSTANCE hInst,
 WINBOOL STDCALL
 DestroyCursor(HCURSOR hCursor)
 {
-  return (WINBOOL)NtUserDestroyCursor((HICON)hCursor, 0);
+  return (WINBOOL)NtUserDestroyCursorIcon((HANDLE)hCursor, 0);
 }
 
 

reactos/lib/user32/windows/icon.c

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: icon.c,v 1.15 2003/12/09 19:45:37 gvg Exp $
+/* $Id: icon.c,v 1.16 2003/12/09 20:58:16 weiden Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/icon.c
@@ -162,7 +162,7 @@ CopyIcon(
 {
   ICONINFO IconInfo;
   
-  if(NtUserGetIconInfo(hIcon, &IconInfo))
+  if(NtUserGetCursorIconInfo((HANDLE)hIcon, &IconInfo))
   {
     return NtUserCreateCursorIconHandle(&IconInfo, FALSE);
   }
@@ -344,7 +344,7 @@ CreateIconIndirect(PICONINFO IconInfo)
     return (HICON)0;
   }*/
   
-  return NtUserCreateCursorIconHandle(IconInfo, TRUE);
+  return (HICON)NtUserCreateCursorIconHandle(IconInfo, TRUE);
 }
 
 
@@ -356,7 +356,7 @@ STDCALL
 DestroyIcon(
   HICON hIcon)
 {
-  return (WINBOOL)NtUserDestroyCursor(hIcon, 0);
+  return (WINBOOL)NtUserDestroyCursorIcon((HANDLE)hIcon, 0);
 }
 
 
@@ -406,7 +406,7 @@ GetIconInfo(
   PICONINFO IconInfo)
 {
   /* FIXME - copy bitmaps */
-  return (WINBOOL)NtUserGetIconInfo(hIcon, IconInfo);
+  return (WINBOOL)NtUserGetCursorIconInfo((HANDLE)hIcon, IconInfo);
 }
 
 

reactos/subsys/win32k/objects/cursoricon.c

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cursoricon.c,v 1.31 2003/12/09 19:38:47 weiden Exp $ */
+/* $Id: cursoricon.c,v 1.32 2003/12/09 20:58:16 weiden Exp $ */
 
 #undef WIN32_LEAN_AND_MEAN
 
@@ -230,7 +230,7 @@ IntSetupCurIconHandles(PWINSTATION_OBJECT WinStaObject)
 
 PCURICON_OBJECT FASTCALL
 IntFindExistingCurIconObject(PWINSTATION_OBJECT WinStaObject, HMODULE hModule, 
-                             HRSRC hRsrc)
+                             HRSRC hRsrc, LONG cx, LONG cy)
 {
   PUSER_HANDLE_TABLE HandleTable;
   PLIST_ENTRY CurrentEntry;
@@ -250,6 +250,10 @@ IntFindExistingCurIconObject(PWINSTATION_OBJECT WinStaObject, HMODULE hModule,
       Object = (PCURICON_OBJECT)Current->Handles[i].ObjectBody;
       if(Object && (Object->hModule == hModule) && (Object->hRsrc == hRsrc))
       {
+        if(cx && ((cx != Object->Size.cx) || (cy != Object->Size.cy)))
+        {
+          continue;
+        }
         ObmReferenceObject(Object);
         ExReleaseFastMutex(&HandleTable->ListLock);
         return Object;
@@ -313,7 +317,7 @@ IntDestroyCurIconObject(PWINSTATION_OBJECT WinStaObject, HANDLE Handle)
 /*
  * @implemented
  */
-HICON
+HANDLE
 STDCALL
 NtUserCreateCursorIconHandle(PICONINFO IconInfo, BOOL Indirect)
 {
@@ -321,7 +325,7 @@ NtUserCreateCursorIconHandle(PICONINFO IconInfo, BOOL Indirect)
   PWINSTATION_OBJECT WinStaObject;
   PBITMAPOBJ bmp;
   NTSTATUS Status;
-  HICON Ret;
+  HANDLE Ret;
   
   Status = IntValidateWindowStationHandle(PROCESS_WINDOW_STATION(),
 				                               KernelMode,
@@ -331,7 +335,7 @@ NtUserCreateCursorIconHandle(PICONINFO IconInfo, BOOL Indirect)
   if(!NT_SUCCESS(Status))
   {
     SetLastNtError(Status);
-    return (HICON)0;
+    return (HANDLE)0;
   }
   
   CurIconObject = IntCreateCurIconHandle(WinStaObject);
@@ -380,7 +384,7 @@ NtUserCreateCursorIconHandle(PICONINFO IconInfo, BOOL Indirect)
 
   SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
   ObDereferenceObject(WinStaObject);
-  return (HICON)0;
+  return (HANDLE)0;
 }
 
 /*
@@ -388,8 +392,8 @@ NtUserCreateCursorIconHandle(PICONINFO IconInfo, BOOL Indirect)
  */
 BOOL
 STDCALL
-NtUserGetIconInfo(
-  HICON hIcon,
+NtUserGetCursorIconInfo(
+  HANDLE Handle,
   PICONINFO IconInfo)
 {
   ICONINFO ii;
@@ -409,7 +413,7 @@ NtUserGetIconInfo(
     return FALSE;
   }
   
-  CurIconObject = IntGetCurIconObject(WinStaObject, hIcon);
+  CurIconObject = IntGetCurIconObject(WinStaObject, Handle);
   if(CurIconObject)
   {
     if(IconInfo)
@@ -448,8 +452,8 @@ NtUserGetIconInfo(
  */
 BOOL
 STDCALL
-NtUserGetIconSize(
-  HICON hIcon,
+NtUserGetCursorIconSize(
+  HANDLE Handle,
   BOOL *fIcon,
   SIZE *Size)
 {
@@ -470,7 +474,7 @@ NtUserGetIconSize(
     return FALSE;
   }
   
-  CurIconObject = IntGetCurIconObject(WinStaObject, hIcon);
+  CurIconObject = IntGetCurIconObject(WinStaObject, Handle);
   if(CurIconObject)
   {
     /* Copy fields */
@@ -645,8 +649,8 @@ NtUserClipCursor(
  */
 BOOL
 STDCALL
-NtUserDestroyCursor(
-  HCURSOR hCursor,
+NtUserDestroyCursorIcon(
+  HANDLE Handle,
   DWORD Unknown)
 {
   PWINSTATION_OBJECT WinStaObject;
@@ -663,7 +667,7 @@ NtUserDestroyCursor(
     return FALSE;
   }
   
-  if(IntDestroyCurIconObject(WinStaObject, hCursor))
+  if(IntDestroyCurIconObject(WinStaObject, Handle))
   {
     ObDereferenceObject(WinStaObject);
     return TRUE;
@@ -678,16 +682,18 @@ NtUserDestroyCursor(
 /*
  * @implemented
  */
-HICON
+HANDLE
 STDCALL
 NtUserFindExistingCursorIcon(
   HMODULE hModule,
-  HRSRC hRsrc)
+  HRSRC hRsrc,
+  LONG cx,
+  LONG cy)
 {
   PCURICON_OBJECT CurIconObject;
   PWINSTATION_OBJECT WinStaObject;
   NTSTATUS Status;
-  HICON Ret = (HICON)0;
+  HANDLE Ret = (HANDLE)0;
   
   Status = IntValidateWindowStationHandle(PROCESS_WINDOW_STATION(),
 				                               KernelMode,
@@ -700,7 +706,7 @@ NtUserFindExistingCursorIcon(
     return Ret;
   }
   
-  CurIconObject = IntFindExistingCurIconObject(WinStaObject, hModule, hRsrc);
+  CurIconObject = IntFindExistingCurIconObject(WinStaObject, hModule, hRsrc, cx, cy);
   if(CurIconObject)
   {
     Ret = CurIconObject->Handle;
@@ -712,7 +718,7 @@ NtUserFindExistingCursorIcon(
   
   SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE);
   ObDereferenceObject(WinStaObject);
-  return (HICON)0;
+  return (HANDLE)0;
 }
 
 
@@ -775,7 +781,7 @@ NtUserGetClipCursor(
 
 
 /*
- * @unimplemented
+ * @implemented
  */
 HCURSOR
 STDCALL
@@ -817,7 +823,7 @@ NtUserSetCursor(
 BOOL
 STDCALL
 NtUserSetCursorIconContents(
-  HCURSOR hCursor,
+  HANDLE Handle,
   PICONINFO IconInfo)
 {
   PCURICON_OBJECT CurIconObject;
@@ -837,7 +843,7 @@ NtUserSetCursorIconContents(
     return FALSE;
   }
   
-  CurIconObject = IntGetCurIconObject(WinStaObject, (HICON)hCursor);
+  CurIconObject = IntGetCurIconObject(WinStaObject, Handle);
   if(CurIconObject)
   {
     /* Copy fields */
@@ -887,7 +893,7 @@ NtUserSetCursorIconContents(
 BOOL
 STDCALL
 NtUserSetCursorIconData(
-  HICON hIcon,
+  HANDLE Handle,
   PBOOL fIcon,
   POINT *Hotspot,
   HMODULE hModule,
@@ -911,9 +917,13 @@ NtUserSetCursorIconData(
     return FALSE;
   }
   
-  CurIconObject = IntGetCurIconObject(WinStaObject, hIcon);
+  CurIconObject = IntGetCurIconObject(WinStaObject, Handle);
   if(CurIconObject)
   {
+    CurIconObject->hModule = hModule;
+    CurIconObject->hRsrc = hRsrc;
+    CurIconObject->hGroupRsrc = hGroupRsrc;
+    
     /* Copy fields */
     if(fIcon)
     {
@@ -938,10 +948,6 @@ NtUserSetCursorIconData(
         CurIconObject->IconInfo.xHotspot = SafeHotspot.x;
         CurIconObject->IconInfo.yHotspot = SafeHotspot.y;
         
-        CurIconObject->hModule = hModule;
-        CurIconObject->hRsrc = hRsrc;
-        CurIconObject->hGroupRsrc = hGroupRsrc;
-        
         Ret = TRUE;
       }
       else
@@ -950,9 +956,6 @@ NtUserSetCursorIconData(
     
     if(!fIcon && !Hotspot)
     {
-      CurIconObject->hModule = hModule;
-      CurIconObject->hRsrc = hRsrc;
-      CurIconObject->hGroupRsrc = hGroupRsrc;
       Ret = TRUE;
     }