Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 04:53:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SYSSETUP] Fix handling of the status message window

Browse source 
This fixes a race condition, where the message thread was still running when InstallReactOS returned and syssetup.dll was unloaded by the caller (setup.exe).
This commit is contained in:
Timo Kreuzer 2018-03-17 14:23:34 +01:00
parent 85d4a49acd
commit 36051d3065
1 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

45
dll/win32/syssetup/install.c
View file

@ -552,9 +552,9 @@ static DWORD WINAPI
ShowStatusMessageThread(
IN LPVOID lpParameter)
{
HWND *phWnd = (HWND *)lpParameter;
HWND hWnd, hItem;
MSG Msg;
UNREFERENCED_PARAMETER(lpParameter);
hWnd = CreateDialogParam(hDllInstance,
MAKEINTRESOURCE(IDD_STATUSWINDOW_DLG),
@ -563,7 +563,6 @@ ShowStatusMessageThread(
(LPARAM)NULL);
if (!hWnd)
return 0;
*phWnd = hWnd;
ShowWindow(hWnd, SW_SHOW);
@ -580,6 +579,8 @@ ShowStatusMessageThread(
DispatchMessage(&Msg);
}
EndDialog(hWnd, 0);
return 0;
}
@ -667,7 +668,8 @@ cleanup:
static BOOL
CommonInstall(VOID)
{
HWND hWnd = NULL;
HANDLE hThread = NULL;
BOOL bResult = FALSE;
hSysSetupInf = SetupOpenInfFileW(L"syssetup.inf",
NULL,
@ -682,49 +684,54 @@ CommonInstall(VOID)
if (!InstallSysSetupInfDevices())
{
FatalError("InstallSysSetupInfDevices() failed!\n");
goto error;
goto Exit;
}
if(!InstallSysSetupInfComponents())
{
FatalError("InstallSysSetupInfComponents() failed!\n");
goto error;
goto Exit;
}
if (!IsConsoleBoot())
{
HANDLE hThread;
hThread = CreateThread(NULL,
0,
ShowStatusMessageThread,
(LPVOID)&hWnd,
NULL,
0,
NULL);
if (hThread)
CloseHandle(hThread);
}
if (!EnableUserModePnpManager())
{
FatalError("EnableUserModePnpManager() failed!\n");
goto error;
goto Exit;
}
if (CMP_WaitNoPendingInstallEvents(INFINITE) != WAIT_OBJECT_0)
{
FatalError("CMP_WaitNoPendingInstallEvents() failed!\n");
goto error;
goto Exit;
}
EndDialog(hWnd, 0);
return TRUE;
bResult = TRUE;
error:
if (hWnd)
EndDialog(hWnd, 0);
SetupCloseInfFile(hSysSetupInf);
return FALSE;
Exit:
if (bResult == FALSE)
{
SetupCloseInfFile(hSysSetupInf);
}
if (hThread != NULL)
{
PostThreadMessage(GetThreadId(hThread), WM_QUIT, 0, 0);
WaitForSingleObject(hThread, INFINITE);
CloseHandle(hThread);
}
return bResult;
}
/* Install a section of a .inf file