From 362257a995f6b5ce956c833d651c8e692b977e57 Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Thu, 7 Nov 2013 13:19:23 +0000 Subject: [PATCH] [shell32] - Do not use HIMAGELIST_QueryInterface which is exported from vista comctl32. The replacement code is taken from HIMAGELIST_QueryInterface and its fine to use it, as is safe to assume that an HIMAGELIST is a IImageList* - Allows us to use comctl32 5.82 from win2003 and boot to desktop svn path=/trunk/; revision=60879 --- reactos/dll/win32/shell32/shellord.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/reactos/dll/win32/shell32/shellord.cpp b/reactos/dll/win32/shell32/shellord.cpp index 77491c2e1af..13e17a15365 100644 --- a/reactos/dll/win32/shell32/shellord.cpp +++ b/reactos/dll/win32/shell32/shellord.cpp @@ -2269,7 +2269,9 @@ EXTERN_C HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) /* Get the interface for the new image list */ if (hNew) { - ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); + IImageList *imageList = (IImageList*) hNew; + ret = imageList->QueryInterface(riid, ppv); + ImageList_Destroy(hNew); }