From 76518c0883f76ed288750e2f493d5f07046a568c Mon Sep 17 00:00:00 2001
From: Owen Rudge <owen@owenrudge.net>
Date: Mon, 21 Jul 2008 19:42:16 +0100
Subject: [PATCH] appwiz.cpl: Add imagelist for listview.

---
 dlls/appwiz.cpl/appwiz.c | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c
index b07c2a762f..6f3a0830e2 100644
--- a/dlls/appwiz.cpl/appwiz.c
+++ b/dlls/appwiz.cpl/appwiz.c
@@ -114,6 +114,30 @@ static BOOL AddListViewColumns(HWND hWnd)
     return TRUE;
 }
 
+/******************************************************************************
+ * Name       : AddListViewImageList
+ * Description: Creates an ImageList for the list view control.
+ * Parameters : hWnd    - Handle of the list view control.
+ * Returns    : Handle of the image list.
+ */
+static HIMAGELIST AddListViewImageList(HWND hWnd)
+{
+    HIMAGELIST hSmall;
+    HICON hDefaultIcon;
+
+    hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),
+        ILC_MASK, 1, 1);
+
+    /* Add default icon to image list */
+    hDefaultIcon = LoadIconW(hInst, MAKEINTRESOURCEW(ICO_MAIN));
+    ImageList_AddIcon(hSmall, hDefaultIcon);
+    DestroyIcon(hDefaultIcon);
+
+    (void) ListView_SetImageList(hWnd, hSmall, LVSIL_SMALL);
+
+    return hSmall;
+}
+
 /******************************************************************************
  * Name       : ResetApplicationList
  * Description: Empties the app list, if need be, and recreates it.
@@ -134,6 +158,13 @@ static HIMAGELIST ResetApplicationList(BOOL bFirstRun, HWND hWnd, HIMAGELIST hIm
         if (!AddListViewColumns(hWndListView))
             return NULL;
     }
+    else /* we need to remove the existing things first */
+    {
+        ImageList_Destroy(hImageList);
+    }
+
+    /* now create the image list and add the applications to the listview */
+    hImageList = AddListViewImageList(hWndListView);
 
     return(hImageList);
 }
@@ -156,7 +187,15 @@ static BOOL CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar
         case WM_INITDIALOG:
             hImageList = ResetApplicationList(TRUE, hWnd, hImageList);
 
+            if (!hImageList)
+                return FALSE;
+
             return TRUE;
+
+        case WM_DESTROY:
+            ImageList_Destroy(hImageList);
+
+            return 0;
     }
 
     return FALSE;