https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d8b9e1d619f8b44091dac905453f8587904bb71
commit 4d8b9e1d619f8b44091dac905453f8587904bb71 Author: Stanislav Motylkov <[email protected]> AuthorDate: Sat May 8 18:36:15 2021 +0300 Commit: Stanislav Motylkov <[email protected]> CommitDate: Sat May 8 18:36:15 2021 +0300 [SDBINST] Minor quick fixes after merge --- base/applications/CMakeLists.txt | 2 +- base/applications/sdbinst/sdbinst.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt index 179d548a07b..7c18212ed4f 100644 --- a/base/applications/CMakeLists.txt +++ b/base/applications/CMakeLists.txt @@ -35,6 +35,7 @@ add_subdirectory(regedit) add_subdirectory(regedt32) add_subdirectory(sc) add_subdirectory(screensavers) +add_subdirectory(sdbinst) add_subdirectory(setup16) add_subdirectory(shutdown) add_subdirectory(sndrec32) @@ -46,4 +47,3 @@ add_subdirectory(winver) add_subdirectory(wordpad) add_subdirectory(write) add_subdirectory(wusa) -add_subdirectory(sdbinst) diff --git a/base/applications/sdbinst/sdbinst.c b/base/applications/sdbinst/sdbinst.c index 68f31a477bb..01626080c72 100644 --- a/base/applications/sdbinst/sdbinst.c +++ b/base/applications/sdbinst/sdbinst.c @@ -131,7 +131,7 @@ AddUninstallKey( goto end; } - // Sdb guid reg key + // Sdb GUID registry key hres = StringCchPrintfW(regName, MAX_PATH, L"%ls\\%ls", UNINSTALL_REG_PATH, guidDbStr); if (FAILED(hres)) { @@ -205,7 +205,7 @@ end: } // -// Get database guid id +// Get database GUID id // BOOL GetSdbGuid( @@ -414,7 +414,7 @@ SdbInstall( currentTime.LowPart = systemTime.dwLowDateTime; currentTime.HighPart = systemTime.dwHighDateTime; - // Open db + // Open database pdb = SdbOpenDatabase(sdbPath, DOS_PATH); if (pdb == NULL) { @@ -429,7 +429,7 @@ SdbInstall( goto end; } - // Get db guid + // Get database GUID if (!GetSdbGuid(pdb, tagDb, &dbGuid)) { wprintf(L"GetSdbGuid error\n"); @@ -589,7 +589,6 @@ SdbUninstall( goto end; } - // if (!GetSdbGuid(pdb, tagDb, &dbGuid)) { wprintf(L"GetSdbGuid error\n"); @@ -751,7 +750,7 @@ SdbUninstallByName( status = RegEnumKeyEx(hKey, index, keyName, &keyNameLen, NULL, NULL, NULL, NULL); wprintf(L"0x%08X %d %ls \n", status, keyNameLen, keyName); - // Search db guid by name + // Search database GUID by name while (status == ERROR_SUCCESS) { status = RegOpenKeyExW(hKey, keyName, 0, KEY_READ | KEY_QUERY_VALUE, &subKey); @@ -809,10 +808,11 @@ end: void ShowHelp() { + /* FIXME: to be localized */ wprintf(L"Using: sdbinst [-?][-q][-u][-g][-n] foo.sdb | {guid} | \"name\" \n" L"-? - show help\n" L"-u - uninstall\n" - L"-g - {guid} file guid (only uninstall)\n" + L"-g - {guid} file GUID (only uninstall)\n" L"-n - \"name\" - file name (only uninstall)\n"); } @@ -889,7 +889,7 @@ int _tmain(int argc, LPWSTR argv[]) } else if (isUninstByGuid) { - wprintf(L"uninstall by guid\n"); + wprintf(L"uninstall by GUID\n"); success = SdbUninstallByGuid(guidSdbStr); } else if (isUninstByName)
