[SYSSETUP] Register type libraries before signaling we are done

This prevents a race condition, where hSysSetupInf could be closed before all type libraries are registered
This commit is contained in:
Mark Jansen 2021-11-15 19:53:21 +01:00
parent 51b2197c12
commit e6568af2d3

View file

@ -2170,6 +2170,12 @@ RegistrationProc(LPVOID Parameter)
RegistrationNotify.Progress = RegistrationData->DllCount;
RegistrationNotify.ActivityID = IDS_REGISTERING_COMPONENTS;
RegistrationNotify.CurrentItem = NULL;
RegisterTypeLibraries(hSysSetupInf, L"TypeLibraries");
// FIXME: Move this call to a separate cleanup page!
RtlCreateBootStatusDataFile();
SendMessage(RegistrationData->hwndDlg, PM_REGISTRATION_NOTIFY,
1, (LPARAM) &RegistrationNotify);
if (NULL != RegistrationNotify.ErrorMessage &&
@ -2181,11 +2187,6 @@ RegistrationProc(LPVOID Parameter)
SetupTermDefaultQueueCallback(RegistrationData->DefaultContext);
HeapFree(GetProcessHeap(), 0, RegistrationData);
RegisterTypeLibraries(hSysSetupInf, L"TypeLibraries");
// FIXME: Move this call to a separate cleanup page!
RtlCreateBootStatusDataFile();
return 0;
}