commit 5b14b535c834e39959daffd3f4bbfd3d75cfeb1e
author Pavel Roskin <pavel_roskin@geocities.com> Sun Apr 18 09:34:51 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Apr 18 09:34:51 1999 +0000
tree c7062d11157ca019f98d699d70bd87d43a3d0e87
parent a8f8bef09834908329dbbb676017b2c0da95aeae

LookupIconIdFromDirectoryEx16() fixed: if GetSystemPaletteEntries()
returns 0, it is interpreted as if it were 256.

objects/cursoricon.c

diff --git a/objects/cursoricon.c b/objects/cursoricon.c
index 39d461d..33ed6cf 100644
--- a/objects/cursoricon.c
+++ b/objects/cursoricon.c
@@ -1375,10 +1375,15 @@
     UINT16 retVal = 0;
     if( dir && !dir->idReserved && (dir->idType & 3) )
     {
-        HDC hdc = GetDC(0);
-	UINT palEnts = GetSystemPaletteEntries(hdc, 0, 0, NULL);
-	int colors = (cFlag & LR_MONOCHROME) ? 2 : palEnts;
 	CURSORICONDIRENTRY* entry;
+	HDC hdc;
+	UINT palEnts;
+	int colors;
+	hdc = GetDC(0);
+	palEnts = GetSystemPaletteEntries(hdc, 0, 0, NULL);
+	if (palEnts == 0)
+	    palEnts = 256;
+	colors = (cFlag & LR_MONOCHROME) ? 2 : palEnts;
 
 	ReleaseDC(0, hdc);