commit a38d84d8542aec351a54954562e521eefc6c70bf
author Huw D M Davies <daviesh@abacus.physics.ox.ac.uk> Mon Nov 30 11:18:26 1998 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Nov 30 11:18:26 1998 +0000
tree 93f4fa37bbffdaa819ed711e2168aee6d378a4d8
parent 1ff1f7d15f320252dfae7a49634379cee9aab0f0

GetSystemPaletteEntries returns palette size if entries==NULL.
Use this instead of COLOR_GetSystemPaletteSize.

objects/cursoricon.c

diff --git a/objects/cursoricon.c b/objects/cursoricon.c
index 060ac3a..2fb2914 100644
--- a/objects/cursoricon.c
+++ b/objects/cursoricon.c
@@ -833,6 +833,10 @@
  */
 HICON16 WINAPI LoadIcon16( HINSTANCE16 hInstance, SEGPTR name )
 {
+    HDC32 hdc = GetDC32(0);
+    UINT32 palEnts = GetSystemPaletteEntries32(hdc, 0, 0, NULL);
+    ReleaseDC32(0, hdc);
+
     if (HIWORD(name))
         TRACE(icon, "%04x '%s'\n",
                       hInstance, (char *)PTR_SEG_TO_LIN( name ) );
@@ -842,7 +846,7 @@
 
     return CURSORICON_Load16( hInstance, name,
                               SYSMETRICS_CXICON, SYSMETRICS_CYICON,
-                              MIN( 16, COLOR_GetSystemPaletteSize() ), FALSE, 0);
+                              MIN(16, palEnts), FALSE, 0);
 }
 
 
@@ -1294,7 +1298,11 @@
     UINT16 retVal = 0;
     if( dir && !dir->idReserved && (dir->idType & 3) )
     {
-	int colors = (cFlag & LR_MONOCHROME) ? 2 : COLOR_GetSystemPaletteSize();
+        HDC32 hdc = GetDC32(0);
+	UINT32 palEnts = GetSystemPaletteEntries32(hdc, 0, 0, NULL);
+	int colors = (cFlag & LR_MONOCHROME) ? 2 : palEnts;
+	ReleaseDC32(0, hdc);
+
 	if( bIcon )
 	{
 	    ICONDIRENTRY* entry;
@@ -1484,9 +1492,13 @@
  */
 HICON32 WINAPI LoadIcon32W(HINSTANCE32 hInstance, LPCWSTR name)
 {
+    HDC32 hdc = GetDC32(0);
+    UINT32 palEnts = GetSystemPaletteEntries32(hdc, 0, 0, NULL);
+    ReleaseDC32(0, hdc);
+
     return CURSORICON_Load32( hInstance, name,
                               SYSMETRICS_CXICON, SYSMETRICS_CYICON,
-                              MIN( 16, COLOR_GetSystemPaletteSize() ), FALSE, 0);
+                              MIN( 16, palEnts ), FALSE, 0);
 }
 
 /***********************************************************************