wine-devel May 2020

wine-devel@winehq.org

79 participants
626 discussions

[PATCH] Add missing RtlQueryEnvironmentVariable to ntdll with sign Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48773 Signed-off-by: Alon Barzilai <alon.barzilai@gmail.com>
by Alon Barzilai 04 May '20

04 May '20

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

04 May '20

1 0

[PATCH] Add missing RtlQueryEnvironmentVariable to ntdll with sign Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48773 Signed-off-by: Alon Barzilai <alon@skylinesoft.com>
by Alon Barzilai 04 May '20

04 May '20

From: Alon Barzilai <alon(a)skylinesoft.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 0

03 May '20

1 1

[PATCH] ntoskrnl.exe: Implement IoIs32bitProcess().
by Zebediah Figura 03 May '20

03 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49088 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + include/ddk/wdm.h | 3 +++ 4 files changed, 17 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6ee08f7202..1aa34c9b27 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2145,6 +2145,7 @@ static void *create_process_object( HANDLE handle ) process->header.Type = 3; process->header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */ NtQueryInformationProcess( handle, ProcessBasicInformation, &process->info, sizeof(process->info), NULL ); + IsWow64Process( handle, &process->wow64 ); return process; } @@ -3884,6 +3885,17 @@ PEPROCESS WINAPI IoGetRequestorProcess(IRP *irp) return irp->Tail.Overlay.Thread->kthread.process; } +#ifdef _WIN64 +/*********************************************************************** + * IoIs32bitProcess (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI IoIs32bitProcess(IRP *irp) +{ + TRACE("irp %p.\n", irp); + return irp->Tail.Overlay.Thread->kthread.process->wow64; +} +#endif + /*********************************************************************** * RtlIsNtDdiVersionAvailable (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 14d95a47f8..8e3b127b16 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -416,6 +416,7 @@ @ stdcall IoInitializeTimer(ptr ptr ptr) @ stdcall IoInvalidateDeviceRelations(ptr long) @ stub IoInvalidateDeviceState +@ stdcall -arch=win64 IoIs32bitProcess(ptr) @ stub IoIsFileOriginRemote @ stub IoIsOperationSynchronous @ stub IoIsSystemThread diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 256e945e6f..23f03c336d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -40,6 +40,7 @@ struct _EPROCESS { DISPATCHER_HEADER header; PROCESS_BASIC_INFORMATION info; + BOOL wow64; }; struct _KTHREAD diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 60396779fc..db8073ebe3 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1608,6 +1608,9 @@ void WINAPI IoGetStackLimits(ULONG_PTR*,ULONG_PTR*); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +#ifdef _WIN64 +BOOLEAN WINAPI IoIs32bitProcess(IRP*); +#endif NTSTATUS WINAPI IoOpenDeviceRegistryKey(DEVICE_OBJECT*,ULONG,ACCESS_MASK,HANDLE*); void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING); -- 2.26.2

1 0

[PATCH v3 1/2] cmd: Fix regression in if condition parsing.
by Bernhard Übelacker 03 May '20

03 May '20

Regression introduced in f238e846e701d2039eceb51f2f6e9d936f8c791c. Therefore if conditions got influenced by values of the previous line. v3: Unchanged, but patchwatcher did not run tests last time. Supersedes 184644 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47770 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48738 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- programs/cmd/builtins.c | 6 ++++++ programs/cmd/wcmdmain.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1870e5688da..70ccddebc11 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2938,9 +2938,15 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) int test; /* Condition evaluation result */ WCHAR *command; + /* Function evaluate_if_condition relies on the global variables quals, param1 and param2 + set in a call to WCMD_parse before */ if (evaluate_if_condition(p, &command, &test, &negate) == -1) goto syntax_err; + WINE_TRACE("p: %s, quals: %s, param1: %s, param2: %s, command: %s\n", + wine_dbgstr_w(p), wine_dbgstr_w(quals), wine_dbgstr_w(param1), + wine_dbgstr_w(param2), wine_dbgstr_w(command)); + /* Process rest of IF statement which is on the same line Note: This may process all or some of the cmdList (eg a GOTO) */ WCMD_part_execute(cmdList, command, TRUE, (test != negate)); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2819f7fa99f..16843e40873 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1947,8 +1947,6 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE To be able to handle ('s in the condition part take as much as evaluate_if_condition would take and skip parsing it here. */ } else if (WCMD_keyword_ws_found(ifCmd, ARRAY_SIZE(ifCmd), curPos)) { - static const WCHAR parmI[] = {'/','I','\0'}; - static const WCHAR notW[] = {'n','o','t','\0'}; int negate; /* Negate condition */ int test; /* Condition evaluation result */ WCHAR *p, *command; @@ -1956,17 +1954,18 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE inIf = TRUE; p = curPos+(ARRAY_SIZE(ifCmd)); - while (*p == ' ' || *p == '\t') { + while (*p == ' ' || *p == '\t') p++; - if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), notW) == 0) - p += lstrlenW(notW); - if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), parmI) == 0) - p += lstrlenW(parmI); - } + WCMD_parse (p, quals, param1, param2); + /* Function evaluate_if_condition relies on the global variables quals, param1 and param2 + set in a call to WCMD_parse before */ if (evaluate_if_condition(p, &command, &test, &negate) != -1) { int if_condition_len = command - curPos; + WINE_TRACE("p: %s, quals: %s, param1: %s, param2: %s, command: %s, if_condition_len: %d\n", + wine_dbgstr_w(p), wine_dbgstr_w(quals), wine_dbgstr_w(param1), + wine_dbgstr_w(param2), wine_dbgstr_w(command), if_condition_len); memcpy(&curCopyTo[*curLen], curPos, if_condition_len*sizeof(WCHAR)); (*curLen)+=if_condition_len; curPos+=if_condition_len; -- 2.20.1

2 2

[PATCH resend] msi: Avoid an uninitialized compiler warning in InstallerImpl_SummaryInformation.
by Gerald Pfeifer 03 May '20

03 May '20

[ https://www.winehq.org/pipermail/wine-devel/2020-February/159977.html has the original submissions; I just verified it still occurs. ] According to my visually tracing to the sources this looks like a false positive, alas a tricky one, and GCC 10 warns, hence this straightforward approach to silence it - which is conservative programming in any case. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/msi/automation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index ba3a068a74..489adc96a9 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1837,7 +1837,7 @@ static HRESULT InstallerImpl_SummaryInformation(WORD wFlags, UINT ret; HRESULT hr; MSIHANDLE hsuminfo; - IDispatch *dispatch; + IDispatch *dispatch = 0; VARIANTARG varg0, varg1; if (!(wFlags & DISPATCH_PROPERTYGET)) -- 2.25.0

1 0

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

03 May '20

--- 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..bb081e20ed 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

3 3

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

03 May '20

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

1 0

[PATCH] riched20: Include wine/asm.h in editstr.h.
by Jacek Caban 03 May '20

03 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49068 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/riched20/editstr.h | 1 + dlls/riched20/txthost.c | 1 - dlls/riched20/txtsrv.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel May 2020