[ros-diffs] [gedmurphy] 28860: - fix SetupDiLoadClassIcon to load 32x22 for the large icon - fix SetupDiGetClassImageList to load 16x16 icons for the device image list. - devmgmt now loads up the correct sizes for both the treeview and the property page

Author: gedmurphy
Date: Wed Sep  5 01:30:22 2007
New Revision: 28860

URL: http://svn.reactos.org/svn/reactos?rev=28860&view=rev
Log:
- fix SetupDiLoadClassIcon to load 32x22 for the large icon
- fix SetupDiGetClassImageList to load 16x16 icons for the device image list.
- devmgmt now loads up the correct sizes for both the treeview and the property page

Modified:
    trunk/reactos/dll/win32/setupapi/devclass.c

Modified: trunk/reactos/dll/win32/setupapi/devclass.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas…
==============================================================================
--- trunk/reactos/dll/win32/setupapi/devclass.c (original)
+++ trunk/reactos/dll/win32/setupapi/devclass.c Wed Sep  5 01:30:22 2007
@@ -1459,17 +1459,25 @@
          * and put their index in the image list in the IconIndexes array */
         for (i = 0; i < list->NumberOfGuids; i++)
         {
+            INT miniIconIndex;
+
             ret = SetupDiLoadClassIcon(
                 &list->Guids[i],
-                &hIcon,
-                NULL);
+                NULL,
+                &miniIconIndex);
             if (ret)
             {
-                list->IconIndexes[i] =
ImageList_AddIcon(ClassImageListData->ImageList, hIcon);
-                DestroyIcon(hIcon);
+                hIcon = LoadImage(hInstance, MAKEINTRESOURCE(miniIconIndex), IMAGE_ICON,
16, 16, LR_DEFAULTCOLOR);
+                if (hIcon)
+                {
+                    list->IconIndexes[i] =
ImageList_AddIcon(ClassImageListData->ImageList, hIcon);
+                    DestroyIcon(hIcon);
+                }
+                else
+                    list->IconIndexes[i] = -1;
             }
             else
-                list->IconIndexes[i] = -1; /* Special value to tell that icon is
unavailable */
+                list->IconIndexes[i] = -1; /* Special value to indicate that the icon
is unavailable */
         }
 
         ret = TRUE;
@@ -1615,7 +1623,7 @@
         TRACE("Icon index %d, dll name %s\n", iconIndex, debugstr_w(DllName));
         if (LargeIcon)
         {
-            *LargeIcon = LoadImage(hInstance, MAKEINTRESOURCE(iconIndex), IMAGE_ICON, 16,
16, LR_DEFAULTCOLOR);
+            *LargeIcon = LoadImage(hInstance, MAKEINTRESOURCE(iconIndex), IMAGE_ICON, 32,
32, LR_DEFAULTCOLOR);
             if (!*LargeIcon)
             {
                 SetLastError(ERROR_INVALID_INDEX);