Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 05/05: [WINDOWSCODECS] It turns out that /wd4133 is not enough to demote the error; we need to use remove_target_compile_option() to completely remove the /we4133 flag.
by Hermès Bélusca-Maïto 06 Nov '20

06 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d829bcc629b36ecf38c8a… commit d829bcc629b36ecf38c8a99f2f4098296b071c8a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 6 00:17:33 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 6 01:06:13 2020 +0100 [WINDOWSCODECS] It turns out that /wd4133 is not enough to demote the error; we need to use remove_target_compile_option() to completely remove the /we4133 flag. Addendum to commits 7e116f0e and 00ed72d7. This removes the "error C4133: 'function': incompatible types - from 'WICPixelFormatNumericRepresentation *' to 'DWORD *'" message that still remains even when using /wd4133 . --- dll/win32/windowscodecs/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dll/win32/windowscodecs/CMakeLists.txt b/dll/win32/windowscodecs/CMakeLists.txt index c9f0e9ecdbd..316fd1f329b 100644 --- a/dll/win32/windowscodecs/CMakeLists.txt +++ b/dll/win32/windowscodecs/CMakeLists.txt @@ -71,9 +71,10 @@ add_library(windowscodecs MODULE ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def) if(MSVC) - target_compile_options(windowscodecs PRIVATE - /wd4133 # error C4133: 'function': incompatible types - from 'WICPixelFormatNumericRepresentation *' to 'DWORD *' - /FItypeof.h) + # error C4133: 'function': incompatible types - from 'WICPixelFormatNumericRepresentation *' to 'DWORD *' + remove_target_compile_option(windowscodecs "/we4133") + + target_compile_options(windowscodecs PRIVATE /FItypeof.h) endif() set_module_type(windowscodecs win32dll)

1 0

[reactos] 04/05: [RAPPS.COM] Use HeapAlloc/Free instead of the deprecated LocalAlloc/Free.
by Hermès Bélusca-Maïto 06 Nov '20

06 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce2c1f6321f3e59da8697… commit ce2c1f6321f3e59da86970f545ec497ebf0e54cf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 5 19:55:33 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 6 01:06:12 2020 +0100 [RAPPS.COM] Use HeapAlloc/Free instead of the deprecated LocalAlloc/Free. And fix my build. --- base/applications/rapps_com/main.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/base/applications/rapps_com/main.c b/base/applications/rapps_com/main.c index fdb583f053d..d5f7c01ff0f 100644 --- a/base/applications/rapps_com/main.c +++ b/base/applications/rapps_com/main.c @@ -9,11 +9,12 @@ #include <winbase.h> #include <strsafe.h> - int run_rapps(LPWSTR cmdline) { + DWORD dwExit; STARTUPINFOW si = { sizeof(si) }; PROCESS_INFORMATION pi = { 0 }; + SetLastError(0); if (!CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { @@ -22,18 +23,21 @@ int run_rapps(LPWSTR cmdline) } CloseHandle(pi.hThread); WaitForSingleObject(pi.hProcess, INFINITE); - DWORD dwExit; GetExitCodeProcess(pi.hProcess, &dwExit); CloseHandle(pi.hProcess); - return dwExit; + return (int)dwExit; } int wmain(int argc, wchar_t* argv[]) { + int iRet; + int n; + size_t arglen; WCHAR RappsExe[MAX_PATH] = { 0 }; + wchar_t* cmdline; GetModuleFileNameW(NULL, RappsExe, ARRAYSIZE(RappsExe)); - size_t arglen = wcslen(RappsExe); + arglen = wcslen(RappsExe); if (arglen > 4 && !wcsicmp(RappsExe + arglen - 4, L".com")) { wcscpy(RappsExe + arglen - 4, L".exe"); @@ -41,18 +45,18 @@ int wmain(int argc, wchar_t* argv[]) else { fprintf(stderr, "Unable to build rapps.exe path...\n"); - return - 1; + return -1; } - arglen += (1 + 2); // nullterminator + 2 quotes + arglen += (1 + 2); // NULL terminator + 2 quotes - for (int n = 1; n < argc; ++n) + for (n = 1; n < argc; ++n) { arglen += wcslen(argv[n]); arglen += 3; // Surrounding quotes + space } - wchar_t* cmdline = LocalAlloc(LMEM_ZEROINIT, arglen * sizeof(WCHAR)); + cmdline = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, arglen * sizeof(WCHAR)); if (cmdline) { wchar_t* ptr = cmdline; @@ -60,14 +64,14 @@ int wmain(int argc, wchar_t* argv[]) StringCchPrintfExW(ptr, cchRemaining, &ptr, &cchRemaining, 0, L"\"%s\"", RappsExe); - for (int n = 1; n < argc; ++n) + for (n = 1; n < argc; ++n) { StringCchPrintfExW(ptr, cchRemaining, &ptr, &cchRemaining, 0, L" \"%s\"", argv[n]); } } - int iRet = run_rapps(cmdline); + iRet = run_rapps(cmdline); if (cmdline) - LocalFree(cmdline); + HeapFree(GetProcessHeap(), 0, cmdline); return iRet; }

1 0

[reactos] 03/05: [NTOS:EX] Move the C_ASSERT UUID_CACHED_VALUES_STRUCT.GuidInit to a better place, where the structure is defined.
by Hermès Bélusca-Maïto 06 Nov '20

06 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce55fef1e5c98c146d187… commit ce55fef1e5c98c146d187c5fa5011fd3a5cce425 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 5 19:03:30 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 6 01:06:12 2020 +0100 [NTOS:EX] Move the C_ASSERT UUID_CACHED_VALUES_STRUCT.GuidInit to a better place, where the structure is defined. --- ntoskrnl/ex/uuid.c | 1 - ntoskrnl/include/internal/ex.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ex/uuid.c b/ntoskrnl/ex/uuid.c index b196d6e9833..07530161d29 100644 --- a/ntoskrnl/ex/uuid.c +++ b/ntoskrnl/ex/uuid.c @@ -394,7 +394,6 @@ ExUuidCreate(OUT UUID *Uuid) { Time.QuadPart = ExpUuidCachedValues.Time; - C_ASSERT(sizeof(ExpUuidCachedValues.GuidInit) == sizeof(Uuid->Data4)); RtlCopyMemory(Uuid->Data4, ExpUuidCachedValues.GuidInit, sizeof(Uuid->Data4)); diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index 5ec4a8434f5..fae2026fc1c 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -183,6 +183,8 @@ typedef struct _UUID_CACHED_VALUES_STRUCT }; } UUID_CACHED_VALUES_STRUCT, *PUUID_CACHED_VALUES_STRUCT; +C_ASSERT(RTL_FIELD_SIZE(UUID_CACHED_VALUES_STRUCT, GuidInit) == RTL_FIELD_SIZE(UUID, Data4)); + /* INITIALIZATION FUNCTIONS *************************************************/ BOOLEAN

1 0

[reactos] 02/05: [CMD][SERVMAN][SHELL32][WINSPOOL][ROSAPPS][NTOS:PNP] Fix my build.
by Hermès Bélusca-Maïto 06 Nov '20

06 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c722e35b1c89cb07bfa3… commit 3c722e35b1c89cb07bfa3c281be2c2e013c008f6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 20 17:47:40 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 6 01:06:11 2020 +0100 [CMD][SERVMAN][SHELL32][WINSPOOL][ROSAPPS][NTOS:PNP] Fix my build. --- base/applications/mscutils/servman/mainwnd.c | 4 ++-- base/shell/cmd/batch.c | 4 +++- dll/win32/shell32/shellrecyclebin/recyclebin_v5.c | 3 ++- dll/win32/shell32/wine/shellord.c | 2 +- modules/rostests/apitests/shlwapi/SHLoadIndirectString.c | 3 ++- modules/rostests/apitests/utildll/CachedGetUserFromSid.c | 14 +++++++------- ntoskrnl/io/pnpmgr/devaction.c | 6 ++++-- win32ss/printing/base/winspool/jobs.c | 4 ++-- 8 files changed, 23 insertions(+), 17 deletions(-) diff --git a/base/applications/mscutils/servman/mainwnd.c b/base/applications/mscutils/servman/mainwnd.c index d96b4a32e79..1b016fb593b 100644 --- a/base/applications/mscutils/servman/mainwnd.c +++ b/base/applications/mscutils/servman/mainwnd.c @@ -380,12 +380,12 @@ MainWndCommand(PMAIN_WND_INFO Info, WORD CmdId, HWND hControl) { - UNREFERENCED_PARAMETER(hControl); - WCHAR szAppName[256]; WCHAR szAppAuthors[256]; HICON hIcon; + UNREFERENCED_PARAMETER(hControl); + switch (CmdId) { case ID_PROP: diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index 36600cd0720..8fc6bf8466e 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -409,11 +409,13 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) /* Perform top-level batch initialization */ if (bTopLevel) { + TCHAR *dot; + /* Default the top-level batch context type to .BAT */ BatType = BAT_TYPE; /* If this is a .CMD file, adjust the type */ - TCHAR *dot = _tcsrchr(bc->BatchFilePath, _T('.')); + dot = _tcsrchr(bc->BatchFilePath, _T('.')); if (dot && (!_tcsicmp(dot, _T(".cmd")))) { BatType = CMD_TYPE; diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c index 4e333da9f27..766bf4f4631 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c @@ -474,6 +474,7 @@ RecycleBin5_RecycleBin5_Restore( DELETED_FILE_RECORD *pRecord, *pLast; DWORD dwEntries, i; SHFILEOPSTRUCTW op; + int res; TRACE("(%p, %s, %p)\n", This, debugstr_w(pDeletedFileName), pDeletedFile); @@ -503,7 +504,7 @@ RecycleBin5_RecycleBin5_Restore( op.pFrom = pDeletedFileName; op.pTo = pDeletedFile->FileNameW; - int res = SHFileOperationW(&op); + res = SHFileOperationW(&op); if (res) { ERR("SHFileOperationW failed with 0x%x\n", res); diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index 37ff171d4b6..0b3965711c2 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -1486,8 +1486,8 @@ BOOL WINAPI SHRunControlPanel (_In_ LPCWSTR commandLine, _In_opt_ HWND parent) * However we need to keep it "alive" even when ReactOS is compliled as NT6+ * in order to keep control panel elements launch commands. */ - TRACE("(%s, %p)n", debugstr_w(commandLine), parent); WCHAR parameters[MAX_PATH] = L"shell32.dll,Control_RunDLL "; + TRACE("(%s, %p)n", debugstr_w(commandLine), parent); wcscat(parameters, commandLine); return ((INT_PTR)ShellExecuteW(parent, L"open", L"rundll32.exe", parameters, NULL, SW_SHOWNORMAL) > 32); diff --git a/modules/rostests/apitests/shlwapi/SHLoadIndirectString.c b/modules/rostests/apitests/shlwapi/SHLoadIndirectString.c index f086a7e2514..0eac5b04db6 100644 --- a/modules/rostests/apitests/shlwapi/SHLoadIndirectString.c +++ b/modules/rostests/apitests/shlwapi/SHLoadIndirectString.c @@ -16,6 +16,7 @@ static void execute_test(LPCWSTR DllFile) HRESULT hr; HANDLE hEvent; DWORD dwRet; + HMODULE mod; hEvent = CreateEventA(NULL, TRUE, FALSE, "Local\\shlwapi_apitest_evt"); @@ -24,7 +25,7 @@ static void execute_test(LPCWSTR DllFile) ok_hex(dwRet, WAIT_TIMEOUT); // Ensure the module is not loaded yet... - HMODULE mod = GetModuleHandleW(DllFile); + mod = GetModuleHandleW(DllFile); if (mod != NULL) { CloseHandle(hEvent); diff --git a/modules/rostests/apitests/utildll/CachedGetUserFromSid.c b/modules/rostests/apitests/utildll/CachedGetUserFromSid.c index 04a5ad75e14..0199fda2c06 100644 --- a/modules/rostests/apitests/utildll/CachedGetUserFromSid.c +++ b/modules/rostests/apitests/utildll/CachedGetUserFromSid.c @@ -61,26 +61,26 @@ static void test_Sid_Null(void) START_TEST(CachedGetUserFromSid) { const char szFunction[] = "CachedGetUserFromSid"; + void* pFunction; // TODO: Dynamically checking, until ReactOS implements this dll. - HMODULE hModule = LoadLibraryW(L"utildll.dll"); - DWORD dwLE = GetLastError(); + HMODULE hModule; + DWORD dwLE; + hModule = LoadLibraryW(L"utildll.dll"); if (!hModule) { + dwLE = GetLastError(); ok(FALSE, "LoadLibraryW(\"%S\") failed! (dwLE = %lu)\n", L"utildll.dll", dwLE); - skip("No DLL\n"); return; } - void *pFunction = (void *)GetProcAddress(hModule, szFunction); - dwLE = GetLastError(); - + pFunction = (void*)GetProcAddress(hModule, szFunction); if (!pFunction) { + dwLE = GetLastError(); ok(FALSE, "GetProcAddress(\"%s\") failed! (dwLE = %lu)\n", szFunction, dwLE); - skip("No function\n"); FreeLibrary(hModule); return; diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index 67221e83e20..e6479074f32 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -2404,6 +2404,8 @@ PipDeviceActionWorker( PLIST_ENTRY ListEntry; PDEVICE_ACTION_REQUEST Request; KIRQL OldIrql; + PDEVICE_NODE deviceNode; + NTSTATUS status; KeAcquireSpinLock(&IopDeviceActionLock, &OldIrql); while (!IsListEmpty(&IopDeviceActionRequestList)) @@ -2414,10 +2416,10 @@ PipDeviceActionWorker( ASSERT(Request->DeviceObject); - PDEVICE_NODE deviceNode = IopGetDeviceNode(Request->DeviceObject); + deviceNode = IopGetDeviceNode(Request->DeviceObject); ASSERT(deviceNode); - NTSTATUS status = STATUS_SUCCESS; + status = STATUS_SUCCESS; DPRINT("Processing PnP request %p: DeviceObject - %p, Action - %s\n", Request, Request->DeviceObject, ActionToStr(Request->Action)); diff --git a/win32ss/printing/base/winspool/jobs.c b/win32ss/printing/base/winspool/jobs.c index 69531438653..b0a248e1b37 100644 --- a/win32ss/printing/base/winspool/jobs.c +++ b/win32ss/printing/base/winspool/jobs.c @@ -435,9 +435,9 @@ SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command break; case 1: { + JOB_INFO_1A *info1A = (JOB_INFO_1A*)pJobInfo; JOB_INFO_1W *info1W = HeapAlloc(GetProcessHeap(), 0, sizeof(*info1W)); ZeroMemory( info1W, sizeof(JOB_INFO_1W) ); - JOB_INFO_1A *info1A = (JOB_INFO_1A*)pJobInfo; JobW = (LPBYTE)info1W; info1W->pUserName = AsciiToUnicode(&usBuffer, info1A->pUserName); @@ -452,9 +452,9 @@ SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command } case 2: { + JOB_INFO_2A *info2A = (JOB_INFO_2A*)pJobInfo; JOB_INFO_2W *info2W = HeapAlloc(GetProcessHeap(), 0, sizeof(*info2W)); ZeroMemory( info2W, sizeof(JOB_INFO_2W) ); - JOB_INFO_2A *info2A = (JOB_INFO_2A*)pJobInfo; JobW = (LPBYTE)info2W; info2W->pUserName = AsciiToUnicode(&usBuffer, info2A->pUserName);

1 0

[reactos] 01/05: [SERVMAN] Fix trailing whitespace.
by Hermès Bélusca-Maïto 06 Nov '20

06 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec0853ba70e63c75605b2… commit ec0853ba70e63c75605b2285be485c0e5ca84390 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 20 17:50:42 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 6 01:06:10 2020 +0100 [SERVMAN] Fix trailing whitespace. --- base/applications/mscutils/servman/mainwnd.c | 4 ++-- base/applications/mscutils/servman/propsheet_depends.c | 1 - base/applications/mscutils/servman/servman.c | 2 +- base/applications/mscutils/servman/stop.c | 4 ++-- base/applications/mscutils/servman/stop_dependencies.c | 6 +++--- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/base/applications/mscutils/servman/mainwnd.c b/base/applications/mscutils/servman/mainwnd.c index 02d4ff55232..d96b4a32e79 100644 --- a/base/applications/mscutils/servman/mainwnd.c +++ b/base/applications/mscutils/servman/mainwnd.c @@ -383,7 +383,7 @@ MainWndCommand(PMAIN_WND_INFO Info, UNREFERENCED_PARAMETER(hControl); WCHAR szAppName[256]; - WCHAR szAppAuthors[256]; + WCHAR szAppAuthors[256]; HICON hIcon; switch (CmdId) @@ -596,7 +596,7 @@ MainWndCommand(PMAIN_WND_INFO Info, case ID_ABOUT: LoadStringW(hInstance, IDS_APPNAME, szAppName, _countof(szAppName)); LoadStringW(hInstance, IDS_APPAUTHORS, szAppAuthors, _countof(szAppAuthors)); - + hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_SM_ICON)); ShellAboutW(Info->hMainWnd, szAppName, szAppAuthors, hIcon); DestroyIcon(hIcon); diff --git a/base/applications/mscutils/servman/propsheet_depends.c b/base/applications/mscutils/servman/propsheet_depends.c index de1d6a55737..90e4e909f40 100644 --- a/base/applications/mscutils/servman/propsheet_depends.c +++ b/base/applications/mscutils/servman/propsheet_depends.c @@ -185,7 +185,6 @@ DependenciesPageProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { - PDEPENDDATA pDependData; /* Get the window context */ diff --git a/base/applications/mscutils/servman/servman.c b/base/applications/mscutils/servman/servman.c index 1c893798b2d..ea6142fc765 100644 --- a/base/applications/mscutils/servman/servman.c +++ b/base/applications/mscutils/servman/servman.c @@ -27,7 +27,7 @@ wWinMain(HINSTANCE hThisInstance, MSG Msg; int Ret = 1; INITCOMMONCONTROLSEX icex; - + switch (GetUserDefaultUILanguage()) { case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): diff --git a/base/applications/mscutils/servman/stop.c b/base/applications/mscutils/servman/stop.c index c4a346dd003..b6844ad7a97 100644 --- a/base/applications/mscutils/servman/stop.c +++ b/base/applications/mscutils/servman/stop.c @@ -26,7 +26,7 @@ DoStopService(_In_z_ LPWSTR ServiceName, DWORD WaitTime; DWORD Timeout; DWORD dwResult = ERROR_SUCCESS; - + hSCManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); @@ -113,7 +113,7 @@ DoStopService(_In_z_ LPWSTR ServiceName, } else { - dwResult = GetLastError(); + dwResult = GetLastError(); } CloseServiceHandle(hService); diff --git a/base/applications/mscutils/servman/stop_dependencies.c b/base/applications/mscutils/servman/stop_dependencies.c index 31588388dcd..da94ebbf414 100644 --- a/base/applications/mscutils/servman/stop_dependencies.c +++ b/base/applications/mscutils/servman/stop_dependencies.c @@ -14,7 +14,7 @@ typedef struct _STOP_DATA LPWSTR ServiceName; LPWSTR DisplayName; LPWSTR ServiceList; - + } STOP_DATA, *PSTOP_DATA; static LPWSTR @@ -250,7 +250,7 @@ InitDialog(HWND hDlg, AddServiceNamesToStop(hServiceListBox, (LPWSTR)StopData->ServiceList); } - + return bRet; } @@ -309,6 +309,6 @@ CreateStopDependsDialog(HWND hParent, (LPARAM)&StopData); if (Result == IDOK) return TRUE; - + return FALSE; } \ No newline at end of file

1 0

[reactos] 02/02: [USETUP] Introduce two helpers for formatting displayed disk and partition sizes in order to reduce code duplication.
by Hermès Bélusca-Maïto 04 Nov '20

04 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1a4a6e70449f71f5e250… commit f1a4a6e70449f71f5e250527a0e44c1f28022dd8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 3 17:03:59 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 4 23:26:54 2020 +0100 [USETUP] Introduce two helpers for formatting displayed disk and partition sizes in order to reduce code duplication. --- base/setup/usetup/usetup.c | 165 ++++++++++++++++++--------------------------- 1 file changed, 67 insertions(+), 98 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 9b7cabb6324..01907778721 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -419,6 +419,66 @@ PopupError(PCCH Text, } +/** See also usetup:partlist.c!PrintDiskData() **/ +VOID +PrettifySize1( + IN OUT PULONGLONG Size, + OUT PCSTR* Unit) +{ + ULONGLONG DiskSize = *Size; + +#if 0 + if (DiskSize >= 10 * GB) /* 10 GB */ + { + DiskSize = DiskSize / GB; + *Unit = MUIGetString(STRING_GB); + } + else +#endif + { + DiskSize = DiskSize / MB; + if (DiskSize == 0) + DiskSize = 1; + + *Unit = MUIGetString(STRING_MB); + } + + *Size = DiskSize; +} + +/** See also usetup:partlist.c!PrintPartitionData() **/ +VOID +PrettifySize2( + IN OUT PULONGLONG Size, + OUT PCSTR* Unit) +{ + ULONGLONG PartSize = *Size; + +#if 0 + if (PartSize >= 10 * GB) /* 10 GB */ + { + PartSize = PartSize / GB; + *Unit = MUIGetString(STRING_GB); + } + else +#endif + if (PartSize >= 10 * MB) /* 10 MB */ + { + PartSize = PartSize / MB; + *Unit = MUIGetString(STRING_MB); + } + else + { + PartSize = PartSize / KB; + *Unit = MUIGetString(STRING_KB); + } + + // if (PartSize == 0) + // PartSize = 1; + *Size = PartSize; +} + + /* * Confirm quit setup * RETURNS @@ -2081,21 +2141,7 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSENEWPARTITION)); DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; -#if 0 - if (DiskSize >= 10 * GB) /* 10 GB */ - { - DiskSize = DiskSize / GB; - Unit = MUIGetString(STRING_GB); - } - else -#endif - { - DiskSize = DiskSize / MB; - if (DiskSize == 0) - DiskSize = 1; - - Unit = MUIGetString(STRING_MB); - } + PrettifySize1(&DiskSize, &Unit); if (DiskEntry->DriverName.Length > 0) { @@ -2243,21 +2289,7 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_EXTENDED_PARTITION)); DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; -#if 0 - if (DiskSize >= 10 * GB) /* 10 GB */ - { - DiskSize = DiskSize / GB; - Unit = MUIGetString(STRING_GB); - } - else -#endif - { - DiskSize = DiskSize / MB; - if (DiskSize == 0) - DiskSize = 1; - - Unit = MUIGetString(STRING_MB); - } + PrettifySize1(&DiskSize, &Unit); if (DiskEntry->DriverName.Length > 0) { @@ -2404,21 +2436,7 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_LOGICAL_PARTITION)); DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; -#if 0 - if (DiskSize >= 10 * GB) /* 10 GB */ - { - DiskSize = DiskSize / GB; - Unit = MUIGetString(STRING_GB); - } - else -#endif - { - DiskSize = DiskSize / MB; - if (DiskSize == 0) - DiskSize = 1; - - Unit = MUIGetString(STRING_MB); - } + PrettifySize1(&DiskSize, &Unit); if (DiskEntry->DriverName.Length > 0) { @@ -2606,24 +2624,7 @@ DeletePartitionPage(PINPUT_RECORD Ir) ARRAYSIZE(PartTypeString)); PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; -#if 0 - if (PartSize >= 10 * GB) /* 10 GB */ - { - PartSize = PartSize / GB; - Unit = MUIGetString(STRING_GB); - } - else -#endif - if (PartSize >= 10 * MB) /* 10 MB */ - { - PartSize = PartSize / MB; - Unit = MUIGetString(STRING_MB); - } - else - { - PartSize = PartSize / KB; - Unit = MUIGetString(STRING_KB); - } + PrettifySize2(&PartSize, &Unit); if (*PartTypeString == '\0') // STRING_FORMATUNKNOWN ?? { @@ -2647,21 +2648,7 @@ DeletePartitionPage(PINPUT_RECORD Ir) } DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; -#if 0 - if (DiskSize >= 10 * GB) /* 10 GB */ - { - DiskSize = DiskSize / GB; - Unit = MUIGetString(STRING_GB); - } - else -#endif - { - DiskSize = DiskSize / MB; - if (DiskSize == 0) - DiskSize = 1; - - Unit = MUIGetString(STRING_MB); - } + PrettifySize1(&DiskSize, &Unit); if (DiskEntry->DriverName.Length > 0) { @@ -3124,29 +3111,11 @@ SelectFileSystemPage(PINPUT_RECORD Ir) /* Adjust disk size */ DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - if (DiskSize >= 10 * GB) /* 10 GB */ - { - DiskSize = DiskSize / GB; - DiskUnit = MUIGetString(STRING_GB); - } - else - { - DiskSize = DiskSize / MB; - DiskUnit = MUIGetString(STRING_MB); - } + PrettifySize1(&DiskSize, &DiskUnit); /* Adjust partition size */ PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - if (PartSize >= 10 * GB) /* 10 GB */ - { - PartSize = PartSize / GB; - PartUnit = MUIGetString(STRING_GB); - } - else - { - PartSize = PartSize / MB; - PartUnit = MUIGetString(STRING_MB); - } + PrettifySize2(&PartSize, &PartUnit); /* Adjust partition type */ GetPartTypeStringFromPartitionType(PartEntry->PartitionType,

1 0

[reactos] 01/02: [USETUP] Use pointers to const strings where meaningful.
by Hermès Bélusca-Maïto 04 Nov '20

04 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13dd01b44cf30c9832254… commit 13dd01b44cf30c983225469f4bc8724bfd884502 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Nov 4 23:20:03 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 4 23:26:53 2020 +0100 [USETUP] Use pointers to const strings where meaningful. --- base/setup/usetup/mui.c | 2 +- base/setup/usetup/mui.h | 10 +++++----- base/setup/usetup/partlist.c | 6 +++--- base/setup/usetup/usetup.c | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/base/setup/usetup/mui.c b/base/setup/usetup/mui.c index e31b2c7e59d..d16caaa8800 100644 --- a/base/setup/usetup/mui.c +++ b/base/setup/usetup/mui.c @@ -226,7 +226,7 @@ MUIDisplayError( va_end(arg_ptr); } -LPSTR +PCSTR MUIGetString( ULONG Number) { diff --git a/base/setup/usetup/mui.h b/base/setup/usetup/mui.h index d7618ed56d3..13bedf61edd 100644 --- a/base/setup/usetup/mui.h +++ b/base/setup/usetup/mui.h @@ -4,15 +4,15 @@ typedef struct { SHORT X; SHORT Y; - LPCSTR Buffer; + PCSTR Buffer; DWORD Flags; INT TextID; } MUI_ENTRY, *PMUI_ENTRY; typedef struct { - LPCSTR ErrorText; - LPCSTR ErrorStatus; + PCSTR ErrorText; + PCSTR ErrorStatus; } MUI_ERROR; typedef struct @@ -24,7 +24,7 @@ typedef struct typedef struct { LONG Number; - LPSTR String; + PCSTR String; } MUI_STRING; typedef struct @@ -68,7 +68,7 @@ MUIDisplayError( VOID SetConsoleCodePage(VOID); -LPSTR +PCSTR MUIGetString( ULONG Number); diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index c35ffed1a42..f62b75b0595 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -172,10 +172,10 @@ PrintPartitionData( USHORT Width; USHORT Height; LARGE_INTEGER PartSize; - PCHAR Unit; + PCSTR Unit; UCHAR Attribute; CHAR PartTypeString[32]; - PCHAR PartType = PartTypeString; + PCSTR PartType = PartTypeString; Width = ListUi->Right - ListUi->Left - 1; Height = ListUi->Bottom - ListUi->Top - 2; @@ -308,7 +308,7 @@ PrintDiskData( USHORT Width; USHORT Height; ULARGE_INTEGER DiskSize; - PCHAR Unit; + PCSTR Unit; Width = ListUi->Right - ListUi->Left - 1; Height = ListUi->Bottom - ListUi->Top - 2; diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index b4956d1be46..9b7cabb6324 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -144,9 +144,9 @@ DoWatchDestFileName(LPCWSTR FileName) /* FUNCTIONS ****************************************************************/ static VOID -PrintString(char* fmt,...) +PrintString(IN PCSTR fmt,...) { - char buffer[512]; + CHAR buffer[512]; va_list ap; UNICODE_STRING UnicodeString; ANSI_STRING AnsiString; @@ -2065,7 +2065,7 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) ULONGLONG PartSize; ULONGLONG DiskSize; ULONGLONG SectorCount; - PCHAR Unit; + PCSTR Unit; if (PartitionList == NULL || CurrentPartition == NULL) { @@ -2227,7 +2227,7 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) ULONGLONG PartSize; ULONGLONG DiskSize; ULONGLONG SectorCount; - PCHAR Unit; + PCSTR Unit; if (PartitionList == NULL || CurrentPartition == NULL) { @@ -2388,7 +2388,7 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) ULONGLONG PartSize; ULONGLONG DiskSize; ULONGLONG SectorCount; - PCHAR Unit; + PCSTR Unit; if (PartitionList == NULL || CurrentPartition == NULL) { @@ -2586,7 +2586,7 @@ DeletePartitionPage(PINPUT_RECORD Ir) PDISKENTRY DiskEntry; ULONGLONG DiskSize; ULONGLONG PartSize; - PCHAR Unit; + PCSTR Unit; CHAR PartTypeString[32]; if (PartitionList == NULL || CurrentPartition == NULL) @@ -2757,8 +2757,8 @@ SelectFileSystemPage(PINPUT_RECORD Ir) PDISKENTRY DiskEntry; ULONGLONG DiskSize; ULONGLONG PartSize; - PCHAR DiskUnit; - PCHAR PartUnit; + PCSTR DiskUnit; + PCSTR PartUnit; CHAR PartTypeString[32]; FORMATMACHINESTATE PreviousFormatState; PCWSTR DefaultFs;

1 0

[reactos] 01/01: [PC98VID] Fix build for PC-98 target (#3352)
by Dmitry Borisov 04 Nov '20

04 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4dc3125450a253736acfc… commit 4dc3125450a253736acfc6786ef4743fdbef2c5e Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Thu Nov 5 03:26:37 2020 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 5 00:26:37 2020 +0300 [PC98VID] Fix build for PC-98 target (#3352) - Some prototypes are not needed anymore. Addendum to 5c7ce4475e246560d1622b8cc60dc603e3955f66. --- win32ss/drivers/miniport/pc98vid/ioctl.c | 8 +++ win32ss/drivers/miniport/pc98vid/pc98vid.c | 3 ++ win32ss/drivers/miniport/pc98vid/pc98vid.h | 79 +----------------------------- 3 files changed, 12 insertions(+), 78 deletions(-) diff --git a/win32ss/drivers/miniport/pc98vid/ioctl.c b/win32ss/drivers/miniport/pc98vid/ioctl.c index 23bc2c6c6be..d89a17510cd 100644 --- a/win32ss/drivers/miniport/pc98vid/ioctl.c +++ b/win32ss/drivers/miniport/pc98vid/ioctl.c @@ -11,6 +11,7 @@ /* FUNCTIONS ******************************************************************/ +static CODE_SEG("PAGE") VOID FASTCALL @@ -43,6 +44,7 @@ Pc98VidQueryMode( VIDEO_MODE_PALETTE_DRIVEN | VIDEO_MODE_MANAGED_PALETTE; } +static CODE_SEG("PAGE") VP_STATUS FASTCALL @@ -70,6 +72,7 @@ Pc98VidQueryAvailModes( return NO_ERROR; } +static CODE_SEG("PAGE") VP_STATUS FASTCALL @@ -90,6 +93,7 @@ Pc98VidQueryNumAvailModes( return NO_ERROR; } +static CODE_SEG("PAGE") VP_STATUS FASTCALL @@ -110,6 +114,7 @@ Pc98VidQueryCurrentMode( return NO_ERROR; } +static CODE_SEG("PAGE") VP_STATUS FASTCALL @@ -150,6 +155,7 @@ Pc98VidMapVideoMemory( return Status; } +static CODE_SEG("PAGE") VP_STATUS FASTCALL @@ -166,6 +172,7 @@ Pc98VidUnmapVideoMemory( NULL); } +static CODE_SEG("PAGE") VP_STATUS FASTCALL @@ -178,6 +185,7 @@ Pc98VidResetDevice(VOID) return NO_ERROR; } +static CODE_SEG("PAGE") VP_STATUS FASTCALL diff --git a/win32ss/drivers/miniport/pc98vid/pc98vid.c b/win32ss/drivers/miniport/pc98vid/pc98vid.c index 716a760acb9..485cd1a0120 100644 --- a/win32ss/drivers/miniport/pc98vid/pc98vid.c +++ b/win32ss/drivers/miniport/pc98vid/pc98vid.c @@ -45,6 +45,7 @@ static VIDEO_ACCESS_RANGE LegacyRangeList[] = /* FUNCTIONS ******************************************************************/ +static CODE_SEG("PAGE") VP_STATUS NTAPI @@ -138,6 +139,7 @@ Pc98VidFindAdapter( return NO_ERROR; } +static CODE_SEG("PAGE") BOOLEAN NTAPI @@ -156,6 +158,7 @@ Pc98VidInitialize( return TRUE; } +static CODE_SEG("PAGE") VP_STATUS NTAPI diff --git a/win32ss/drivers/miniport/pc98vid/pc98vid.h b/win32ss/drivers/miniport/pc98vid/pc98vid.h index fd2d8e29b05..75cb4402c26 100644 --- a/win32ss/drivers/miniport/pc98vid/pc98vid.h +++ b/win32ss/drivers/miniport/pc98vid/pc98vid.h @@ -9,6 +9,7 @@ #define _PC98VID_PCH_ #include <ntdef.h> +#include <section_attribs.h> #include <dderror.h> #include <devioctl.h> #include <miniport.h> @@ -48,106 +49,28 @@ typedef struct _HW_DEVICE_EXTENSION ULONG FrameBufferLength; } HW_DEVICE_EXTENSION, *PHW_DEVICE_EXTENSION; -VP_STATUS -NTAPI -Pc98VidFindAdapter( - _In_ PVOID HwDeviceExtension, - _In_opt_ PVOID HwContext, - _In_opt_ PWSTR ArgumentString, - _Inout_ PVIDEO_PORT_CONFIG_INFO ConfigInfo, - _Out_ PUCHAR Again); - BOOLEAN NTAPI HasPegcController( _In_ PHW_DEVICE_EXTENSION DeviceExtension); -BOOLEAN -NTAPI -Pc98VidInitialize( - _In_ PVOID HwDeviceExtension); - -VP_STATUS -NTAPI -Pc98VidGetVideoChildDescriptor( - _In_ PVOID HwDeviceExtension, - _In_ PVIDEO_CHILD_ENUM_INFO ChildEnumInfo, - _Out_ PVIDEO_CHILD_TYPE VideoChildType, - _Out_ PUCHAR pChildDescriptor, - _Out_ PULONG UId, - _Out_ PULONG pUnused); - BOOLEAN NTAPI Pc98VidStartIO( _In_ PVOID HwDeviceExtension, _Inout_ PVIDEO_REQUEST_PACKET RequestPacket); -VOID -FASTCALL -Pc98VidQueryMode( - _In_ PHW_DEVICE_EXTENSION DeviceExtension, - _In_ ULONG ModeNumber, - _Out_ PVIDEO_MODE_INFORMATION VideoMode); - -VP_STATUS -FASTCALL -Pc98VidQueryAvailModes( - _In_ PHW_DEVICE_EXTENSION DeviceExtension, - _Out_ PVIDEO_MODE_INFORMATION ModeInformation, - _Out_ PSTATUS_BLOCK StatusBlock); - -VP_STATUS -FASTCALL -Pc98VidQueryNumAvailModes( - _In_ PHW_DEVICE_EXTENSION DeviceExtension, - _Out_ PVIDEO_NUM_MODES Modes, - _Out_ PSTATUS_BLOCK StatusBlock); - VP_STATUS FASTCALL Pc98VidSetCurrentMode( _In_ PHW_DEVICE_EXTENSION DeviceExtension, _In_ PVIDEO_MODE RequestedMode); -VP_STATUS -FASTCALL -Pc98VidQueryCurrentMode( - _In_ PHW_DEVICE_EXTENSION DeviceExtension, - _Out_ PVIDEO_MODE_INFORMATION VideoMode, - _Out_ PSTATUS_BLOCK StatusBlock); - -VP_STATUS -FASTCALL -Pc98VidMapVideoMemory( - _In_ PHW_DEVICE_EXTENSION DeviceExtension, - _In_ PVIDEO_MEMORY RequestedAddress, - _Out_ PVIDEO_MEMORY_INFORMATION MapInformation, - _Out_ PSTATUS_BLOCK StatusBlock); - -VP_STATUS -FASTCALL -Pc98VidUnmapVideoMemory( - _In_ PHW_DEVICE_EXTENSION DeviceExtension, - _In_ PVIDEO_MEMORY VideoMemory); - -VP_STATUS -FASTCALL -Pc98VidResetDevice(VOID); - VP_STATUS FASTCALL Pc98VidSetColorRegisters( _In_ PVIDEO_CLUT ColorLookUpTable); -VP_STATUS -FASTCALL -Pc98VidGetChildState( - _In_ PHW_DEVICE_EXTENSION DeviceExtension, - _In_ PULONG ChildIndex, - _Out_ PULONG ChildState, - _Out_ PSTATUS_BLOCK StatusBlock); - VP_STATUS NTAPI Pc98VidGetPowerState(

1 0

[reactos] 01/01: [DNSAPI_APITEST] Fix null-reference in case of failure
by Mark Jansen 04 Nov '20

04 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf869e3444598624e8056… commit cf869e3444598624e805607d79c9dd78cfc9c9b8 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Oct 29 22:27:13 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Nov 4 21:13:42 2020 +0100 [DNSAPI_APITEST] Fix null-reference in case of failure --- modules/rostests/apitests/dnsapi/DnsQuery.c | 42 ++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/rostests/apitests/dnsapi/DnsQuery.c b/modules/rostests/apitests/dnsapi/DnsQuery.c index c4873474a1f..3229ed9a3af 100644 --- a/modules/rostests/apitests/dnsapi/DnsQuery.c +++ b/modules/rostests/apitests/dnsapi/DnsQuery.c @@ -71,7 +71,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_A(host_name, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, host_name) == 0, "DnsQuery_A returned wrong answer '%s' expected '%s'\n", dp->pName, host_name); ok(dp->wType == DNS_TYPE_A, "DnsQuery_A returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -84,7 +84,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_A("127.0.0.1", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, "127.0.0.1") == 0, "DnsQuery_A returned wrong answer '%s' expected '%s'\n", dp->pName, "127.0.0.1"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_A returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -98,7 +98,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_A("LocalHost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { /* On Windows 7 is unchanged on XP is lowercased */ ok(strcmp(dp->pName, "localhost") == 0 || broken(strcmp(dp->pName, "LocalHost") == 0), "DnsQuery_A returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); @@ -112,7 +112,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_A("Localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { /* On Windows 7 is unchanged on XP is lowercased */ ok(strcmp(dp->pName, "localhost") == 0 || broken(strcmp(dp->pName, "Localhost") == 0), "DnsQuery_A returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); @@ -126,7 +126,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_A("localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, "localhost") == 0, "DnsQuery_A returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_A returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -139,7 +139,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_A("", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { /* On Windows 7 is the host on XP is dot ??? */ ok(strcmp(dp->pName, ".") == 0 || broken(strcmp(dp->pName, host_name) == 0), "DnsQuery_A returned wrong answer '%s' expected '%s' or '.'\n", dp->pName, host_name); @@ -165,7 +165,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_A("0.0.0.0", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, "0.0.0.0") == 0, "DnsQuery_A returned wrong answer '%s' expected '%s'\n", dp->pName, "0.0.0.0"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_A returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -284,7 +284,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_UTF8(host_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, host_name) == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, host_name); ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -299,7 +299,7 @@ void TestHostName(void) wcstombs(test_nameUTF8, test_nameW, 255); dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, "127.0.0.1") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "127.0.0.1"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -315,7 +315,7 @@ void TestHostName(void) wcstombs(test_nameUTF8, test_nameW, 255); dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { /* On Windows 7 is unchanged on XP is lowercased */ ok(strcmp(dp->pName, "localhost") == 0 || broken(strcmp(dp->pName, "LocalHost") == 0), "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); @@ -331,7 +331,7 @@ void TestHostName(void) wcstombs(test_nameUTF8, test_nameW, 255); dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { /* On Windows 7 is unchanged on XP is lowercased */ ok(strcmp(dp->pName, "localhost") == 0 || broken(strcmp(dp->pName, "Localhost") == 0), "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); @@ -347,7 +347,7 @@ void TestHostName(void) wcstombs(test_nameUTF8, test_nameW, 255); dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, "localhost") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -362,7 +362,7 @@ void TestHostName(void) wcstombs(test_nameUTF8, test_nameW, 255); dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { /* On Windows 7 is the host on XP is dot ??? */ ok(strcmp(dp->pName, ".") == 0 || broken(strcmp(dp->pName, host_name) == 0), "DnsQuery_UTF8 returned wrong answer '%s' expected '%s' or '.'\n", dp->pName, host_name); @@ -392,7 +392,7 @@ void TestHostName(void) wcstombs(test_nameUTF8, test_nameW, 255); dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, "0.0.0.0") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "0.0.0.0"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -534,7 +534,7 @@ void TestHostName(void) //Testing HostName dns_status = DnsQuery_W(host_nameW, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(wcscmp((LPCWSTR)dp->pName, host_nameW) == 0, "DnsQuery_w returned wrong answer '%ls' expected '%ls'\n", (LPCWSTR)dp->pName, host_nameW); ok(dp->wType == DNS_TYPE_A, "DnsQuery_W returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -546,7 +546,7 @@ void TestHostName(void) //127.0.0.1 dns_status = DnsQuery_W(L"127.0.0.1", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(wcscmp((LPCWSTR)dp->pName, L"127.0.0.1") == 0, "DnsQuery_W returned wrong answer '%ls' expected '%ls'\n", (LPCWSTR)dp->pName, L"127.0.0.1"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_W returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -559,7 +559,7 @@ void TestHostName(void) //Localhost strings dns_status = DnsQuery_W(L"LocalHost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(wcscmp((LPCWSTR)dp->pName, L"localhost") == 0 || broken(wcscmp((LPCWSTR)dp->pName, L"LocalHost") == 0), "DnsQuery_W returned wrong answer '%ls' expected '%ls'\n", (LPCWSTR)dp->pName, L"localhost"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_W returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -571,7 +571,7 @@ void TestHostName(void) dns_status = DnsQuery_W(L"Localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(wcscmp((LPCWSTR)dp->pName, L"localhost") == 0 || broken(wcscmp((LPCWSTR)dp->pName, L"Localhost") == 0), "DnsQuery_W returned wrong answer '%ls' expected '%ls'\n", (LPCWSTR)dp->pName, L"localhost"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_W returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -583,7 +583,7 @@ void TestHostName(void) dns_status = DnsQuery_W(L"localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(wcscmp((LPCWSTR)dp->pName, L"localhost") == 0, "DnsQuery_W returned wrong answer '%ls' expected '%ls'\n", (LPCWSTR)dp->pName, L"localhost"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_W returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -595,7 +595,7 @@ void TestHostName(void) dns_status = DnsQuery_W(L"", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { /* On Windows 7 is the host on XP is dot ??? */ ok(wcscmp((LPCWSTR)dp->pName, L".") == 0 || broken(wcscmp((LPCWSTR)dp->pName, host_nameW) == 0), "DnsQuery_W returned wrong answer '%ls' expected '%ls'\n", (LPCWSTR)dp->pName, host_nameW); @@ -620,7 +620,7 @@ void TestHostName(void) dns_status = DnsQuery_W(L"0.0.0.0", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(wcscmp((LPCWSTR)dp->pName, L"0.0.0.0") == 0, "DnsQuery_W returned wrong answer '%ls' expected '%ls'\n", (LPCWSTR)dp->pName, L"0.0.0.0"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_W returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A);

1 0

[reactos] 02/02: [FREELDR] Add the possibility to change the boot load options from TXTSETUP.SIF at runtime from the boot selection menu or from FREELDR.INI.
by Hermès Bélusca-Maïto 04 Nov '20

04 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4792c007aafa9739c76ff… commit 4792c007aafa9739c76fff31cb3c19ffdc7a456d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 3 01:42:09 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 4 19:59:28 2020 +0100 [FREELDR] Add the possibility to change the boot load options from TXTSETUP.SIF at runtime from the boot selection menu or from FREELDR.INI. CORE-17350, CORE-9023 For a proper override of the options by new user options, specify the /SIFOPTIONSOVERRIDE switch in addition. Otherwise, user options are merged with those retrieved from TXTSETUP.SIF, with priority given to the former ones. - Update the documentation for the 'ReactOSSetup' OS type in the FREELDR.INI file template. - Use a different prompt in the custom boot options editor for the 'ReactOSSetup' OS type, with adequate explanation. - Get rid of the ReactOS-specific TXTSETUP.SIF 'DbgOsLoadOptions' value, and use instead the Windows-compatible 'SetupDebugOptions' value that is added to the other load options when debugging is to be enabled. --- boot/bootdata/txtsetup.sif | 6 +- boot/freeldr/FREELDR.INI | 24 +- boot/freeldr/freeldr/custom.c | 9 +- boot/freeldr/freeldr/ntldr/ntldropts.c | 80 ++++++ boot/freeldr/freeldr/ntldr/ntldropts.h | 7 + boot/freeldr/freeldr/ntldr/setupldr.c | 429 ++++++++++++++++++++++++++++++--- 6 files changed, 511 insertions(+), 44 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 2b7b04002e2..2ddb0512ed3 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -212,10 +212,10 @@ Cabinet=reactos.cab [SetupData] DefaultPath = \ReactOS +SetupDebugOptions = "/DEBUG /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE" +;SetupDebugOptions = "/DEBUG /SOS /DEBUGPORT=SCREEN" +;SetupDebugOptions = "/DEBUG /DEBUGPORT=BOCHS" OsLoadOptions = "/NOGUIBOOT /NODEBUG" -DbgOsLoadOptions = "/NOGUIBOOT /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE" -;DbgOsLoadOptions = "/SOS /DEBUGPORT=SCREEN" -;DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS" [NLS] AnsiCodepage = c_1252.nls diff --git a/boot/freeldr/FREELDR.INI b/boot/freeldr/FREELDR.INI index 0bd420d06dc..48561fc4475 100644 --- a/boot/freeldr/FREELDR.INI +++ b/boot/freeldr/FREELDR.INI @@ -115,14 +115,14 @@ ; will only be used to set the boot partition. ; Initrd - specifies the optional init ramdisk file name to be used. ; The same remarks about the path as for "Kernel" remain valid. -; CommandLine - specifies the command line options for the kernel. +; CommandLine - specifies the boot load options for the kernel. ; ["Windows(NT40|2003)" OSType] Section Commands: ; ; SystemPath - specifies the system root path (must be a valid ARC path): ; multi(0)disk(0)rdisk(0)partition(1)\reactos ; multi(0)disk(0)fdisk(0) -; Options - specifies the command line options for the kernel being booted. +; Options - specifies the boot load options for the kernel. ; Kernel - specifies the kernel file name (default: ntoskrnl.exe) ; Hal - specifies the HAL file name (default: hal.dll) ; @@ -133,8 +133,24 @@ ; ["ReactOSSetup" OSType] Section Commands: ; -; No options defined for the moment. This OS type is used to tell FreeLdr -; to start the SETUP portion of NT / ReactOS. +; This OS type is used to start the SETUP portion of NT / ReactOS. +; +; SystemPath - specifies the system root path (must be a valid ARC path): +; multi(0)disk(0)rdisk(0)partition(1)\reactos +; multi(0)disk(0)fdisk(0) +; Options - specifies extra boot load options for the kernel and the +; setup environment (see REMARK 2 below). +; +; REMARK: Contrary to the "Windows" type, this OS type does not support separate +; "Kernel" and "Hal" values. Instead, these values must be specified using the +; NT-compatible "/HAL=filename" and "/KERNEL=filename" option switches. +; +; REMARK 2: The SETUP portion retrieves the default boot load options from the +; TXTSETUP.SIF file present in the installation source (section "[SetupData]", +; values "OsLoadOptions" and "SetupDebugOptions"). Thus, any options specified +; using the "Options" value will supplement those already obtained from the +; TXTSETUP.SIF file, unless the "/SIFOPTIONSOVERRIDE" option switch is specified, +; in which case the "Options" value overrides those from TXTSETUP.SIF. [FREELOADER] diff --git a/boot/freeldr/freeldr/custom.c b/boot/freeldr/freeldr/custom.c index 7cfd38c8d40..2422107d58e 100644 --- a/boot/freeldr/freeldr/custom.c +++ b/boot/freeldr/freeldr/custom.c @@ -36,7 +36,8 @@ const CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first const CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; const CHAR ARCPathPrompt[] = "Enter the boot ARC path.\n\nExamples:\nmulti(0)disk(0)rdisk(0)partition(1)\nmulti(0)disk(0)fdisk(0)"; const CHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS"; -const CHAR ReactOSOptionsPrompt[] = "Enter the options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; +const CHAR ReactOSOptionsPrompt[] = "Enter the load options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; +const CHAR ReactOSSetupOptionsPrompt[] = "Enter additional load options you want passed to the ReactOS Setup.\nThese options will supplement those obtained from the TXTSETUP.SIF\nfile, unless you also specify the /SIFOPTIONSOVERRIDE option switch.\n\nExample:\n/NOGUIBOOT /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200"; const CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; /* FUNCTIONS ******************************************************************/ @@ -659,7 +660,7 @@ EditCustomBootReactOS( return; } - if (!UiEditBox(ReactOSOptionsPrompt, ReactOSOptions, sizeof(ReactOSOptions))) + if (!UiEditBox(IsSetup ? ReactOSSetupOptionsPrompt : ReactOSOptionsPrompt, ReactOSOptions, sizeof(ReactOSOptions))) return; /* Modify the settings values and return if we were in edit mode */ @@ -686,7 +687,9 @@ EditCustomBootReactOS( return; /* Construct the ReactOS ARC system path */ - ConstructArcPath(ReactOSARCPath, ReactOSSystemPath, DriveMapGetBiosDriveNumber(BootDriveString), atoi(BootPartitionString)); + ConstructArcPath(ReactOSARCPath, ReactOSSystemPath, + DriveMapGetBiosDriveNumber(BootDriveString), + atoi(BootPartitionString)); /* Add the system path */ if (!IniAddSettingValueToSection(SectionId, "SystemPath", ReactOSARCPath)) diff --git a/boot/freeldr/freeldr/ntldr/ntldropts.c b/boot/freeldr/freeldr/ntldr/ntldropts.c index 2173924e224..ee3eb344cde 100644 --- a/boot/freeldr/freeldr/ntldr/ntldropts.c +++ b/boot/freeldr/freeldr/ntldr/ntldropts.c @@ -131,3 +131,83 @@ NtLdrGetOption( { return NtLdrGetOptionEx(Options, OptionName, NULL); } + +/* + * Appends or prepends new options to the ones originally contained + * in the buffer pointed by LoadOptions, of maximum size BufferSize. + */ +VOID +NtLdrAddOptions( + IN OUT PSTR LoadOptions, + IN ULONG BufferSize, + IN BOOLEAN Append, + IN PCSTR NewOptions OPTIONAL) +{ + ULONG OptionsLength; + ULONG NewOptsLength; + BOOLEAN AddSeparator; + + if (!LoadOptions || (BufferSize == 0)) + return; + // ASSERT(strlen(LoadOptions) + 1 <= BufferSize); + + if (!NewOptions || !*NewOptions) + return; + + if (Append) + { + OptionsLength = (ULONG)strlen(LoadOptions); + OptionsLength = min(OptionsLength, BufferSize-1); + + /* Add a whitespace separator if needed */ + if (OptionsLength != 0 && + (LoadOptions[OptionsLength-1] != ' ') && + (LoadOptions[OptionsLength-1] != '\t') && + (*NewOptions != '\0') && + (*NewOptions != ' ') && + (*NewOptions != '\t')) + { + RtlStringCbCatA(LoadOptions, BufferSize * sizeof(CHAR), " "); + } + + /* Append the options */ + RtlStringCbCatA(LoadOptions, BufferSize * sizeof(CHAR), NewOptions); + } + else + { + NewOptsLength = (ULONG)strlen(NewOptions); + NewOptsLength = min(NewOptsLength, BufferSize-1); + + /* Add a whitespace separator if needed */ + AddSeparator = FALSE; + if (NewOptsLength != 0 && + (NewOptions[NewOptsLength-1] != ' ') && + (NewOptions[NewOptsLength-1] != '\t') && + (*LoadOptions != '\0') && + (*LoadOptions != ' ') && + (*LoadOptions != '\t')) + { + AddSeparator = TRUE; + ++NewOptsLength; + } + + /* + * Move the original load options forward (possibly truncating them + * at the end if the buffer is not large enough) to make place for + * the options to prepend. + */ + OptionsLength = (ULONG)strlen(LoadOptions) + 1; + OptionsLength = min(OptionsLength, BufferSize - NewOptsLength); + RtlMoveMemory(LoadOptions + NewOptsLength, + LoadOptions, + OptionsLength * sizeof(CHAR)); + /* NULL-terminate */ + (LoadOptions + NewOptsLength)[OptionsLength-1] = '\0'; + + /* Restore the new options length back to its original value */ + if (AddSeparator) --NewOptsLength; + /* Prepend the options and add the whitespace separator if needed */ + strncpy(LoadOptions, NewOptions, NewOptsLength); + if (AddSeparator) LoadOptions[NewOptsLength] = ' '; + } +} diff --git a/boot/freeldr/freeldr/ntldr/ntldropts.h b/boot/freeldr/freeldr/ntldr/ntldropts.h index aab539ce92d..9b92eac8e74 100644 --- a/boot/freeldr/freeldr/ntldr/ntldropts.h +++ b/boot/freeldr/freeldr/ntldr/ntldropts.h @@ -29,3 +29,10 @@ PCSTR NtLdrGetOption( IN PCSTR Options, IN PCSTR OptionName); + +VOID +NtLdrAddOptions( + IN OUT PSTR LoadOptions, + IN ULONG BufferSize, + IN BOOLEAN Append, + IN PCSTR NewOptions OPTIONAL); diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 548e4b7c21b..e80d15e03a6 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -15,8 +15,6 @@ #include <debug.h> DBG_DEFAULT_CHANNEL(WINDOWS); -#define TAG_BOOT_OPTIONS 'pOtB' - // TODO: Move to .h VOID AllocateAndInitLPB( @@ -175,6 +173,264 @@ SetupLdrScanBootDrivers(PLIST_ENTRY BootDriverListHead, HINF InfHandle, PCSTR Se /* SETUP STARTER **************************************************************/ +/* + * Update the options in the buffer pointed by LoadOptions, of maximum size + * BufferSize, by first removing any specified options, and then adding any + * other ones. + * + * OptionsToAdd is a NULL-terminated array of string buffer pointers that + * specify the options to be added into LoadOptions. Whether they are + * prepended or appended to LoadOptions is controlled via the Append + * parameter. The options are added in the order specified by the array. + * + * OptionsToRemove is a NULL-terminated array of string buffer pointers that + * specify the options to remove from LoadOptions. Specifying also there + * any options to add, has the effect of removing from LoadOptions any + * duplicates of the options to be added, before adding them later into + * LoadOptions. The options are removed in the order specified by the array. + * + * The options string buffers in the OptionsToRemove array have the format: + * "/option1 /option2[=] ..." + * + * An option in the OptionsToRemove list with a trailing '=' or ':' designates + * an option in LoadOptions with user-specific data appended after the sign. + * When such an option is being removed from LoadOptions, all the appended + * data is also removed until the next option. + */ +VOID +NtLdrUpdateLoadOptions( + IN OUT PSTR LoadOptions, + IN ULONG BufferSize, + IN BOOLEAN Append, + IN PCSTR OptionsToAdd[] OPTIONAL, + IN PCSTR OptionsToRemove[] OPTIONAL) +{ + PCSTR NextOptions, NextOpt; + PSTR Options, Option; + ULONG NextOptLength; + ULONG OptionLength; + + if (!LoadOptions || (BufferSize == 0)) + return; + // ASSERT(strlen(LoadOptions) + 1 <= BufferSize); + + /* Loop over the options to remove */ + for (; OptionsToRemove && *OptionsToRemove; ++OptionsToRemove) + { + NextOptions = *OptionsToRemove; + while ((NextOpt = NtLdrGetNextOption(&NextOptions, &NextOptLength))) + { + /* Scan the load options */ + Options = LoadOptions; + while ((Option = (PSTR)NtLdrGetNextOption((PCSTR*)&Options, &OptionLength))) + { + /* + * Check whether the option to find exactly matches the current + * load option, or is a prefix thereof if this is an option with + * appended data. + */ + if ((OptionLength >= NextOptLength) && + (_strnicmp(Option, NextOpt, NextOptLength) == 0)) + { + if ((OptionLength == NextOptLength) || + (NextOpt[NextOptLength-1] == '=') || + (NextOpt[NextOptLength-1] == ':')) + { + /* Eat any skipped option or whitespace separators */ + while ((Option > LoadOptions) && + (Option[-1] == '/' || + Option[-1] == ' ' || + Option[-1] == '\t')) + { + --Option; + } + + /* If the option was not preceded by a whitespace + * separator, insert one and advance the pointer. */ + if ((Option > LoadOptions) && + (Option[-1] != ' ') && + (Option[-1] != '\t') && + (*Options != '\0') /* && + ** Not necessary since NtLdrGetNextOption() ** + ** stripped any leading separators. ** + (*Options != ' ') && + (*Options != '\t') */) + { + *Option++ = ' '; + } + + /* Move the remaining options back, erasing the current one */ + ASSERT(Option <= Options); + RtlMoveMemory(Option, + Options, + (strlen(Options) + 1) * sizeof(CHAR)); + + /* Reset the iterator */ + Options = Option; + } + } + } + } + } + + /* Now loop over the options to add */ + for (; OptionsToAdd && *OptionsToAdd; ++OptionsToAdd) + { + NtLdrAddOptions(LoadOptions, + BufferSize, + Append, + *OptionsToAdd); + } +} + + +/* + * List of options and their corresponding higher priority ones, + * that are either checked before any other ones, or whose name + * includes another option name as a subset (e.g. NODEBUG vs. DEBUG). + * See also https://geoffchappell.com/notes/windows/boot/editoptions.htm + */ +static const struct +{ + PCSTR Options; + PCSTR ExtraOptions; + PCSTR HigherPriorOptions; +} HighPriorOptionsMap[] = +{ + /* NODEBUG has a higher precedence than DEBUG */ + {"/DEBUG/DEBUG=", NULL, "/NODEBUG"}, + + /* When using SCREEN debug port, we need boot video */ + {"/DEBUGPORT=SCREEN", NULL, "/NOGUIBOOT"}, + + /* DETECTHAL has a higher precedence than HAL= or KERNEL= */ + {"/HAL=/KERNEL=", NULL, "/DETECTHAL"}, + + /* NOPAE has a higher precedence than PAE */ + {"/PAE", NULL, "/NOPAE"}, + + /* NOEXECUTE(=) has a higher precedence than EXECUTE */ + {"/EXECUTE", "/NOEXECUTE=ALWAYSOFF", "/NOEXECUTE/NOEXECUTE="}, + /* NOEXECUTE(=) options are self-excluding and + * some have higher precedence than others. */ + {"/NOEXECUTE/NOEXECUTE=", NULL, "/NOEXECUTE/NOEXECUTE="}, + + /* SAFEBOOT(:) options are self-excluding */ + {"/SAFEBOOT/SAFEBOOT:", NULL, "/SAFEBOOT/SAFEBOOT:"}, +}; + +#define TAG_BOOT_OPTIONS 'pOtB' + +VOID +NtLdrGetHigherPriorityOptions( + IN PCSTR BootOptions, + OUT PSTR* ExtraOptions, + OUT PSTR* HigherPriorityOptions) +{ + ULONG i; + PCSTR NextOptions, NextOpt; + ULONG NextOptLength; + SIZE_T ExtraOptsSize = 0; + SIZE_T HighPriorOptsSize = 0; + + /* Masks specifying the presence (TRUE) or absence (FALSE) of the options */ + BOOLEAN Masks[RTL_NUMBER_OF(HighPriorOptionsMap)]; + + /* Just return if we cannot return anything */ + if (!ExtraOptions && !HigherPriorityOptions) + return; + + if (ExtraOptions) + *ExtraOptions = NULL; + if (HigherPriorityOptions) + *HigherPriorityOptions = NULL; + + /* Just return if no initial options were given */ + if (!BootOptions || !*BootOptions) + return; + + /* Determine the presence of the colliding options, and the + * maximum necessary sizes for the pointers to be allocated. */ + RtlZeroMemory(Masks, sizeof(Masks)); + for (i = 0; i < RTL_NUMBER_OF(HighPriorOptionsMap); ++i) + { + /* Loop over the given options to search for */ + NextOptions = HighPriorOptionsMap[i].Options; + while ((NextOpt = NtLdrGetNextOption(&NextOptions, &NextOptLength))) + { + /* If any of these options are present... */ + if (NtLdrGetOptionExN(BootOptions, NextOpt, NextOptLength, NULL)) + { + /* ... set the mask, retrieve the sizes and stop looking for these options */ + Masks[i] = TRUE; + if (ExtraOptions && HighPriorOptionsMap[i].ExtraOptions) + { + ExtraOptsSize += strlen(HighPriorOptionsMap[i].ExtraOptions) * sizeof(CHAR); + } + if (HigherPriorityOptions && HighPriorOptionsMap[i].HigherPriorOptions) + { + HighPriorOptsSize += strlen(HighPriorOptionsMap[i].HigherPriorOptions) * sizeof(CHAR); + } + break; + } + } + } + /* Count the NULL-terminator */ + if (ExtraOptions) + ExtraOptsSize += sizeof(ANSI_NULL); + if (HigherPriorityOptions) + HighPriorOptsSize += sizeof(ANSI_NULL); + + /* Allocate the string pointers */ + if (ExtraOptions) + { + *ExtraOptions = FrLdrHeapAlloc(ExtraOptsSize, TAG_BOOT_OPTIONS); + if (!*ExtraOptions) + return; + } + if (HigherPriorityOptions) + { + *HigherPriorityOptions = FrLdrHeapAlloc(HighPriorOptsSize, TAG_BOOT_OPTIONS); + if (!*HigherPriorityOptions) + { + if (ExtraOptions) + { + FrLdrHeapFree(*ExtraOptions, TAG_BOOT_OPTIONS); + *ExtraOptions = NULL; + } + return; + } + } + + /* Initialize the strings */ + if (ExtraOptions) + *(*ExtraOptions) = '\0'; + if (HigherPriorityOptions) + *(*HigherPriorityOptions) = '\0'; + + /* Go through the masks that determine the options to check */ + for (i = 0; i < RTL_NUMBER_OF(HighPriorOptionsMap); ++i) + { + if (Masks[i]) + { + /* Retrieve the strings */ + if (ExtraOptions && HighPriorOptionsMap[i].ExtraOptions) + { + RtlStringCbCatA(*ExtraOptions, + ExtraOptsSize, + HighPriorOptionsMap[i].ExtraOptions); + } + if (HigherPriorityOptions && HighPriorOptionsMap[i].HigherPriorOptions) + { + RtlStringCbCatA(*HigherPriorityOptions, + HighPriorOptsSize, + HighPriorOptionsMap[i].HigherPriorOptions); + } + } + } +} + + ARC_STATUS LoadReactOSSetup( IN ULONG Argc, @@ -196,9 +452,8 @@ LoadReactOSSetup( PSETUP_LOADER_BLOCK SetupBlock; CHAR BootPath[MAX_PATH]; CHAR FilePath[MAX_PATH]; - CHAR BootOptions2[256]; - PSTR BootOptions; - PCSTR LoadOptions; + CHAR UserBootOptions[256]; + PCSTR BootOptions; static PCSTR SourcePaths[] = { @@ -287,20 +542,22 @@ LoadReactOSSetup( TRACE("BootPath: '%s'\n", BootPath); - /* Retrieve the boot options */ - *BootOptions2 = ANSI_NULL; - ArgValue = GetArgumentValue(Argc, Argv, "Options"); - if (ArgValue && *ArgValue) - RtlStringCbCopyA(BootOptions2, sizeof(BootOptions2), ArgValue); + /* + * Retrieve the boot options. Any options present here will supplement or + * override those that will be specified in TXTSETUP.SIF's OsLoadOptions. + */ + BootOptions = GetArgumentValue(Argc, Argv, "Options"); + if (!BootOptions) + BootOptions = ""; - TRACE("BootOptions: '%s'\n", BootOptions2); + TRACE("BootOptions: '%s'\n", BootOptions); /* Check if a RAM disk file was given */ - FileName = (PSTR)NtLdrGetOptionEx(BootOptions2, "RDPATH=", &FileNameLength); + FileName = (PSTR)NtLdrGetOptionEx(BootOptions, "RDPATH=", &FileNameLength); if (FileName && (FileNameLength > 7)) { /* Load the RAM disk */ - Status = RamDiskInitialize(FALSE, BootOptions2, SystemPartition); + Status = RamDiskInitialize(FALSE, BootOptions, SystemPartition); if (Status != ESUCCESS) { FileName += 7; FileNameLength -= 7; @@ -335,34 +592,138 @@ LoadReactOSSetup( TRACE("BootPath: '%s', SystemPath: '%s'\n", BootPath, SystemPath); - /* Get load options - debug and non-debug */ - if (!InfFindFirstLine(InfHandle, "SetupData", "OsLoadOptions", &InfContext)) - { - ERR("Failed to find 'SetupData/OsLoadOptions'\n"); - return EINVAL; - } + // UseLocalSif = NtLdrGetOption(BootOptions, "USELOCALSIF"); - if (!InfGetDataField(&InfContext, 1, &LoadOptions)) + if (NtLdrGetOption(BootOptions, "SIFOPTIONSOVERRIDE")) { - ERR("Failed to get load options\n"); - return EINVAL; - } + PCSTR OptionsToRemove[2] = {"SIFOPTIONSOVERRIDE", NULL}; -#if DBG - /* Get debug load options and use them */ - if (InfFindFirstLine(InfHandle, "SetupData", "DbgOsLoadOptions", &InfContext)) - { - PCSTR DbgLoadOptions; + /* Do not use any load options from TXTSETUP.SIF, but + * use instead those passed from the command line. */ + RtlStringCbCopyA(UserBootOptions, sizeof(UserBootOptions), BootOptions); - if (InfGetDataField(&InfContext, 1, &DbgLoadOptions)) - LoadOptions = DbgLoadOptions; + /* Remove the private switch from the options */ + NtLdrUpdateLoadOptions(UserBootOptions, + sizeof(UserBootOptions), + FALSE, + NULL, + OptionsToRemove); + + BootOptions = UserBootOptions; } + else // if (!*BootOptions || NtLdrGetOption(BootOptions, "SIFOPTIONSADD")) + { + PCSTR LoadOptions = NULL; + PCSTR DbgLoadOptions = NULL; + PSTR ExtraOptions, HigherPriorityOptions; + PSTR OptionsToAdd[3]; + PSTR OptionsToRemove[4]; + + /* Load the options from TXTSETUP.SIF */ + if (InfFindFirstLine(InfHandle, "SetupData", "OsLoadOptions", &InfContext)) + { + if (!InfGetDataField(&InfContext, 1, &LoadOptions)) + WARN("Failed to get load options\n"); + } + +#if !DBG + /* Non-debug mode: get the debug load options only if /DEBUG was specified + * in the Argv command-line options (was e.g. added to the options when + * the user selected "Debugging Mode" in the advanced boot menu). */ + if (NtLdrGetOption(BootOptions, "DEBUG") || + NtLdrGetOption(BootOptions, "DEBUG=")) + { +#else + /* Debug mode: always get the debug load options */ #endif + if (InfFindFirstLine(InfHandle, "SetupData", "SetupDebugOptions", &InfContext)) + { + if (!InfGetDataField(&InfContext, 1, &DbgLoadOptions)) + WARN("Failed to get debug load options\n"); + } + /* If none was found, default to enabling debugging */ + if (!DbgLoadOptions) + DbgLoadOptions = "/DEBUG"; +#if !DBG + } +#endif + + /* Initialize the load options with those from TXTSETUP.SIF */ + *UserBootOptions = ANSI_NULL; + if (LoadOptions && *LoadOptions) + RtlStringCbCopyA(UserBootOptions, sizeof(UserBootOptions), LoadOptions); - /* Copy LoadOptions (original string will be freed) */ - BootOptions = FrLdrTempAlloc(strlen(LoadOptions) + 1, TAG_BOOT_OPTIONS); - ASSERT(BootOptions); - strcpy(BootOptions, LoadOptions); + /* Merge the debug load options if any */ + if (DbgLoadOptions) + { + RtlZeroMemory(OptionsToAdd, sizeof(OptionsToAdd)); + RtlZeroMemory(OptionsToRemove, sizeof(OptionsToRemove)); + + /* + * Retrieve any option patterns that we should remove from the + * SIF load options because they are of higher precedence than + * those specified in the debug load options to be added. + * Also always remove NODEBUG (even if the debug load options + * do not contain explicitly the DEBUG option), since we want + * to have debugging enabled if possible. + */ + OptionsToRemove[0] = "/NODEBUG"; + NtLdrGetHigherPriorityOptions(DbgLoadOptions, + &ExtraOptions, + &HigherPriorityOptions); + OptionsToAdd[1] = (ExtraOptions ? ExtraOptions : ""); + OptionsToRemove[1] = (HigherPriorityOptions ? HigherPriorityOptions : ""); + + /* + * Prepend the debug load options, so that in case it contains + * redundant options with respect to the SIF load options, the + * former can take precedence over the latter. + */ + OptionsToAdd[0] = (PSTR)DbgLoadOptions; + OptionsToRemove[2] = (PSTR)DbgLoadOptions; + NtLdrUpdateLoadOptions(UserBootOptions, + sizeof(UserBootOptions), + FALSE, + (PCSTR*)OptionsToAdd, + (PCSTR*)OptionsToRemove); + + if (ExtraOptions) + FrLdrHeapFree(ExtraOptions, TAG_BOOT_OPTIONS); + if (HigherPriorityOptions) + FrLdrHeapFree(HigherPriorityOptions, TAG_BOOT_OPTIONS); + } + + RtlZeroMemory(OptionsToAdd, sizeof(OptionsToAdd)); + RtlZeroMemory(OptionsToRemove, sizeof(OptionsToRemove)); + + /* + * Retrieve any option patterns that we should remove from the + * SIF load options because they are of higher precedence than + * those specified in the options to be added. + */ + NtLdrGetHigherPriorityOptions(BootOptions, + &ExtraOptions, + &HigherPriorityOptions); + OptionsToAdd[1] = (ExtraOptions ? ExtraOptions : ""); + OptionsToRemove[0] = (HigherPriorityOptions ? HigherPriorityOptions : ""); + + /* Finally, prepend the user-specified options that + * take precedence over those from TXTSETUP.SIF. */ + OptionsToAdd[0] = (PSTR)BootOptions; + OptionsToRemove[1] = (PSTR)BootOptions; + NtLdrUpdateLoadOptions(UserBootOptions, + sizeof(UserBootOptions), + FALSE, + (PCSTR*)OptionsToAdd, + (PCSTR*)OptionsToRemove); + + if (ExtraOptions) + FrLdrHeapFree(ExtraOptions, TAG_BOOT_OPTIONS); + if (HigherPriorityOptions) + FrLdrHeapFree(HigherPriorityOptions, TAG_BOOT_OPTIONS); + + BootOptions = UserBootOptions; + } TRACE("BootOptions: '%s'\n", BootOptions);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs