Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-22 10:10:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SDK] Add some missing propsheet fields + validate struct sizes

Browse source
This commit is contained in:
Mark Jansen 2020-01-24 20:43:06 +01:00
parent db55933b0c
commit cd3c1e94ff
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
2 changed files with 92 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

98
modules/rostests/apitests/comctl32/propsheet.c
View file

@ -1,9 +1,10 @@
/* /*
* PROJECT: ReactOS api tests * PROJECT: ReactOS api tests
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Test for property sheet * PURPOSE: Test for v6 property sheet
* COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com) * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
*/ */
#include "wine/test.h" #include "wine/test.h"
#include <windows.h> #include <windows.h>
#include <windowsx.h> #include <windowsx.h>
@ -73,17 +74,82 @@ Page1DlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return 0; return 0;
} }
#ifdef _MSC_VER
#define CHECK_STRUCT_SIZE(x, y) C_ASSERT((x) == (y))
#else
// Can't do this compile time, thanks gcc
// 'error: non-nested function with variably modified type'
#define CHECK_STRUCT_SIZE(x, y) ok((x) == (y), "Wrong size for %s, got %u, expected %u\n", #x, y, x)
#endif
// Validate struct sizes
static void test_StructSizes()
{
#ifdef _M_X64
CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V1_SIZE, 72);
CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V2_SIZE, 88);
CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V3_SIZE, 96);
CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V4_SIZE, 104);
CHECK_STRUCT_SIZE(PROPSHEETHEADERA_V1_SIZE, 72);
CHECK_STRUCT_SIZE(PROPSHEETHEADERA_V2_SIZE, 96);
CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V1_SIZE, 72);
CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V2_SIZE, 88);
CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V3_SIZE, 96);
CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V4_SIZE, 104);
CHECK_STRUCT_SIZE(PROPSHEETHEADERW_V1_SIZE, 72);
CHECK_STRUCT_SIZE(PROPSHEETHEADERW_V2_SIZE, 96);
#else
CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V1_SIZE, 40);
CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V2_SIZE, 48);
CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V3_SIZE, 52);
CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V4_SIZE, 56);
CHECK_STRUCT_SIZE(PROPSHEETHEADERA_V1_SIZE, 40);
CHECK_STRUCT_SIZE(PROPSHEETHEADERA_V2_SIZE, 52);
CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V1_SIZE, 40);
CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V2_SIZE, 48);
CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V3_SIZE, 52);
CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V4_SIZE, 56);
CHECK_STRUCT_SIZE(PROPSHEETHEADERW_V1_SIZE, 40);
CHECK_STRUCT_SIZE(PROPSHEETHEADERW_V2_SIZE, 52);
#endif
}
typedef HPROPSHEETPAGE (WINAPI *FN_CreatePropertySheetPageW)(LPCPROPSHEETPAGEW); typedef HPROPSHEETPAGE (WINAPI *FN_CreatePropertySheetPageW)(LPCPROPSHEETPAGEW);
typedef int (WINAPI *FN_PropertySheetW)(LPCPROPSHEETHEADERW); typedef int (WINAPI *FN_PropertySheetW)(LPCPROPSHEETHEADERW);
static FN_CreatePropertySheetPageW pCreatePropertySheetPageW;
static FN_PropertySheetW pPropertySheetW;
// Show that the Apply button is not enabled by default
static void test_ApplyButtonDisabled()
{
PROPSHEETPAGEW psp = {0};
PROPSHEETHEADERW header = {0};
HPROPSHEETPAGE hpsp[1];
psp.dwSize = sizeof(psp);
psp.dwFlags = PSP_DEFAULT;
psp.hInstance = GetModuleHandleW(NULL);
psp.pszTemplate = MAKEINTRESOURCEW(1);
psp.pfnDlgProc = Page1DlgProc;
hpsp[0] = pCreatePropertySheetPageW(&psp);
ok(hpsp[0] != NULL, "hpsp[0] was NULL.\n");
header.dwSize = sizeof(header);
header.dwFlags = 0;
header.hInstance = GetModuleHandleW(NULL);
header.hwndParent = NULL;
header.nPages = ARRAYSIZE(hpsp);
header.phpage = hpsp;
header.pszCaption = L"propsheet";
ok(pPropertySheetW(&header) > 0, "PropertySheet returned non-positive value.\n");
}
START_TEST(propsheet) START_TEST(propsheet)
{ {
PROPSHEETPAGEW psp;
PROPSHEETHEADERW header;
HPROPSHEETPAGE hpsp[1];
HMODULE hComCtl32; HMODULE hComCtl32;
FN_CreatePropertySheetPageW pCreatePropertySheetPageW;
FN_PropertySheetW pPropertySheetW;
hComCtl32 = LoadLibraryW(L"comctl32.dll"); hComCtl32 = LoadLibraryW(L"comctl32.dll");
pCreatePropertySheetPageW = (FN_CreatePropertySheetPageW)GetProcAddress(hComCtl32, "CreatePropertySheetPageW"); pCreatePropertySheetPageW = (FN_CreatePropertySheetPageW)GetProcAddress(hComCtl32, "CreatePropertySheetPageW");
@ -98,24 +164,8 @@ START_TEST(propsheet)
return; return;
} }
ZeroMemory(&psp, sizeof(psp)); test_StructSizes();
psp.dwSize = sizeof(psp); test_ApplyButtonDisabled();
psp.dwFlags = PSP_DEFAULT;
psp.hInstance = GetModuleHandleW(NULL);
psp.pszTemplate = MAKEINTRESOURCEW(1);
psp.pfnDlgProc = Page1DlgProc;
hpsp[0] = (*pCreatePropertySheetPageW)(&psp);
ok(hpsp[0] != NULL, "hpsp[0] was NULL.\n");
ZeroMemory(&header, sizeof(header));
header.dwSize = sizeof(header);
header.dwFlags = 0;
header.hInstance = GetModuleHandleW(NULL);
header.hwndParent = NULL;
header.nPages = ARRAYSIZE(hpsp);
header.phpage = hpsp;
header.pszCaption = L"propsheet";
ok((*pPropertySheetW)(&header) > 0, "PropertySheet returned non-positive value.\n");
FreeLibrary(hComCtl32); FreeLibrary(hComCtl32);
} }

18
sdk/include/psdk/prsht.h
View file

@ -194,6 +194,15 @@ typedef struct _PROPSHEETPAGEA {
LPCSTR pszHeaderTitle; LPCSTR pszHeaderTitle;
LPCSTR pszHeaderSubTitle; LPCSTR pszHeaderSubTitle;
#endif #endif
#if (_WIN32_IE >= 0x0501)
HANDLE hActCtx;
#endif
#if (_WIN32_IE >= 0x0600)
_ANONYMOUS_UNION union {
HBITMAP hbmHeader;
LPCSTR pszbmHeader;
} DUMMYUNIONNAME3;
#endif
} PROPSHEETPAGEA,*LPPROPSHEETPAGEA, } PROPSHEETPAGEA,*LPPROPSHEETPAGEA,
PROPSHEETPAGEA_LATEST, *LPPROPSHEETPAGEA_LATEST; PROPSHEETPAGEA_LATEST, *LPPROPSHEETPAGEA_LATEST;
typedef const PROPSHEETPAGEA *LPCPROPSHEETPAGEA, *LPCPROPSHEETPAGEA_LATEST; typedef const PROPSHEETPAGEA *LPCPROPSHEETPAGEA, *LPCPROPSHEETPAGEA_LATEST;
@ -222,6 +231,15 @@ typedef struct _PROPSHEETPAGEW {
LPCWSTR pszHeaderTitle; LPCWSTR pszHeaderTitle;
LPCWSTR pszHeaderSubTitle; LPCWSTR pszHeaderSubTitle;
#endif #endif
#if (_WIN32_IE >= 0x0501)
HANDLE hActCtx;
#endif
#if (_WIN32_IE >= 0x0600)
_ANONYMOUS_UNION union {
HBITMAP hbmHeader;
LPCWSTR pszbmHeader;
} DUMMYUNIONNAME3;
#endif
} PROPSHEETPAGEW,*LPPROPSHEETPAGEW, } PROPSHEETPAGEW,*LPPROPSHEETPAGEW,
PROPSHEETPAGEW_LATEST, *LPPROPSHEETPAGEW_LATEST; PROPSHEETPAGEW_LATEST, *LPPROPSHEETPAGEW_LATEST;
typedef const PROPSHEETPAGEW *LPCPROPSHEETPAGEW, *LPCPROPSHEETPAGEW_LATEST; typedef const PROPSHEETPAGEW *LPCPROPSHEETPAGEW, *LPCPROPSHEETPAGEW_LATEST;