Paul Vriens : comctl32/tests: Fix some test failures on comctl32 4.70.
Alexandre Julliard
julliard at winehq.org
Thu Nov 19 10:15:24 CST 2009
Module: wine
Branch: master
Commit: 9e737691125bc82ce6ca60bcb8d3409dffe4fffa
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e737691125bc82ce6ca60bcb8d3409dffe4fffa
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Thu Nov 19 11:53:28 2009 +0100
comctl32/tests: Fix some test failures on comctl32 4.70.
---
dlls/comctl32/tests/propsheet.c | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c
index 111482e..bf40db4 100644
--- a/dlls/comctl32/tests/propsheet.c
+++ b/dlls/comctl32/tests/propsheet.c
@@ -110,6 +110,12 @@ static void test_title(void)
psh.pfnCallback = sheet_callback;
hdlg = (HWND)PropertySheetA(&psh);
+ if (hdlg == INVALID_HANDLE_VALUE)
+ {
+ win_skip("comctl32 4.70 needs dwSize adjustment\n");
+ psh.dwSize = sizeof(psh) - sizeof(HBITMAP) - sizeof(HPALETTE) - sizeof(HBITMAP);
+ hdlg = (HWND)PropertySheetA(&psh);
+ }
DestroyWindow(hdlg);
}
@@ -141,6 +147,12 @@ static void test_nopage(void)
psh.pfnCallback = sheet_callback;
hdlg = (HWND)PropertySheetA(&psh);
+ if (hdlg == INVALID_HANDLE_VALUE)
+ {
+ win_skip("comctl32 4.70 needs dwSize adjustment\n");
+ psh.dwSize = sizeof(psh) - sizeof(HBITMAP) - sizeof(HPALETTE) - sizeof(HBITMAP);
+ hdlg = (HWND)PropertySheetA(&psh);
+ }
ShowWindow(hdlg,SW_NORMAL);
SendMessage(hdlg, PSM_REMOVEPAGE, 0, 0);
RedrawWindow(hdlg,NULL,NULL,RDW_UPDATENOW|RDW_ERASENOW);
@@ -183,6 +195,7 @@ static void test_disableowner(void)
HPROPSHEETPAGE hpsp[1];
PROPSHEETPAGEA psp;
PROPSHEETHEADERA psh;
+ INT_PTR p;
register_parent_wnd_class();
parent = CreateWindowA("parent class", "", WS_CAPTION | WS_SYSMENU | WS_VISIBLE, 100, 100, 100, 100, GetDesktopWindow(), NULL, GetModuleHandleA(NULL), 0);
@@ -207,7 +220,9 @@ static void test_disableowner(void)
U3(psh).phpage = hpsp;
psh.pfnCallback = disableowner_callback;
- PropertySheetA(&psh);
+ p = PropertySheetA(&psh);
+ todo_wine
+ ok(p == 0, "Expected 0, got %ld\n", p);
ok(IsWindowEnabled(parent) != 0, "parent window should be enabled\n");
DestroyWindow(parent);
}
@@ -283,6 +298,12 @@ static void test_wiznavigation(void)
psh.hwndParent = GetDesktopWindow();
U3(psh).phpage = hpsp;
hdlg = (HWND)PropertySheetA(&psh);
+ if (hdlg == INVALID_HANDLE_VALUE)
+ {
+ win_skip("comctl32 4.70 needs dwSize adjustment\n");
+ psh.dwSize = sizeof(psh) - sizeof(HBITMAP) - sizeof(HPALETTE) - sizeof(HBITMAP);
+ hdlg = (HWND)PropertySheetA(&psh);
+ }
ok(active_page == 0, "Active page should be 0. Is: %d\n", active_page);
@@ -381,6 +402,12 @@ static void test_buttons(void)
psh.pfnCallback = sheet_callback;
hdlg = (HWND)PropertySheetA(&psh);
+ if (hdlg == INVALID_HANDLE_VALUE)
+ {
+ win_skip("comctl32 4.70 needs dwSize adjustment\n");
+ psh.dwSize = sizeof(psh) - sizeof(HBITMAP) - sizeof(HPALETTE) - sizeof(HBITMAP);
+ hdlg = (HWND)PropertySheetA(&psh);
+ }
/* OK button */
button = GetDlgItem(hdlg, IDOK);
More information about the wine-cvs
mailing list