From 01593894846537244d938cbbf1c746d5db970efe Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 22 Nov 2011 14:15:23 +0100 Subject: [PATCH] browseui: Make sure that common controls are loaded before creating the dialog. --- dlls/browseui/Makefile.in | 2 +- dlls/browseui/progressdlg.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index 102b9e64162..b463cd72e6f 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -1,5 +1,5 @@ MODULE = browseui.dll -IMPORTS = uuid ole32 user32 advapi32 +IMPORTS = uuid ole32 comctl32 user32 advapi32 EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 2de858c3333..9b970e21861 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -304,6 +304,7 @@ static ULONG WINAPI ProgressDialog_Release(IProgressDialog *iface) static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, HWND hwndParent, IUnknown *punkEnableModeless, DWORD dwFlags, LPCVOID reserved) { + static const INITCOMMONCONTROLSEX init = { sizeof(init), ICC_ANIMATE_CLASS }; ProgressDialog *This = impl_from_IProgressDialog(iface); struct create_params params; HANDLE hThread; @@ -316,6 +317,8 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, if (dwFlags & PROGDLG_NOTIME) FIXME("Flags PROGDLG_NOTIME not supported\n"); + InitCommonControlsEx( &init ); + EnterCriticalSection(&This->cs); if (This->hwnd)