Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-05 22:12:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SYSSETUP]

Browse source 
- Create a modeless syssetup dialog so we can explicitly ignore intermediate WM_CLOSE messages (modal property sheets handle them automatically)
See issue #4960 for more details.

svn path=/trunk/; revision=47011
This commit is contained in:
Gregor Schneider 2010-04-25 12:13:01 +00:00
parent b8998128ea
commit 49496ddec6
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
reactos/dll/win32/syssetup/wizard.c
View file

@ -1960,6 +1960,7 @@ FinishDlgProc(HWND hwndDlg,
case WM_DESTROY: case WM_DESTROY:
{ {
SetupIsActive(0); SetupIsActive(0);
PostQuitMessage(0);
return TRUE; return TRUE;
} }
@ -1999,7 +2000,7 @@ FinishDlgProc(HWND hwndDlg,
break; break;
case PSN_WIZFINISH: case PSN_WIZFINISH:
/* Handle a Finish button click, if necessary */ DestroyWindow(GetParent(hwndDlg));
break; break;
default: default:
@ -2269,6 +2270,8 @@ InstallWizard(VOID)
HPROPSHEETPAGE ahpsp[8]; HPROPSHEETPAGE ahpsp[8];
PROPSHEETPAGE psp = {0}; PROPSHEETPAGE psp = {0};
UINT nPages = 0; UINT nPages = 0;
HWND hWnd;
MSG msg;
/* Clear setup data */ /* Clear setup data */
ZeroMemory(&SetupData, sizeof(SETUPDATA)); ZeroMemory(&SetupData, sizeof(SETUPDATA));
@ -2345,7 +2348,7 @@ InstallWizard(VOID)
/* Create the property sheet */ /* Create the property sheet */
psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwSize = sizeof(PROPSHEETHEADER);
psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER; psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER | PSH_MODELESS;
psh.hInstance = hDllInstance; psh.hInstance = hDllInstance;
psh.hwndParent = NULL; psh.hwndParent = NULL;
psh.nPages = nPages; psh.nPages = nPages;
@ -2358,7 +2361,17 @@ InstallWizard(VOID)
SetupData.hTitleFont = CreateTitleFont(); SetupData.hTitleFont = CreateTitleFont();
/* Display the wizard */ /* Display the wizard */
PropertySheet(&psh); hWnd = (HWND)PropertySheet(&psh);
ShowWindow(hWnd, SW_SHOW);
while (GetMessage(&msg, NULL, 0, 0))
{
if(!IsDialogMessage(hWnd, &msg))
{
TranslateMessage(&msg);
DispatchMessage(&msg);
}
}
DeleteObject(SetupData.hTitleFont); DeleteObject(SetupData.hTitleFont);
} }