system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 17:24:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comctl32: Don't ignore page creation error for a non-modal propery sheet.

Browse source 
Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Dmitry Timoshkov 2018-12-18 18:45:45 +03:00 committed by Alexandre Julliard
parent ca41fd8904
commit 4ee173dfdd
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/comctl32/propsheet.c
View file

@ -2012,6 +2012,13 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg,
if (!psInfo->proppage[index].hwndPage) {
if(!PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage)) {
PROPSHEET_RemovePage(hwndDlg, index, NULL);
if (!psInfo->isModeless)
{
DestroyWindow(hwndDlg);
return FALSE;
}
if(index >= psInfo->nPages)
index--;
if(index < 0)
@ -2754,7 +2761,7 @@ static void PROPSHEET_CleanUp(HWND hwndDlg)
static INT do_loop(const PropSheetInfo *psInfo)
{
MSG msg;
INT ret = -1;
INT ret = 0;
HWND hwnd = psInfo->hwnd;
HWND parent = psInfo->ppshheader.hwndParent;
@ -2771,10 +2778,7 @@ static INT do_loop(const PropSheetInfo *psInfo)
}
if(ret == 0)
{
PostQuitMessage(msg.wParam);
ret = -1;
}
if(ret != -1)
ret = psInfo->result;

4
dlls/comctl32/tests/propsheet.c
View file

@ -276,7 +276,6 @@ static void test_disableowner(void)
psh.pfnCallback = disableowner_callback;
p = pPropertySheetA(&psh);
todo_wine
ok(p == 0, "Expected 0, got %ld\n", p);
ok(IsWindowEnabled(parenthwnd) != 0, "parent window should be enabled\n");
DestroyWindow(parenthwnd);
@ -1165,11 +1164,8 @@ static void test_bad_control_class(void)
psh.hwndParent = GetDesktopWindow();
U3(psh).phpage = &hpsp;
if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once Wine is fixed */
{
ret = pPropertySheetA(&psh);
ok(ret == 0, "got %ld\n", ret);
}
/* Need to recreate hpsp otherwise the test fails under Windows */
hpsp = pCreatePropertySheetPageA(&psp);