Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 10:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MSGINA] Determine which kind of dialog box is before terminating it

Browse source 
Do a sanity check onto the dialog box type before terminating it. As it stands now, a call of PostQuitMessage() is invoked even when the dialog box is modal. This is illegal due to the fact that the shutdown dialog box is initiated by the "Security" main window thus WlxDialogBoxParam.

A call to PostQuitMessage onto a modal dialog box leads to a undefined behaviour, as it'll not just terminate the thread but also eventually killing the Winlogon process whose the thread belongs to.
CORE-17535
This commit is contained in:
George Bișoc 2021-04-19 17:18:51 +02:00
parent 246dbd3384
commit 84b3fecb26
No known key found for this signature in database
GPG key ID: 688C4FBE25D7DEF6
1 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
dll/win32/msgina/shutdown.c
View file

@ -61,6 +61,7 @@ typedef struct _SHUTDOWN_DLG_CONTEXT
BOOL bReasonUI; BOOL bReasonUI;
BOOL bFriendlyUI; BOOL bFriendlyUI;
BOOL bIsButtonHot[NUMBER_OF_BUTTONS]; BOOL bIsButtonHot[NUMBER_OF_BUTTONS];
BOOL bIsDialogModal;
WNDPROC OldButtonProc; WNDPROC OldButtonProc;
} SHUTDOWN_DLG_CONTEXT, *PSHUTDOWN_DLG_CONTEXT; } SHUTDOWN_DLG_CONTEXT, *PSHUTDOWN_DLG_CONTEXT;
@ -1058,10 +1059,18 @@ ShutdownDialogProc(
if (!pContext->bCloseDlg) if (!pContext->bCloseDlg)
{ {
pContext->bCloseDlg = TRUE; pContext->bCloseDlg = TRUE;
if (pContext->bIsDialogModal)
{
EndDialog(hDlg, 0);
}
else
{
DestroyWindow(hDlg); DestroyWindow(hDlg);
PostQuitMessage(0); PostQuitMessage(0);
} }
} }
}
return FALSE; return FALSE;
} }
@ -1079,8 +1088,16 @@ ShutdownDialogProc(
case WM_CLOSE: case WM_CLOSE:
pContext->bCloseDlg = TRUE; pContext->bCloseDlg = TRUE;
if (pContext->bIsDialogModal)
{
EndDialog(hDlg, IDCANCEL);
}
else
{
DestroyWindow(hDlg); DestroyWindow(hDlg);
PostQuitMessage(IDCANCEL); PostQuitMessage(IDCANCEL);
}
break; break;
case WM_COMMAND: case WM_COMMAND:
@ -1105,8 +1122,16 @@ ShutdownDialogProc(
case IDCANCEL: case IDCANCEL:
case IDHELP: case IDHELP:
pContext->bCloseDlg = TRUE; pContext->bCloseDlg = TRUE;
if (pContext->bIsDialogModal)
{
EndDialog(hDlg, LOWORD(wParam));
}
else
{
DestroyWindow(hDlg); DestroyWindow(hDlg);
PostQuitMessage(LOWORD(wParam)); PostQuitMessage(LOWORD(wParam));
}
break; break;
case IDC_SHUTDOWN_ACTION: case IDC_SHUTDOWN_ACTION:
@ -1189,6 +1214,7 @@ ShutdownDialog(
if (pgContext->hWlx && pgContext->pWlxFuncs && !Context.bFriendlyUI) if (pgContext->hWlx && pgContext->pWlxFuncs && !Context.bFriendlyUI)
{ {
Context.bIsDialogModal = TRUE;
ret = pgContext->pWlxFuncs->WlxDialogBoxParam(pgContext->hWlx, ret = pgContext->pWlxFuncs->WlxDialogBoxParam(pgContext->hWlx,
pgContext->hDllInstance, pgContext->hDllInstance,
MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : IDD_SHUTDOWN), MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : IDD_SHUTDOWN),
@ -1210,6 +1236,7 @@ ShutdownDialog(
} }
} }
Context.bIsDialogModal = FALSE;
hDlg = CreateDialogParamW(pgContext->hDllInstance, hDlg = CreateDialogParamW(pgContext->hDllInstance,
MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : ShutdownDialogId), MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : ShutdownDialogId),
hwndDlg, hwndDlg,