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

This commit is contained in:
Francois Gouget 2007-12-10 01:27:50 +01:00 committed by Alexandre Julliard
parent 86b3624158
commit 7a5497b5c0
8 changed files with 9 additions and 34 deletions

View File

@ -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;

View File

@ -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();

View File

@ -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;

View File

@ -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);

View File

@ -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)

View File

@ -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;

View File

@ -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;

View File

@ -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;