[ros-diffs] [dchapyshev] 38653: - Sync ICO_ExtractIconExW with Wine head. This fixed exception in wine tests. All tests for PrivateExtractIconsA/W passed now

[dchapyshev at svn.reactos.org]

Author: dchapyshev
Date: Thu Jan  8 14:28:19 2009
New Revision: 38653

URL: http://svn.reactos.org/svn/reactos?rev=38653&view=rev
Log:
- Sync ICO_ExtractIconExW with Wine head. This fixed exception in wine tests. All tests for PrivateExtractIconsA/W passed now

Modified:
    trunk/reactos/dll/win32/user32/misc/exticon.c

Modified: trunk/reactos/dll/win32/user32/misc/exticon.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/exticon.c?rev=38653&r1=38652&r2=38653&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/exticon.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/exticon.c [iso-8859-1] Thu Jan  8 14:28:19 2009
@@ -287,9 +287,9 @@
 	CloseHandle(fmapping);
 
 	cx1 = LOWORD(cxDesired);
-	cx2 = HIWORD(cxDesired) ? HIWORD(cxDesired) : cx1;
+	cx2 = HIWORD(cxDesired);
 	cy1 = LOWORD(cyDesired);
-	cy2 = HIWORD(cyDesired) ? HIWORD(cyDesired) : cy1;
+	cy2 = HIWORD(cyDesired);
 
 	if (pIconId) /* Invalidate first icon identifier */
 		*pIconId = 0xFFFFFFFF;
@@ -439,7 +439,7 @@
 	  iconDirCount = icongroupresdir->NumberOfNamedEntries + icongroupresdir->NumberOfIdEntries;
 
 	  /* only number of icons requested */
-	  if( nIcons == 0 )
+	  if( !pIconId )
 	  {
 	    ret = iconDirCount;
 	    goto end;		/* success */
@@ -479,13 +479,13 @@
 	  }
 
 	  /* assure we don't get too much */
-	  if( nIcons / 2 > iconDirCount - nIconIndex )
-	    nIcons = 2 * (iconDirCount - nIconIndex);
+	  if( nIcons > iconDirCount - nIconIndex )
+	    nIcons = iconDirCount - nIconIndex;
 
 	  /* starting from specified index */
 	  xresent = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(icongroupresdir+1) + nIconIndex;
 
-	  for (i=0; i < nIcons; i++)
+	  for (i=0; i < nIcons; i++,xresent++)
 	  {
 	    const IMAGE_RESOURCE_DIRECTORY *resdir;
 
@@ -519,8 +519,8 @@
 	      FIXME("no matching real address for icongroup!\n");
 	      goto end;	/* failure */
 	    }
-	    pIconId[i] = LookupIconIdFromDirectoryEx(igdata, TRUE, (i & 1) ? cx2 : cx1, (i & 1) ? cy2 : cy1, flags);
-	    if (i & 1) xresent++;
+	    pIconId[i] = LookupIconIdFromDirectoryEx(igdata, TRUE, cx1, cy1, flags);
+	        if (cx2 && cy2) pIconId[++i] = LookupIconIdFromDirectoryEx(igdata, TRUE, cx2, cy2, flags);
 	  }
 
 	  if (!(iconresdir=find_entry_by_id(rootresdir,LOWORD(RT_ICON),rootresdir)))
@@ -535,16 +535,16 @@
 	    xresdir = find_entry_by_id(iconresdir, LOWORD(pIconId[i]), rootresdir);
 	    if (!xresdir)
 	    {
-	      WARN("find_entry_by_id failed\n");
-	      ret = 0xFFFFFFFF;
-	      goto end;
+	      WARN("icon entry %d not found\n", LOWORD(pIconId[i]));
+	      RetPtr[i]=0;
+	      continue;
 	    }
 	    xresdir = find_entry_default(xresdir, rootresdir);
 	    if (!xresdir)
 	    {
-	      WARN("find_entry_default failed\n");
-	      ret = 0xFFFFFFFF;
-	      goto end;
+	      WARN("icon entry %d not found\n", LOWORD(pIconId[i]));
+	      RetPtr[i]=0;
+	      continue;
 	    }
 	    idataent = (PIMAGE_RESOURCE_DATA_ENTRY)xresdir;
 	    idata = NULL;
@@ -564,8 +564,9 @@
 	      RetPtr[i]=0;
 	      continue;
 	    }
-	    RetPtr[i] = (HICON) CreateIconFromResourceEx(idata,idataent->Size,TRUE,0x00030000,
-	                                                 (i & 1) ? cx2 : cx1, (i & 1) ? cy2 : cy1, flags);
+	    RetPtr[i] = CreateIconFromResourceEx(idata, idataent->Size, TRUE, 0x00030000, cx1, cy1, flags);
+            if (cx2 && cy2)
+                RetPtr[++i] = CreateIconFromResourceEx(idata, idataent->Size, TRUE, 0x00030000, cx2, cy2, flags);
 	  }
 	  ret = i;	/* return number of retrieved icons */
 	}			/* if(sig == IMAGE_NT_SIGNATURE) */