Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SDBINST] Minor quick fixes after merge

Browse source
This commit is contained in:
Stanislav Motylkov 2021-05-08 18:36:15 +03:00
parent 23b6397ae9
commit 4d8b9e1d61
No known key found for this signature in database
GPG key ID: AFE513258CBA9E92
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/applications/CMakeLists.txt
View file

@ -35,6 +35,7 @@ add_subdirectory(regedit)
add_subdirectory(regedt32) add_subdirectory(regedt32)
add_subdirectory(sc) add_subdirectory(sc)
add_subdirectory(screensavers) add_subdirectory(screensavers)
add_subdirectory(sdbinst)
add_subdirectory(setup16) add_subdirectory(setup16)
add_subdirectory(shutdown) add_subdirectory(shutdown)
add_subdirectory(sndrec32) add_subdirectory(sndrec32)
@ -46,4 +47,3 @@ add_subdirectory(winver)
add_subdirectory(wordpad) add_subdirectory(wordpad)
add_subdirectory(write) add_subdirectory(write)
add_subdirectory(wusa) add_subdirectory(wusa)
add_subdirectory(sdbinst)

16
base/applications/sdbinst/sdbinst.c
View file

@ -131,7 +131,7 @@ AddUninstallKey(
goto end; goto end;
} }
// Sdb guid reg key // Sdb GUID registry key
hres = StringCchPrintfW(regName, MAX_PATH, L"%ls\\%ls", UNINSTALL_REG_PATH, guidDbStr); hres = StringCchPrintfW(regName, MAX_PATH, L"%ls\\%ls", UNINSTALL_REG_PATH, guidDbStr);
if (FAILED(hres)) if (FAILED(hres))
{ {
@ -205,7 +205,7 @@ end:
} }
// //
// Get database guid id // Get database GUID id
// //
BOOL BOOL
GetSdbGuid( GetSdbGuid(
@ -414,7 +414,7 @@ SdbInstall(
currentTime.LowPart = systemTime.dwLowDateTime; currentTime.LowPart = systemTime.dwLowDateTime;
currentTime.HighPart = systemTime.dwHighDateTime; currentTime.HighPart = systemTime.dwHighDateTime;
// Open db // Open database
pdb = SdbOpenDatabase(sdbPath, DOS_PATH); pdb = SdbOpenDatabase(sdbPath, DOS_PATH);
if (pdb == NULL) if (pdb == NULL)
{ {
@ -429,7 +429,7 @@ SdbInstall(
goto end; goto end;
} }
// Get db guid // Get database GUID
if (!GetSdbGuid(pdb, tagDb, &dbGuid)) if (!GetSdbGuid(pdb, tagDb, &dbGuid))
{ {
wprintf(L"GetSdbGuid error\n"); wprintf(L"GetSdbGuid error\n");
@ -589,7 +589,6 @@ SdbUninstall(
goto end; goto end;
} }
//
if (!GetSdbGuid(pdb, tagDb, &dbGuid)) if (!GetSdbGuid(pdb, tagDb, &dbGuid))
{ {
wprintf(L"GetSdbGuid error\n"); wprintf(L"GetSdbGuid error\n");
@ -751,7 +750,7 @@ SdbUninstallByName(
status = RegEnumKeyEx(hKey, index, keyName, &keyNameLen, NULL, NULL, NULL, NULL); status = RegEnumKeyEx(hKey, index, keyName, &keyNameLen, NULL, NULL, NULL, NULL);
wprintf(L"0x%08X %d %ls \n", status, keyNameLen, keyName); wprintf(L"0x%08X %d %ls \n", status, keyNameLen, keyName);
// Search db guid by name // Search database GUID by name
while (status == ERROR_SUCCESS) while (status == ERROR_SUCCESS)
{ {
status = RegOpenKeyExW(hKey, keyName, 0, KEY_READ | KEY_QUERY_VALUE, &subKey); status = RegOpenKeyExW(hKey, keyName, 0, KEY_READ | KEY_QUERY_VALUE, &subKey);
@ -809,10 +808,11 @@ end:
void void
ShowHelp() ShowHelp()
{ {
/* FIXME: to be localized */
wprintf(L"Using: sdbinst [-?][-q][-u][-g][-n] foo.sdb | {guid} | \"name\" \n" wprintf(L"Using: sdbinst [-?][-q][-u][-g][-n] foo.sdb | {guid} | \"name\" \n"
L"-? - show help\n" L"-? - show help\n"
L"-u - uninstall\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"); L"-n - \"name\" - file name (only uninstall)\n");
} }
@ -889,7 +889,7 @@ int _tmain(int argc, LPWSTR argv[])
} }
else if (isUninstByGuid) else if (isUninstByGuid)
{ {
wprintf(L"uninstall by guid\n"); wprintf(L"uninstall by GUID\n");
success = SdbUninstallByGuid(guidSdbStr); success = SdbUninstallByGuid(guidSdbStr);
} }
else if (isUninstByName) else if (isUninstByName)