May 2020 - Wine-devel - list.winehq.org

[PATCH 2/5] winegcc: Explicitly pass DLL crt entry point to PE linker when Wine crt is used.
by Jacek Caban 04 May '20

04 May '20

Linkers don't agree on its default. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH 1/5] winegcc: Add entry symbol underscore when building linker command.
by Jacek Caban 04 May '20

04 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)

1 0

[PATCH 1/4] comctl32/header: Use wide string literals.
by Nikolay Sivov 04 May '20

04 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/header.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index c70960484a..085549fed6 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -111,7 +111,7 @@ static void HEADER_FreeCallbackItems(HEADER_ITEM *lpItem); static LRESULT HEADER_SendNotify(const HEADER_INFO *infoPtr, UINT code, NMHDR *hdr); static LRESULT HEADER_SendCtrlCustomDraw(const HEADER_INFO *infoPtr, DWORD dwDrawStage, HDC hdc, const RECT *rect); -static const WCHAR themeClass[] = {'H','e','a','d','e','r',0}; +static const WCHAR themeClass[] = L"Header"; static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDITEMW *phdi, BOOL fUnicode) { @@ -146,9 +146,7 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDI if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ { - static const WCHAR emptyString[] = {0}; - - LPCWSTR pszText = (phdi->pszText != NULL ? phdi->pszText : emptyString); + const WCHAR *pszText = phdi->pszText != NULL ? phdi->pszText : L""; if (fUnicode) Str_SetPtrW(&lpItem->pszText, pszText); else -- 2.26.2

1 3

[PATCH 2/2] msvcrt: Fix 0 parsing in parse_double helper.
by Piotr Caban 04 May '20

04 May '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 5 ++++- dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-)

1 1

[PATCH 1/2] msvcrt: Cleanup strtod tests.
by Piotr Caban 04 May '20

04 May '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 92 ++++++++++++++------------------------ 1 file changed, 33 insertions(+), 59 deletions(-)

1 0

[PATCH] Add missing RtlQueryEnvironmentVariable to ntdll signed
by Alon Barzilai 04 May '20

04 May '20

Hi, I am new to the list. I am trying to send this patch to the list. I get the message from the list with the patch but I do not see it in the list archives, testbot logs or patch status page Alon. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48773 Signed-off-by: Alon Barzilai <alon(a)skylinesoft.com> --- dlls/ntdll/env.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/env.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 71ae48681d..61c4d56baa 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -38,6 +38,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "winnt.h" @@ -990,6 +991,49 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, return nts; } + +/****************************************************************** + * RtlQueryEnvironmentVariable [NTDLL.@] + * + */ +NTSTATUS WINAPI RtlQueryEnvironmentVariable(PWSTR env, + PWSTR name, + size_t name_length, + PWSTR value, + size_t value_length, + size_t* return_length) +{ + UNICODE_STRING name_u; + UNICODE_STRING value_u; + NTSTATUS nts; + + name_u.Length = name_length * sizeof(WCHAR); + name_u.MaximumLength = name_u.Length; + name_u.Buffer = name; + + value_u.Length = 0; + value_u.MaximumLength = value_length * sizeof(WCHAR); + value_u.Buffer = value; + + nts = RtlQueryEnvironmentVariable_U(env, &name_u, &value_u); + switch (nts) + { + case STATUS_SUCCESS: + *return_length = value_u.Length / sizeof(WCHAR); + break; + + case STATUS_BUFFER_TOO_SMALL: + *return_length = (value_u.Length / sizeof(WCHAR)) + 1; + break; + + case STATUS_VARIABLE_NOT_FOUND: + default: + *return_length = 0; + break; + } + return nts; +} + /****************************************************************** * RtlSetCurrentEnvironment [NTDLL.@] * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cbc43259bd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -860,6 +860,7 @@ @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) +@ stdcall RtlQueryEnvironmentVariable(ptr ptr long ptr long ptr) @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..e308ab0973 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPD static NTSTATUS (WINAPI *pRtlCreateEnvironment)(BOOLEAN, PWSTR*); static NTSTATUS (WINAPI *pRtlDestroyEnvironment)(PWSTR); static NTSTATUS (WINAPI *pRtlQueryEnvironmentVariable_U)(PWSTR, PUNICODE_STRING, PUNICODE_STRING); +static NTSTATUS (WINAPI* pRtlQueryEnvironmentVariable)(PWSTR, PWSTR, size_t, PWSTR, size_t, size_t*); static void (WINAPI *pRtlSetCurrentEnvironment)(PWSTR, PWSTR*); static NTSTATUS (WINAPI *pRtlSetEnvironmentVariable)(PWSTR*, PUNICODE_STRING, PUNICODE_STRING); static NTSTATUS (WINAPI *pRtlExpandEnvironmentStrings_U)(LPWSTR, PUNICODE_STRING, PUNICODE_STRING, PULONG); @@ -95,6 +96,9 @@ static void testQuery(void) UNICODE_STRING name; UNICODE_STRING value; NTSTATUS nts; + size_t name_length; + size_t value_length; + size_t return_length; unsigned int i; for (i = 0; tests[i].var; i++) @@ -130,6 +134,45 @@ static void testQuery(void) break; } } + + /* test RtlQueryEnvironmentVariable */ + if (pRtlQueryEnvironmentVariable) + { + for (i = 0; tests[i].var; i++) + { + const struct test* test = &tests[i]; + name_length = strlen(test->var); + value_length = test->len; + value.Buffer = bv; + bv[test->len] = '@'; + + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1); + nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length); + ok(nts == test->status || (test->alt && nts == test->alt), + "[%d]: Wrong status for '%s', expecting %x got %x\n", + i, test->var, test->status, nts); + if (nts == test->status) switch (nts) + { + case STATUS_SUCCESS: + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1); + ok(return_length == strlen(test->val), "Wrong length %d for %s\n", + return_length, test->var); + ok((return_length == strlen(test->val) && memcmp(bv, bn, return_length) == 0) || + lstrcmpW(bv, bn) == 0, + "Wrong result for %s/%d\n", test->var, test->len); + ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len); + break; + case STATUS_BUFFER_TOO_SMALL: + ok(return_length == (strlen(test->val) + 1), + "Wrong returned length %d (too small buffer) for %s\n", return_length, test->var); + break; + } + } + } + else + { + win_skip("RtlQueryEnvironmentVariable not available, skipping tests\n"); + } } static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret, NTSTATUS alt) @@ -525,6 +568,7 @@ START_TEST(env) pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment"); pRtlQueryEnvironmentVariable_U = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable_U"); + pRtlQueryEnvironmentVariable = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable"); pRtlSetCurrentEnvironment = (void*)GetProcAddress(mod, "RtlSetCurrentEnvironment"); pRtlSetEnvironmentVariable = (void*)GetProcAddress(mod, "RtlSetEnvironmentVariable"); pRtlExpandEnvironmentStrings_U = (void*)GetProcAddress(mod, "RtlExpandEnvironmentStrings_U"); -- 2.17.1

2 1

[PATCH v3 2/2] ntdll: Deny file operations on mapping handles.
by Paul Gofman 04 May '20

04 May '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - don't add redundant checks on server. v3: - always pass &fd_type instead of type in server_get_unix_fd(). dlls/ntdll/file.c | 6 +++++- dlls/ntdll/server.c | 18 ++++++++++++++---- dlls/ntdll/tests/om.c | 44 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 9997a5e1cd..33f78b63ac 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3266,10 +3266,11 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io PVOID buffer, ULONG length, FS_INFORMATION_CLASS info_class ) { + enum server_fd_type type; int fd, needs_close; struct stat st; - io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ); + io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, &type, NULL ); if (io->u.Status == STATUS_BAD_DEVICE_TYPE) { SERVER_START_REQ( get_volume_info ) @@ -3285,6 +3286,9 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io } else if (io->u.Status) return io->u.Status; + if (type == FD_TYPE_MAPPING) + return STATUS_OBJECT_TYPE_MISMATCH; + io->u.Status = STATUS_NOT_IMPLEMENTED; io->Information = 0; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 3832a80f1e..214c11c8f2 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1073,6 +1073,7 @@ int server_remove_fd_from_cache( HANDLE handle ) int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ) { + enum server_fd_type fd_type = FD_TYPE_NB_TYPES; sigset_t sigset; obj_handle_t fd_handle; int ret, fd = -1; @@ -1082,11 +1083,11 @@ int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, *needs_close = 0; wanted_access &= FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA; - ret = get_cached_fd( handle, &fd, type, &access, options ); + ret = get_cached_fd( handle, &fd, &fd_type, &access, options ); if (ret != STATUS_INVALID_HANDLE) goto done; server_enter_uninterrupted_section( &fd_cache_section, &sigset ); - ret = get_cached_fd( handle, &fd, type, &access, options ); + ret = get_cached_fd( handle, &fd, &fd_type, &access, options ); if (ret == STATUS_INVALID_HANDLE) { SERVER_START_REQ( get_handle_fd ) @@ -1094,7 +1095,7 @@ int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, req->handle = wine_server_obj_handle( handle ); if (!(ret = wine_server_call( req ))) { - if (type) *type = reply->type; + fd_type = reply->type; if (options) *options = reply->options; access = reply->access; if ((fd = receive_fd( &fd_handle )) != -1) @@ -1116,12 +1117,21 @@ int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, server_leave_uninterrupted_section( &fd_cache_section, &sigset ); done: + if (!ret && wanted_access && fd_type == FD_TYPE_MAPPING) + ret = STATUS_INVALID_HANDLE; + if (!ret && ((access & wanted_access) != wanted_access)) { ret = STATUS_ACCESS_DENIED; if (*needs_close) close( fd ); } - if (!ret) *unix_fd = fd; + if (!ret) + { + if (type) + *type = fd_type; + + *unix_fd = fd; + } return ret; } diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c17b6ffa8d..b6a338596e 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -23,6 +23,7 @@ #include "winternl.h" #include "stdio.h" #include "winnt.h" +#include "winioctl.h" #include "stdlib.h" static HANDLE (WINAPI *pCreateWaitableTimerA)(SECURITY_ATTRIBUTES*, BOOL, LPCSTR); @@ -72,6 +73,8 @@ static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, c static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI *pNtOpenIoCompletion)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, void *, ULONG, FILE_INFORMATION_CLASS); +static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)( HANDLE handle, PIO_STATUS_BLOCK io, PVOID buffer, + ULONG length, FS_INFORMATION_CLASS info_class ); static NTSTATUS (WINAPI *pNtQuerySystemTime)( LARGE_INTEGER * ); static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); static void (WINAPI *pRtlWakeAddressAll)( const void * ); @@ -1585,9 +1588,16 @@ static void test_query_object(void) static void test_type_mismatch(void) { - HANDLE h; - NTSTATUS res; + char tmp_path[MAX_PATH], file_name[MAX_PATH + 16]; + FILE_FS_DEVICE_INFORMATION info; OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + LARGE_INTEGER size; + HANDLE h, hfile; + DWORD length; + NTSTATUS res; + DWORD type; + BOOL ret; attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -1603,6 +1613,35 @@ static void test_type_mismatch(void) ok(res == STATUS_OBJECT_TYPE_MISMATCH, "expected 0xc0000024, got %x\n", res); pNtClose( h ); + + GetTempPathA(MAX_PATH, tmp_path); + GetTempFileNameA(tmp_path, "foo", 0, file_name); + hfile = CreateFileA(file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_FLAG_DELETE_ON_CLOSE, 0); + ok(hfile != INVALID_HANDLE_VALUE, "Got unexpected hfile %p.\n", hfile); + + size.QuadPart = 256; + res = pNtCreateSection(&h, SECTION_MAP_WRITE | SECTION_MAP_READ, NULL, &size, + PAGE_READWRITE, SEC_COMMIT, hfile); + ok(res == STATUS_SUCCESS , "Got unexpected res %x\n", res); + + res = pNtQueryVolumeInformationFile(h, &io, &info, sizeof(info), FileFsDeviceInformation); + ok(res == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected result %#x.\n", res); + + type = GetFileType(h); + ok(type == FILE_TYPE_UNKNOWN, "Got unexpected type %#x.\n", type); + + SetLastError(0xdeadbeef); + ret = WriteFile(h, file_name, 16, &length, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected ret %#x, GetLastError() %#x.\n", + ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = ReadFile(h, file_name, 16, &length, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected ret %#x, GetLastError() %#x.\n", + ret, GetLastError()); + pNtClose(h); + CloseHandle(hfile); } static void test_event(void) @@ -2207,6 +2246,7 @@ START_TEST(om) pRtlWaitOnAddress = (void *)GetProcAddress(hntdll, "RtlWaitOnAddress"); pRtlWakeAddressAll = (void *)GetProcAddress(hntdll, "RtlWakeAddressAll"); pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); + pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile"); test_case_sensitive(); test_namespace_pipe(); -- 2.26.2

1 0

[PATCH 1/6] dwrite: Add separate structure for top level gsub/gpos offsets.
by Nikolay Sivov 04 May '20

04 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 16 +++++++++------- dlls/dwrite/opentype.c | 27 ++++++++++++++------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5755696875..d89dacb3a4 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -434,19 +434,21 @@ enum SCRIPT_JUSTIFY SCRIPT_JUSTIFY_ARABIC_SEEN_M }; +struct ot_gsubgpos_table +{ + struct dwrite_fonttable table; + unsigned int script_list; + unsigned int feature_list; + unsigned int lookup_list; +}; + struct scriptshaping_cache { const struct shaping_font_ops *font; void *context; UINT16 upem; - struct - { - struct dwrite_fonttable table; - unsigned int script_list; - unsigned int feature_list; - unsigned int lookup_list; - } gpos; + struct ot_gsubgpos_table gpos; struct { diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0307cd5981..66c3398316 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2962,10 +2962,11 @@ void opentype_layout_scriptshaping_cache_init(struct scriptshaping_cache *cache) cache->gdef.classdef = table_read_be_word(&cache->gdef.table, FIELD_OFFSET(struct gdef_header, classdef)); } -DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD kind, DWORD script, +unsigned int opentype_layout_find_script(const struct scriptshaping_cache *cache, unsigned int kind, DWORD script, unsigned int *script_index) { - WORD script_count; + const struct ot_gsubgpos_table *table = &cache->gpos; + UINT16 script_count; unsigned int i; *script_index = ~0u; @@ -2973,14 +2974,14 @@ DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD if (kind != MS_GPOS_TAG) return 0; - script_count = table_read_be_word(&cache->gpos.table, cache->gpos.script_list); + script_count = table_read_be_word(&table->table, table->script_list); if (!script_count) return 0; for (i = 0; i < script_count; i++) { - DWORD tag = table_read_dword(&cache->gpos.table, cache->gpos.script_list + - FIELD_OFFSET(struct ot_script_list, scripts) + i * sizeof(struct ot_script_record)); + unsigned int tag = table_read_dword(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + i * sizeof(struct ot_script_record)); if (!tag) continue; @@ -2994,10 +2995,11 @@ DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD return 0; } -DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWORD kind, DWORD language, +unsigned int opentype_layout_find_language(const struct scriptshaping_cache *cache, unsigned int kind, DWORD language, unsigned int script_index, unsigned int *language_index) { - WORD table_offset, lang_count; + const struct ot_gsubgpos_table *table = &cache->gpos; + UINT16 table_offset, lang_count; unsigned int i; *language_index = ~0u; @@ -3005,17 +3007,16 @@ DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWO if (kind != MS_GPOS_TAG) return 0; - table_offset = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + - FIELD_OFFSET(struct ot_script_list, scripts) + script_index * sizeof(struct ot_script_record) + - FIELD_OFFSET(struct ot_script_record, script)); + table_offset = table_read_be_word(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + script_index * sizeof(struct ot_script_record) + FIELD_OFFSET(struct ot_script_record, script)); if (!table_offset) return 0; - lang_count = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset + + lang_count = table_read_be_word(&table->table, table->script_list + table_offset + FIELD_OFFSET(struct ot_script, langsys_count)); for (i = 0; i < lang_count; i++) { - DWORD tag = table_read_dword(&cache->gpos.table, cache->gpos.script_list + table_offset + + unsigned int tag = table_read_dword(&table->table, table->script_list + table_offset + FIELD_OFFSET(struct ot_script, langsys) + i * sizeof(struct ot_langsys_record)); if (tag == language) @@ -3026,7 +3027,7 @@ DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWO } /* Try 'defaultLangSys' if it's set. */ - if (table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset)) + if (table_read_be_word(&table->table, table->script_list + table_offset)) return ~0u; return 0; -- 2.26.2

1 5

[PATCH] ntdll: Add missing RtlQueryEnvironmentVariable function
by Alon Barzilai 04 May '20

04 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48773 Signed-off-by: Alon Barzilai <alon.barzilai(a)gmail.com> --- dlls/ntdll/env.c | 38 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/env.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 71ae48681d..59aac39a7b 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -990,6 +990,44 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, return nts; } + +/****************************************************************** + * RtlQueryEnvironmentVariable [NTDLL.@] + * + */ +NTSTATUS WINAPI RtlQueryEnvironmentVariable(WCHAR* env, WCHAR* name, SIZE_T name_length, WCHAR* value, SIZE_T value_length, SIZE_T* return_length) +{ + UNICODE_STRING name_u; + UNICODE_STRING value_u; + NTSTATUS nts; + + name_u.Length = name_length * sizeof(WCHAR); + name_u.MaximumLength = name_u.Length; + name_u.Buffer = name; + + value_u.Length = 0; + value_u.MaximumLength = value_length * sizeof(WCHAR); + value_u.Buffer = value; + + nts = RtlQueryEnvironmentVariable_U(env, &name_u, &value_u); + if (nts == STATUS_SUCCESS) + { + *return_length = value_u.Length / sizeof(WCHAR); + } + else + { + if (nts == STATUS_BUFFER_TOO_SMALL) + { + *return_length = (value_u.Length / sizeof(WCHAR)) + 1; + } + else + { + *return_length = value_u.Length / sizeof(WCHAR); + } + } + return nts; +} + /****************************************************************** * RtlSetCurrentEnvironment [NTDLL.@] * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cbc43259bd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -860,6 +860,7 @@ @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) +@ stdcall RtlQueryEnvironmentVariable(ptr ptr long ptr long ptr) @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..07ec0a08c6 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPD static NTSTATUS (WINAPI *pRtlCreateEnvironment)(BOOLEAN, PWSTR*); static NTSTATUS (WINAPI *pRtlDestroyEnvironment)(PWSTR); static NTSTATUS (WINAPI *pRtlQueryEnvironmentVariable_U)(PWSTR, PUNICODE_STRING, PUNICODE_STRING); +static NTSTATUS (WINAPI* pRtlQueryEnvironmentVariable)(WCHAR*, WCHAR*, SIZE_T, WCHAR*, SIZE_T, SIZE_T*); static void (WINAPI *pRtlSetCurrentEnvironment)(PWSTR, PWSTR*); static NTSTATUS (WINAPI *pRtlSetEnvironmentVariable)(PWSTR*, PUNICODE_STRING, PUNICODE_STRING); static NTSTATUS (WINAPI *pRtlExpandEnvironmentStrings_U)(LPWSTR, PUNICODE_STRING, PUNICODE_STRING, PULONG); @@ -95,6 +96,9 @@ static void testQuery(void) UNICODE_STRING name; UNICODE_STRING value; NTSTATUS nts; + SIZE_T name_length; + SIZE_T value_length; + SIZE_T return_length; unsigned int i; for (i = 0; tests[i].var; i++) @@ -130,6 +134,44 @@ static void testQuery(void) break; } } + + if (pRtlQueryEnvironmentVariable) + { + for (i = 0; tests[i].var; i++) + { + const struct test* test = &tests[i]; + name_length = strlen(test->var); + value_length = test->len; + value.Buffer = bv; + bv[test->len] = '@'; + + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1); + nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length); + ok(nts == test->status || (test->alt && nts == test->alt), + "[%d]: Wrong status for '%s', expecting %x got %x\n", + i, test->var, test->status, nts); + if (nts == test->status) switch (nts) + { + case STATUS_SUCCESS: + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1); + ok(return_length == strlen(test->val), "Wrong length %d for %s\n", + return_length, test->var); + ok((return_length == strlen(test->val) && memcmp(bv, bn, return_length) == 0) || + lstrcmpW(bv, bn) == 0, + "Wrong result for %s/%d\n", test->var, test->len); + ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len); + break; + case STATUS_BUFFER_TOO_SMALL: + ok(return_length == (strlen(test->val) + 1), + "Wrong returned length %d (too small buffer) for %s\n", return_length, test->var); + break; + } + } + } + else + { + win_skip("RtlQueryEnvironmentVariable not available, skipping tests\n"); + } } static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret, NTSTATUS alt) @@ -525,6 +567,7 @@ START_TEST(env) pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment"); pRtlQueryEnvironmentVariable_U = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable_U"); + pRtlQueryEnvironmentVariable = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable"); pRtlSetCurrentEnvironment = (void*)GetProcAddress(mod, "RtlSetCurrentEnvironment"); pRtlSetEnvironmentVariable = (void*)GetProcAddress(mod, "RtlSetEnvironmentVariable"); pRtlExpandEnvironmentStrings_U = (void*)GetProcAddress(mod, "RtlExpandEnvironmentStrings_U"); -- 2.17.1

1 1

[PATCH] winspool.drv: return success in AddPrintProcessorA
by Austin English 04 May '20

04 May '20

This syncs the return value with AddPrintProcessorW Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26171 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 593f091c2d..0ddca147e6 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5405,7 +5405,7 @@ BOOL WINAPI AddPrintProcessorA(LPSTR pName, LPSTR pEnvironment, LPSTR pPathName, { FIXME("(%s,%s,%s,%s): stub\n", debugstr_a(pName), debugstr_a(pEnvironment), debugstr_a(pPathName), debugstr_a(pPrintProcessorName)); - return FALSE; + return TRUE; } /***************************************************************************** -- 2.24.1

2 1