June 2024 - Wine-commits - list.winehq.org

Danyil Blyschak : opcservices: Check for memory allocation failure before deflating.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: f0707f17577db9675d49a829d4cb6b43596e8505 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0707f17577db9675d49a829d4cb6b… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Thu Jun 13 12:52:19 2024 -0500 opcservices: Check for memory allocation failure before deflating. --- dlls/opcservices/compress.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/opcservices/compress.c b/dlls/opcservices/compress.c index 841c674c26c..78b38f8437a 100644 --- a/dlls/opcservices/compress.c +++ b/dlls/opcservices/compress.c @@ -202,6 +202,7 @@ static void compress_write_content(struct zip_archive *archive, IStream *content LARGE_INTEGER move; ULONG num_read; HRESULT hr; + int init_ret; data_desc->crc32 = RtlComputeCrc32(0, NULL, 0); move.QuadPart = 0; @@ -232,7 +233,8 @@ static void compress_write_content(struct zip_archive *archive, IStream *content memset(&z_str, 0, sizeof(z_str)); z_str.zalloc = zalloc; z_str.zfree = zfree; - deflateInit2(&z_str, level, Z_DEFLATED, -MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY); + if ((init_ret = deflateInit2(&z_str, level, Z_DEFLATED, -MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY)) != Z_OK) + WARN("Failed to allocate memory in deflateInit2, ret %d.\n", init_ret); do {

1 0

Alex Henrie : ntdll: Don't accept a query routine when using RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 54991feaaec71e79255e2b2ba18f89bbbbbb323d URL: https://gitlab.winehq.org/wine/wine/-/commit/54991feaaec71e79255e2b2ba18f89… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 13 22:48:48 2024 -0600 ntdll: Don't accept a query routine when using RTL_QUERY_REGISTRY_DIRECT. --- dlls/ntdll/reg.c | 5 +++++ dlls/ntdll/tests/reg.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 9be75649cc3..271abb03768 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -261,6 +261,8 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (pQuery->Flags & RTL_QUERY_REGISTRY_DIRECT) { + if (pQuery->QueryRoutine) + return STATUS_INVALID_PARAMETER; if (str->MaximumLength < default_size) return STATUS_BUFFER_TOO_SMALL; memcpy(str->Buffer, pQuery->DefaultData, default_size); @@ -277,6 +279,9 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (pQuery->Flags & RTL_QUERY_REGISTRY_DIRECT) { + if (pQuery->QueryRoutine) + return STATUS_INVALID_PARAMETER; + switch(pInfo->Type) { case REG_EXPAND_SZ: diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 9449cd2f904..eda20c35e9f 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2662,7 +2662,12 @@ static struct query_reg_values_test query_reg_values_tests[] = /* DIRECT doesn't call the query routine and reads directly into a buffer */ { {{ query_routine, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }}, - STATUS_INVALID_PARAMETER, 0, WINE_TODO_RET | WINE_TODO_NAME | WINE_TODO_TYPE | WINE_TODO_SIZE | WINE_TODO_DATA + STATUS_INVALID_PARAMETER, 0 + }, + { + {{ query_routine, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", + &query_reg_values_direct_str, REG_SZ, (WCHAR*)L"Some default" }}, + STATUS_INVALID_PARAMETER, 0 }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }},

1 0

Alex Henrie : ntdll: Set the string size when using RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: eb59c213fb504fa0a3a166ea0d73eec68f77b7a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb59c213fb504fa0a3a166ea0d73ee… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 13 22:48:48 2024 -0600 ntdll: Set the string size when using RTL_QUERY_REGISTRY_DIRECT. --- dlls/ntdll/reg.c | 1 + dlls/ntdll/tests/reg.c | 29 +++++++++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 271abb03768..df8763835ad 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -266,6 +266,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (str->MaximumLength < default_size) return STATUS_BUFFER_TOO_SMALL; memcpy(str->Buffer, pQuery->DefaultData, default_size); + str->Length = default_size - sizeof(WCHAR); return STATUS_SUCCESS; } else if (pQuery->QueryRoutine) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index eda20c35e9f..d569f1f4d19 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2662,12 +2662,12 @@ static struct query_reg_values_test query_reg_values_tests[] = /* DIRECT doesn't call the query routine and reads directly into a buffer */ { {{ query_routine, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }}, - STATUS_INVALID_PARAMETER, 0 + STATUS_INVALID_PARAMETER, 0, 0, REG_NONE, NULL, -1 }, { {{ query_routine, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_SZ, (WCHAR*)L"Some default" }}, - STATUS_INVALID_PARAMETER, 0 + STATUS_INVALID_PARAMETER, 0, 0, REG_NONE, NULL, -1 }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }}, @@ -2681,7 +2681,7 @@ static struct query_reg_values_test query_reg_values_tests[] = { {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"CapitalsOfEurope", &query_reg_values_direct_str }}, - STATUS_SUCCESS, 0, 0, REG_SZ, L"Brussels\0Paris\0Madrid", sizeof(L"Brussels\0Paris\0Madrid") + STATUS_SUCCESS, 0, WINE_TODO_DATA, REG_SZ, L"Brussels\0Paris\0Madrid\0", sizeof(L"Brussels\0Paris\0Madrid\0") }, /* DIRECT with a null buffer crashes on Windows */ /* { @@ -2744,7 +2744,7 @@ static struct query_reg_values_test query_reg_values_tests[] = { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_EXPAND_SZ, (WCHAR*)L"%SYSTEMDRIVE%" }}, - STATUS_SUCCESS, 0, WINE_TODO_DATA, REG_EXPAND_SZ, L"C:" + STATUS_SUCCESS, 0, WINE_TODO_SIZE | WINE_TODO_DATA, REG_EXPAND_SZ, L"C:" }, /* DIRECT with a multi-string default value crashes on Windows */ /* { @@ -2764,12 +2764,12 @@ static struct query_reg_values_test query_reg_values_tests[] = { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_SZ }}, - STATUS_DATA_OVERRUN, 0, WINE_TODO_RET + STATUS_DATA_OVERRUN, 0, WINE_TODO_RET | WINE_TODO_SIZE, REG_NONE, NULL, -1 }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_NONE, (WCHAR*)L"Some default" }}, - STATUS_SUCCESS, 0 + STATUS_SUCCESS, 0, WINE_TODO_SIZE, REG_NONE, NULL, -1 }, /* REQUIRED fails if the value doesn't exist and there is no default */ { @@ -2830,7 +2830,9 @@ static void test_RtlQueryRegistryValues(void) } query_routine_calls = 0; - wcscpy(query_reg_values_direct_str.Buffer, L"###"); + query_reg_values_direct_str.Length = query_reg_values_direct_str.MaximumLength - sizeof(WCHAR); + memset(query_reg_values_direct_str.Buffer, 0x23, query_reg_values_direct_str.Length); + query_reg_values_direct_str.Buffer[query_reg_values_direct_str.Length] = 0; status = pRtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, winetestpath.Buffer, test->query_table, test, NULL); @@ -2857,11 +2859,18 @@ static void test_RtlQueryRegistryValues(void) expected_size = test->expected_data_size; } + if (!expected_size && expected_data) + expected_size = (wcslen(expected_data) + 1) * sizeof(WCHAR); + else if (expected_size == -1) + expected_size = query_reg_values_direct_str.MaximumLength; + + todo_wine_if(test->flags & WINE_TODO_SIZE) + ok(query_reg_values_direct_str.Length + sizeof(WCHAR) == expected_size, + "Expected size %lu, got %Iu\n", expected_size, + query_reg_values_direct_str.Length + sizeof(WCHAR)); + if (expected_data) { - if (!expected_size) - expected_size = (wcslen(expected_data) + 1) * sizeof(WCHAR); - todo_wine_if(test->flags & WINE_TODO_DATA) ok(!memcmp(query_reg_values_direct_str.Buffer, expected_data, expected_size), "Expected data %s, got %s\n", debugstr_w(expected_data),

1 0

Alex Henrie : ntdll: Only allow string default values with RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 4db02f76190a52acd12af745829dbb35582440cb URL: https://gitlab.winehq.org/wine/wine/-/commit/4db02f76190a52acd12af745829dbb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 13 22:48:49 2024 -0600 ntdll: Only allow string default values with RTL_QUERY_REGISTRY_DIRECT. --- dlls/ntdll/reg.c | 16 ++++++++++++---- dlls/ntdll/tests/reg.c | 27 ++++++++++++++++++++------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index df8763835ad..044bf32f460 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -263,10 +263,18 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, { if (pQuery->QueryRoutine) return STATUS_INVALID_PARAMETER; - if (str->MaximumLength < default_size) - return STATUS_BUFFER_TOO_SMALL; - memcpy(str->Buffer, pQuery->DefaultData, default_size); - str->Length = default_size - sizeof(WCHAR); + + if (pQuery->DefaultType == REG_SZ || pQuery->DefaultType == REG_EXPAND_SZ || + pQuery->DefaultType == REG_MULTI_SZ || pQuery->DefaultType == REG_LINK) + { + if (!pQuery->DefaultData) + return STATUS_DATA_OVERRUN; + if (str->MaximumLength < default_size) + return STATUS_BUFFER_TOO_SMALL; + memcpy(str->Buffer, pQuery->DefaultData, default_size); + str->Length = default_size - sizeof(WCHAR); + } + return STATUS_SUCCESS; } else if (pQuery->QueryRoutine) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index d569f1f4d19..b6763e6e1d2 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2601,7 +2601,7 @@ static NTSTATUS WINAPI query_routine(const WCHAR *value_name, ULONG value_type, expected_size = 0; } - if (!expected_size && expected_data) + if (!expected_size && expected_data && (expected_type == REG_SZ || expected_type == REG_EXPAND_SZ)) expected_size = (wcslen(expected_data) + 1) * sizeof(WCHAR); todo_wine_if(test->flags & WINE_TODO_TYPE) @@ -2611,11 +2611,11 @@ static NTSTATUS WINAPI query_routine(const WCHAR *value_name, ULONG value_type, ok(value_data_size == expected_size, "Expected size %lu, got %lu\n", expected_size, value_data_size); todo_wine_if(test->flags & WINE_TODO_DATA && !(test->flags & SPLIT_MULTI && query_routine_calls == 0)) - if (expected_data) + if (expected_data == query->DefaultData || expected_data == NULL) + ok(value_data == expected_data, "Expected data %p, got %p\n", expected_data, value_data); + else ok(!memcmp(value_data, expected_data, value_data_size), "Expected data %s, got %s\n", debugstr_w(expected_data), debugstr_w(value_data)); - else - ok(!value_data, "Expected null data\n"); } query_routine_calls++; @@ -2731,6 +2731,10 @@ static struct query_reg_values_test query_reg_values_tests[] = {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_MULTI_SZ, (WCHAR*)L"Brussels\0Paris\0Madrid\0" }}, STATUS_SUCCESS, 3, EXPECT_DEFAULT_DATA | SPLIT_MULTI | WINE_TODO_CALLS | WINE_TODO_TYPE | WINE_TODO_SIZE }, + { + {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_DWORD, (WCHAR*)0xdeadbeef }}, + STATUS_SUCCESS, 1, EXPECT_DEFAULT_DATA + }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_SZ, (WCHAR*)L"Some default", 4 * sizeof(WCHAR) }}, @@ -2764,12 +2768,18 @@ static struct query_reg_values_test query_reg_values_tests[] = { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_SZ }}, - STATUS_DATA_OVERRUN, 0, WINE_TODO_RET | WINE_TODO_SIZE, REG_NONE, NULL, -1 + STATUS_DATA_OVERRUN, 0, 0, REG_NONE, NULL, -1 }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_NONE, (WCHAR*)L"Some default" }}, - STATUS_SUCCESS, 0, WINE_TODO_SIZE, REG_NONE, NULL, -1 + STATUS_SUCCESS, 0, 0, REG_NONE, NULL, -1 + }, + /* DIRECT additionally requires the default value to be a string */ + { + {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", + &query_reg_values_direct_str, REG_DWORD, (WCHAR*)0xdeadbeef }}, + STATUS_SUCCESS, 0, 0, REG_NONE, NULL, -1 }, /* REQUIRED fails if the value doesn't exist and there is no default */ { @@ -2820,6 +2830,7 @@ static void test_RtlQueryRegistryValues(void) RTL_QUERY_REGISTRY_TABLE *query; const WCHAR *expected_data; ULONG expected_size; + ULONG expected_type; winetest_push_context("%u/%Iu", i, ARRAY_SIZE(query_reg_values_tests) - 1); @@ -2850,16 +2861,18 @@ static void test_RtlQueryRegistryValues(void) { if (test->flags & EXPECT_DEFAULT_DATA) { + expected_type = query->DefaultType; expected_data = query->DefaultData; expected_size = query->DefaultLength; } else { + expected_type = test->expected_type; expected_data = test->expected_data; expected_size = test->expected_data_size; } - if (!expected_size && expected_data) + if (!expected_size && expected_data && (expected_type == REG_SZ || expected_type == REG_EXPAND_SZ)) expected_size = (wcslen(expected_data) + 1) * sizeof(WCHAR); else if (expected_size == -1) expected_size = query_reg_values_direct_str.MaximumLength;

1 0

Alex Henrie : ntdll: Replace the whole string when using RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 54c3f962148c6ead2ec04b776c08fade390148f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/54c3f962148c6ead2ec04b776c08fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 13 22:48:49 2024 -0600 ntdll: Replace the whole string when using RTL_QUERY_REGISTRY_DIRECT. --- dlls/ntdll/reg.c | 7 ++++++- dlls/ntdll/tests/reg.c | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 044bf32f460..3cbd055f367 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -311,7 +311,12 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (str->Buffer == NULL) RtlCreateUnicodeString(str, (WCHAR*)(((CHAR*)pInfo) + pInfo->DataOffset)); else - RtlAppendUnicodeToString(str, (WCHAR*)(((CHAR*)pInfo) + pInfo->DataOffset)); + { + if (str->MaximumLength < len) + return STATUS_BUFFER_TOO_SMALL; + memcpy(str->Buffer, (char*)pInfo + pInfo->DataOffset, len); + str->Length = len - sizeof(WCHAR); + } break; case REG_MULTI_SZ: diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index b6763e6e1d2..14227db755c 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2673,6 +2673,11 @@ static struct query_reg_values_test query_reg_values_tests[] = {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }}, STATUS_SUCCESS, 0, 0, REG_SZ, L"C:" }, + { + {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"WindowsDrive", + &query_reg_values_direct_str }}, + STATUS_SUCCESS, 0, 0, REG_SZ, L"%SYSTEMDRIVE%" + }, /* DIRECT on a multi-string crashes on Windows without NOEXPAND */ /* { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"CapitalsOfEurope", &query_reg_values_direct_str }},

1 0

Alexandre Julliard : ntdll: Move some security Rtl functions to sec.c.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 88414d0c5b6352fd352b1f950033eb033961ee21 URL: https://gitlab.winehq.org/wine/wine/-/commit/88414d0c5b6352fd352b1f950033eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 11:40:12 2024 +0200 ntdll: Move some security Rtl functions to sec.c. --- dlls/ntdll/rtl.c | 133 ------------------------------------------------------- dlls/ntdll/sec.c | 54 ++++++++++++++++++++++ 2 files changed, 54 insertions(+), 133 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 948412071c5..fb51ee867b9 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -761,139 +761,6 @@ ULONG WINAPI RtlRandomEx( ULONG *seed ) return RtlRandom( seed ); } -/************************************************************************* - * RtlAreAllAccessesGranted [NTDLL.@] - * - * Check if all desired accesses are granted - * - * RETURNS - * TRUE: All desired accesses are granted - * FALSE: Otherwise - */ -BOOLEAN WINAPI RtlAreAllAccessesGranted( - ACCESS_MASK GrantedAccess, - ACCESS_MASK DesiredAccess) -{ - return (GrantedAccess & DesiredAccess) == DesiredAccess; -} - - -/************************************************************************* - * RtlAreAnyAccessesGranted [NTDLL.@] - * - * Check if at least one of the desired accesses is granted - * - * PARAMS - * GrantedAccess [I] Access mask of granted accesses - * DesiredAccess [I] Access mask of desired accesses - * - * RETURNS - * TRUE: At least one of the desired accesses is granted - * FALSE: Otherwise - */ -BOOLEAN WINAPI RtlAreAnyAccessesGranted( - ACCESS_MASK GrantedAccess, - ACCESS_MASK DesiredAccess) -{ - return (GrantedAccess & DesiredAccess) != 0; -} - - -/************************************************************************* - * RtlMapGenericMask [NTDLL.@] - * - * Determine the nongeneric access rights specified by an access mask - * - * RETURNS - * Nothing. - */ -void WINAPI RtlMapGenericMask( - PACCESS_MASK AccessMask, - const GENERIC_MAPPING *GenericMapping) -{ - if (*AccessMask & GENERIC_READ) { - *AccessMask |= GenericMapping->GenericRead; - } /* if */ - - if (*AccessMask & GENERIC_WRITE) { - *AccessMask |= GenericMapping->GenericWrite; - } /* if */ - - if (*AccessMask & GENERIC_EXECUTE) { - *AccessMask |= GenericMapping->GenericExecute; - } /* if */ - - if (*AccessMask & GENERIC_ALL) { - *AccessMask |= GenericMapping->GenericAll; - } /* if */ - - *AccessMask &= 0x0FFFFFFF; -} - - -/************************************************************************* - * RtlCopyLuid [NTDLL.@] - * - * Copy a local unique ID. - * - * PARAMS - * LuidDest [O] Destination for the copied Luid - * LuidSrc [I] Source Luid to copy to LuidDest - * - * RETURNS - * Nothing. - */ -void WINAPI RtlCopyLuid (PLUID LuidDest, const LUID *LuidSrc) -{ - *LuidDest = *LuidSrc; -} - - -/************************************************************************* - * RtlEqualLuid [NTDLL.@] - * - * Compare two local unique IDs. - * - * PARAMS - * Luid1 [I] First Luid to compare to Luid2 - * Luid2 [I] Second Luid to compare to Luid1 - * - * RETURNS - * TRUE: The two LUIDs are equal. - * FALSE: Otherwise - */ -BOOLEAN WINAPI RtlEqualLuid (const LUID *Luid1, const LUID *Luid2) -{ - return (Luid1->LowPart == Luid2->LowPart && Luid1->HighPart == Luid2->HighPart); -} - - -/************************************************************************* - * RtlCopyLuidAndAttributesArray [NTDLL.@] - * - * Copy an array of local unique IDs and attributes. - * - * PARAMS - * Count [I] Number of Luid/attributes in Src - * Src [I] Source Luid/attributes to copy - * Dest [O] Destination for copied Luid/attributes - * - * RETURNS - * Nothing. - * - * NOTES - * Dest must be large enough to hold Src. - */ -void WINAPI RtlCopyLuidAndAttributesArray( - ULONG Count, - const LUID_AND_ATTRIBUTES *Src, - PLUID_AND_ATTRIBUTES Dest) -{ - ULONG i; - - for (i = 0; i < Count; i++) Dest[i] = Src[i]; -} - static BOOL parse_ipv4_component(const WCHAR **str, BOOL strict, ULONG *value) { int base = 10, d; diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 4188faafb4b..2c09e31ac1a 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1540,6 +1540,60 @@ NTSTATUS WINAPI RtlGetAce(PACL pAcl,DWORD dwAceIndex,LPVOID *pAce ) return STATUS_SUCCESS; } +/************************************************************************* + * RtlAreAllAccessesGranted [NTDLL.@] + */ +BOOLEAN WINAPI RtlAreAllAccessesGranted( ACCESS_MASK granted, ACCESS_MASK desired ) +{ + return (granted & desired) == desired; +} + +/************************************************************************* + * RtlAreAnyAccessesGranted [NTDLL.@] + */ +BOOLEAN WINAPI RtlAreAnyAccessesGranted( ACCESS_MASK granted, ACCESS_MASK desired ) +{ + return (granted & desired) != 0; +} + +/************************************************************************* + * RtlMapGenericMask [NTDLL.@] + */ +void WINAPI RtlMapGenericMask( ACCESS_MASK *mask, const GENERIC_MAPPING *mapping ) +{ + if (*mask & GENERIC_READ) *mask |= mapping->GenericRead; + if (*mask & GENERIC_WRITE) *mask |= mapping->GenericWrite; + if (*mask & GENERIC_EXECUTE) *mask |= mapping->GenericExecute; + if (*mask & GENERIC_ALL) *mask |= mapping->GenericAll; + *mask &= ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + +/************************************************************************* + * RtlCopyLuid [NTDLL.@] + */ +void WINAPI RtlCopyLuid( LUID *dest, const LUID *src ) +{ + *dest = *src; +} + +/************************************************************************* + * RtlEqualLuid [NTDLL.@] + */ +BOOLEAN WINAPI RtlEqualLuid( const LUID *luid1, const LUID *luid2 ) +{ + return (luid1->LowPart == luid2->LowPart && luid1->HighPart == luid2->HighPart); +} + +/************************************************************************* + * RtlCopyLuidAndAttributesArray [NTDLL.@] + */ +void WINAPI RtlCopyLuidAndAttributesArray( ULONG count, const LUID_AND_ATTRIBUTES *src, PLUID_AND_ATTRIBUTES dest ) +{ + ULONG i; + + for (i = 0; i < count; i++) dest[i] = src[i]; +} + /* * misc */

1 0

Alexandre Julliard : ntdll: Move some synchronization Rtl functions to sync.c.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 94d1bc52c3845e0657b713a64b2042379e3c3aa1 URL: https://gitlab.winehq.org/wine/wine/-/commit/94d1bc52c3845e0657b713a64b2042… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 11:40:59 2024 +0200 ntdll: Move some synchronization Rtl functions to sync.c. --- dlls/ntdll/rtl.c | 385 ------------------------------------------------------ dlls/ntdll/sync.c | 372 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 372 insertions(+), 385 deletions(-)

1 0

Alexandre Julliard : ntdll: Move the error mode Rtl functions to thread.c.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 30816b0ca0e29449cc778af75b54c7561b4abdf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/30816b0ca0e29449cc778af75b54c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 11:41:24 2024 +0200 ntdll: Move the error mode Rtl functions to thread.c. --- dlls/ntdll/rtl.c | 41 ----------------------------------------- dlls/ntdll/thread.c | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 6253bb0a4a5..31c98424aca 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1536,47 +1536,6 @@ NTSTATUS WINAPI RtlDecompressBuffer(USHORT format, PUCHAR uncompressed, ULONG un compressed, compressed_size, 0, final_size, NULL); } -/*********************************************************************** - * RtlSetThreadErrorMode [NTDLL.@] - * - * Set the thread local error mode. - * - * PARAMS - * mode [I] The new error mode - * oldmode [O] Destination of the old error mode (may be NULL) - * - * RETURNS - * Success: STATUS_SUCCESS - * Failure: STATUS_INVALID_PARAMETER_1 - */ -NTSTATUS WINAPI RtlSetThreadErrorMode( DWORD mode, LPDWORD oldmode ) -{ - if (mode & ~0x70) - return STATUS_INVALID_PARAMETER_1; - - if (oldmode) - *oldmode = NtCurrentTeb()->HardErrorMode; - - NtCurrentTeb()->HardErrorMode = mode; - return STATUS_SUCCESS; -} - -/*********************************************************************** - * RtlGetThreadErrorMode [NTDLL.@] - * - * Get the thread local error mode. - * - * PARAMS - * None. - * - * RETURNS - * The current thread local error mode. - */ -DWORD WINAPI RtlGetThreadErrorMode( void ) -{ - return NtCurrentTeb()->HardErrorMode; -} - /****************************************************************************** * RtlGetCurrentTransaction [NTDLL.@] */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 1206d5b24b8..26cf99cdad0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -414,6 +414,31 @@ BOOLEAN WINAPI RtlIsCurrentThread( HANDLE handle ) } +/*********************************************************************** + * RtlSetThreadErrorMode (NTDLL.@) + */ +NTSTATUS WINAPI RtlSetThreadErrorMode( DWORD mode, LPDWORD oldmode ) +{ + if (mode & ~0x70) + return STATUS_INVALID_PARAMETER_1; + + if (oldmode) + *oldmode = NtCurrentTeb()->HardErrorMode; + + NtCurrentTeb()->HardErrorMode = mode; + return STATUS_SUCCESS; +} + + +/*********************************************************************** + * RtlGetThreadErrorMode (NTDLL.@) + */ +DWORD WINAPI RtlGetThreadErrorMode( void ) +{ + return NtCurrentTeb()->HardErrorMode; +} + + /*********************************************************************** * _errno (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Move the PEB lock Rtl functions to env.c.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: b563ff18cea031aa674c500b1496ee47267fbae8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b563ff18cea031aa674c500b1496ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 11:41:49 2024 +0200 ntdll: Move the PEB lock Rtl functions to env.c. --- dlls/ntdll/env.c | 16 ++++++++++++++++ dlls/ntdll/rtl.c | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 14f00ab1538..720597dcaf9 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -106,6 +106,22 @@ static void set_wow64_environment( WCHAR **env ) } +/****************************************************************************** + * RtlAcquirePebLock [NTDLL.@] + */ +void WINAPI RtlAcquirePebLock(void) +{ + RtlEnterCriticalSection( NtCurrentTeb()->Peb->FastPebLock ); +} + +/****************************************************************************** + * RtlReleasePebLock [NTDLL.@] + */ +void WINAPI RtlReleasePebLock(void) +{ + RtlLeaveCriticalSection( NtCurrentTeb()->Peb->FastPebLock ); +} + /****************************************************************************** * RtlCreateEnvironment [NTDLL.@] */ diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 31c98424aca..047cce1e0d5 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -183,22 +183,6 @@ NTSTATUS WINAPI vDbgPrintExWithPrefix( LPCSTR prefix, ULONG id, ULONG level, LPC return STATUS_SUCCESS; } -/****************************************************************************** - * RtlAcquirePebLock [NTDLL.@] - */ -VOID WINAPI RtlAcquirePebLock(void) -{ - RtlEnterCriticalSection( NtCurrentTeb()->Peb->FastPebLock ); -} - -/****************************************************************************** - * RtlReleasePebLock [NTDLL.@] - */ -VOID WINAPI RtlReleasePebLock(void) -{ - RtlLeaveCriticalSection( NtCurrentTeb()->Peb->FastPebLock ); -} - /****************************************************************************** * RtlInitializeGenericTable [NTDLL.@] */

1 0

Alexandre Julliard : ntdll: Move the memory copy Rtl functions to string.c.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 9062376bbf227738558f9475595471ff6d006b39 URL: https://gitlab.winehq.org/wine/wine/-/commit/9062376bbf227738558f9475595471… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 11:50:24 2024 +0200 ntdll: Move the memory copy Rtl functions to string.c. --- dlls/ntdll/rtl.c | 128 ---------------------------------------------------- dlls/ntdll/string.c | 73 ++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 128 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 047cce1e0d5..1288b57f11c 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -243,112 +243,6 @@ void * WINAPI RtlLookupElementGenericTable(RTL_GENERIC_TABLE *table, void *buffe return NULL; } -/****************************************************************************** - * RtlMoveMemory [NTDLL.@] - * - * Move a block of memory that may overlap. - * - * PARAMS - * Destination [O] End destination for block - * Source [O] Where to start copying from - * Length [I] Number of bytes to copy - * - * RETURNS - * Nothing. - */ -#undef RtlMoveMemory -VOID WINAPI RtlMoveMemory( void *Destination, const void *Source, SIZE_T Length ) -{ - memmove(Destination, Source, Length); -} - -/****************************************************************************** - * RtlFillMemory [NTDLL.@] - * - * Set a block of memory with a value. - * - * PARAMS - * Destination [O] Block to fill - * Length [I] Number of bytes to fill - * Fill [I] Value to set - * - * RETURNS - * Nothing. - */ -#undef RtlFillMemory -VOID WINAPI RtlFillMemory( VOID *Destination, SIZE_T Length, BYTE Fill ) -{ - memset(Destination, Fill, Length); -} - -/****************************************************************************** - * RtlZeroMemory [NTDLL.@] - * - * Set a block of memory with 0's. - * - * PARAMS - * Destination [O] Block to fill - * Length [I] Number of bytes to fill - * - * RETURNS - * Nothing. - */ -#undef RtlZeroMemory -VOID WINAPI RtlZeroMemory( VOID *Destination, SIZE_T Length ) -{ - memset(Destination, 0, Length); -} - -/****************************************************************************** - * RtlCompareMemory [NTDLL.@] - * - * Compare one block of memory with another - * - * PARAMS - * Source1 [I] Source block - * Source2 [I] Block to compare to Source1 - * Length [I] Number of bytes to compare - * - * RETURNS - * The length of the first byte at which Source1 and Source2 differ, or Length - * if they are the same. - */ -SIZE_T WINAPI RtlCompareMemory( const VOID *Source1, const VOID *Source2, SIZE_T Length) -{ - SIZE_T i; - for(i=0; (i<Length) && (((const BYTE*)Source1)[i]==((const BYTE*)Source2)[i]); i++); - return i; -} - -/****************************************************************************** - * RtlCompareMemoryUlong [NTDLL.@] - * - * Compare a block of memory with a value, a ULONG at a time - * - * PARAMS - * Source1 [I] Source block. This must be ULONG aligned - * Length [I] Number of bytes to compare. This should be a multiple of 4 - * dwVal [I] Value to compare to - * - * RETURNS - * The byte position of the first byte at which Source1 is not dwVal. - */ -SIZE_T WINAPI RtlCompareMemoryUlong(VOID *Source1, SIZE_T Length, ULONG dwVal) -{ - SIZE_T i; - for(i = 0; i < Length/sizeof(ULONG) && ((ULONG *)Source1)[i] == dwVal; i++); - return i * sizeof(ULONG); -} - -/****************************************************************************** - * RtlCopyMemory [NTDLL.@] - */ -#undef RtlCopyMemory -void WINAPI RtlCopyMemory(void *dest, const void *src, SIZE_T len) -{ - memcpy(dest, src, len); -} - /****************************************************************************** * RtlAssert [NTDLL.@] * @@ -366,28 +260,6 @@ void WINAPI RtlAssert(void *assertion, void *filename, ULONG linenumber, char *m linenumber, debugstr_a(message)); } -/************************************************************************* - * RtlFillMemoryUlong [NTDLL.@] - * - * Fill memory with a 32 bit (dword) value. - * - * PARAMS - * lpDest [I] Bitmap pointer - * ulCount [I] Number of dwords to write - * ulValue [I] Value to fill with - * - * RETURNS - * Nothing. - */ -VOID WINAPI RtlFillMemoryUlong(ULONG* lpDest, ULONG ulCount, ULONG ulValue) -{ - TRACE("(%p,%lu,%lu)\n", lpDest, ulCount, ulValue); - - ulCount /= sizeof(ULONG); - while(ulCount--) - *lpDest++ = ulValue; -} - /********************************************************************* * RtlComputeCrc32 [NTDLL.@] * diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index a48496b65c6..46fb80a3a69 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -248,6 +248,79 @@ void *__cdecl memset( void *dst, int c, size_t n ) } +/****************************************************************************** + * RtlCopyMemory (NTDLL.@) + */ +#undef RtlCopyMemory +void WINAPI RtlCopyMemory( void *dest, const void *src, SIZE_T len ) +{ + memcpy( dest, src, len ); +} + + +/****************************************************************************** + * RtlMoveMemory (NTDLL.@) + */ +#undef RtlMoveMemory +void WINAPI RtlMoveMemory( void *dest, const void *src, SIZE_T len ) +{ + memmove( dest, src, len ); +} + + +/****************************************************************************** + * RtlFillMemory (NTDLL.@) + */ +#undef RtlFillMemory +void WINAPI RtlFillMemory( VOID *dest, SIZE_T len, BYTE fill ) +{ + memset( dest, fill, len ); +} + + +/****************************************************************************** + * RtlZeroMemory (NTDLL.@) + */ +#undef RtlZeroMemory +void WINAPI RtlZeroMemory( VOID *dest, SIZE_T len ) +{ + memset( dest, 0, len ); +} + + +/****************************************************************************** + * RtlCompareMemory (NTDLL.@) + */ +SIZE_T WINAPI RtlCompareMemory( const void *src1, const void *src2, SIZE_T len ) +{ + SIZE_T i = 0; + while (i < len && ((const BYTE *)src1)[i] == ((const BYTE *)src2)[i]) i++; + return i; +} + + +/****************************************************************************** + * RtlCompareMemoryUlong (NTDLL.@) + */ +SIZE_T WINAPI RtlCompareMemoryUlong( void *src, SIZE_T len, ULONG val ) +{ + SIZE_T i = 0; + len /= sizeof(ULONG); + while (i < len && ((ULONG *)src)[i] == val) i++; + return i * sizeof(ULONG); +} + + +/************************************************************************* + * RtlFillMemoryUlong (NTDLL.@) + */ +void WINAPI RtlFillMemoryUlong( ULONG *dest, ULONG len, ULONG val ) +{ + len /= sizeof(ULONG); + while (len--) *dest++ = val; +} + + /********************************************************************* * strcat (NTDLL.@) */

1 0