[2/2] comctl32/tests: Use the PROPSHEETHEADERA_V1_SIZE macros for compatibility with old comctl32 versions.

[Francois Gouget]

In particular this fixes the tests on NT4 SP1 and simplifies the code.
---
 dlls/comctl32/tests/propsheet.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c
index 04deac6..6222187 100644
--- a/dlls/comctl32/tests/propsheet.c
+++ b/dlls/comctl32/tests/propsheet.c
@@ -120,7 +120,7 @@ static void test_title(void)
     hpsp[0] = CreatePropertySheetPageA(&psp);
 
     memset(&psh, 0, sizeof(psh));
-    psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback);
+    psh.dwSize = PROPSHEETHEADERA_V1_SIZE;
     psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK;
     psh.pszCaption = "test caption";
     psh.nPages = 1;
@@ -156,7 +156,7 @@ static void test_nopage(void)
     hpsp[0] = CreatePropertySheetPageA(&psp);
 
     memset(&psh, 0, sizeof(psh));
-    psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback);
+    psh.dwSize = PROPSHEETHEADERA_V1_SIZE;
     psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK;
     psh.pszCaption = "test caption";
     psh.nPages = 1;
@@ -237,7 +237,7 @@ static void test_disableowner(void)
     hpsp[0] = CreatePropertySheetPageA(&psp);
 
     memset(&psh, 0, sizeof(psh));
-    psh.dwSize = sizeof(psh);
+    psh.dwSize = PROPSHEETHEADERA_V1_SIZE;
     psh.dwFlags = PSH_USECALLBACK;
     psh.pszCaption = "test caption";
     psh.nPages = 1;
@@ -316,7 +316,7 @@ static void test_wiznavigation(void)
 
     /* set up the property sheet dialog */
     memset(&psh, 0, sizeof(psh));
-    psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback);
+    psh.dwSize = PROPSHEETHEADERA_V1_SIZE;
     psh.dwFlags = PSH_MODELESS | PSH_WIZARD;
     psh.pszCaption = "A Wizard";
     psh.nPages = 4;
@@ -414,7 +414,7 @@ static void test_buttons(void)
     hpsp[0] = CreatePropertySheetPageA(&psp);
 
     memset(&psh, 0, sizeof(psh));
-    psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback);
+    psh.dwSize = PROPSHEETHEADERA_V1_SIZE;
     psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK;
     psh.pszCaption = "test caption";
     psh.nPages = 1;
@@ -493,7 +493,7 @@ static void test_custom_default_button(void)
     psp[0].pszTitle = "Page1";
     psp[0].lParam = 0;
 
-    psh.dwSize = sizeof (PROPSHEETHEADERA);
+    psh.dwSize = PROPSHEETHEADERA_V1_SIZE;
     psh.dwFlags = PSH_PROPSHEETPAGE | PSH_MODELESS;
     psh.hwndParent = GetDesktopWindow();
     psh.hInstance = GetModuleHandleA(NULL);
@@ -723,7 +723,7 @@ static void test_messages(void)
     hpsp[0] = CreatePropertySheetPageA(&psp);
 
     memset(&psh, 0, sizeof(psh));
-    psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback);
+    psh.dwSize = PROPSHEETHEADERA_V1_SIZE;
     psh.dwFlags = PSH_NOAPPLYNOW | PSH_WIZARD | PSH_USECALLBACK
                   | PSH_MODELESS | PSH_USEICONID;
     psh.pszCaption = "test caption";
@@ -766,7 +766,7 @@ static void test_PSM_ADDPAGE(void)
     hpsp[2] = CreatePropertySheetPageA(&psp);
 
     memset(&psh, 0, sizeof(psh));
-    psh.dwSize = sizeof(psh);
+    psh.dwSize = PROPSHEETHEADERA_V1_SIZE;
     psh.dwFlags = PSH_MODELESS;
     psh.pszCaption = "test caption";
     psh.nPages = 1;
-- 
1.7.5.4