Ros-diffs May 2021

ros-diffs@reactos.org

21 participants
183 discussions

[reactos] 02/02: [RTL] Implement RtlGetLengthWithoutLastFullDorOrNtPathElement

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=264aaa9e05c8dc6856185… commit 264aaa9e05c8dc68561852c738b89cb8061250fe Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Feb 15 20:11:49 2021 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 8 19:24:23 2021 +0200 [RTL] Implement RtlGetLengthWithoutLastFullDorOrNtPathElement CORE-17248 --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + ...RtlGetLengthWithoutLastFullDosOrNtPathElement.c | 109 +++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + sdk/lib/rtl/path.c | 86 +++++++++++++++- 4 files changed, 195 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 545d935e144..85dba02c31d 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -62,6 +62,7 @@ list(APPEND SOURCE RtlGetFullPathName_U.c RtlGetFullPathName_Ustr.c RtlGetFullPathName_UstrEx.c + RtlGetLengthWithoutLastFullDosOrNtPathElement.c RtlGetLengthWithoutTrailingPathSeperators.c RtlGetLongestNtPathLength.c RtlGetNtProductType.c diff --git a/modules/rostests/apitests/ntdll/RtlGetLengthWithoutLastFullDosOrNtPathElement.c b/modules/rostests/apitests/ntdll/RtlGetLengthWithoutLastFullDosOrNtPathElement.c new file mode 100644 index 00000000000..d6d7c0dff9b --- /dev/null +++ b/modules/rostests/apitests/ntdll/RtlGetLengthWithoutLastFullDosOrNtPathElement.c @@ -0,0 +1,109 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for RtlGetLengthWithoutLastFullDosOrNtPathElement + * COPYRIGHT: Copyright 2021 Mark Jansen <mark.jansen(a)reactos.org> + */ + +#include "precomp.h" + + +NTSTATUS +NTAPI +RtlGetLengthWithoutLastFullDosOrNtPathElement( + IN ULONG Flags, + IN PCUNICODE_STRING Path, + OUT PULONG LengthOut); + + +typedef struct _rtl_test_data +{ + LPCWSTR Path; + ULONG Length; + NTSTATUS Status; +} rtl_test_data; + +// Based on http://undoc.airesoft.co.uk/ntdll.dll/RtlGetLengthWithoutLastFullDosOrNtPat… +rtl_test_data tests[] = { + { L"", 0, STATUS_SUCCESS, }, + { L"C", 0, STATUS_INVALID_PARAMETER, }, + { L"C:", 0, STATUS_INVALID_PARAMETER, }, + { L"C:\\", 0, STATUS_SUCCESS, }, + { L"C:\\test", 3, STATUS_SUCCESS, }, + { L"C:\\test\\", 3, STATUS_SUCCESS, }, + { L"C:\\test\\a", 8, STATUS_SUCCESS, }, + { L"C:\\test\\a\\", 8, STATUS_SUCCESS, }, + { L"C://test", 3, STATUS_SUCCESS, }, + { L"C://test\\", 3, STATUS_SUCCESS, }, + { L"C://test\\\\", 3, STATUS_SUCCESS, }, + { L"C://test/", 3, STATUS_SUCCESS, }, + { L"C://test//", 3, STATUS_SUCCESS, }, + { L"C://test\\a", 9, STATUS_SUCCESS, }, + { L"C://test\\\\a", 9, STATUS_SUCCESS, }, + { L"C://test/a", 9, STATUS_SUCCESS, }, + { L"C://test//a", 9, STATUS_SUCCESS, }, + { L"C://test\\a\\", 9, STATUS_SUCCESS, }, + { L"C://test//a//", 9, STATUS_SUCCESS, }, + { L"C://test//a/", 9, STATUS_SUCCESS, }, + { L"X", 0, STATUS_INVALID_PARAMETER, }, + { L"X:", 0, STATUS_INVALID_PARAMETER, }, + { L"X:\\", 0, STATUS_SUCCESS, }, + { L"D:\\Test\\hello.ext", 8, STATUS_SUCCESS, }, + { L"\\\\?\\C", 0, STATUS_INVALID_PARAMETER, }, + { L"\\\\?\\C:", 0, STATUS_INVALID_PARAMETER, }, + { L"\\\\?\\CC", 0, STATUS_INVALID_PARAMETER, }, + { L"\\\\?\\C:\\", 4, STATUS_SUCCESS, }, + { L"\\\\?\\::\\", 4, STATUS_SUCCESS, }, + { L"\\\\?\\CCC", 0, STATUS_INVALID_PARAMETER, }, + { L"\\\\?\\CCC\\", 0, STATUS_INVALID_PARAMETER, }, + { L"\\??\\UNC\\Mytest", 8, STATUS_SUCCESS, }, + { L"\\SystemRoot", 0, STATUS_SUCCESS, }, + { L"\\SystemRoot\\", 0, STATUS_SUCCESS, }, + { L"\\SystemRoot\\ntdll.dll", 12, STATUS_SUCCESS, }, + { L"\\Device\\HarddiskVolume9000", 8, STATUS_SUCCESS, }, + { L"\\Stuff\\doesnt\\really\\matter", 21, STATUS_SUCCESS, }, + { L"this\\doesnt\\really\\work", 0, STATUS_INVALID_PARAMETER, }, + { L"multi(0)disk(0)rdisk(0)partition(1)", 0, STATUS_INVALID_PARAMETER, }, + { L"multi(0)disk(0)rdisk(0)partition(1)\\test", 0, STATUS_INVALID_PARAMETER, }, + { L"xyz", 0, STATUS_INVALID_PARAMETER, }, + { L"CON", 0, STATUS_INVALID_PARAMETER, }, + { L":", 0, STATUS_INVALID_PARAMETER, }, + { L"\\\\", 0, STATUS_SUCCESS, }, +}; + + +START_TEST(RtlGetLengthWithoutLastFullDosOrNtPathElement) +{ + UNICODE_STRING Dum; + NTSTATUS Status; + ULONG Length; + RtlInitUnicodeString(&Dum, L"c:\\test\\"); + + Length = 333; + Status = RtlGetLengthWithoutLastFullDosOrNtPathElement(0, NULL, &Length); + ok_int(Length, 0); + ok_hex(Status, STATUS_INVALID_PARAMETER); + + Status = RtlGetLengthWithoutLastFullDosOrNtPathElement(0, &Dum, NULL); + ok_hex(Status, STATUS_INVALID_PARAMETER); + + for (ULONG n = 0; n < 32; ++n) + { + Length = 333; + Status = RtlGetLengthWithoutLastFullDosOrNtPathElement((1 << n), &Dum, &Length); + ok_int(Length, 0); + ok_hex(Status, STATUS_INVALID_PARAMETER); + } + + for (ULONG n = 0; n < ARRAYSIZE(tests); ++n) + { + UNICODE_STRING Str; + Length = 333; + + RtlInitUnicodeString(&Str, tests[n].Path); + + Status = RtlGetLengthWithoutLastFullDosOrNtPathElement(0, &Str, &Length); + ok(Status == tests[n].Status, "Got Status=0x%lx, expected 0x%lx (%S)\n", Status, tests[n].Status, Str.Buffer); + ok(Length == tests[n].Length, "Got Length=0x%lx, expected 0x%lx (%S)\n", Length, tests[n].Length, Str.Buffer); + } +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 7c9cdb2f694..141a1305f61 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -59,6 +59,7 @@ extern void func_RtlGenerate8dot3Name(void); extern void func_RtlGetFullPathName_U(void); extern void func_RtlGetFullPathName_Ustr(void); extern void func_RtlGetFullPathName_UstrEx(void); +extern void func_RtlGetLengthWithoutLastFullDosOrNtPathElement(void); extern void func_RtlGetLengthWithoutTrailingPathSeperators(void); extern void func_RtlGetLongestNtPathLength(void); extern void func_RtlGetNtProductType(void); @@ -138,6 +139,7 @@ const struct test winetest_testlist[] = { "RtlGetFullPathName_U", func_RtlGetFullPathName_U }, { "RtlGetFullPathName_Ustr", func_RtlGetFullPathName_Ustr }, { "RtlGetFullPathName_UstrEx", func_RtlGetFullPathName_UstrEx }, + { "RtlGetLengthWithoutLastFullDosOrNtPathElement", func_RtlGetLengthWithoutLastFullDosOrNtPathElement }, { "RtlGetLengthWithoutTrailingPathSeperators", func_RtlGetLengthWithoutTrailingPathSeperators }, { "RtlGetLongestNtPathLength", func_RtlGetLongestNtPathLength }, { "RtlGetNtProductType", func_RtlGetNtProductType }, diff --git a/sdk/lib/rtl/path.c b/sdk/lib/rtl/path.c index fb28160141b..360c68df735 100644 --- a/sdk/lib/rtl/path.c +++ b/sdk/lib/rtl/path.c @@ -494,11 +494,91 @@ RtlpApplyLengthFunction(IN ULONG Flags, NTSTATUS NTAPI RtlGetLengthWithoutLastFullDosOrNtPathElement(IN ULONG Flags, - IN PWCHAR Path, + IN PCUNICODE_STRING Path, OUT PULONG LengthOut) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + static const UNICODE_STRING PathDividers = RTL_CONSTANT_STRING(L"\\/"); + USHORT Position; + RTL_PATH_TYPE PathType; + + /* All failure paths have this in common, so simplify code */ + if (LengthOut) + *LengthOut = 0; + + if (Flags || !Path || !LengthOut) + { + return STATUS_INVALID_PARAMETER; + } + + if ((Path->Length / sizeof(WCHAR)) == 0) + { + /* Nothing to do here */ + return STATUS_SUCCESS; + } + + + PathType = RtlDetermineDosPathNameType_Ustr(Path); + switch (PathType) + { + case RtlPathTypeLocalDevice: + // Handle \\\\?\\C:\\ with the last ':' or '\\' missing: + if (Path->Length / sizeof(WCHAR) < 7 || + Path->Buffer[5] != ':' || + !IS_PATH_SEPARATOR(Path->Buffer[6])) + { + return STATUS_INVALID_PARAMETER; + } + break; + case RtlPathTypeRooted: + // "\\??\\" + break; + case RtlPathTypeUncAbsolute: + // "\\\\" + break; + case RtlPathTypeDriveAbsolute: + // "C:\\" + break; + default: + return STATUS_INVALID_PARAMETER; + } + + /* Find the last path separator */ + if (!NT_SUCCESS(RtlFindCharInUnicodeString(RTL_FIND_CHAR_IN_UNICODE_STRING_START_AT_END, Path, &PathDividers, &Position))) + Position = 0; + + /* Is it the last char of the string? */ + if (Position && Position + sizeof(WCHAR) == Path->Length) + { + UNICODE_STRING Tmp = *Path; + Tmp.Length = Position; + + /* Keep walking path separators to eliminate multiple next to eachother */ + while (Tmp.Length > sizeof(WCHAR) && IS_PATH_SEPARATOR(Tmp.Buffer[Tmp.Length / sizeof(WCHAR)])) + Tmp.Length -= sizeof(WCHAR); + + /* Find the previous occurence */ + if (!NT_SUCCESS(RtlFindCharInUnicodeString(RTL_FIND_CHAR_IN_UNICODE_STRING_START_AT_END, &Tmp, &PathDividers, &Position))) + Position = 0; + } + + /* Simplify code by working in chars instead of bytes */ + if (Position) + Position /= sizeof(WCHAR); + + if (Position) + { + // Keep walking path separators to eliminate multiple next to eachother, but ensure we leave one in place! + while (Position > 1 && IS_PATH_SEPARATOR(Path->Buffer[Position - 1])) + Position--; + } + + if (Position > 0) + { + /* Return a length, not an index */ + *LengthOut = Position + 1; + } + + return STATUS_SUCCESS; } NTSTATUS

3 years, 4 months

[reactos] 01/02: [RTL] Implement RtlpApplyLengthFunction

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e7e4ee360a46cc48c818… commit 3e7e4ee360a46cc48c818c40f905d1b901e6d3c8 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Feb 15 20:10:59 2021 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 8 19:24:23 2021 +0200 [RTL] Implement RtlpApplyLengthFunction CORE-17248 --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../apitests/ntdll/RtlpApplyLengthFunction.c | 143 +++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + sdk/lib/rtl/path.c | 45 ++++++- 4 files changed, 188 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index ed0a199a903..545d935e144 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -73,6 +73,7 @@ list(APPEND SOURCE RtlMemoryStream.c RtlMultipleAllocateHeap.c RtlNtPathNameToDosPathName.c + RtlpApplyLengthFunction.c RtlpEnsureBufferSize.c RtlQueryTimeZoneInfo.c RtlReAllocateHeap.c diff --git a/modules/rostests/apitests/ntdll/RtlpApplyLengthFunction.c b/modules/rostests/apitests/ntdll/RtlpApplyLengthFunction.c new file mode 100644 index 00000000000..60b9ee6a53e --- /dev/null +++ b/modules/rostests/apitests/ntdll/RtlpApplyLengthFunction.c @@ -0,0 +1,143 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for RtlpApplyLengthFunction + * COPYRIGHT: Copyright 2021 Mark Jansen <mark.jansen(a)reactos.org> + */ + +#include "precomp.h" +#include <ntstrsafe.h> + + +NTSTATUS +NTAPI +RtlpApplyLengthFunction(IN ULONG Flags, + IN ULONG Type, + IN PVOID UnicodeStringOrUnicodeStringBuffer, + IN NTSTATUS(NTAPI*LengthFunction)(ULONG, PUNICODE_STRING, PULONG)); + + +NTSTATUS NTAPI LengthFunctionFail(ULONG Unknown, PUNICODE_STRING String, PULONG Length) +{ + ok_int(*Length, 0); + /* Show that this is ignored when an error is returned */ + *Length = 3; + return STATUS_INVALID_ACCOUNT_NAME; +} + +NTSTATUS NTAPI LengthFunctionOk(ULONG Unknown, PUNICODE_STRING String, PULONG Length) +{ + ok_int(*Length, 0); + *Length = 4; + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI LengthFunctionReturn1(ULONG Unknown, PUNICODE_STRING String, PULONG Length) +{ + ok_int(*Length, 0); + *Length = 4; + return (NTSTATUS)1; +} + +NTSTATUS NTAPI LengthFunctionCopyLen(ULONG Unknown, PUNICODE_STRING String, PULONG Length) +{ + /* Use Buffer as length, to show that the function does not interpret the contents at all */ + *Length = (ULONG)(ULONG_PTR)String->Buffer; + return STATUS_SUCCESS; +} + + +START_TEST(RtlpApplyLengthFunction) +{ + NTSTATUS Status; + /* Show that RtlpApplyLengthFunction does not interpret anything in the UNICODE_STRING */ + UNICODE_STRING String = { 1, 2, (PWSTR)3 }; + RTL_UNICODE_STRING_BUFFER Buffer; + WCHAR StaticBuffer[10] = { 0 }; + ULONG n; + + Status = RtlpApplyLengthFunction(0, 0, NULL, LengthFunctionFail); + ok_int(String.Length, 1); + ok_hex(Status, STATUS_INVALID_PARAMETER); + + Status = RtlpApplyLengthFunction(0, 0, &String, LengthFunctionFail); + ok_int(String.Length, 1); + ok_hex(Status, STATUS_INVALID_PARAMETER); + + /* Show that no flag is accepted */ + for (n = 0; n < 32; ++n) + { + Status = RtlpApplyLengthFunction((1 << n), sizeof(String), &String, LengthFunctionFail); + ok_int(String.Length, 1); + ok_hex(Status, STATUS_INVALID_PARAMETER); + } + + Status = RtlpApplyLengthFunction(0, sizeof(String), &String, NULL); + ok_int(String.Length, 1); + ok_hex(Status, STATUS_INVALID_PARAMETER); + + /* Still Length 1 when the function returns an error */ + Status = RtlpApplyLengthFunction(0, sizeof(String), &String, LengthFunctionFail); + ok_int(String.Length, 1); + ok_hex(Status, STATUS_INVALID_ACCOUNT_NAME); + + Status = RtlpApplyLengthFunction(0, sizeof(String), &String, LengthFunctionOk); + ok_int(String.Length, 8); /* Value returned from LengthFunction is multiplied by sizeof(WCHAR) */ + ok_hex(Status, STATUS_SUCCESS); + + String.Length = 1; + Status = RtlpApplyLengthFunction(0, sizeof(String), &String, LengthFunctionReturn1); + ok_int(String.Length, 8); + ok_hex(Status, STATUS_SUCCESS); /* Returns STATUS_SUCCESS regardless of success code from the function */ + + /* Show max length */ + String.Buffer = (PWCHAR)UNICODE_STRING_MAX_CHARS; + String.Length = 2; + Status = RtlpApplyLengthFunction(0, sizeof(String), &String, LengthFunctionCopyLen); + ok_int(String.Length, UNICODE_STRING_MAX_CHARS * sizeof(WCHAR)); + ok_hex(Status, STATUS_SUCCESS); + + String.Buffer = (PWCHAR)(UNICODE_STRING_MAX_CHARS + 1); + String.Length = 2; + Status = RtlpApplyLengthFunction(0, sizeof(String), &String, LengthFunctionCopyLen); + ok_int(String.Length, 2); /* Unchanged */ + ok_hex(Status, STATUS_NAME_TOO_LONG); + + /* Now try it with the RTL_UNICODE_STRING_BUFFER, this works fine on 2k3 but not on Win10!! */ + RtlInitBuffer(&Buffer.ByteBuffer, (PUCHAR)StaticBuffer, sizeof(StaticBuffer)); + /* In this case the Buffer is modified, so we should have a valid UNICODE_STRING! */ + Buffer.String.Length = 5; + Buffer.String.MaximumLength = Buffer.ByteBuffer.StaticSize; + Buffer.String.Buffer = (PWSTR)Buffer.ByteBuffer.Buffer; + wcscpy(StaticBuffer, L"123456789"); + + /* Show that no flag is accepted */ + for (n = 0; n < 32; ++n) + { + Status = RtlpApplyLengthFunction((1 << n), sizeof(Buffer), &Buffer, LengthFunctionFail); + ok_int(Buffer.String.Length, 5); + ok_hex(Status, STATUS_INVALID_PARAMETER); + ok_wstr(StaticBuffer, L"123456789"); + } + + /* Still Length 1 when the function returns an error */ + Status = RtlpApplyLengthFunction(0, sizeof(Buffer), &Buffer, LengthFunctionFail); + ok_int(Buffer.String.Length, 5); + ok_hex(Status, STATUS_INVALID_ACCOUNT_NAME); + ok_wstr(StaticBuffer, L"123456789"); + + Status = RtlpApplyLengthFunction(0, sizeof(Buffer), &Buffer, LengthFunctionOk); + ok_int(Buffer.String.Length, 8); /* Value returned from LengthFunction is multiplied by sizeof(WCHAR) */ + ok_hex(Status, STATUS_SUCCESS); + ok_wstr(StaticBuffer, L"1234"); /* Buffer is truncated */ + ok_wstr(StaticBuffer + 5, L"6789"); /* Rest is not overwritten*/ + + Buffer.String.Length = 1; + wcscpy(StaticBuffer, L"123456789"); + Status = RtlpApplyLengthFunction(0, sizeof(Buffer), &Buffer, LengthFunctionReturn1); + ok_int(Buffer.String.Length, 8); + ok_hex(Status, STATUS_SUCCESS); /* Returns STATUS_SUCCESS regardless of success code from the function */ + ok_wstr(StaticBuffer, L"1234"); /* Buffer is truncated */ + ok_wstr(StaticBuffer + 5, L"6789"); /* Rest is not overwritten*/ +} + diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 8b7df571591..7c9cdb2f694 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -70,6 +70,7 @@ extern void func_RtlIsNameLegalDOS8Dot3(void); extern void func_RtlMemoryStream(void); extern void func_RtlMultipleAllocateHeap(void); extern void func_RtlNtPathNameToDosPathName(void); +extern void func_RtlpApplyLengthFunction(void); extern void func_RtlpEnsureBufferSize(void); extern void func_RtlQueryTimeZoneInformation(void); extern void func_RtlReAllocateHeap(void); @@ -148,6 +149,7 @@ const struct test winetest_testlist[] = { "RtlMemoryStream", func_RtlMemoryStream }, { "RtlMultipleAllocateHeap", func_RtlMultipleAllocateHeap }, { "RtlNtPathNameToDosPathName", func_RtlNtPathNameToDosPathName }, + { "RtlpApplyLengthFunction", func_RtlpApplyLengthFunction }, { "RtlpEnsureBufferSize", func_RtlpEnsureBufferSize }, { "RtlQueryTimeZoneInformation", func_RtlQueryTimeZoneInformation }, { "RtlReAllocateHeap", func_RtlReAllocateHeap }, diff --git a/sdk/lib/rtl/path.c b/sdk/lib/rtl/path.c index 6031ae32087..fb28160141b 100644 --- a/sdk/lib/rtl/path.c +++ b/sdk/lib/rtl/path.c @@ -446,10 +446,49 @@ NTAPI RtlpApplyLengthFunction(IN ULONG Flags, IN ULONG Type, IN PVOID UnicodeStringOrUnicodeStringBuffer, - IN PVOID LengthFunction) + IN NTSTATUS(NTAPI* LengthFunction)(ULONG, PUNICODE_STRING, PULONG)) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PUNICODE_STRING String; + ULONG Length; + + if (Flags || UnicodeStringOrUnicodeStringBuffer == NULL || LengthFunction == NULL) + { + DPRINT1("ERROR: Flags=0x%x, UnicodeStringOrUnicodeStringBuffer=%p, LengthFunction=%p\n", + Flags, UnicodeStringOrUnicodeStringBuffer, LengthFunction); + return STATUS_INVALID_PARAMETER; + } + + if (Type == sizeof(UNICODE_STRING)) + { + String = (PUNICODE_STRING)UnicodeStringOrUnicodeStringBuffer; + } + else if (Type == sizeof(RTL_UNICODE_STRING_BUFFER)) + { + String = &((PRTL_UNICODE_STRING_BUFFER)UnicodeStringOrUnicodeStringBuffer)->String; + } + else + { + DPRINT1("ERROR: Type = %u\n", Type); + return STATUS_INVALID_PARAMETER; + } + + Length = 0; + Status = LengthFunction(0, String, &Length); + if (!NT_SUCCESS(Status)) + return Status; + + if (Length > UNICODE_STRING_MAX_CHARS) + return STATUS_NAME_TOO_LONG; + + String->Length = (USHORT)(Length * sizeof(WCHAR)); + + if (Type == sizeof(RTL_UNICODE_STRING_BUFFER)) + { + String->Buffer[Length] = UNICODE_NULL; + } + + return STATUS_SUCCESS; } NTSTATUS

3 years, 4 months

[reactos] 01/01: [NTOS:SE] Add further remarks in SeQueryInformationToken

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11f239373dfdda7ba700c… commit 11f239373dfdda7ba700ce5556b7621a440b735a Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat May 8 18:11:42 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat May 8 18:11:42 2021 +0200 [NTOS:SE] Add further remarks in SeQueryInformationToken Explicitly mention under remarks that some classes are not implemented for that function, for documentation purposes. No code changes. --- ntoskrnl/se/token.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index bb623ea7c4c..02664c44298 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -1823,6 +1823,12 @@ SeFilterToken(IN PACCESS_TOKEN ExistingToken, * pool memory allocation has failed to satisfy an operation. Otherwise * STATUS_INVALID_INFO_CLASS is returned indicating that the information * class provided is not supported by the routine. + * + * @remarks + * Only certain information classes are not implemented in this function and + * these are TokenOrigin, TokenGroupsAndPrivileges, TokenRestrictedSids and + * TokenSandBoxInert. The following classes are implemented in NtQueryInformationToken + * only. */ NTSTATUS NTAPI

3 years, 4 months

[reactos] 01/01: [SDBINST] Minor quick fixes after merge

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d8b9e1d619f8b44091da… commit 4d8b9e1d619f8b44091dac905453f8587904bb71 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat May 8 18:36:15 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> 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)

3 years, 4 months

[reactos] 01/01: [FONTEXT_APITEST] Test more cases for GetDisplayNameOf

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23b6397ae97bae1cfa8b3… commit 23b6397ae97bae1cfa8b3f5d12582e96fc0ac124 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Apr 7 20:21:32 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 8 15:53:43 2021 +0200 [FONTEXT_APITEST] Test more cases for GetDisplayNameOf --- .../rostests/apitests/fontext/GetDisplayNameOf.cpp | 131 +++++++++++++++++++-- modules/rostests/apitests/fontext/shellext.cpp | 2 +- 2 files changed, 119 insertions(+), 14 deletions(-) diff --git a/modules/rostests/apitests/fontext/GetDisplayNameOf.cpp b/modules/rostests/apitests/fontext/GetDisplayNameOf.cpp index a0c164d6683..f843b2b26b0 100644 --- a/modules/rostests/apitests/fontext/GetDisplayNameOf.cpp +++ b/modules/rostests/apitests/fontext/GetDisplayNameOf.cpp @@ -15,9 +15,27 @@ #include <shlobj.h> #include <shlwapi.h> #include <shellutils.h> +#include <versionhelpers.h> #include "wine/test.h" -static HRESULT Initialize(CComPtr<IShellFolder>& spFolder) +static const CLSID CLSID_FontExt = { 0xBD84B380, 0x8CA2, 0x1069, { 0xAB, 0x1D, 0x08, 0x00, 0x09, 0x48, 0xF5, 0x34 } }; +static BOOL g_bFontFolderWithShellView = FALSE; +static BOOL g_bVistaWorkaround = FALSE; + +static HRESULT GetDisplayName(CComPtr<IShellFolder>& spFolder, LPCITEMIDLIST pidlRelative, SHGDNF uFlags, WCHAR Buf[MAX_PATH]) +{ + STRRET strret; + HRESULT hr = spFolder->GetDisplayNameOf(pidlRelative, uFlags, &strret); + ok_hex(hr, S_OK); + if (FAILED(hr)) + return hr; + + hr = StrRetToBufW(&strret, pidlRelative, Buf, MAX_PATH); + ok_hex(hr, S_OK); + return hr; +} + +static HRESULT Initialize(CComPtr<IShellFolder>& spFolder, WCHAR FolderName[MAX_PATH]) { WCHAR Path[MAX_PATH] = {0}; HRESULT hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, Path); @@ -39,10 +57,21 @@ static HRESULT Initialize(CComPtr<IShellFolder>& spFolder) hr = desktopFolder->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &spFolder)); ok_hex(hr, S_OK); - return hr; + if (FAILED(hr)) + return hr; + + + CComPtr<IShellFolder> psfParent; + LPCITEMIDLIST pidlRelative = NULL; + hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &psfParent), &pidlRelative); + ok_hex(hr, S_OK); + if (FAILED(hr)) + return hr; + + return GetDisplayName(psfParent, pidlRelative, SHGDN_NORMAL, FolderName); } -static void Test_GetDisplayNameOf(CComPtr<IShellFolder>& spFolder) +static void Test_GetDisplayNameOf(CComPtr<IShellFolder>& spFolder, const WCHAR* FolderName) { CComPtr<IEnumIDList> fontsEnum; HRESULT hr = spFolder->EnumObjects(NULL, SHCONTF_NONFOLDERS, &fontsEnum); @@ -52,27 +81,91 @@ static void Test_GetDisplayNameOf(CComPtr<IShellFolder>& spFolder) return; CComHeapPtr<ITEMIDLIST> fontPidl; + + // Get the first item from the folder 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; - WCHAR Buf[MAX_PATH]; - hr = StrRetToBufW(&strret, fontPidl, Buf, _countof(Buf)); - ok_hex(hr, S_OK); - if (FAILED(hr)) + + WCHAR Buf[MAX_PATH], *Ptr; + if (FAILED(GetDisplayName(spFolder, fontPidl, SHGDN_FORPARSING, Buf))) return; // On 2k3 where this is not a custom IShellFolder, it will return something like: + // Same for Vista?? // 'C:\\WINDOWS\\Fonts\\arial.ttf' - // On Vista+ this results in something like: + // On 7+ this results is: // 'C:\\Windows\\Fonts\\System Bold' BOOL bRelative = PathIsRelativeW(Buf); + Ptr = PathFindNextComponentW(Buf); + trace("Path: %s\n", wine_dbgstr_w(Buf)); + ok(bRelative == FALSE, "Path not absolute? (%s)\n", wine_dbgstr_w(Buf)); + ok(Ptr != (Buf + wcslen(Buf)), "Did not find a separator in '%s'!\n", wine_dbgstr_w(Buf)); + + // Expected 'arial.ttf' (2k3), 'Arial' (Vista) or 'System Bold' (7+), 'System \0388\03bd\03c4\03bf\03bd\03b7 \03b3\03c1\03b1\03c6\03ae' in greek + if (FAILED(GetDisplayName(spFolder, fontPidl, SHGDN_INFOLDER, Buf))) + return; + + bRelative = PathIsRelativeW(Buf); + Ptr = PathFindNextComponentW(Buf); + trace("Path: %s\n", wine_dbgstr_w(Buf)); + ok(bRelative != FALSE, "Path not relative? (%s)\n", wine_dbgstr_w(Buf)); + ok(Ptr == (Buf + wcslen(Buf)), "Found a separator in '%s'!\n", wine_dbgstr_w(Buf)); + + // Expected 'arial.ttf' (2k3) or 'Arial' (Vista), 'System Bold' (7+), 'System \0388\03bd\03c4\03bf\03bd\03b7 \03b3\03c1\03b1\03c6\03ae' in greek + if (FAILED(GetDisplayName(spFolder, fontPidl, SHGDN_NORMAL, Buf))) + return; + + bRelative = PathIsRelativeW(Buf); + Ptr = PathFindNextComponentW(Buf); + trace("Path: %s\n", wine_dbgstr_w(Buf)); + ok(bRelative != FALSE, "Path not relative? (%s)\n", wine_dbgstr_w(Buf)); + ok(Ptr == (Buf + wcslen(Buf)), "Found a separator in '%s'!\n", wine_dbgstr_w(Buf)); + + // Expected 'arial.ttf' (2k3), 'C:\\WINDOWS\\Fonts\\arial.ttf' (Vista), 'System Bold' (7+) + if (FAILED(GetDisplayName(spFolder, fontPidl, SHGDN_INFOLDER | SHGDN_FORPARSING, Buf))) + return; + + bRelative = PathIsRelativeW(Buf); + Ptr = PathFindNextComponentW(Buf); trace("Path: %s\n", wine_dbgstr_w(Buf)); - ok(bRelative == FALSE, "Path not relative? (%s)\n", wine_dbgstr_w(Buf)); + if (g_bVistaWorkaround) + { + // Vista is the odd one here + ok(bRelative == FALSE, "Path not absolute? (%s)\n", wine_dbgstr_w(Buf)); + ok(Ptr != (Buf + wcslen(Buf)), "Did not find a separator in '%s'!\n", wine_dbgstr_w(Buf)); + } + else + { + ok(bRelative != FALSE, "Path not relative? (%s)\n", wine_dbgstr_w(Buf)); + ok(Ptr == (Buf + wcslen(Buf)), "Found a separator in '%s'!\n", wine_dbgstr_w(Buf)); + } + + // Expected 'arial.ttf' (2k3), 'Arial' (Vista) or 'Fonts\\System Bold' (7+), 'Fonts\\System \0388\03bd\03c4\03bf\03bd\03b7 \03b3\03c1\03b1\03c6\03ae' in greek + if (FAILED(GetDisplayName(spFolder, fontPidl, SHGDN_FORADDRESSBAR, Buf))) + return; + + bRelative = PathIsRelativeW(Buf); + Ptr = PathFindNextComponentW(Buf); + trace("Path: %s\n", wine_dbgstr_w(Buf)); + ok(bRelative != FALSE, "Path not relative? (%s)\n", wine_dbgstr_w(Buf)); + + // 2k3 does not have a custom IShellFolder, so there this weird behavior does not exist: + // (And vista's version is ???) + if (g_bFontFolderWithShellView || g_bVistaWorkaround) + { + ok(Ptr == (Buf + wcslen(Buf)), "Found a separator in '%s'!\n", wine_dbgstr_w(Buf)); + } + else + { + // For some reason, there is 'Fonts\\' in front of the fontname... + ok(Ptr != (Buf + wcslen(Buf)), "Did not find a separator in '%s'!\n", wine_dbgstr_w(Buf)); + ok(!_wcsnicmp(FolderName, Buf, wcslen(FolderName)), "Result (%s) does not start with fonts folder (%s)\n", + wine_dbgstr_w(Buf), wine_dbgstr_w(FolderName)); + } } @@ -80,12 +173,24 @@ START_TEST(GetDisplayNameOf) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + // Detect if this is an old (2k3) style fontext, or a new one. + // The old one has an IShellView, the new one an IShellFolder + { + CComPtr<IShellView> spView; + HRESULT hr = CoCreateInstance(CLSID_FontExt, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellView, &spView)); + g_bFontFolderWithShellView = SUCCEEDED(hr); + } + + g_bVistaWorkaround = IsWindowsVistaOrGreater() && !IsWindows7OrGreater(); + + trace("Has shellview: %d, Vista: %d\n", g_bFontFolderWithShellView, g_bVistaWorkaround); { CComPtr<IShellFolder> spFolder; - HRESULT hr = Initialize(spFolder); + WCHAR FolderName[MAX_PATH]; + HRESULT hr = Initialize(spFolder, FolderName); if (SUCCEEDED(hr)) { - Test_GetDisplayNameOf(spFolder); + Test_GetDisplayNameOf(spFolder, FolderName); } } diff --git a/modules/rostests/apitests/fontext/shellext.cpp b/modules/rostests/apitests/fontext/shellext.cpp index 00480a7497c..7a23002137a 100644 --- a/modules/rostests/apitests/fontext/shellext.cpp +++ b/modules/rostests/apitests/fontext/shellext.cpp @@ -17,7 +17,7 @@ #include <shellutils.h> #include "wine/test.h" -const CLSID CLSID_FontExt = { 0xBD84B380, 0x8CA2, 0x1069, { 0xAB, 0x1D, 0x08, 0x00, 0x09, 0x48, 0xF5, 0x34 } }; +static const CLSID CLSID_FontExt = { 0xBD84B380, 0x8CA2, 0x1069, { 0xAB, 0x1D, 0x08, 0x00, 0x09, 0x48, 0xF5, 0x34 } }; static DWORD g_WinVersion;

3 years, 4 months

[reactos] 07/07: [SDBINST] Restore file attributes before deleting

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=20c98b31443647316e06c… commit 20c98b31443647316e06c03c4ff336251c5b844a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat May 8 15:49:28 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 8 15:49:28 2021 +0200 [SDBINST] Restore file attributes before deleting --- base/applications/sdbinst/sdbinst.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/base/applications/sdbinst/sdbinst.c b/base/applications/sdbinst/sdbinst.c index fb807e80136..68f31a477bb 100644 --- a/base/applications/sdbinst/sdbinst.c +++ b/base/applications/sdbinst/sdbinst.c @@ -579,7 +579,7 @@ SdbUninstall( if (pdb == NULL) { wprintf(L"Can't open database %ls\n", sdbPath); - goto end; + return FALSE; } tagDb = SdbFindFirstTag(pdb, TAGID_ROOT, TAG_DATABASE); @@ -590,7 +590,7 @@ SdbUninstall( } // - if (!GetSdbGuid(pdb, tagDb, &dbGuid)) + if (!GetSdbGuid(pdb, tagDb, &dbGuid)) { wprintf(L"GetSdbGuid error\n"); goto end; @@ -620,29 +620,32 @@ SdbUninstall( } SdbCloseDatabase(pdb); + pdb = NULL; hres = DeleteUninstallKey(sdbName); if (FAILED(hres)) { wprintf(L"Remove uninstall key fail\n"); - //goto end; } if (!SdbUnregisterDatabase(&dbGuid)) { wprintf(L"SdbUnregisterDatabase\n"); - goto end; + return FALSE; } - if (!DeleteFile(sdbPath)) + SetFileAttributesW(sdbPath, FILE_ATTRIBUTE_NORMAL); + if (!DeleteFileW(sdbPath)) { wprintf(L"Remove file fail 0x%08X\n", GetLastError()); - goto end; + return FALSE; } res = TRUE; end: + if (pdb) + SdbCloseDatabase(pdb); return res; } @@ -871,7 +874,7 @@ int _tmain(int argc, LPWSTR argv[]) } nameSdbStr = argv[i]; - wprintf(L"guidSdbStr %ls\n", nameSdbStr); + wprintf(L"nameSdbStr %ls\n", nameSdbStr); isUninstByName = TRUE; isInstall = FALSE;

3 years, 4 months

[reactos] 06/07: [SDBINST] Add remove Layers call

by Max Korostil

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c4181f534cd99281185bc… commit c4181f534cd99281185bcfa2e96a14d02e4c85e0 Author: Max Korostil <mrmks04(a)yandex.ru> AuthorDate: Tue Jan 12 10:48:20 2021 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 8 14:24:21 2021 +0200 [SDBINST] Add remove Layers call --- base/applications/sdbinst/CMakeLists.txt | 2 +- base/applications/sdbinst/sdbinst.c | 65 ++++++++++++++++++++++---------- 2 files changed, 46 insertions(+), 21 deletions(-) diff --git a/base/applications/sdbinst/CMakeLists.txt b/base/applications/sdbinst/CMakeLists.txt index b33566aa786..6b0e7490265 100644 --- a/base/applications/sdbinst/CMakeLists.txt +++ b/base/applications/sdbinst/CMakeLists.txt @@ -3,5 +3,5 @@ include_directories(${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp) add_executable(sdbinst sdbinst.c) set_module_type(sdbinst win32cui UNICODE) -add_importlibs(sdbinst advapi32 apphelp ole32 msvcrt kernel32 ntdll) +add_importlibs(sdbinst shlwapi advapi32 apphelp ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET sdbinst DESTINATION reactos/system32 FOR all) diff --git a/base/applications/sdbinst/sdbinst.c b/base/applications/sdbinst/sdbinst.c index ed25e70a8f2..fb807e80136 100644 --- a/base/applications/sdbinst/sdbinst.c +++ b/base/applications/sdbinst/sdbinst.c @@ -13,14 +13,18 @@ #include <strsafe.h> #include <objbase.h> #include <apphelp.h> +#include <shlwapi.h> #define APPCOMPAT_CUSTOM_REG_PATH L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Custom" -#define APPCOMPAT_LAYERS_REG_PATH L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers" +#define APPCOMPAT_LAYERS_REG_PATH L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Custom\\Layers" #define APPCOMPAT_INSTALLEDSDB_REG_PATH L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\InstalledSDB" #define UNINSTALL_REG_PATH L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall" #define DBPATH_KEY_NAME L"DatabasePath" #define SDB_EXT L".sdb" #define GUID_STR_LENGTH 38 +#define GUID_SBD_NAME_LENGTH (GUID_STR_LENGTH + ARRAYSIZE(SDB_EXT)) + +BOOL SdbUninstallByGuid(_In_ LPWSTR guidSdbStr); HRESULT RegisterSdbEntry( @@ -48,6 +52,11 @@ RegisterSdbEntry( if (!isInstall) { status = RegDeleteKeyW(HKEY_LOCAL_MACHINE, regName); + if (status == ERROR_FILE_NOT_FOUND) + { + status = ERROR_SUCCESS; + } + return HRESULT_FROM_WIN32(status); } @@ -321,19 +330,16 @@ CopySdbToAppPatch( // Get parent folder fo sdb file CopyMemory(sysdirPath, destSdbPath, destLen * sizeof(WCHAR)); - pTmpSysdir = sysdirPath + destLen; - - while (pTmpSysdir > sysdirPath && *pTmpSysdir != L'\\') - { - *pTmpSysdir = L'\0'; - --pTmpSysdir; - } - - if (pTmpSysdir == sysdirPath) + pTmpSysdir = StrRChrW(sysdirPath, sysdirPath + destLen, L'\\'); + if (pTmpSysdir == NULL) { wprintf(L"Can't find directory separator\n"); goto end; } + else + { + *pTmpSysdir = UNICODE_NULL; + } // Create directory if need if (!CreateDirectory(sysdirPath, NULL)) @@ -402,7 +408,7 @@ SdbInstall( FILETIME systemTime = {0}; ULARGE_INTEGER currentTime = {0}; WCHAR sysdirPatchPath[MAX_PATH]; - WCHAR guidDbStr[GUID_STR_LENGTH + ARRAYSIZE(SDB_EXT) + 1]; + WCHAR guidDbStr[GUID_SBD_NAME_LENGTH]; GetSystemTimeAsFileTime(&systemTime); currentTime.LowPart = systemTime.dwLowDateTime; @@ -430,8 +436,8 @@ SdbInstall( goto end; } - StringFromGUID2(&dbGuid, guidDbStr, MAX_PATH); - HRESULT hres = StringCchCatW(guidDbStr, MAX_PATH, SDB_EXT); + StringFromGUID2(&dbGuid, guidDbStr, GUID_SBD_NAME_LENGTH); + HRESULT hres = StringCchCatW(guidDbStr, GUID_SBD_NAME_LENGTH, SDB_EXT); if (FAILED(hres)) { wprintf(L"StringCchCatW error 0x%08X\n", hres); @@ -550,17 +556,21 @@ SdbUninstall( PDB pdb; TAGID tagDb; GUID dbGuid = {0}; + WCHAR guidDbStr[GUID_SBD_NAME_LENGTH]; SIZE_T sdbPathLen = wcslen(sdbPath); sdbName = sdbPath + sdbPathLen; - wprintf(L"uninstall name %ls\n", sdbPath); - while (*sdbName != L'\\' && sdbPathLen > 0) + wprintf(L"uninstall path %ls\n", sdbPath); + sdbName = StrRChrW(sdbPath, sdbPath + sdbPathLen, L'\\'); + if (sdbName == NULL) { - --sdbName; - --sdbPathLen; + sdbName = sdbPath; + } + else + { + sdbName++; } - sdbName++; wprintf(L"uninstall name %ls\n", sdbName); @@ -586,6 +596,14 @@ SdbUninstall( goto end; } + // Database name must be GUID string + if (wcslen(sdbName) + 1 != GUID_SBD_NAME_LENGTH) + { + StringFromGUID2(&dbGuid, guidDbStr, GUID_SBD_NAME_LENGTH); + SdbCloseDatabase(pdb); + return SdbUninstallByGuid(guidDbStr); + } + //remove regkey in appatch/custom HRESULT hres = ProcessExe(pdb, tagDb, NULL, 0, FALSE); if (FAILED(hres)) @@ -594,12 +612,19 @@ SdbUninstall( goto end; } + hres = ProcessLayers(pdb, tagDb, NULL, 0, FALSE); + if (FAILED(hres)) + { + wprintf(L"Process layers fail\n"); + goto end; + } + SdbCloseDatabase(pdb); hres = DeleteUninstallKey(sdbName); if (FAILED(hres)) { - wprintf(L"Remove key fail\n"); + wprintf(L"Remove uninstall key fail\n"); //goto end; } @@ -877,7 +902,7 @@ int _tmain(int argc, LPWSTR argv[]) if (!success) { - wprintf(L"Sdb install failed\n"); + wprintf(isInstall ? L"Sdb install failed\n" : L"Sdb uninstall failed\n"); return -1; }

3 years, 4 months

[reactos] 05/07: [SDBINST] Update according to review

by Max Korostil

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd34a8a731cf49ba05a9d… commit dd34a8a731cf49ba05a9d2e68782f6b18408e021 Author: Max Korostil <30373544+mrmks04(a)users.noreply.github.com> AuthorDate: Mon Oct 26 23:58:52 2020 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 8 14:24:20 2021 +0200 [SDBINST] Update according to review Replace macroses with unicode functions Minor fixes Replace dynamic allocations Add GUID string validation Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> Co-authored-by: Mark Jansen <mark.jansen(a)reactos.org> --- base/applications/sdbinst/CMakeLists.txt | 3 +- base/applications/sdbinst/sdbinst.c | 280 ++++++++++++------------------- 2 files changed, 106 insertions(+), 177 deletions(-) diff --git a/base/applications/sdbinst/CMakeLists.txt b/base/applications/sdbinst/CMakeLists.txt index 682b84117cb..b33566aa786 100644 --- a/base/applications/sdbinst/CMakeLists.txt +++ b/base/applications/sdbinst/CMakeLists.txt @@ -1,6 +1,7 @@ +project(appcompat) include_directories(${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp) add_executable(sdbinst sdbinst.c) set_module_type(sdbinst win32cui UNICODE) -add_importlibs(sdbinst msvcrt kernel32 ntdll advapi32 apphelp ole32) +add_importlibs(sdbinst advapi32 apphelp ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET sdbinst DESTINATION reactos/system32 FOR all) diff --git a/base/applications/sdbinst/sdbinst.c b/base/applications/sdbinst/sdbinst.c index c4783ae68f7..ed25e70a8f2 100644 --- a/base/applications/sdbinst/sdbinst.c +++ b/base/applications/sdbinst/sdbinst.c @@ -5,22 +5,22 @@ * COPYRIGHT: Copyright 2020 Max Korostil (mrmks04(a)yandex.ru) */ +#include <tchar.h> #include <windef.h> #include <winbase.h> -#include <tchar.h> #include <winreg.h> #include <strsafe.h> #include <objbase.h> #include <apphelp.h> - - #define APPCOMPAT_CUSTOM_REG_PATH L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Custom" #define APPCOMPAT_LAYERS_REG_PATH L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers" #define APPCOMPAT_INSTALLEDSDB_REG_PATH L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\InstalledSDB" #define UNINSTALL_REG_PATH L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall" #define DBPATH_KEY_NAME L"DatabasePath" +#define SDB_EXT L".sdb" +#define GUID_STR_LENGTH 38 HRESULT RegisterSdbEntry( @@ -30,21 +30,14 @@ RegisterSdbEntry( _In_ BOOL isInstall, _In_ BOOL isExe) { - PWCHAR regName; - HKEY hKey = NULL; + WCHAR regName[MAX_PATH]; + HKEY hKey = NULL; LSTATUS status; HRESULT hres; - regName = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); - if (!regName) - { - hres = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); - goto end; - } - ZeroMemory(regName, MAX_PATH * sizeof(WCHAR)); - - hres = StringCchPrintf(regName, MAX_PATH, L"%ls\\%ls", - isExe ? APPCOMPAT_CUSTOM_REG_PATH : APPCOMPAT_LAYERS_REG_PATH, sdbEntryName); + hres = StringCchPrintfW(regName, MAX_PATH, L"%ls\\%ls", + isExe ? APPCOMPAT_CUSTOM_REG_PATH : APPCOMPAT_LAYERS_REG_PATH, + sdbEntryName); if (FAILED(hres)) { wprintf(L"StringCchPrintfW error: 0x%08X\n", hres); @@ -54,12 +47,12 @@ RegisterSdbEntry( // Remove key if (!isInstall) { - status = RegDeleteKey(HKEY_LOCAL_MACHINE, regName); + status = RegDeleteKeyW(HKEY_LOCAL_MACHINE, regName); return HRESULT_FROM_WIN32(status); } // Create main key - status = RegCreateKeyEx(HKEY_LOCAL_MACHINE, + status = RegCreateKeyExW(HKEY_LOCAL_MACHINE, regName, 0, NULL, @@ -68,7 +61,6 @@ RegisterSdbEntry( NULL, &hKey, NULL); - if (status != ERROR_SUCCESS) { wprintf(L"RegKeyCreateEx error: 0x%08X", status); @@ -76,8 +68,8 @@ RegisterSdbEntry( goto end; } - // Set instlled time - status = RegSetValueEx(hKey, + // Set installed time + status = RegSetValueExW(hKey, dbGuid, 0, REG_QWORD, @@ -85,7 +77,7 @@ RegisterSdbEntry( sizeof(time)); if (status != ERROR_SUCCESS) { - wprintf(L"RegSetValueEx error: 0x%08X", status); + wprintf(L"RegSetValueExW error: 0x%08X", status); hres = HRESULT_FROM_WIN32(status); goto end; } @@ -96,11 +88,6 @@ end: RegCloseKey(hKey); } - if (regName) - { - HeapFree(GetProcessHeap(), 0, regName); - } - return hres; } @@ -110,52 +97,41 @@ AddUninstallKey( _In_ LPCWSTR sdbInstalledPath, _In_ LPCWSTR guidDbStr) { - PWCHAR sdbinstPath; - PWCHAR regName; - PWCHAR uninstString; + WCHAR sdbinstPath[MAX_PATH]; + WCHAR regName[MAX_PATH]; + WCHAR uninstString[MAX_PATH]; HKEY hKey = NULL; HRESULT hres; - sdbinstPath = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); - regName = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); - uninstString = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); - - if (!sdbinstPath || !regName || !uninstString) - { - hres = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); - goto end; - } - - ZeroMemory(sdbinstPath, MAX_PATH * sizeof(WCHAR)); - ZeroMemory(regName, MAX_PATH * sizeof(WCHAR)); - ZeroMemory(uninstString, MAX_PATH * sizeof(WCHAR)); - UINT count = GetSystemWindowsDirectory(sdbinstPath, MAX_PATH); if (sdbinstPath[count - 1] != L'\\') { - sdbinstPath[count] = L'\\'; + hres = StringCchCatW(sdbinstPath, MAX_PATH, L"\\"); + if (FAILED(hres)) + { + wprintf(L"StringCchCatW error: 0x%08X", hres); + goto end; + } } // Full path to sdbinst.exe - hres = StringCchCat(sdbinstPath, MAX_PATH, L"System32\\sdbinst.exe"); + hres = StringCchCatW(sdbinstPath, MAX_PATH, L"System32\\sdbinst.exe"); if (FAILED(hres)) { - wprintf(L"StringCchCat error: 0x%08X", hres); + wprintf(L"StringCchCatW error: 0x%08X", hres); + goto end; } // Sdb guid reg key - hres = StringCchPrintf(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)) { wprintf(L"StringCchPrintfW error: 0x%08X", hres); goto end; } - wprintf(L"%ls\n", sdbinstPath); - wprintf(L"%ls\n", regName); - // Create main key - LSTATUS status = RegCreateKeyEx(HKEY_LOCAL_MACHINE, + LSTATUS status = RegCreateKeyExW(HKEY_LOCAL_MACHINE, regName, 0, NULL, @@ -174,7 +150,7 @@ AddUninstallKey( // Set Display name DWORD length = wcslen(dbName) * sizeof(WCHAR); - status = RegSetValueEx(hKey, + status = RegSetValueExW(hKey, L"DisplayName", 0, REG_SZ, @@ -182,13 +158,13 @@ AddUninstallKey( length + sizeof(WCHAR)); if (status != ERROR_SUCCESS) { - wprintf(L"RegSetValueEx error: 0x%08X", status); + wprintf(L"RegSetValueExW error: 0x%08X", status); hres = HRESULT_FROM_WIN32(status); goto end; } // Uninstall full string - hres = StringCchPrintf(uninstString, MAX_PATH, L"%ls -u \"%ls\"", sdbinstPath, sdbInstalledPath); + hres = StringCchPrintfW(uninstString, MAX_PATH, L"%ls -u \"%ls\"", sdbinstPath, sdbInstalledPath); if (FAILED(hres)) { wprintf(L"StringCchPrintfW error: 0x%08X", hres); @@ -197,7 +173,7 @@ AddUninstallKey( // Set uninstall string length = wcslen(uninstString) * sizeof(WCHAR); - status = RegSetValueEx(hKey, + status = RegSetValueExW(hKey, L"UninstallString", 0, REG_SZ, @@ -205,7 +181,7 @@ AddUninstallKey( length + sizeof(WCHAR)); if (status != ERROR_SUCCESS) { - wprintf(L"RegSetValueEx error: 0x%08X", status); + wprintf(L"RegSetValueExW error: 0x%08X", status); hres = HRESULT_FROM_WIN32(status); goto end; } @@ -216,21 +192,6 @@ end: RegCloseKey(hKey); } - if (sdbinstPath) - { - HeapFree(GetProcessHeap(), 0, sdbinstPath); - } - - if (regName) - { - HeapFree(GetProcessHeap(), 0, regName); - } - - if (uninstString) - { - HeapFree(GetProcessHeap(), 0, uninstString); - } - return hres; } @@ -246,7 +207,6 @@ GetSdbGuid( TAGID tagDbId; tagDbId = SdbFindFirstTag(pdb, tagDb, TAG_DATABASE_ID); - if (!tagDbId) { wprintf(L"Can't find database id tag"); @@ -276,7 +236,7 @@ ProcessLayers( TAGID tagLayer = SdbFindFirstTag(pdb, tagDb, TAG_LAYER); - // Add all exe to registry (AppCompatFlags) + // Add all layers to registry (AppCompatFlags) while (tagLayer && (tagLayer != prevTagLayer)) { tagLayerName = SdbFindFirstTag(pdb, tagLayer, TAG_NAME); @@ -287,7 +247,6 @@ ProcessLayers( } LPWSTR name = SdbGetStringTagPtr(pdb, tagLayerName); - wprintf(L"Layer name %ls", name); res = RegisterSdbEntry(name, guidDbStr, time, isInstall, FALSE); if (FAILED(res)) @@ -329,7 +288,6 @@ ProcessExe( } LPWSTR name = SdbGetStringTagPtr(pdb, tagExeName); - wprintf(L"Exe name %ls\n", name); res = RegisterSdbEntry(name, guidDbStr, time, isInstall, TRUE); if (FAILED(res)) @@ -365,13 +323,17 @@ CopySdbToAppPatch( CopyMemory(sysdirPath, destSdbPath, destLen * sizeof(WCHAR)); pTmpSysdir = sysdirPath + destLen; - while (*pTmpSysdir != L'\\') + while (pTmpSysdir > sysdirPath && *pTmpSysdir != L'\\') { *pTmpSysdir = L'\0'; --pTmpSysdir; } - wprintf(L"%ls\n", sysdirPath); + if (pTmpSysdir == sysdirPath) + { + wprintf(L"Can't find directory separator\n"); + goto end; + } // Create directory if need if (!CreateDirectory(sysdirPath, NULL)) @@ -379,7 +341,7 @@ CopySdbToAppPatch( error = GetLastError(); if (error != ERROR_ALREADY_EXISTS) { - wprintf(L"Can't create folder %ls\n Error: 0x%08\n", sysdirPath, error); + wprintf(L"Can't create folder %ls\n Error: 0x%08X\n", sysdirPath, error); goto end; } error = ERROR_SUCCESS; @@ -392,34 +354,37 @@ CopySdbToAppPatch( wprintf(L"Can't copy sdb file"); } - HeapFree(GetProcessHeap(), 0, sysdirPath); - end: + if (sysdirPath) + { + HeapFree(GetProcessHeap(), 0, sysdirPath); + } + return HRESULT_FROM_WIN32(error); } HRESULT BuildPathToSdb( - _In_ PWCHAR* buffer, + _In_ PWCHAR buffer, _In_ SIZE_T bufLen, _In_ LPCWSTR guidDbStr) { - PWCHAR pBuffer = *buffer; - ZeroMemory(pBuffer, bufLen * sizeof(WCHAR)); + ZeroMemory(buffer, bufLen * sizeof(WCHAR)); - UINT count = GetSystemWindowsDirectory(pBuffer, bufLen); - if (pBuffer[count - 1] != L'\\') + // Can't use here SdbGetAppPatchDir, because Windows XP haven't this function + UINT count = GetSystemWindowsDirectory(buffer, bufLen); + if (buffer[count - 1] != L'\\') { - pBuffer[count] = L'\\'; + buffer[count] = L'\\'; } - HRESULT res = StringCchCatW(pBuffer, bufLen, L"AppPatch\\Custom\\"); + HRESULT res = StringCchCatW(buffer, bufLen, L"AppPatch\\Custom\\"); if (FAILED(res)) { goto end; } - res = StringCchCatW(pBuffer, bufLen, guidDbStr); + res = StringCchCatW(buffer, bufLen, guidDbStr); end: return res; @@ -436,15 +401,8 @@ SdbInstall( GUID dbGuid = {0}; FILETIME systemTime = {0}; ULARGE_INTEGER currentTime = {0}; - PWCHAR sysdirPatchPath = NULL; - PWCHAR guidDbStr; - - guidDbStr = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); - if (!guidDbStr) - { - goto end; - } - ZeroMemory(guidDbStr, MAX_PATH * sizeof(WCHAR)); + WCHAR sysdirPatchPath[MAX_PATH]; + WCHAR guidDbStr[GUID_STR_LENGTH + ARRAYSIZE(SDB_EXT) + 1]; GetSystemTimeAsFileTime(&systemTime); currentTime.LowPart = systemTime.dwLowDateTime; @@ -473,7 +431,7 @@ SdbInstall( } StringFromGUID2(&dbGuid, guidDbStr, MAX_PATH); - HRESULT hres = StringCchCatW(guidDbStr, MAX_PATH, L".sdb"); + HRESULT hres = StringCchCatW(guidDbStr, MAX_PATH, SDB_EXT); if (FAILED(hres)) { wprintf(L"StringCchCatW error 0x%08X\n", hres); @@ -508,11 +466,8 @@ SdbInstall( goto end; } - SIZE_T bufLen = MAX_PATH * 2; - sysdirPatchPath = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, bufLen * sizeof(WCHAR)); - - // Create full path tos db in system folder - hres = BuildPathToSdb(&sysdirPatchPath, bufLen, guidDbStr); + // Create full path to sdb in system folder + hres = BuildPathToSdb(sysdirPatchPath, ARRAYSIZE(sysdirPatchPath), guidDbStr); if (FAILED(hres)) { wprintf(L"Build path error\n"); @@ -533,7 +488,7 @@ SdbInstall( // Registration if (!SdbRegisterDatabaseEx(sysdirPatchPath, SDB_DATABASE_SHIM, &currentTime.QuadPart)) { - wprintf(L"SdbRegisterDatabaseEx UNSUCCESS"); + wprintf(L"SdbRegisterDatabaseEx failed"); goto end; } @@ -545,16 +500,6 @@ end: SdbCloseDatabase(pdb); } - if (sysdirPatchPath) - { - HeapFree(GetProcessHeap(), 0, sysdirPatchPath); - } - - if (guidDbStr) - { - HeapFree(GetProcessHeap(), 0, guidDbStr); - } - return res; } @@ -565,7 +510,7 @@ DeleteUninstallKey( HKEY hKey = NULL; HRESULT hres = HRESULT_FROM_WIN32(ERROR_SUCCESS); - LSTATUS status = RegCreateKeyEx(HKEY_LOCAL_MACHINE, + LSTATUS status = RegCreateKeyExW(HKEY_LOCAL_MACHINE, UNINSTALL_REG_PATH, 0, NULL, @@ -581,7 +526,7 @@ DeleteUninstallKey( goto end; } - status = RegDeleteKey(hKey, keyName); + status = RegDeleteKeyW(hKey, keyName); if (status != ERROR_SUCCESS) { hres = HRESULT_FROM_WIN32(status); @@ -676,8 +621,25 @@ end: return res; } -#define BUFFER_SIZE (MAX_PATH * sizeof(WCHAR) + sizeof(WCHAR)) -#define STRING_LEN (MAX_PATH + 1) +BOOL +ValidateGuidString( + _In_ PWCHAR guidStr) +{ + ULONG length = wcslen(guidStr); + + if (length == GUID_STR_LENGTH && + guidStr[0] == L'{' && + guidStr[GUID_STR_LENGTH - 1] == L'}' && + guidStr[9] == L'-' && + guidStr[14] == L'-' && + guidStr[19] == L'-' && + guidStr[24] == L'-') + { + return TRUE; + } + + return FALSE; +} BOOL SdbUninstallByGuid( @@ -687,24 +649,24 @@ SdbUninstallByGuid( HKEY hKey = NULL; HKEY guidKey = NULL; LSTATUS status; - DWORD keyValSize = BUFFER_SIZE; - PWCHAR dbPath = NULL; + WCHAR dbPath[MAX_PATH]; + DWORD keyValSize = sizeof(dbPath); - dbPath = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); - if (!dbPath) + if (!ValidateGuidString(guidSdbStr)) { - goto end; + wprintf(L"Invalid GUID: %ls\n", guidSdbStr); + return res; } - status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, APPCOMPAT_INSTALLEDSDB_REG_PATH, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); + status = RegOpenKeyExW(HKEY_LOCAL_MACHINE, APPCOMPAT_INSTALLEDSDB_REG_PATH, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); if (status != ERROR_SUCCESS) { - wprintf(L"RegOpenKey error: 0x%08X", status); + wprintf(L"RegOpenKeyW error: 0x%08X", status); goto end; } - status = RegOpenKeyEx(hKey, guidSdbStr, 0, KEY_READ | KEY_QUERY_VALUE, &guidKey); + status = RegOpenKeyExW(hKey, guidSdbStr, 0, KEY_READ | KEY_QUERY_VALUE, &guidKey); if (status != ERROR_SUCCESS) { @@ -712,21 +674,16 @@ SdbUninstallByGuid( goto end; } - status = RegQueryValueEx(guidKey, DBPATH_KEY_NAME, NULL, NULL, (LPBYTE)dbPath, &keyValSize); + status = RegQueryValueExW(guidKey, DBPATH_KEY_NAME, NULL, NULL, (LPBYTE)dbPath, &keyValSize); if (status != ERROR_SUCCESS) { - wprintf(L"RegQueryValueEx: 0x%08X\n", status); + wprintf(L"RegQueryValueExW: 0x%08X\n", status); goto end; } res = SdbUninstall(dbPath); end: - if (dbPath) - { - HeapFree(GetProcessHeap(), 0, dbPath); - } - if (hKey) { RegCloseKey(hKey); @@ -748,31 +705,18 @@ SdbUninstallByName( LSTATUS status; HKEY hKey = NULL; HKEY subKey = NULL; - DWORD index = 0; - DWORD keyNameLen = STRING_LEN; - PWCHAR keyName = NULL; + DWORD index = 0; + WCHAR keyName[MAX_PATH]; + DWORD keyNameLen = ARRAYSIZE(keyName); DWORD keyValSize; - PWCHAR dbDescript = NULL; - PWCHAR dbPath = NULL; - - keyName = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); - dbDescript = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); - dbPath = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); - - if (!keyName || !dbDescript || !dbPath) - { - goto end; - } - - ZeroMemory(keyName, BUFFER_SIZE); - ZeroMemory(dbDescript, BUFFER_SIZE); - ZeroMemory(dbPath, BUFFER_SIZE); + WCHAR dbDescript[MAX_PATH]; + WCHAR dbPath[MAX_PATH]; - status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, APPCOMPAT_INSTALLEDSDB_REG_PATH, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); + status = RegOpenKeyExW(HKEY_LOCAL_MACHINE, APPCOMPAT_INSTALLEDSDB_REG_PATH, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); if (status != ERROR_SUCCESS) { - wprintf(L"RegOpenKey error: 0x%08X", status); + wprintf(L"RegOpenKeyW error: 0x%08X", status); goto end; } @@ -782,14 +726,14 @@ SdbUninstallByName( // Search db guid by name while (status == ERROR_SUCCESS) { - status = RegOpenKeyEx(hKey, keyName, 0, KEY_READ | KEY_QUERY_VALUE, &subKey); + status = RegOpenKeyExW(hKey, keyName, 0, KEY_READ | KEY_QUERY_VALUE, &subKey); if (status != ERROR_SUCCESS) { break; } - keyValSize = BUFFER_SIZE; - status = RegQueryValueEx(subKey, L"DatabaseDescription", NULL, NULL, (LPBYTE)dbDescript, &keyValSize); + keyValSize = sizeof(dbDescript); + status = RegQueryValueExW(subKey, L"DatabaseDescription", NULL, NULL, (LPBYTE)dbDescript, &keyValSize); if (status != ERROR_SUCCESS) { break; @@ -800,8 +744,8 @@ SdbUninstallByName( if (_wcsnicmp(dbDescript, nameSdbStr, keyNameLen) == 0) { // Take db full path - keyValSize = BUFFER_SIZE; - status = RegQueryValueEx(subKey, DBPATH_KEY_NAME, NULL, NULL, (LPBYTE)dbPath, &keyValSize); + keyValSize = sizeof(dbPath); + status = RegQueryValueExW(subKey, DBPATH_KEY_NAME, NULL, NULL, (LPBYTE)dbPath, &keyValSize); if (status != ERROR_SUCCESS) { dbPath[0] = UNICODE_NULL; @@ -818,8 +762,8 @@ SdbUninstallByName( keyName[0] = UNICODE_NULL; ++index; - keyNameLen = STRING_LEN; - status = RegEnumKeyEx(hKey, index, keyName, &keyNameLen, NULL, NULL, NULL, NULL); + keyNameLen = ARRAYSIZE(keyName); + status = RegEnumKeyExW(hKey, index, keyName, &keyNameLen, NULL, NULL, NULL, NULL); } RegCloseKey(hKey); @@ -830,21 +774,6 @@ SdbUninstallByName( } end: - if (dbPath) - { - HeapFree(GetProcessHeap(), 0, dbPath); - } - - if (dbDescript) - { - HeapFree(GetProcessHeap(), 0, dbDescript); - } - - if (keyName) - { - HeapFree(GetProcessHeap(), 0, keyName); - } - return res; } @@ -854,7 +783,6 @@ ShowHelp() { wprintf(L"Using: sdbinst [-?][-q][-u][-g][-n] foo.sdb | {guid} | \"name\" \n" L"-? - show help\n" - //L"-q - silence mode\n" L"-u - uninstall\n" L"-g - {guid} file guid (only uninstall)\n" L"-n - \"name\" - file name (only uninstall)\n");

3 years, 4 months

[reactos] 04/07: [SDBINST] Add uninstall by guid and name

by Max Korostil

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4a9879583a0e126fda04… commit d4a9879583a0e126fda04679d0ac620b03f770b6 Author: Max Korostil <mrmks04(a)yandex.ru> AuthorDate: Sun Oct 25 04:03:34 2020 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 8 14:24:20 2021 +0200 [SDBINST] Add uninstall by guid and name --- base/applications/sdbinst/sdbinst.c | 350 +++++++++++++++++++++++++++++++++--- 1 file changed, 324 insertions(+), 26 deletions(-) diff --git a/base/applications/sdbinst/sdbinst.c b/base/applications/sdbinst/sdbinst.c index f124c667820..c4783ae68f7 100644 --- a/base/applications/sdbinst/sdbinst.c +++ b/base/applications/sdbinst/sdbinst.c @@ -1,4 +1,11 @@ -#define WIN32_NO_STATUS +/* + * PROJECT: ReactOS sdbinst + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Application compatibility database installer + * COPYRIGHT: Copyright 2020 Max Korostil (mrmks04(a)yandex.ru) + */ + + #include <windef.h> #include <winbase.h> #include <tchar.h> @@ -11,7 +18,9 @@ #define APPCOMPAT_CUSTOM_REG_PATH L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Custom" #define APPCOMPAT_LAYERS_REG_PATH L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers" +#define APPCOMPAT_INSTALLEDSDB_REG_PATH L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\InstalledSDB" #define UNINSTALL_REG_PATH L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall" +#define DBPATH_KEY_NAME L"DatabasePath" HRESULT RegisterSdbEntry( @@ -21,11 +30,20 @@ RegisterSdbEntry( _In_ BOOL isInstall, _In_ BOOL isExe) { - WCHAR regName[MAX_PATH] = {0}; - HKEY hKey; + PWCHAR regName; + HKEY hKey = NULL; LSTATUS status; + HRESULT hres; + + regName = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + if (!regName) + { + hres = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); + goto end; + } + ZeroMemory(regName, MAX_PATH * sizeof(WCHAR)); - HRESULT hres = StringCchPrintf(regName, sizeof(regName) / sizeof(WCHAR), L"%ls\\%ls", + hres = StringCchPrintf(regName, MAX_PATH, L"%ls\\%ls", isExe ? APPCOMPAT_CUSTOM_REG_PATH : APPCOMPAT_LAYERS_REG_PATH, sdbEntryName); if (FAILED(hres)) { @@ -73,6 +91,16 @@ RegisterSdbEntry( } end: + if (hKey) + { + RegCloseKey(hKey); + } + + if (regName) + { + HeapFree(GetProcessHeap(), 0, regName); + } + return hres; } @@ -82,27 +110,41 @@ AddUninstallKey( _In_ LPCWSTR sdbInstalledPath, _In_ LPCWSTR guidDbStr) { - WCHAR sdbinstPath[MAX_PATH] = {0}; - WCHAR regName[MAX_PATH] = {0}; - WCHAR uninstString[MAX_PATH * 2] = {0}; - HKEY hKey; + PWCHAR sdbinstPath; + PWCHAR regName; + PWCHAR uninstString; + HKEY hKey = NULL; HRESULT hres; - UINT count = GetSystemWindowsDirectory(sdbinstPath, sizeof(sdbinstPath) / sizeof(WCHAR)); + sdbinstPath = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + regName = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + uninstString = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + + if (!sdbinstPath || !regName || !uninstString) + { + hres = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); + goto end; + } + + ZeroMemory(sdbinstPath, MAX_PATH * sizeof(WCHAR)); + ZeroMemory(regName, MAX_PATH * sizeof(WCHAR)); + ZeroMemory(uninstString, MAX_PATH * sizeof(WCHAR)); + + UINT count = GetSystemWindowsDirectory(sdbinstPath, MAX_PATH); if (sdbinstPath[count - 1] != L'\\') { sdbinstPath[count] = L'\\'; } // Full path to sdbinst.exe - hres = StringCchCat(sdbinstPath, sizeof(sdbinstPath) / sizeof(WCHAR), L"System32\\sdbinst.exe"); + hres = StringCchCat(sdbinstPath, MAX_PATH, L"System32\\sdbinst.exe"); if (FAILED(hres)) { wprintf(L"StringCchCat error: 0x%08X", hres); } // Sdb guid reg key - hres = StringCchPrintf(regName, sizeof(regName) / sizeof(WCHAR), L"%ls\\%ls", UNINSTALL_REG_PATH, guidDbStr); + hres = StringCchPrintf(regName, MAX_PATH, L"%ls\\%ls", UNINSTALL_REG_PATH, guidDbStr); if (FAILED(hres)) { wprintf(L"StringCchPrintfW error: 0x%08X", hres); @@ -146,7 +188,7 @@ AddUninstallKey( } // Uninstall full string - hres = StringCchPrintf(uninstString, sizeof(uninstString) / sizeof(WCHAR), L"%ls -u \"%ls\"", sdbinstPath, sdbInstalledPath); + hres = StringCchPrintf(uninstString, MAX_PATH, L"%ls -u \"%ls\"", sdbinstPath, sdbInstalledPath); if (FAILED(hres)) { wprintf(L"StringCchPrintfW error: 0x%08X", hres); @@ -169,6 +211,25 @@ AddUninstallKey( } end: + if (hKey) + { + RegCloseKey(hKey); + } + + if (sdbinstPath) + { + HeapFree(GetProcessHeap(), 0, sdbinstPath); + } + + if (regName) + { + HeapFree(GetProcessHeap(), 0, regName); + } + + if (uninstString) + { + HeapFree(GetProcessHeap(), 0, uninstString); + } return hres; } @@ -376,7 +437,14 @@ SdbInstall( FILETIME systemTime = {0}; ULARGE_INTEGER currentTime = {0}; PWCHAR sysdirPatchPath = NULL; - WCHAR guidDbStr[MAX_PATH] = {0}; + PWCHAR guidDbStr; + + guidDbStr = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + if (!guidDbStr) + { + goto end; + } + ZeroMemory(guidDbStr, MAX_PATH * sizeof(WCHAR)); GetSystemTimeAsFileTime(&systemTime); currentTime.LowPart = systemTime.dwLowDateTime; @@ -405,14 +473,14 @@ SdbInstall( } StringFromGUID2(&dbGuid, guidDbStr, MAX_PATH); - HRESULT hres = StringCchCatW(guidDbStr, sizeof(guidDbStr) / sizeof(WCHAR), L".sdb"); + HRESULT hres = StringCchCatW(guidDbStr, MAX_PATH, L".sdb"); if (FAILED(hres)) { wprintf(L"StringCchCatW error 0x%08X\n", hres); goto end; } - wprintf(L"Database guid %wZ\n", &guidDbStr); + wprintf(L"Database guid %ls\n", guidDbStr); tagDbName = SdbFindFirstTag(pdb, tagDb, TAG_NAME); if (!tagDbName) @@ -477,6 +545,16 @@ end: SdbCloseDatabase(pdb); } + if (sysdirPatchPath) + { + HeapFree(GetProcessHeap(), 0, sysdirPatchPath); + } + + if (guidDbStr) + { + HeapFree(GetProcessHeap(), 0, guidDbStr); + } + return res; } @@ -484,7 +562,7 @@ HRESULT DeleteUninstallKey( _In_ LPCWSTR keyName) { - HKEY hKey; + HKEY hKey = NULL; HRESULT hres = HRESULT_FROM_WIN32(ERROR_SUCCESS); LSTATUS status = RegCreateKeyEx(HKEY_LOCAL_MACHINE, @@ -510,6 +588,11 @@ DeleteUninstallKey( } end: + if (hKey) + { + RegCloseKey(hKey); + } + return hres; } @@ -521,14 +604,16 @@ SdbUninstall( PWCHAR sdbName = NULL; PDB pdb; TAGID tagDb; - GUID dbGuid; + GUID dbGuid = {0}; SIZE_T sdbPathLen = wcslen(sdbPath); sdbName = sdbPath + sdbPathLen; - while (*sdbName != L'\\') + wprintf(L"uninstall name %ls\n", sdbPath); + while (*sdbName != L'\\' && sdbPathLen > 0) { --sdbName; + --sdbPathLen; } sdbName++; @@ -570,7 +655,7 @@ SdbUninstall( if (FAILED(hres)) { wprintf(L"Remove key fail\n"); - goto end; + //goto end; } if (!SdbUnregisterDatabase(&dbGuid)) @@ -585,10 +670,183 @@ SdbUninstall( goto end; } + res = TRUE; + end: return res; } +#define BUFFER_SIZE (MAX_PATH * sizeof(WCHAR) + sizeof(WCHAR)) +#define STRING_LEN (MAX_PATH + 1) + +BOOL +SdbUninstallByGuid( + _In_ LPWSTR guidSdbStr) +{ + BOOL res = FALSE; + HKEY hKey = NULL; + HKEY guidKey = NULL; + LSTATUS status; + DWORD keyValSize = BUFFER_SIZE; + PWCHAR dbPath = NULL; + + dbPath = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); + if (!dbPath) + { + goto end; + } + + status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, APPCOMPAT_INSTALLEDSDB_REG_PATH, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); + + if (status != ERROR_SUCCESS) + { + wprintf(L"RegOpenKey error: 0x%08X", status); + goto end; + } + + status = RegOpenKeyEx(hKey, guidSdbStr, 0, KEY_READ | KEY_QUERY_VALUE, &guidKey); + + if (status != ERROR_SUCCESS) + { + wprintf(L"Cant open key: 0x%08X %ls\n", status, guidSdbStr); + goto end; + } + + status = RegQueryValueEx(guidKey, DBPATH_KEY_NAME, NULL, NULL, (LPBYTE)dbPath, &keyValSize); + if (status != ERROR_SUCCESS) + { + wprintf(L"RegQueryValueEx: 0x%08X\n", status); + goto end; + } + + res = SdbUninstall(dbPath); + +end: + if (dbPath) + { + HeapFree(GetProcessHeap(), 0, dbPath); + } + + if (hKey) + { + RegCloseKey(hKey); + } + + if (guidKey) + { + RegCloseKey(guidKey); + } + + return res; +} + +BOOL +SdbUninstallByName( + _In_ LPWSTR nameSdbStr) +{ + BOOL res = FALSE; + LSTATUS status; + HKEY hKey = NULL; + HKEY subKey = NULL; + DWORD index = 0; + DWORD keyNameLen = STRING_LEN; + PWCHAR keyName = NULL; + DWORD keyValSize; + PWCHAR dbDescript = NULL; + PWCHAR dbPath = NULL; + + keyName = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); + dbDescript = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); + dbPath = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); + + if (!keyName || !dbDescript || !dbPath) + { + goto end; + } + + ZeroMemory(keyName, BUFFER_SIZE); + ZeroMemory(dbDescript, BUFFER_SIZE); + ZeroMemory(dbPath, BUFFER_SIZE); + + status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, APPCOMPAT_INSTALLEDSDB_REG_PATH, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); + + if (status != ERROR_SUCCESS) + { + wprintf(L"RegOpenKey error: 0x%08X", status); + goto end; + } + + 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 + while (status == ERROR_SUCCESS) + { + status = RegOpenKeyEx(hKey, keyName, 0, KEY_READ | KEY_QUERY_VALUE, &subKey); + if (status != ERROR_SUCCESS) + { + break; + } + + keyValSize = BUFFER_SIZE; + status = RegQueryValueEx(subKey, L"DatabaseDescription", NULL, NULL, (LPBYTE)dbDescript, &keyValSize); + if (status != ERROR_SUCCESS) + { + break; + } + + wprintf(L"dbdescript: %ls \n", dbDescript); + + if (_wcsnicmp(dbDescript, nameSdbStr, keyNameLen) == 0) + { + // Take db full path + keyValSize = BUFFER_SIZE; + status = RegQueryValueEx(subKey, DBPATH_KEY_NAME, NULL, NULL, (LPBYTE)dbPath, &keyValSize); + if (status != ERROR_SUCCESS) + { + dbPath[0] = UNICODE_NULL; + break; + } + + wprintf(L"dbpath: 0x%08X %ls \n", status, dbPath); + RegCloseKey(subKey); + break; + } + + RegCloseKey(subKey); + + keyName[0] = UNICODE_NULL; + + ++index; + keyNameLen = STRING_LEN; + status = RegEnumKeyEx(hKey, index, keyName, &keyNameLen, NULL, NULL, NULL, NULL); + } + + RegCloseKey(hKey); + + if (dbPath[0] != UNICODE_NULL) + { + res = SdbUninstall(dbPath); + } + +end: + if (dbPath) + { + HeapFree(GetProcessHeap(), 0, dbPath); + } + + if (dbDescript) + { + HeapFree(GetProcessHeap(), 0, dbDescript); + } + + if (keyName) + { + HeapFree(GetProcessHeap(), 0, keyName); + } + + return res; +} void @@ -596,7 +854,7 @@ ShowHelp() { wprintf(L"Using: sdbinst [-?][-q][-u][-g][-n] foo.sdb | {guid} | \"name\" \n" L"-? - show help\n" - L"-q - silence mode\n" + //L"-q - silence mode\n" L"-u - uninstall\n" L"-g - {guid} file guid (only uninstall)\n" L"-n - \"name\" - file name (only uninstall)\n"); @@ -606,7 +864,11 @@ int _tmain(int argc, LPWSTR argv[]) { LPWSTR sdbPath = NULL; BOOL isInstall = TRUE; - //LPWSTR guidSdbStr = NULL; + BOOL isUninstByGuid = FALSE; + BOOL isUninstByName = FALSE; + BOOL success = FALSE; + LPWSTR guidSdbStr = NULL; + LPWSTR nameSdbStr = NULL; if (argc < 2) { @@ -635,24 +897,60 @@ int _tmain(int argc, LPWSTR argv[]) case L'g': ++i; - if (i < argc) + if (i >= argc) { return ERROR_INVALID_PARAMETER; } - //guidSdbStr = argv[i]; + guidSdbStr = argv[i]; + wprintf(L"guidSdbStr %ls\n", guidSdbStr); + + isUninstByGuid = TRUE; + isInstall = FALSE; + break; + + case L'n': + ++i; + + if (i >= argc) + { + return ERROR_INVALID_PARAMETER; + } + + nameSdbStr = argv[i]; + wprintf(L"guidSdbStr %ls\n", nameSdbStr); + + isUninstByName = TRUE; + isInstall = FALSE; break; } } if (isInstall) { - SdbInstall(sdbPath); + wprintf(L"install\n"); + success = SdbInstall(sdbPath); + } + else if (isUninstByGuid) + { + wprintf(L"uninstall by guid\n"); + success = SdbUninstallByGuid(guidSdbStr); + } + else if (isUninstByName) + { + wprintf(L"uninstall by name\n"); + success = SdbUninstallByName(nameSdbStr); } else { - // call uninstall - SdbUninstall(sdbPath); + wprintf(L"uninstall\n"); + success = SdbUninstall(sdbPath); + } + + if (!success) + { + wprintf(L"Sdb install failed\n"); + return -1; } return ERROR_SUCCESS;

3 years, 4 months

[reactos] 03/07: [SDBINST] Add uninstall option

by Max Korostil

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fd004e50b2fe8b652975… commit 7fd004e50b2fe8b6529757ecfa595704e2b9fad0 Author: Max Korostil <mrmks04(a)yandex.ru> AuthorDate: Thu Oct 22 22:45:20 2020 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 8 14:24:20 2021 +0200 [SDBINST] Add uninstall option --- base/applications/sdbinst/sdbinst.c | 257 ++++++++++++++++++++++++++++++------ dll/appcompat/apphelp/apphelp.h | 1 + 2 files changed, 218 insertions(+), 40 deletions(-) diff --git a/base/applications/sdbinst/sdbinst.c b/base/applications/sdbinst/sdbinst.c index 530071d1749..f124c667820 100644 --- a/base/applications/sdbinst/sdbinst.c +++ b/base/applications/sdbinst/sdbinst.c @@ -9,34 +9,47 @@ -#define APPCOMPAT_REG_PATH L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Custom\\" +#define APPCOMPAT_CUSTOM_REG_PATH L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Custom" +#define APPCOMPAT_LAYERS_REG_PATH L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers" #define UNINSTALL_REG_PATH L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall" HRESULT RegisterSdbEntry( _In_ PWCHAR sdbEntryName, _In_ LPCWSTR dbGuid, - _In_ ULONGLONG time) + _In_ ULONGLONG time, + _In_ BOOL isInstall, + _In_ BOOL isExe) { WCHAR regName[MAX_PATH] = {0}; HKEY hKey; + LSTATUS status; - HRESULT hres = StringCchPrintf(regName, sizeof(regName) / sizeof(WCHAR), L"%ls\\%ls", APPCOMPAT_REG_PATH, sdbEntryName); + HRESULT hres = StringCchPrintf(regName, sizeof(regName) / sizeof(WCHAR), L"%ls\\%ls", + isExe ? APPCOMPAT_CUSTOM_REG_PATH : APPCOMPAT_LAYERS_REG_PATH, sdbEntryName); if (FAILED(hres)) { - wprintf(L"StringCchPrintfW error: 0x%08X", hres); + wprintf(L"StringCchPrintfW error: 0x%08X\n", hres); goto end; } - LSTATUS status = RegCreateKeyEx(HKEY_LOCAL_MACHINE, - regName, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hKey, - NULL); + // Remove key + if (!isInstall) + { + status = RegDeleteKey(HKEY_LOCAL_MACHINE, regName); + return HRESULT_FROM_WIN32(status); + } + + // Create main key + status = RegCreateKeyEx(HKEY_LOCAL_MACHINE, + regName, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hKey, + NULL); if (status != ERROR_SUCCESS) { @@ -45,6 +58,7 @@ RegisterSdbEntry( goto end; } + // Set instlled time status = RegSetValueEx(hKey, dbGuid, 0, @@ -80,12 +94,14 @@ AddUninstallKey( sdbinstPath[count] = L'\\'; } + // Full path to sdbinst.exe hres = StringCchCat(sdbinstPath, sizeof(sdbinstPath) / sizeof(WCHAR), L"System32\\sdbinst.exe"); if (FAILED(hres)) { wprintf(L"StringCchCat error: 0x%08X", hres); } + // Sdb guid reg key hres = StringCchPrintf(regName, sizeof(regName) / sizeof(WCHAR), L"%ls\\%ls", UNINSTALL_REG_PATH, guidDbStr); if (FAILED(hres)) { @@ -96,6 +112,7 @@ AddUninstallKey( wprintf(L"%ls\n", sdbinstPath); wprintf(L"%ls\n", regName); + // Create main key LSTATUS status = RegCreateKeyEx(HKEY_LOCAL_MACHINE, regName, 0, @@ -113,6 +130,7 @@ AddUninstallKey( goto end; } + // Set Display name DWORD length = wcslen(dbName) * sizeof(WCHAR); status = RegSetValueEx(hKey, L"DisplayName", @@ -127,7 +145,7 @@ AddUninstallKey( goto end; } - // Uninst string + // Uninstall full string hres = StringCchPrintf(uninstString, sizeof(uninstString) / sizeof(WCHAR), L"%ls -u \"%ls\"", sdbinstPath, sdbInstalledPath); if (FAILED(hres)) { @@ -135,8 +153,7 @@ AddUninstallKey( goto end; } - //wprintf(L"%ls\n", uninstString); - + // Set uninstall string length = wcslen(uninstString) * sizeof(WCHAR); status = RegSetValueEx(hKey, L"UninstallString", @@ -188,15 +205,18 @@ HRESULT ProcessLayers( _In_ PDB pdb, _In_ TAGID tagDb, - _In_ LPCWSTR guidDbStr, - _In_ ULONGLONG time) + _In_opt_ LPCWSTR guidDbStr, + _In_opt_ ULONGLONG time, + _In_ BOOL isInstall) { HRESULT res = ERROR_SUCCESS; TAGID tagLayerName; + TAGID prevTagLayer = 0; TAGID tagLayer = SdbFindFirstTag(pdb, tagDb, TAG_LAYER); - while (tagLayer) + // Add all exe to registry (AppCompatFlags) + while (tagLayer && (tagLayer != prevTagLayer)) { tagLayerName = SdbFindFirstTag(pdb, tagLayer, TAG_NAME); if (!tagLayerName) @@ -208,14 +228,15 @@ ProcessLayers( LPWSTR name = SdbGetStringTagPtr(pdb, tagLayerName); wprintf(L"Layer name %ls", name); - res = RegisterSdbEntry(name, guidDbStr, time); + res = RegisterSdbEntry(name, guidDbStr, time, isInstall, FALSE); if (FAILED(res)) { wprintf(L"Can't register layer\n"); break; } - tagLayer = SdbFindNextTag(pdb, tagDb, TAG_LAYER); + prevTagLayer = tagLayer; + tagLayer = SdbFindNextTag(pdb, tagDb, tagLayer); } return res; @@ -225,16 +246,18 @@ HRESULT ProcessExe( _In_ PDB pdb, _In_ TAGID tagDb, - _In_ LPCWSTR guidDbStr, - _In_ ULONGLONG time -) + _In_opt_ LPCWSTR guidDbStr, + _In_opt_ ULONGLONG time, + _In_ BOOL isInstall) { HRESULT res = ERROR_SUCCESS; TAGID tagExeName; + TAGID tagExePrev = 0; TAGID tagExe = SdbFindFirstTag(pdb, tagDb, TAG_EXE); - while (tagExe) + // Add all exe to registry (AppCompatFlags) + while (tagExe != 0 && (tagExe != tagExePrev)) { tagExeName = SdbFindFirstTag(pdb, tagExe, TAG_NAME); if (!tagExeName) @@ -247,14 +270,15 @@ ProcessExe( LPWSTR name = SdbGetStringTagPtr(pdb, tagExeName); wprintf(L"Exe name %ls\n", name); - res = RegisterSdbEntry(name, guidDbStr, time); + res = RegisterSdbEntry(name, guidDbStr, time, isInstall, TRUE); if (FAILED(res)) { - wprintf(L"Can't register exe\n"); + wprintf(L"Can't register exe 0x%08X\n", res); break; } - tagExe = SdbFindNextTag(pdb, tagDb, TAG_EXE); + tagExePrev = tagExe; + tagExe = SdbFindNextTag(pdb, tagDb, tagExe); } return res; @@ -276,6 +300,7 @@ CopySdbToAppPatch( goto end; } + // Get parent folder fo sdb file CopyMemory(sysdirPath, destSdbPath, destLen * sizeof(WCHAR)); pTmpSysdir = sysdirPath + destLen; @@ -287,6 +312,7 @@ CopySdbToAppPatch( wprintf(L"%ls\n", sysdirPath); + // Create directory if need if (!CreateDirectory(sysdirPath, NULL)) { error = GetLastError(); @@ -298,6 +324,7 @@ CopySdbToAppPatch( error = ERROR_SUCCESS; } + // Copy file if (!CopyFile(sourceSdbPath, destSdbPath, TRUE)) { error = GetLastError(); @@ -355,6 +382,7 @@ SdbInstall( currentTime.LowPart = systemTime.dwLowDateTime; currentTime.HighPart = systemTime.dwHighDateTime; + // Open db pdb = SdbOpenDatabase(sdbPath, DOS_PATH); if (pdb == NULL) { @@ -369,7 +397,7 @@ SdbInstall( goto end; } - // + // Get db guid if (!GetSdbGuid(pdb, tagDb, &dbGuid)) { wprintf(L"GetSdbGuid error\n"); @@ -396,14 +424,16 @@ SdbInstall( LPWSTR dbName = SdbGetStringTagPtr(pdb, tagDbName); wprintf(L"Database name %ls\n", dbName); - hres = ProcessExe(pdb, tagDb, guidDbStr, currentTime.QuadPart); + // Process exe tags + hres = ProcessExe(pdb, tagDb, guidDbStr, currentTime.QuadPart, TRUE); if (FAILED(hres)) { wprintf(L"Process exe failed. Status: 0x%08X", res); goto end; } - hres = ProcessLayers(pdb, tagDb, guidDbStr, currentTime.QuadPart); + // Proess layer tags + hres = ProcessLayers(pdb, tagDb, guidDbStr, currentTime.QuadPart, TRUE); if (FAILED(hres)) { wprintf(L"Process layers failed. Status: 0x%08X", res); @@ -413,6 +443,7 @@ SdbInstall( SIZE_T bufLen = MAX_PATH * 2; sysdirPatchPath = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, bufLen * sizeof(WCHAR)); + // Create full path tos db in system folder hres = BuildPathToSdb(&sysdirPatchPath, bufLen, guidDbStr); if (FAILED(hres)) { @@ -431,6 +462,7 @@ SdbInstall( AddUninstallKey(dbName, sysdirPatchPath, guidDbStr); + // Registration if (!SdbRegisterDatabaseEx(sysdirPatchPath, SDB_DATABASE_SHIM, &currentTime.QuadPart)) { wprintf(L"SdbRegisterDatabaseEx UNSUCCESS"); @@ -448,6 +480,117 @@ end: return res; } +HRESULT +DeleteUninstallKey( + _In_ LPCWSTR keyName) +{ + HKEY hKey; + HRESULT hres = HRESULT_FROM_WIN32(ERROR_SUCCESS); + + LSTATUS status = RegCreateKeyEx(HKEY_LOCAL_MACHINE, + UNINSTALL_REG_PATH, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hKey, + NULL); + + if (status != ERROR_SUCCESS) + { + hres = HRESULT_FROM_WIN32(status); + goto end; + } + + status = RegDeleteKey(hKey, keyName); + if (status != ERROR_SUCCESS) + { + hres = HRESULT_FROM_WIN32(status); + } + +end: + return hres; +} + +BOOL +SdbUninstall( + _In_ LPWSTR sdbPath) +{ + BOOL res = FALSE; + PWCHAR sdbName = NULL; + PDB pdb; + TAGID tagDb; + GUID dbGuid; + + SIZE_T sdbPathLen = wcslen(sdbPath); + sdbName = sdbPath + sdbPathLen; + + while (*sdbName != L'\\') + { + --sdbName; + } + sdbName++; + + wprintf(L"uninstall name %ls\n", sdbName); + + // open sdb + pdb = SdbOpenDatabase(sdbPath, DOS_PATH); + if (pdb == NULL) + { + wprintf(L"Can't open database %ls\n", sdbPath); + goto end; + } + + tagDb = SdbFindFirstTag(pdb, TAGID_ROOT, TAG_DATABASE); + if (!tagDb) + { + wprintf(L"Can't find database tag\n"); + goto end; + } + + // + if (!GetSdbGuid(pdb, tagDb, &dbGuid)) + { + wprintf(L"GetSdbGuid error\n"); + goto end; + } + + //remove regkey in appatch/custom + HRESULT hres = ProcessExe(pdb, tagDb, NULL, 0, FALSE); + if (FAILED(hres)) + { + wprintf(L"Process exe fail\n"); + goto end; + } + + SdbCloseDatabase(pdb); + + hres = DeleteUninstallKey(sdbName); + if (FAILED(hres)) + { + wprintf(L"Remove key fail\n"); + goto end; + } + + if (!SdbUnregisterDatabase(&dbGuid)) + { + wprintf(L"SdbUnregisterDatabase\n"); + goto end; + } + + if (!DeleteFile(sdbPath)) + { + wprintf(L"Remove file fail 0x%08X\n", GetLastError()); + goto end; + } + +end: + return res; +} + + + void ShowHelp() { @@ -459,24 +602,58 @@ ShowHelp() L"-n - \"name\" - file name (only uninstall)\n"); } -int _tmain(int argc, LPCWSTR argv[]) +int _tmain(int argc, LPWSTR argv[]) { - LPCWSTR sdbPath = NULL; + LPWSTR sdbPath = NULL; + BOOL isInstall = TRUE; + //LPWSTR guidSdbStr = NULL; if (argc < 2) { ShowHelp(); } - if (argv[1][0] == L'-' && argv[1][1] == L'?') + for (int i = 1; i < argc; ++i) { - ShowHelp(); - return ERROR_SUCCESS; - } + if (argv[i][0] != L'-') + { + sdbPath = argv[i]; + break; + } - sdbPath = argv[1]; + switch (argv[i][1]) + { + case L'?': + ShowHelp(); + return ERROR_SUCCESS; + break; + + case L'u': + isInstall = FALSE; + break; + + case L'g': + ++i; + + if (i < argc) + { + return ERROR_INVALID_PARAMETER; + } + + //guidSdbStr = argv[i]; + break; + } + } - SdbInstall(sdbPath); + if (isInstall) + { + SdbInstall(sdbPath); + } + else + { + // call uninstall + SdbUninstall(sdbPath); + } return ERROR_SUCCESS; -} \ No newline at end of file +} diff --git a/dll/appcompat/apphelp/apphelp.h b/dll/appcompat/apphelp/apphelp.h index 87ddce5cfbe..8dca5408da3 100644 --- a/dll/appcompat/apphelp/apphelp.h +++ b/dll/appcompat/apphelp/apphelp.h @@ -111,6 +111,7 @@ DWORD WINAPI SdbQueryDataExTagID(PDB pdb, TAGID tiExe, LPCWSTR lpszDataName, LPD BOOL WINAPI SdbGetDatabaseInformation(PDB pdb, PDB_INFORMATION information); VOID WINAPI SdbFreeDatabaseInformation(PDB_INFORMATION information); BOOL WINAPI SdbRegisterDatabaseEx(_In_ LPCWSTR pszDatabasePath, _In_ DWORD dwDatabaseType, _In_opt_ const PULONGLONG pTimeStamp); +BOOL WINAPI SdbUnregisterDatabase(_In_ const GUID *pguidDB); /* sdbread.c */ BOOL WINAPI SdbpReadData(PDB pdb, PVOID dest, DWORD offset, DWORD num);

3 years, 4 months

← Newer
1
...
8
9
10
11
12
13
14
...
19
Older →

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 May 2021