Francois Gouget : comctl32/tests: InitCommonControlsEx() is missing on Windows 95 so call InitCommonControls() instead.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7a5497b5c06600dc3b58788d0d6132e9f7cb7b87
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7a5497b5c06600dc3b58788d0d...

Author: Francois Gouget 
Date:   Mon Dec 10 01:27:50 2007 +0100

comctl32/tests: InitCommonControlsEx() is missing on Windows 95 so call InitCommonControls() instead.

---

dlls/comctl32/tests/comboex.c  |    5 +----
 dlls/comctl32/tests/datetime.c |    6 +-----
 dlls/comctl32/tests/header.c   |    5 +----
 dlls/comctl32/tests/listview.c |    6 +-----
 dlls/comctl32/tests/monthcal.c |    6 ++----
 dlls/comctl32/tests/progress.c |    5 +----
 dlls/comctl32/tests/rebar.c    |    5 +----
 dlls/comctl32/tests/treeview.c |    5 +----
 8 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c
index 8f436ca..f3f46b3 100644
--- a/dlls/comctl32/tests/comboex.c
+++ b/dlls/comctl32/tests/comboex.c
@@ -189,11 +189,8 @@ static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, L

static void init(void) {
     WNDCLASSA wc;
-    INITCOMMONCONTROLSEX icex;

-    icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
-    icex.dwICC   = ICC_USEREX_CLASSES;
-    InitCommonControlsEx(&icex);
+    InitCommonControls();

wc.style = CS_HREDRAW | CS_VREDRAW;
     wc.cbClsExtra = 0;
diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c
index 1a8afd1..956f16e 100644
--- a/dlls/comctl32/tests/datetime.c
+++ b/dlls/comctl32/tests/datetime.c
@@ -560,11 +560,7 @@ static void test_datetime_control(void)

START_TEST(datetime)
 {
-    INITCOMMONCONTROLSEX icex;
-
-    icex.dwSize = sizeof(icex);
-    icex.dwICC = ICC_DATE_CLASSES;
-    InitCommonControlsEx(&icex);
+    InitCommonControls();
     init_msg_sequences(sequences, NUM_MSG_SEQUENCES);

test_datetime_control();
diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c
index e80944f..fa75d49 100644
--- a/dlls/comctl32/tests/header.c
+++ b/dlls/comctl32/tests/header.c
@@ -1482,11 +1482,8 @@ static LRESULT CALLBACK HeaderTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LP

static void init(void) {
     WNDCLASSA wc;
-    INITCOMMONCONTROLSEX icex;

-    icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
-    icex.dwICC  = ICC_USEREX_CLASSES;
-    InitCommonControlsEx(&icex);
+    InitCommonControls();

wc.style = CS_HREDRAW | CS_VREDRAW;
     wc.cbClsExtra = 0;
diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index 9138442..30a81a8 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -1040,11 +1040,7 @@ static void test_item_position(void)

START_TEST(listview)
 {
-    INITCOMMONCONTROLSEX icc;
-
-    icc.dwICC = 0;
-    icc.dwSize = sizeof icc;
-    InitCommonControlsEx(&icc);
+    InitCommonControls();

init_msg_sequences(sequences, NUM_MSG_SEQUENCES);

diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c
index a495919..7fe2bd7 100644
--- a/dlls/comctl32/tests/monthcal.c
+++ b/dlls/comctl32/tests/monthcal.c
@@ -313,10 +313,9 @@ static void test_monthcal(void)
 {
     HWND hwnd;
     SYSTEMTIME st[2], st1[2];
-    INITCOMMONCONTROLSEX ic = {sizeof(INITCOMMONCONTROLSEX), ICC_DATE_CLASSES};
     int res, month_range;

-    InitCommonControlsEx(&ic);
+    InitCommonControls();
     hwnd = CreateWindowA(MONTHCAL_CLASSA, "MonthCal", WS_POPUP | WS_VISIBLE, CW_USEDEFAULT,
                          0, 300, 300, 0, 0, NULL, NULL);
     ok(hwnd != NULL, "Failed to create MonthCal\n");
@@ -478,9 +477,8 @@ static HWND create_monthcal_control(DWORD style, HWND parent_window)
 {
     struct subclass_info *info;
     HWND hwnd;
-    static const INITCOMMONCONTROLSEX ic = {sizeof(INITCOMMONCONTROLSEX), ICC_DATE_CLASSES};

-    InitCommonControlsEx(&ic);
+    InitCommonControls();

info = HeapAlloc(GetProcessHeap(), 0, sizeof(struct subclass_info));
     if (!info)
diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c
index 42c1e8d..2716f33 100644
--- a/dlls/comctl32/tests/progress.c
+++ b/dlls/comctl32/tests/progress.c
@@ -91,12 +91,9 @@ static void update_window(HWND hWnd)
 static void init(void)
 {
     WNDCLASSA wc;
-    INITCOMMONCONTROLSEX icex;
     RECT rect;

-    icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
-    icex.dwICC   = ICC_PROGRESS_CLASS;
-    InitCommonControlsEx(&icex);
+    InitCommonControls();

wc.style = CS_HREDRAW | CS_VREDRAW;
     wc.cbClsExtra = 0;
diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c
index 79da16e..6bebeb7 100644
--- a/dlls/comctl32/tests/rebar.c
+++ b/dlls/comctl32/tests/rebar.c
@@ -786,14 +786,11 @@ static void bandinfo_test(void)

START_TEST(rebar)
 {
-    INITCOMMONCONTROLSEX icc;
     WNDCLASSA wc;
     MSG msg;
     RECT rc;

-    icc.dwSize = sizeof(icc);
-    icc.dwICC = ICC_COOL_CLASSES;
-    InitCommonControlsEx(&icc);
+    InitCommonControls();

wc.style = CS_HREDRAW | CS_VREDRAW;
     wc.cbClsExtra = 0;
diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c
index 2981db7..93010d3 100644
--- a/dlls/comctl32/tests/treeview.c
+++ b/dlls/comctl32/tests/treeview.c
@@ -651,11 +651,8 @@ START_TEST(treeview)
 {
     WNDCLASSA wc;
     MSG msg;
-    INITCOMMONCONTROLSEX icex;

-    icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
-    icex.dwICC   = ICC_TREEVIEW_CLASSES;
-    InitCommonControlsEx(&icex);
+    InitCommonControls();
     init_msg_sequences(MsgSequences, NUM_MSG_SEQUENCES);

wc.style = CS_HREDRAW | CS_VREDRAW;