comdlg32: load ComboBoxEx before creating dialogs that use it

[Daniel Jeliński]

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20130505/8a58637f/attachment.html>
-------------- next part --------------
From 9334f6f0d87bff729a28ffc835a51775f98c6671 Mon Sep 17 00:00:00 2001
From: Daniel Jelinski <djelinski1 at gmail.com>
Date: Sun, 5 May 2013 21:04:24 +0200
Subject: [PATCH] comdlg32: load ComboBoxEx before creating dialogs that use
 it

Fixes comdlg32 tests when running with native comctl32.
Allows notepad to create file dialogs on prefix running native.
Fixes bug 32728
---
 dlls/comdlg32/filedlg.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index eeac384..1b59ba1 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -356,6 +356,12 @@ static BOOL GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType)
   LPWSTR defext = NULL;
   LPWSTR filter = NULL;
   LPWSTR customfilter = NULL;
+  INITCOMMONCONTROLSEX icc;
+
+  /*Initialize ComboBoxEx32 */
+  icc.dwSize = sizeof(icc);
+  icc.dwICC = ICC_USEREX_CLASSES;
+  InitCommonControlsEx(&icc);
 
   /* Initialize CommDlgExtendedError() */
   COMDLG32_SetCommDlgExtendedError(0);
-- 
1.7.5.4