Ros-diffs April 2021

ros-diffs@reactos.org

21 participants
173 discussions

[reactos] 01/01: [SETUPAPI] SetupDiInstallDevice: Do not fail if the .inf file does not have a .Services section

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4646bc5d14b322d1e5bd… commit e4646bc5d14b322d1e5bd4ffa599d455addbb9f5 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Apr 7 21:39:55 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Apr 7 21:39:55 2021 +0200 [SETUPAPI] SetupDiInstallDevice: Do not fail if the .inf file does not have a .Services section CORE-17530 --- dll/win32/setupapi/devinst.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index d629e138f1d..082be95386e 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -5609,7 +5609,11 @@ SetupDiInstallDevice( NULL, NULL); if (!Result) - goto cleanup; + { + if (GetLastError() != ERROR_SECTION_NOT_FOUND) + goto cleanup; + SetLastError(ERROR_SUCCESS); + } if (GetLastError() == ERROR_SUCCESS_REBOOT_REQUIRED) RebootRequired = TRUE;

3 years, 8 months

[reactos] 01/01: [SYSSETUP] Manually start PlugPlay service, and wait for it before continuing

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d25869e0e7853179c13e… commit 4d25869e0e7853179c13e4e28e5178289c3e3f06 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Apr 7 19:26:06 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Apr 7 19:35:50 2021 +0200 [SYSSETUP] Manually start PlugPlay service, and wait for it before continuing That way, class installers are already registered before installing devices. CORE-17538 --- boot/bootdata/hivesys.inf | 2 +- dll/win32/syssetup/install.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 7dc2c1141fd..fc218fed6a6 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1995,7 +1995,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ErrorControl",0x00010001,0x00 HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Group",0x00000000,"PlugPlay" HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k DcomLaunch" HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Type",0x00010001,0x00000020 HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\umpnpmgr.dll" diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index f0ce192f498..ba8fd226b64 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -486,7 +486,9 @@ EnableUserModePnpManager(VOID) { SC_HANDLE hSCManager = NULL; SC_HANDLE hService = NULL; + SERVICE_STATUS_PROCESS ServiceStatus; BOOL bRet = FALSE; + DWORD BytesNeeded, WaitTime; hSCManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE); if (hSCManager == NULL) @@ -498,7 +500,7 @@ EnableUserModePnpManager(VOID) hService = OpenServiceW(hSCManager, L"PlugPlay", - SERVICE_CHANGE_CONFIG | SERVICE_START); + SERVICE_CHANGE_CONFIG | SERVICE_START | SERVICE_QUERY_STATUS); if (hService == NULL) { DPRINT1("Unable to open PlugPlay service\n"); @@ -524,6 +526,35 @@ EnableUserModePnpManager(VOID) goto cleanup; } + while (TRUE) + { + bRet = QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(ServiceStatus), + &BytesNeeded); + if (!bRet) + { + DPRINT1("QueryServiceStatusEx() failed for PlugPlay service (error 0x%x)\n", GetLastError()); + goto cleanup; + } + + if (ServiceStatus.dwCurrentState != SERVICE_START_PENDING) + break; + + WaitTime = ServiceStatus.dwWaitHint / 10; + if (WaitTime < 1000) WaitTime = 1000; + else if (WaitTime > 10000) WaitTime = 10000; + Sleep(WaitTime); + }; + + if (ServiceStatus.dwCurrentState != SERVICE_RUNNING) + { + bRet = FALSE; + DPRINT1("Failed to start PlugPlay service\n"); + goto cleanup; + } + bRet = TRUE; cleanup:

3 years, 8 months

[reactos] 01/01: [NTOS:MM][NTOS:SE] Mute some noisy stubs Mute debug prints of MmDoesFileHaveUserWritableReferences and SeAuditingFileEventsWithContext stubs. These stubs are very noisy and create a lot of spam in the log when using Microsoft NTFS driver in ReactOS (with some other improvements applied). Implementing those functions isn't badly required for the proper work of this driver, so better way for now is just mute these stubs a bit. After my changes, they will be displayed only once, an

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52f4d8019b9d751146611… commit 52f4d8019b9d75114661187c494a79182e5d0ae2 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Mon Apr 5 21:49:50 2021 +0300 Commit: George Bișoc <fraizeraust99(a)gmail.com> CommitDate: Wed Apr 7 13:16:03 2021 +0200 [NTOS:MM][NTOS:SE] Mute some noisy stubs Mute debug prints of MmDoesFileHaveUserWritableReferences and SeAuditingFileEventsWithContext stubs. These stubs are very noisy and create a lot of spam in the log when using Microsoft NTFS driver in ReactOS (with some other improvements applied). Implementing those functions isn't badly required for the proper work of this driver, so better way for now is just mute these stubs a bit. After my changes, they will be displayed only once, and the log will be more clear, so it will seem to be enough to understand that the driver calls these routines. CORE-17409 --- ntoskrnl/mm/ARM3/section.c | 2 +- ntoskrnl/se/audit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index 1301267e6b3..fa4bb52d999 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -3341,7 +3341,7 @@ ULONG NTAPI MmDoesFileHaveUserWritableReferences(IN PSECTION_OBJECT_POINTERS SectionPointer) { - UNIMPLEMENTED; + UNIMPLEMENTED_ONCE; return 0; } diff --git a/ntoskrnl/se/audit.c b/ntoskrnl/se/audit.c index e4722f3da99..9cc7c51f9f3 100644 --- a/ntoskrnl/se/audit.c +++ b/ntoskrnl/se/audit.c @@ -731,7 +731,7 @@ SeAuditingFileEventsWithContext(IN BOOLEAN AccessGranted, IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext OPTIONAL) { - UNIMPLEMENTED; + UNIMPLEMENTED_ONCE; return FALSE; }

3 years, 8 months

[reactos] 01/01: [USETUP] Display some contents in the page whilst installing the bootloader (#3559)

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ee9535e05384f291039a… commit 3ee9535e05384f291039aa78a31384f139143a68 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Apr 7 10:11:07 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 7 10:11:07 2021 +0200 [USETUP] Display some contents in the page whilst installing the bootloader (#3559) CORE-17523 --- base/setup/usetup/lang/bg-BG.h | 28 ++++++++++ base/setup/usetup/lang/bn-BD.h | 28 ++++++++++ base/setup/usetup/lang/cs-CZ.h | 28 ++++++++++ base/setup/usetup/lang/da-DK.h | 28 ++++++++++ base/setup/usetup/lang/de-DE.h | 28 ++++++++++ base/setup/usetup/lang/el-GR.h | 28 ++++++++++ base/setup/usetup/lang/en-US.h | 28 ++++++++++ base/setup/usetup/lang/es-ES.h | 28 ++++++++++ base/setup/usetup/lang/et-EE.h | 28 ++++++++++ base/setup/usetup/lang/eu-ES.h | 28 ++++++++++ base/setup/usetup/lang/fr-FR.h | 28 ++++++++++ base/setup/usetup/lang/he-IL.h | 28 ++++++++++ base/setup/usetup/lang/hu-HU.h | 28 ++++++++++ base/setup/usetup/lang/id-ID.h | 28 ++++++++++ base/setup/usetup/lang/it-IT.h | 28 ++++++++++ base/setup/usetup/lang/ja-JP.h | 28 ++++++++++ base/setup/usetup/lang/lt-LT.h | 28 ++++++++++ base/setup/usetup/lang/ms-MY.h | 28 ++++++++++ base/setup/usetup/lang/nl-NL.h | 28 ++++++++++ base/setup/usetup/lang/pl-PL.h | 28 ++++++++++ base/setup/usetup/lang/pt-BR.h | 28 ++++++++++ base/setup/usetup/lang/pt-PT.h | 28 ++++++++++ base/setup/usetup/lang/ro-RO.h | 28 ++++++++++ base/setup/usetup/lang/ru-RU.h | 28 ++++++++++ base/setup/usetup/lang/sk-SK.h | 28 ++++++++++ base/setup/usetup/lang/sq-AL.h | 28 ++++++++++ base/setup/usetup/lang/sv-SE.h | 28 ++++++++++ base/setup/usetup/lang/tr-TR.h | 28 ++++++++++ base/setup/usetup/lang/uk-UA.h | 28 ++++++++++ base/setup/usetup/usetup.c | 117 +++++++++++++++++------------------------ base/setup/usetup/usetup.h | 3 +- 31 files changed, 861 insertions(+), 71 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 010cbb78359..184821b2032 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1533,6 +1533,30 @@ static MUI_ENTRY bgBGBootLoaderEntries[] = } }; +static MUI_ENTRY bgBGBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY bgBGKeyboardSettingsEntries[] = { { @@ -2183,6 +2207,10 @@ MUI_PAGE bgBGPages[] = SUCCESS_PAGE, bgBGSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + bgBGBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, bgBGBootPageEntries diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 9c6ea7a80ea..8ecec83cd19 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -981,6 +981,30 @@ static MUI_ENTRY bnBDBootPageEntries[] = }; +static MUI_ENTRY bnBDBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY bnBDSelectPartitionEntries[] = { { @@ -2171,6 +2195,10 @@ MUI_PAGE bnBDPages[] = SUCCESS_PAGE, bnBDSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + bnBDBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, bnBDBootPageEntries diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index fc680399fc2..7ee0878be8e 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1531,6 +1531,30 @@ static MUI_ENTRY csCZBootLoaderEntries[] = } }; +static MUI_ENTRY csCZBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY csCZKeyboardSettingsEntries[] = { { @@ -2179,6 +2203,10 @@ MUI_PAGE csCZPages[] = SUCCESS_PAGE, csCZSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + csCZBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, csCZBootPageEntries diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index aa29e1f774c..d953f6c0d46 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1525,6 +1525,30 @@ static MUI_ENTRY daDKBootLoaderEntries[] = } }; +static MUI_ENTRY daDKBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY daDKKeyboardSettingsEntries[] = { { @@ -2174,6 +2198,10 @@ MUI_PAGE daDKPages[] = SUCCESS_PAGE, daDKSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + daDKBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, daDKBootPageEntries diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index c595845dbde..ad8544fd8c8 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1525,6 +1525,30 @@ static MUI_ENTRY deDEBootLoaderEntries[] = } }; +static MUI_ENTRY deDEBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY deDEKeyboardSettingsEntries[] = { { @@ -2176,6 +2200,10 @@ MUI_PAGE deDEPages[] = SUCCESS_PAGE, deDESuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + deDEBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, deDEBootPageEntries diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index f626aa78386..edb49657ef2 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1540,6 +1540,30 @@ static MUI_ENTRY elGRBootLoaderEntries[] = } }; +static MUI_ENTRY elGRBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY elGRKeyboardSettingsEntries[] = { { @@ -2187,6 +2211,10 @@ MUI_PAGE elGRPages[] = SUCCESS_PAGE, elGRSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + elGRBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, elGRBootPageEntries diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index e71eaa80534..1c94ac657e4 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1523,6 +1523,30 @@ static MUI_ENTRY enUSBootLoaderEntries[] = } }; +static MUI_ENTRY enUSBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY enUSKeyboardSettingsEntries[] = { { @@ -2171,6 +2195,10 @@ MUI_PAGE enUSPages[] = SUCCESS_PAGE, enUSSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + enUSBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, enUSBootPageEntries diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 35d0cabc9c1..82182e30d6c 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1529,6 +1529,30 @@ static MUI_ENTRY esESBootLoaderEntries[] = } }; +static MUI_ENTRY etESBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY esESKeyboardSettingsEntries[] = { { @@ -2177,6 +2201,10 @@ MUI_PAGE esESPages[] = SUCCESS_PAGE, esESSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + etESBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, esESBootPageEntries diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 581ffe97e3e..c29a79ab4d1 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1526,6 +1526,30 @@ static MUI_ENTRY etEEBootLoaderEntries[] = } }; +static MUI_ENTRY etEEBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY etEEKeyboardSettingsEntries[] = { { @@ -2172,6 +2196,10 @@ MUI_PAGE etEEPages[] = SUCCESS_PAGE, etEESuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + etEEBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, etEEBootPageEntries diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index da8ffe3804a..4777c606c2c 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -1524,6 +1524,30 @@ static MUI_ENTRY euESBootLoaderEntries[] = } }; +static MUI_ENTRY euESBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY euESKeyboardSettingsEntries[] = { { @@ -2172,6 +2196,10 @@ MUI_PAGE euESPages[] = SUCCESS_PAGE, euESSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + euESBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, euESBootPageEntries diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 17a3e90e2c2..b34852b57c1 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1560,6 +1560,30 @@ static MUI_ENTRY frFRBootLoaderEntries[] = } }; +static MUI_ENTRY frFRBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY frFRKeyboardSettingsEntries[] = { { @@ -2208,6 +2232,10 @@ MUI_PAGE frFRPages[] = SUCCESS_PAGE, frFRSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + frFRBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, frFRBootPageEntries diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 2f8ea935012..85751ce77e6 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1527,6 +1527,30 @@ static MUI_ENTRY heILBootLoaderEntries[] = } }; +static MUI_ENTRY heILBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY heILKeyboardSettingsEntries[] = { { @@ -2173,6 +2197,10 @@ MUI_PAGE heILPages[] = SUCCESS_PAGE, heILSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + heILBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, heILBootPageEntries diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 9d3d8b3abed..3289d59fc80 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -1417,6 +1417,30 @@ static MUI_ENTRY huHUBootLoaderEntries[] = } }; +static MUI_ENTRY huHUBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY huHUKeyboardSettingsEntries[] = { { @@ -2062,6 +2086,10 @@ MUI_PAGE huHUPages[] = SUCCESS_PAGE, huHUSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + huHUBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, huHUBootPageEntries diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index 3a751b34c12..f6713b686f6 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -1523,6 +1523,30 @@ static MUI_ENTRY idIDBootLoaderEntries[] = } }; +static MUI_ENTRY idIDBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY idIDKeyboardSettingsEntries[] = { { @@ -2171,6 +2195,10 @@ MUI_PAGE idIDPages[] = SUCCESS_PAGE, idIDSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + idIDBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, idIDBootPageEntries diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 8041b37c394..e5a6b812a3f 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -980,6 +980,30 @@ static MUI_ENTRY itITBootPageEntries[] = }; +static MUI_ENTRY itITBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY itITSelectPartitionEntries[] = { { @@ -2177,6 +2201,10 @@ MUI_PAGE itITPages[] = SUCCESS_PAGE, itITSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + itITBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, itITBootPageEntries diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index dd0c2357b00..a0817056070 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1526,6 +1526,30 @@ static MUI_ENTRY jaJPBootLoaderEntries[] = } }; +static MUI_ENTRY jaJPBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY jaJPKeyboardSettingsEntries[] = { { @@ -2174,6 +2198,10 @@ MUI_PAGE jaJPPages[] = SUCCESS_PAGE, jaJPSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + jaJPBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, jaJPBootPageEntries diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 5bcd70c25a2..9c5942222eb 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1534,6 +1534,30 @@ static MUI_ENTRY ltLTBootLoaderEntries[] = } }; +static MUI_ENTRY ltLTBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ltLTKeyboardSettingsEntries[] = { { @@ -2182,6 +2206,10 @@ MUI_PAGE ltLTPages[] = SUCCESS_PAGE, ltLTSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + ltLTBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, ltLTBootPageEntries diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 7a04d9bb2d1..933e4795cd9 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1515,6 +1515,30 @@ static MUI_ENTRY msMYBootLoaderEntries[] = } }; +static MUI_ENTRY msMYBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY msMYKeyboardSettingsEntries[] = { { @@ -2156,6 +2180,10 @@ MUI_PAGE msMYPages[] = SUCCESS_PAGE, msMYSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + msMYBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, msMYBootPageEntries diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 8a3e1adf135..3da7c994373 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1538,6 +1538,30 @@ static MUI_ENTRY nlNLBootLoaderEntries[] = } }; +static MUI_ENTRY nlNLBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY nlNLkeyboardSettingsEntries[] = { { @@ -2196,6 +2220,10 @@ MUI_PAGE nlNLPages[] = SUCCESS_PAGE, nlNLSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + nlNLBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, nlNLBootPageEntries diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 97e27d10776..74f38adb369 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1534,6 +1534,30 @@ static MUI_ENTRY plPLBootLoaderEntries[] = } }; +static MUI_ENTRY plPLBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY plPLKeyboardSettingsEntries[] = { { @@ -2179,6 +2203,10 @@ MUI_PAGE plPLPages[] = SUCCESS_PAGE, plPLSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + plPLBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, plPLBootPageEntries diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 50d59d8ddbb..e898699a295 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1540,6 +1540,30 @@ static MUI_ENTRY ptBRBootLoaderEntries[] = } }; +static MUI_ENTRY ptBRBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ptBRKeyboardSettingsEntries[] = { { @@ -2209,6 +2233,10 @@ MUI_PAGE ptBRPages[] = SUCCESS_PAGE, ptBRSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + ptBRBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, ptBRBootPageEntries diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index bd5eaa9ea13..b95b4d97899 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -1540,6 +1540,30 @@ static MUI_ENTRY ptPTBootLoaderEntries[] = } }; +static MUI_ENTRY ptPTBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ptPTKeyboardSettingsEntries[] = { { @@ -2194,6 +2218,10 @@ MUI_PAGE ptPTPages[] = SUCCESS_PAGE, ptPTSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + ptPTBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, ptPTBootPageEntries diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 84455496dbb..5f2fe87329b 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1548,6 +1548,30 @@ static MUI_ENTRY roROBootLoaderEntries[] = } }; +static MUI_ENTRY roROBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY roROKeyboardSettingsEntries[] = { { @@ -2217,6 +2241,10 @@ MUI_PAGE roROPages[] = SUCCESS_PAGE, roROSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + roROBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, roROBootPageEntries diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 65d55e58a3e..08e01695965 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1546,6 +1546,30 @@ static MUI_ENTRY ruRUBootLoaderEntries[] = } }; +static MUI_ENTRY ruRUBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ruRUKeyboardSettingsEntries[] = { { @@ -2194,6 +2218,10 @@ MUI_PAGE ruRUPages[] = SUCCESS_PAGE, ruRUSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + ruRUBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, ruRUBootPageEntries diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 7d37ba38531..5ec671ea635 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1532,6 +1532,30 @@ static MUI_ENTRY skSKBootLoaderEntries[] = } }; +static MUI_ENTRY skSKBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY skSKKeyboardSettingsEntries[] = { { @@ -2183,6 +2207,10 @@ MUI_PAGE skSKPages[] = SUCCESS_PAGE, skSKSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + skSKBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, skSKBootPageEntries diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 7e0c1b7795f..584c30c278e 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1530,6 +1530,30 @@ static MUI_ENTRY sqALBootLoaderEntries[] = } }; +static MUI_ENTRY sqALBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY sqALKeyboardSettingsEntries[] = { { @@ -2184,6 +2208,10 @@ MUI_PAGE sqALPages[] = SUCCESS_PAGE, sqALSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + sqALBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, sqALBootPageEntries diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 3c87c2992aa..b9f2b89ea4a 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1532,6 +1532,30 @@ static MUI_ENTRY svSEBootLoaderEntries[] = } }; +static MUI_ENTRY svSEBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY svSEKeyboardSettingsEntries[] = { { @@ -2180,6 +2204,10 @@ MUI_PAGE svSEPages[] = SUCCESS_PAGE, svSESuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + svSEBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, svSEBootPageEntries diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 229416e336a..bd02a96f3af 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1500,6 +1500,30 @@ static MUI_ENTRY trTRBootLoaderEntries[] = } }; +static MUI_ENTRY trTRBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY trTRKeyboardSettingsEntries[] = { { @@ -2148,6 +2172,10 @@ MUI_PAGE trTRPages[] = SUCCESS_PAGE, trTRSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + trTRBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, trTRBootPageEntries diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index d242e3d1d70..ce68ce4cb86 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1531,6 +1531,30 @@ static MUI_ENTRY ukUABootLoaderEntries[] = } }; +static MUI_ENTRY ukUABootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ukUAKeyboardSettingsEntries[] = { { @@ -2180,6 +2204,10 @@ MUI_PAGE ukUAPages[] = SUCCESS_PAGE, ukUASuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + ukUABootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, ukUABootPageEntries diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index f1fc3a03753..520b257846d 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -4023,13 +4023,10 @@ Quit: case 1: return BOOT_LOADER_FLOPPY_PAGE; - /* Install on both MBR and VBR */ + /* Install on both MBR and VBR or VBR only */ case 2: - return BOOT_LOADER_HARDDISK_MBR_PAGE; - - /* Install on VBR only */ case 3: - return BOOT_LOADER_HARDDISK_VBR_PAGE; + return BOOT_LOADER_INSTALLATION_PAGE; } return BOOT_LOADER_PAGE; @@ -4092,83 +4089,69 @@ BootLoaderFloppyPage(PINPUT_RECORD Ir) /* - * Displays the BootLoaderHarddiskVbrPage. - * - * Next pages: - * SuccessPage (At once) - * QuitPage - * - * SIDEEFFECTS - * Calls InstallVBRToPartition() - * - * RETURNS - * Number of the next page. - */ -static PAGE_NUMBER -BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) -{ - NTSTATUS Status; - - Status = InstallVBRToPartition(&USetupData.SystemRootPath, - &USetupData.SourceRootPath, - &USetupData.DestinationArcPath, - SystemPartition->FileSystem); - if (!NT_SUCCESS(Status)) - { - MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, - SystemPartition->FileSystem); - return QUIT_PAGE; - } - - return SUCCESS_PAGE; -} - - -/* - * Displays the BootLoaderHarddiskMbrPage. + * Displays the BootLoaderInstallationPage. * * Next pages: * SuccessPage (At once) * QuitPage * * SIDEEFFECTS - * Calls InstallVBRToPartition() - * Calls InstallMbrBootCodeToDisk() - * + * Calls InstallVBRToPartition() if VBR installation is chosen. + * Otherwise both InstallVBRToPartition() and InstallMbrBootCodeToDisk() + * are called if both MBR and VBR installation is chosen. + * * RETURNS * Number of the next page. */ static PAGE_NUMBER -BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) +BootLoaderInstallationPage(PINPUT_RECORD Ir) { NTSTATUS Status; WCHAR DestinationDevicePathBuffer[MAX_PATH]; - /* Step 1: Write the VBR */ - Status = InstallVBRToPartition(&USetupData.SystemRootPath, - &USetupData.SourceRootPath, - &USetupData.DestinationArcPath, - SystemPartition->FileSystem); - if (!NT_SUCCESS(Status)) + MUIDisplayPage(BOOT_LOADER_INSTALLATION_PAGE); + + if (USetupData.MBRInstallType == 2) { - MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, - SystemPartition->FileSystem); - return QUIT_PAGE; - } + /* Step 1: Write the VBR */ + Status = InstallVBRToPartition(&USetupData.SystemRootPath, + &USetupData.SourceRootPath, + &USetupData.DestinationArcPath, + SystemPartition->FileSystem); + if (!NT_SUCCESS(Status)) + { + MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, + SystemPartition->FileSystem); + return QUIT_PAGE; + } - /* Step 2: Write the MBR if the disk containing the system partition is not a super-floppy */ - if (!IsSuperFloppy(SystemPartition->DiskEntry)) + /* Step 2: Write the MBR if the disk containing the system partition is not a super-floppy */ + if (!IsSuperFloppy(SystemPartition->DiskEntry)) + { + RtlStringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), + L"\\Device\\Harddisk%d\\Partition0", + SystemPartition->DiskEntry->DiskNumber); + Status = InstallMbrBootCodeToDisk(&USetupData.SystemRootPath, + &USetupData.SourceRootPath, + DestinationDevicePathBuffer); + if (!NT_SUCCESS(Status)) + { + DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", Status); + MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER, L"MBR"); + return QUIT_PAGE; + } + } + } + else { - RtlStringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), - L"\\Device\\Harddisk%d\\Partition0", - SystemPartition->DiskEntry->DiskNumber); - Status = InstallMbrBootCodeToDisk(&USetupData.SystemRootPath, - &USetupData.SourceRootPath, - DestinationDevicePathBuffer); + Status = InstallVBRToPartition(&USetupData.SystemRootPath, + &USetupData.SourceRootPath, + &USetupData.DestinationArcPath, + SystemPartition->FileSystem); if (!NT_SUCCESS(Status)) { - DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", Status); - MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER, L"MBR"); + MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, + SystemPartition->FileSystem); return QUIT_PAGE; } } @@ -4632,12 +4615,8 @@ RunUSetup(VOID) Page = BootLoaderFloppyPage(&Ir); break; - case BOOT_LOADER_HARDDISK_MBR_PAGE: - Page = BootLoaderHarddiskMbrPage(&Ir); - break; - - case BOOT_LOADER_HARDDISK_VBR_PAGE: - Page = BootLoaderHarddiskVbrPage(&Ir); + case BOOT_LOADER_INSTALLATION_PAGE: + Page = BootLoaderInstallationPage(&Ir); break; /* Repair pages */ diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index cf31b92a81c..a7dbb67f212 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -111,8 +111,7 @@ typedef enum _PAGE_NUMBER REGISTRY_PAGE, BOOT_LOADER_PAGE, BOOT_LOADER_FLOPPY_PAGE, - BOOT_LOADER_HARDDISK_MBR_PAGE, - BOOT_LOADER_HARDDISK_VBR_PAGE, + BOOT_LOADER_INSTALLATION_PAGE, SUCCESS_PAGE, QUIT_PAGE,

3 years, 8 months

[reactos] 01/01: Revert '[FONTEXT_APITEST] Follow-up of #3585'

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f511258ee59183df7cc19… commit f511258ee59183df7cc196e52bc5429dc0322fe7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Apr 7 17:08:23 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Apr 7 17:08:23 2021 +0900 Revert '[FONTEXT_APITEST] Follow-up of #3585' --- .../rostests/apitests/fontext/GetDisplayNameOf.cpp | 97 +++++----------------- 1 file changed, 23 insertions(+), 74 deletions(-) diff --git a/modules/rostests/apitests/fontext/GetDisplayNameOf.cpp b/modules/rostests/apitests/fontext/GetDisplayNameOf.cpp index ac0c7abb425..a0c164d6683 100644 --- a/modules/rostests/apitests/fontext/GetDisplayNameOf.cpp +++ b/modules/rostests/apitests/fontext/GetDisplayNameOf.cpp @@ -3,7 +3,6 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Tests for fontext GetDisplayNameOf behavior * COPYRIGHT: Copyright 2021 Mark Jansen <mark.jansen(a)reactos.org> - * Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include <ntstatus.h> @@ -16,7 +15,6 @@ #include <shlobj.h> #include <shlwapi.h> #include <shellutils.h> -#include <versionhelpers.h> #include "wine/test.h" static HRESULT Initialize(CComPtr<IShellFolder>& spFolder) @@ -41,68 +39,45 @@ static HRESULT Initialize(CComPtr<IShellFolder>& spFolder) hr = desktopFolder->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &spFolder)); ok_hex(hr, S_OK); - if (FAILED(hr)) - { - skip("BindToObject failed\n"); - return hr; - } - return hr; } -static void -Test_GetDisplayNameOf(CComPtr<IShellFolder>& spFolder, - DWORD dwFlags, LPCWSTR text, BOOL fRelative) +static void Test_GetDisplayNameOf(CComPtr<IShellFolder>& spFolder) { CComPtr<IEnumIDList> fontsEnum; HRESULT hr = spFolder->EnumObjects(NULL, SHCONTF_NONFOLDERS, &fontsEnum); + ok_hex(hr, S_OK); if (FAILED(hr)) - { - skip("EnumObjects failed\n"); return; - } - BOOL bFound = FALSE; - for (;;) - { - CComHeapPtr<ITEMIDLIST> fontPidl; - ULONG fetched = 0; - hr = fontsEnum->Next(1, &fontPidl, &fetched); - if (FAILED(hr) || hr == S_FALSE) - break; - - STRRET strret; - hr = spFolder->GetDisplayNameOf(fontPidl, dwFlags, &strret); - if (FAILED(hr)) - continue; - - WCHAR Buf[MAX_PATH]; - hr = StrRetToBufW(&strret, fontPidl, Buf, _countof(Buf)); - if (FAILED(hr)) - continue; + CComHeapPtr<ITEMIDLIST> fontPidl; + ULONG fetched = 0; + hr = fontsEnum->Next(1, &fontPidl, &fetched); + STRRET strret; + hr = spFolder->GetDisplayNameOf(fontPidl, SHGDN_FORPARSING, &strret); + ok_hex(hr, S_OK); + if (FAILED(hr)) + return; - trace("Path: %s\n", wine_dbgstr_w(Buf)); - if (lstrcmpiW(text, Buf) == 0) - { - bFound = TRUE; - ok_int(PathIsRelativeW(Buf), fRelative); - break; - } - } + WCHAR Buf[MAX_PATH]; + hr = StrRetToBufW(&strret, fontPidl, Buf, _countof(Buf)); + ok_hex(hr, S_OK); + if (FAILED(hr)) + return; - ok_int(bFound, TRUE); + // On 2k3 where this is not a custom IShellFolder, it will return something like: + // 'C:\\WINDOWS\\Fonts\\arial.ttf' + // On Vista+ this results in something like: + // 'C:\\Windows\\Fonts\\System Bold' + BOOL bRelative = PathIsRelativeW(Buf); + trace("Path: %s\n", wine_dbgstr_w(Buf)); + ok(bRelative == FALSE, "Path not relative? (%s)\n", wine_dbgstr_w(Buf)); } START_TEST(GetDisplayNameOf) { - if (IsWindowsVistaOrGreater()) - { - skip("Vista+\n"); - return; - } - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); { @@ -110,33 +85,7 @@ START_TEST(GetDisplayNameOf) HRESULT hr = Initialize(spFolder); if (SUCCEEDED(hr)) { - WCHAR szPath[MAX_PATH]; - SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, szPath); - PathAppendW(szPath, L"arial.ttf"); - - trace("SHGDN_NORMAL\n"); - Test_GetDisplayNameOf(spFolder, SHGDN_NORMAL, L"arial.ttf", TRUE); - - trace("SHGDN_INFOLDER\n"); - Test_GetDisplayNameOf(spFolder, SHGDN_INFOLDER, L"arial.ttf", TRUE); - - trace("SHGDN_FORPARSING\n"); - Test_GetDisplayNameOf(spFolder, SHGDN_FORPARSING, szPath, FALSE); - - trace("SHGDN_INFOLDER | SHGDN_FORPARSING\n"); - Test_GetDisplayNameOf(spFolder, SHGDN_INFOLDER | SHGDN_FORPARSING, L"arial.ttf", TRUE); - - trace("SHGDN_FORADDRESSBAR\n"); - Test_GetDisplayNameOf(spFolder, SHGDN_FORADDRESSBAR, L"arial.ttf", TRUE); - - trace("SHGDN_INFOLDER | SHGDN_FORADDRESSBAR\n"); - Test_GetDisplayNameOf(spFolder, SHGDN_INFOLDER | SHGDN_FORADDRESSBAR, L"arial.ttf", TRUE); - - trace("SHGDN_FORPARSING | SHGDN_FORADDRESSBAR\n"); - Test_GetDisplayNameOf(spFolder, SHGDN_FORPARSING | SHGDN_FORADDRESSBAR, szPath, FALSE); - - trace("SHGDN_INFOLDER | SHGDN_FORPARSING | SHGDN_FORADDRESSBAR\n"); - Test_GetDisplayNameOf(spFolder, SHGDN_INFOLDER | SHGDN_FORPARSING | SHGDN_FORADDRESSBAR, L"arial.ttf", TRUE); + Test_GetDisplayNameOf(spFolder); } }

3 years, 8 months

[reactos] 01/01: [BROWSEUI] Reduce IAutoComplete failures (#3590)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2fd058dce6058804f4bcc… commit 2fd058dce6058804f4bcce7226bf84467a77083a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Apr 7 13:38:22 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 7 13:38:22 2021 +0900 [BROWSEUI] Reduce IAutoComplete failures (#3590) - Delete OnEditUpdate method. - Improve the expand condition. CORE-9281 --- dll/win32/browseui/CAutoComplete.cpp | 27 ++++++++++++--------------- dll/win32/browseui/CAutoComplete.h | 1 - 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index df0291021f0..6f2033d9f9f 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -291,7 +291,7 @@ LRESULT CAutoComplete::EditWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l return OnEditChar(wParam, lParam); case WM_CUT: case WM_PASTE: case WM_CLEAR: ret = ::DefSubclassProc(hwnd, uMsg, wParam, lParam); // do default - OnEditUpdate(TRUE); + UpdateCompletion(TRUE); return ret; case WM_GETDLGCODE: ret = ::DefSubclassProc(hwnd, uMsg, wParam, lParam); // do default @@ -950,7 +950,7 @@ BOOL CAutoComplete::OnEditKeyDown(WPARAM wParam, LPARAM lParam) if (!CanAutoSuggest()) return FALSE; // do default ::DefSubclassProc(m_hwndEdit, WM_KEYDOWN, VK_DELETE, 0); // do default - OnEditUpdate(FALSE); + UpdateCompletion(FALSE); return TRUE; // eat } case VK_BACK: @@ -973,21 +973,10 @@ LRESULT CAutoComplete::OnEditChar(WPARAM wParam, LPARAM lParam) return 0; // eat LRESULT ret = ::DefSubclassProc(m_hwndEdit, WM_CHAR, wParam, lParam); // do default if (CanAutoSuggest() || CanAutoAppend()) - OnEditUpdate(wParam != VK_BACK); + UpdateCompletion(wParam != VK_BACK); return ret; } -VOID CAutoComplete::OnEditUpdate(BOOL bAppendOK) -{ - CStringW strText = GetEditText(); - if (m_strText.CompareNoCase(strText) == 0) - { - // no change - return; - } - UpdateCompletion(bAppendOK); -} - VOID CAutoComplete::OnListSelChange() { // update EDIT text @@ -1508,7 +1497,8 @@ INT CAutoComplete::UpdateInnerList() if (m_strStemText.CompareNoCase(strStemText) != 0) { m_strStemText = strStemText; - bExpand = bReset = TRUE; + bReset = TRUE; + bExpand = !m_strStemText.IsEmpty(); } // reset if necessary @@ -1580,6 +1570,13 @@ VOID CAutoComplete::UpdateCompletion(BOOL bAppendOK) { TRACE("CAutoComplete::UpdateCompletion(%p, %d)\n", this, bAppendOK); + CStringW strText = GetEditText(); + if (m_strText.CompareNoCase(strText) == 0) + { + // no change + return; + } + // update inner list UINT cItems = UpdateInnerList(); if (cItems == 0) // no items diff --git a/dll/win32/browseui/CAutoComplete.h b/dll/win32/browseui/CAutoComplete.h index f779fdaf4bf..5da346ebb85 100644 --- a/dll/win32/browseui/CAutoComplete.h +++ b/dll/win32/browseui/CAutoComplete.h @@ -163,7 +163,6 @@ public: LRESULT EditWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); LRESULT OnEditChar(WPARAM wParam, LPARAM lParam); BOOL OnEditKeyDown(WPARAM wParam, LPARAM lParam); - VOID OnEditUpdate(BOOL bAppendOK); VOID OnListSelChange(); BOOL OnListUpDown(UINT vk);

3 years, 8 months

[reactos] 01/01: [BROWSEUI_APITEST] Strengthen IAutoComplete testcase

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4214c2bf3c4a23d6d38e9… commit 4214c2bf3c4a23d6d38e999a6d57efb00f80bd33 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Apr 7 12:39:28 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Apr 7 12:39:28 2021 +0900 [BROWSEUI_APITEST] Strengthen IAutoComplete testcase --- .../rostests/apitests/browseui/IAutoComplete.cpp | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/modules/rostests/apitests/browseui/IAutoComplete.cpp b/modules/rostests/apitests/browseui/IAutoComplete.cpp index 0fa7d301542..d65478e2c5e 100644 --- a/modules/rostests/apitests/browseui/IAutoComplete.cpp +++ b/modules/rostests/apitests/browseui/IAutoComplete.cpp @@ -872,4 +872,33 @@ START_TEST(IAutoComplete) { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"te", TRUE, 2, 2, -1, TRUE }, }; DoTestCaseB(rcWork.right - 100, rcWork.bottom - 30, 80, 40, pList, nCount, testcase8_entries, _countof(testcase8_entries)); + + // Test case #9 (B) + trace("Testcase #9 ------------------------------\n"); + nCount = 32; + pList = (LPWSTR *)CoTaskMemAlloc(nCount * sizeof(LPWSTR)); + for (UINT i = 0; i < nCount; ++i) + { + StringCbPrintfW(szText, sizeof(szText), L"a%u\\b%u\\c%u", i % 2, (i / 2) % 2, i % 4); + SHStrDupW(szText, &pList[i]); + } + static const TEST_B_ENTRY testcase9_entries[] = + { + { __LINE__, WM_CHAR, L'a', 0, L"a", TRUE, 1, 1, -1, TRUE }, + { __LINE__, WM_CHAR, L'0', 0, L"a0", TRUE, 2, 2, -1 }, + { __LINE__, WM_CHAR, L'\\', 0, L"a0\\", TRUE, 3, 3, -1, TRUE, TRUE, L"a0\\" }, + { __LINE__, WM_CHAR, L'b', 0, L"a0\\b", TRUE, 4, 4, -1 }, + { __LINE__, WM_CHAR, L'1', 0, L"a0\\b1", TRUE, 5, 5, -1 }, + { __LINE__, WM_CHAR, L'\\', 0, L"a0\\b1\\", TRUE, 6, 6, -1, TRUE, TRUE, L"a0\\b1\\" }, + { __LINE__, WM_CHAR, L'c', 0, L"a0\\b1\\c", TRUE, 7, 7, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"a0\\b1\\", TRUE, 6, 6, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"a0\\b1", TRUE, 5, 5, -1, TRUE, TRUE, L"a0\\" }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"a0\\b", TRUE, 4, 4, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"a0\\", TRUE, 3, 3, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"a0", TRUE, 2, 2, -1, TRUE }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"a", TRUE, 1, 1, -1 }, + { __LINE__, WM_KEYDOWN, VK_DOWN, 0, L"a0\\b0\\c0", TRUE, 8, 8, 0 }, + { __LINE__, WM_KEYDOWN, VK_UP, 0, L"a", TRUE, 1, 1, -1 }, + }; + DoTestCaseB(0, 0, 100, 30, pList, nCount, testcase9_entries, _countof(testcase9_entries)); }

3 years, 8 months

[reactos] 01/01: [CMAKE] Make cmake use static libraries for testing the compiler

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96dc5836ab1a93120e833… commit 96dc5836ab1a93120e8336830b7dff6267232a53 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Apr 6 19:28:47 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Apr 6 19:28:47 2021 +0200 [CMAKE] Make cmake use static libraries for testing the compiler --- toolchain-gcc.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/toolchain-gcc.cmake b/toolchain-gcc.cmake index 56d1d8337bd..44f6d0ce166 100644 --- a/toolchain-gcc.cmake +++ b/toolchain-gcc.cmake @@ -55,6 +55,9 @@ set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") #MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES) set(CMAKE_CXX_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C++ Libraries") +# This allows to have CMake test the compiler without linking +set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) + set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import") set(CMAKE_MODULE_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import") set(CMAKE_EXE_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import")

3 years, 8 months

[reactos] 01/01: [CMAKE] Honor CMAKE_EXE_LINKER_FLAGS_INIT in GCC build

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c4ae0d05e8106e125d77… commit 9c4ae0d05e8106e125d770f780724122ce497f3a Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Apr 6 19:23:31 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Apr 6 19:26:33 2021 +0200 [CMAKE] Honor CMAKE_EXE_LINKER_FLAGS_INIT in GCC build --- sdk/cmake/gcc.cmake | 2 +- toolchain-clang.cmake | 10 ++++++---- toolchain-gcc.cmake | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 1b5604b6ccb..d5436cea69f 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -238,7 +238,7 @@ set(CMAKE_C_CREATE_SHARED_MODULE ${CMAKE_C_CREATE_SHARED_LIBRARY}) set(CMAKE_CXX_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_LIBRARY}) set(CMAKE_RC_CREATE_SHARED_MODULE ${CMAKE_RC_CREATE_SHARED_LIBRARY}) -set(CMAKE_EXE_LINKER_FLAGS "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import,--disable-stdcall-fixup,--gc-sections") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup,--gc-sections") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") diff --git a/toolchain-clang.cmake b/toolchain-clang.cmake index 826f45f6b9a..2facc441683 100644 --- a/toolchain-clang.cmake +++ b/toolchain-clang.cmake @@ -55,10 +55,12 @@ set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") set(CMAKE_CXX_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C++ Libraries") -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import -fuse-ld=${CMAKE_SYSROOT}/bin/${triplet}-ld") -set(CMAKE_MODULE_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import -fuse-ld=${CMAKE_SYSROOT}/bin/${triplet}-ld") if (DEFINED CMAKE_SYSROOT) - set(CMAKE_EXE_LINKER_FLAGS_INIT "-nostdlib -fuse-ld=${CMAKE_SYSROOT}/bin/${GCC_TOOLCHAIN_PREFIX}ld") + set(LD_EXECUTABLE ${CMAKE_SYSROOT}/bin/${GCC_TOOLCHAIN_PREFIX}ld) else() - set(CMAKE_EXE_LINKER_FLAGS_INIT "-nostdlib -fuse-ld=${GCC_TOOLCHAIN_PREFIX}ld") + set(LD_EXECUTABLE ${GCC_TOOLCHAIN_PREFIX}ld) endif() + +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import -fuse-ld=${LD_EXECUTABLE}") +set(CMAKE_MODULE_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import -fuse-ld=${LD_EXECUTABLE}") +set(CMAKE_EXE_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import -fuse-ld=${LD_EXECUTABLE}") diff --git a/toolchain-gcc.cmake b/toolchain-gcc.cmake index 276225ec663..56d1d8337bd 100644 --- a/toolchain-gcc.cmake +++ b/toolchain-gcc.cmake @@ -57,6 +57,7 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C++ Libraries") set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import") set(CMAKE_MODULE_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import") +set(CMAKE_EXE_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import") set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_LIST_DIR}/overrides-gcc.cmake")

3 years, 8 months

[reactos] 01/01: [NTOS:KE] Rewrite KiSystemCallTrampoline in assembly

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d3825862f596b05d2a94… commit 0d3825862f596b05d2a944f5000813e574302d8f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Apr 6 10:53:35 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Apr 6 17:57:18 2021 +0200 [NTOS:KE] Rewrite KiSystemCallTrampoline in assembly Instead of making assumptions about what the compiler does with forced-inline functions --- ntoskrnl/include/internal/i386/ke.h | 68 +++---------------------------------- ntoskrnl/ke/i386/trap.s | 34 +++++++++++++++++++ 2 files changed, 38 insertions(+), 64 deletions(-) diff --git a/ntoskrnl/include/internal/i386/ke.h b/ntoskrnl/include/internal/i386/ke.h index e7152395c92..e91b8d6ad16 100644 --- a/ntoskrnl/include/internal/i386/ke.h +++ b/ntoskrnl/include/internal/i386/ke.h @@ -684,71 +684,11 @@ KiDispatchException2Args(IN NTSTATUS Code, // // Performs a system call // - - /* - * This sequence does a RtlCopyMemory(Stack - StackBytes, Arguments, StackBytes) - * and then calls the function associated with the system call. - * - * It's done in assembly for two reasons: we need to muck with the stack, - * and the call itself restores the stack back for us. The only way to do - * this in C is to do manual C handlers for every possible number of args on - * the stack, and then have the handler issue a call by pointer. This is - * wasteful since it'll basically push the values twice and require another - * level of call indirection. - * - * The ARM kernel currently does this, but it should probably be changed - * later to function like this as well. - * - */ -#ifdef __GNUC__ -FORCEINLINE -NTSTATUS -KiSystemCallTrampoline(IN PVOID Handler, - IN PVOID Arguments, - IN ULONG StackBytes) -{ - NTSTATUS Result; - - __asm__ __volatile__ - ( - "subl %1, %%esp\n\t" - "movl %%esp, %%edi\n\t" - "movl %2, %%esi\n\t" - "shrl $2, %1\n\t" - "rep movsd\n\t" - "call *%3\n\t" - "movl %%eax, %0" - : "=r"(Result) - : "c"(StackBytes), - "d"(Arguments), - "r"(Handler) - : "%esp", "%esi", "%edi" - ); - return Result; -} -#elif defined(_MSC_VER) -FORCEINLINE NTSTATUS -KiSystemCallTrampoline(IN PVOID Handler, - IN PVOID Arguments, - IN ULONG StackBytes) -{ - __asm - { - mov ecx, StackBytes - mov esi, Arguments - mov eax, Handler - sub esp, ecx - mov edi, esp - shr ecx, 2 - rep movsd - call eax - } - /* Return with result in EAX */ -} -#else -#error Unknown Compiler -#endif +NTAPI +KiSystemCallTrampoline(_In_ PVOID Handler, + _In_ PVOID Arguments, + _In_ ULONG StackBytes); // diff --git a/ntoskrnl/ke/i386/trap.s b/ntoskrnl/ke/i386/trap.s index c4b2e168c54..24dfc1a58aa 100644 --- a/ntoskrnl/ke/i386/trap.s +++ b/ntoskrnl/ke/i386/trap.s @@ -220,4 +220,38 @@ _KiConvertToGuiThread@0: /* return to the caller */ ret +/* +NTSTATUS +NTAPI +KiSystemCallTrampoline(IN PVOID Handler, + IN PVOID Arguments, + IN ULONG StackBytes); +*/ +PUBLIC _KiSystemCallTrampoline@12 +_KiSystemCallTrampoline@12: + push ebp + mov ebp, esp + push esi + push edi + + /* Get handler */ + mov eax, [ebp + 8] + /* Get arguments */ + mov esi, [ebp + 12] + /* Get stack bytes */ + mov ecx, [ebp + 16] + + /* Copy args to the stack */ + sub esp, ecx + mov edi, esp + shr ecx, 2 + rep movsd + + call eax + + pop edi + pop esi + leave + + ret 12 END

3 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2021