From: Zhiyi Zhang zzhang@codeweavers.com
HIMAGELIST_QueryInterface() is needed in SHGetImageList(). Leave it for now. --- dlls/comctl32/comctl32.spec | 11 +---------- dlls/comctl32/commctrl.c | 4 ++++ dlls/comctl32/dpa.c | 2 ++ dlls/comctl32/dsa.c | 2 ++ dlls/comctl32/imagelist.c | 4 ++++ dlls/comctl32/tests/misc.c | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 8091ca489b5..e0f74791b24 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -87,8 +87,6 @@ 375 stdcall -noname -private StrCSpnIW(wstr wstr) kernelbase.StrCSpnIW 376 stdcall -noname -private IntlStrEqWorkerA(long str str long) 377 stdcall -noname -private IntlStrEqWorkerW(long wstr wstr long) -380 stdcall -ordinal LoadIconMetric(ptr wstr long ptr) -381 stdcall -ordinal LoadIconWithScaleDown(ptr wstr long long ptr) 382 stdcall -noname SmoothScrollWindow(ptr) 383 stub -noname DoReaderMode 384 stdcall -noname SetPathWordBreakProc(ptr long) @@ -104,7 +102,7 @@ 403 stdcall -ordinal EnumMRUListW(long long ptr long) 404 stdcall -noname CreateMRUListLazyW(ptr long long long) 410 stdcall -ordinal SetWindowSubclass(long ptr long long) -411 stdcall -ordinal GetWindowSubclass(long ptr long ptr) +411 stdcall -noname GetWindowSubclass(long ptr long ptr) 412 stdcall -ordinal RemoveWindowSubclass(long ptr long) 413 stdcall -ordinal DefSubclassProc(long long long long) 414 stdcall -noname MirrorIcon(ptr ptr) @@ -126,13 +124,8 @@ @ stdcall CreateToolbarEx(long long long long long long ptr long long long long long long) @ stdcall DestroyPropertySheetPage(long) @ stdcall -private DllGetVersion(ptr) -@ stdcall -private DllInstall(long wstr) -@ stdcall -ret64 DPA_GetSize(ptr) -@ stdcall DrawShadowText(long wstr long ptr long long long long long) @ stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA @ stdcall DrawStatusTextW(long ptr wstr long) -@ stdcall DSA_Clone(ptr) -@ stdcall -ret64 DSA_GetSize(ptr) @ stdcall FlatSB_EnableScrollBar (long long long) @ stdcall FlatSB_GetScrollInfo (long long ptr) @ stdcall FlatSB_GetScrollPos (long long) @@ -149,7 +142,6 @@ @ stdcall ImageList_AddIcon(ptr long) @ stdcall ImageList_AddMasked(ptr long long) @ stdcall ImageList_BeginDrag(ptr long long long) -@ stdcall ImageList_CoCreateInstance(ptr ptr ptr ptr) @ stdcall ImageList_Copy(ptr long ptr long long) @ stdcall ImageList_Create(long long long long long) @ stdcall ImageList_Destroy(ptr) @@ -186,7 +178,6 @@ @ stdcall ImageList_SetImageCount(ptr long) @ stdcall ImageList_SetOverlayImage(ptr long long) @ stdcall ImageList_Write(ptr ptr) -@ stdcall ImageList_WriteEx(ptr long ptr) @ stdcall InitCommonControlsEx(ptr) @ stdcall InitMUILanguage(long) @ stdcall InitializeFlatSB(long) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 74f70a5c82b..cd5df530aa7 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -950,6 +950,7 @@ CreateToolbar (HWND hwnd, DWORD style, UINT wID, INT nBitmaps, }
+#if __WINE_COMCTL32_VERSION == 6 /*********************************************************************** * DllInstall (COMCTL32.@) * @@ -964,6 +965,7 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) TRACE("(%u, %s): stub\n", bInstall, debugstr_w(cmdline)); return S_OK; } +#endif /* __WINE_COMCTL32_VERSION == 6 */
/*********************************************************************** * _TrackMouseEvent [COMCTL32.@] @@ -1623,6 +1625,7 @@ LRESULT WINAPI SetPathWordBreakProc(HWND hwnd, BOOL bSet) (LPARAM)(bSet ? PathWordBreakProc : NULL)); }
+#if __WINE_COMCTL32_VERSION == 6 /*********************************************************************** * DrawShadowText [COMCTL32.@] * @@ -1704,6 +1707,7 @@ HRESULT WINAPI LoadIconMetric(HINSTANCE hinst, const WCHAR *name, int size, HICO
return LoadIconWithScaleDown(hinst, name, cx, cy, icon); } +#endif /* __WINE_COMCTL32_VERSION == 6 */
static const WCHAR strMRUList[] = L"MRUList";
diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 22a3f8c451d..4ef16d39977 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -1005,6 +1005,7 @@ void WINAPI DPA_DestroyCallback (HDPA hdpa, PFNDPAENUMCALLBACK enumProc, DPA_Destroy (hdpa); }
+#if __WINE_COMCTL32_VERSION == 6 /************************************************************************** * DPA_GetSize [COMCTL32.@] * @@ -1024,3 +1025,4 @@ ULONGLONG WINAPI DPA_GetSize(HDPA hdpa)
return sizeof(DPA) + hdpa->nMaxCount*sizeof(PVOID); } +#endif /* __WINE_COMCTL32_VERSION == 6 */ diff --git a/dlls/comctl32/dsa.c b/dlls/comctl32/dsa.c index d5e82343fbd..03652a3fcc3 100644 --- a/dlls/comctl32/dsa.c +++ b/dlls/comctl32/dsa.c @@ -438,6 +438,7 @@ void WINAPI DSA_DestroyCallback (HDSA hdsa, PFNDSAENUMCALLBACK enumProc, DSA_Destroy (hdsa); }
+#if __WINE_COMCTL32_VERSION == 6 /************************************************************************** * DSA_Clone [COMCTL32.@] * @@ -493,3 +494,4 @@ ULONGLONG WINAPI DSA_GetSize(HDSA hdsa)
return sizeof(*hdsa) + (ULONGLONG)hdsa->nMaxCount*hdsa->nItemSize; } +#endif /* __WINE_COMCTL32_VERSION == 6 */ diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index ebb84b9af01..493aebd0b45 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2970,6 +2970,7 @@ failed: return result; }
+#if __WINE_COMCTL32_VERSION == 6 /************************************************************************* * ImageList_WriteEx [COMCTL32.@] */ @@ -2978,6 +2979,7 @@ HRESULT WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm) FIXME("%p %#lx %p: semi-stub\n", himl, flags, pstm); return ImageList_Write(himl, pstm) ? S_OK : E_FAIL; } +#endif /* __WINE_COMCTL32_VERSION == 6 */
/************************************************************************* * ImageList_Write [COMCTL32.@] @@ -3123,6 +3125,7 @@ ImageList_SetColorTable(HIMAGELIST himl, UINT uStartIndex, UINT cEntries, const return SetDIBColorTable(himl->hdcImage, uStartIndex, cEntries, prgb); }
+#if __WINE_COMCTL32_VERSION == 6 /************************************************************************* * ImageList_CoCreateInstance [COMCTL32.@] * @@ -3148,6 +3151,7 @@ ImageList_CoCreateInstance (REFCLSID rclsid, const IUnknown *punkOuter, REFIID r
return ImageListImpl_CreateInstance(punkOuter, riid, ppv); } +#endif /* __WINE_COMCTL32_VERSION == 6 */
/************************************************************************* diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 8a2b2ca9f76..a4a29046b88 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1330,7 +1330,7 @@ static void test_version(BOOL v6) if (v6) ok(!!proc, "Get %s failed.\n", v6_only_exports[i]); else - todo_wine_if(!strstr(v6_only_exports[i], "TaskDialog")) + todo_wine_if(!strcmp(v6_only_exports[i], "HIMAGELIST_QueryInterface")) ok(!proc, "Get %s succeeded.\n", v6_only_exports[i]); } }