February 2021 - Wine-Devel - list.winehq.org

[PATCH 1/2] server: Grant the same access rights when req->access is zero in duplicate_token.
by Zebediah Figura Feb. 7, 2021

Feb. 7, 2021

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/token.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/token.c b/server/token.c index ec2616098c6..2ae1cb1780a 100644 --- a/server/token.c +++ b/server/token.c @@ -1358,7 +1358,8 @@ DECL_HANDLER(duplicate_token) struct token *token = token_duplicate( src_token, req->primary, req->impersonation_level, sd, NULL, 0, NULL, 0 ); if (token) { - reply->new_handle = alloc_handle_no_access_check( current->process, token, req->access, objattr->attributes ); + unsigned int access = req->access ? req->access : get_handle_access( current->process, req->handle ); + reply->new_handle = alloc_handle_no_access_check( current->process, token, access, objattr->attributes ); release_object( token ); } release_object( src_token ); -- 2.20.1

1 1

[PATCH v6 4/5] mountmgr: Add support for volume information queries.
by Erich E. Hoover Feb. 6, 2021

Feb. 6, 2021

This patch allows the mountmgr to handle the volume information request IRP, allowing volume information to be queried from the mountmgr by ntdll. v6: Have harddisk_query_volume return the same status as the IoStatus. v5: No change v4: Reordered (no content change) v3: Use SystemBuffer instead of UserBuffer (see 8e98dcd42e13bfeb5a2397ff9bf1c7f63c224e23) v2: Per Zeb's request, now storing the volume with the disk_device so that the lookup doesn't require a search. Best, Erich

1 0

[PATCH v6 2/5] ntdll: Allow NtQueryVolumeInformationFile to make async volume information queries.
by Erich E. Hoover Feb. 6, 2021

Feb. 6, 2021

This patch allows NtQueryVolumeInformationFile to pass FileFsVolumeInformation and FileFsAttributeInformation requests to the mountmgr (as well as other device drivers). These requests currently do not work for NT device paths, which results in a bunch of duplication in kernelbase (see patch 5). v6: No change v5: Fixed improper usage of io->u.Status that caused intermittent test failures in v4 patch 5 v4: Reordered (no content change) v3: No change v2: Split Best, Erich

1 0

[PATCH website 01/15] [website] Add Dutch translation
by Floris Renaud Feb. 6, 2021

Feb. 6, 2021

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- templates/en/global/xml/trans/lang.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/en/global/xml/trans/lang.xml b/templates/en/global/xml/trans/lang.xml index dddc2ada..40ac471e 100644 --- a/templates/en/global/xml/trans/lang.xml +++ b/templates/en/global/xml/trans/lang.xml @@ -15,6 +15,7 @@ <str name="fr">Français</str> <str name="ko">한국어</str> <str name="he">עברית</str> + <str name="nl">Nederlands</str> <str name="pl">Polski</str> <str name="pt">Português</str> <str name="tr">Türkçe</str> @@ -30,6 +31,7 @@ <str name="fr">Changez la langue</str> <str name="ko">언어 변경</str> <str name="he">החלפת השפה</str> + <srr name="nl">Taal veranderen</srr> <str name="pl">Zmień język</str> <str name="pt">Mudar a língua</str> <str name="tr">Lisan Değiştir</str> -- 2.30.0

1 14

[PATCH 2/2] dhtmled.ocx: Implement IOleObject::GetMiscStatus function.
by Vijay Kiran Kamuju Feb. 6, 2021

Feb. 6, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50620 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/2] dhtmled.ocx: Add Dll registry resource.
by Vijay Kiran Kamuju Feb. 6, 2021

Feb. 6, 2021

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/3] configure: Introduce new jxrlib dependency.
by Rémi Bernon Feb. 6, 2021

Feb. 6, 2021

This library is the JPEG-XR / Windows Media Photo / HD Photo reference implementation from Microsoft, released under BSD 2-Clause license: https://archive.codeplex.com/?p=jxrlib It is available for most Linux distributions already, and is also an optional dependency for imagemagick, freeimage or calibre: * https://packages.debian.org/source/sid/jxrlib * https://rpmfind.net/linux/rpm2html/search.php?query=jxrlib * https://packages.ubuntu.com/source/xenial/jxrlib * https://www.archlinux.org/packages/community/x86_64/jxrlib/ Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 198861-198864 configure.ac | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/configure.ac b/configure.ac index 3a0bc6e713a..94120e742cb 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,7 @@ AC_ARG_WITH(gstreamer, AS_HELP_STRING([--without-gstreamer],[do not use GStreame AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])) AC_ARG_WITH(inotify, AS_HELP_STRING([--without-inotify],[do not use inotify (filesystem change notifications)])) AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG])) +AC_ARG_WITH(jxrlib, AS_HELP_STRING([--without-jxrlib],[do not use JPEG-XR])) AC_ARG_WITH(krb5, AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerberos)])) AC_ARG_WITH(ldap, AS_HELP_STRING([--without-ldap],[do not use LDAP]), [if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi]) @@ -1829,6 +1830,21 @@ fi WINE_WARNING_WITH(jpeg,[test "x$ac_cv_lib_soname_jpeg" = "x"], [libjpeg ${notice_platform}development files not found, JPEG won't be supported.]) +dnl **** Check for libjxrglue **** +if test "x$with_jxrlib" != "xno" +then + WINE_PACKAGE_FLAGS(JXRLIB,[jxrlib],,[${JXRLIB_CFLAGS:--I/usr/include/jxrlib}],, + [AC_CHECK_HEADERS([JXRGlue.h],,,[#define FAR]) + if test "$ac_cv_header_JXRGlue_h" = "yes" + then + WINE_CHECK_SONAME(jxrglue,PKImageDecode_Create_WMP,,[JXRLIB_CFLAGS=""],[$JXRLIB_LIBS]) + else + JXRLIB_CFLAGS="" + fi]) +fi +WINE_WARNING_WITH(jxrlib,[test "x$ac_cv_lib_soname_jxrglue" = "x"], + [jxrlib ${notice_platform}development files not found, JPEG-XR won't be supported.]) + dnl **** Check for libpng **** if test "x$with_png" != "xno" then -- 2.30.0

2 5

[PATCH] user32/tests: Add more tests for GetKeyState from background thread.
by Rémi Bernon Feb. 5, 2021

Feb. 5, 2021

It looks like that GetKeyState is supposed to catch key presses when called from a background thread even after its thread message queue and thread input structures have been created. This happens in Bioshock 2 Remaster, and causes the game to stay forever on a "Press space to continue" screen, as the thread checking for space key press calls GetKeyState repeatedly (and PeekMessage), although it's in background. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/input.c | 132 ++++++++++++++++++++++++++++---------- 1 file changed, 98 insertions(+), 34 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 9523401988d..396a39a06c9 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3715,74 +3715,138 @@ static void test_attach_input(void) DestroyWindow(Wnd2); } +struct get_key_state_test_desc +{ + BOOL peek_message_init; + BOOL peek_message_main; + BOOL peek_message_thread; + BOOL create_window; + BOOL expect, todo; +}; + +struct get_key_state_test_desc get_key_state_tests[] = +{ + /* 0: without a message queue: GetKeyState miss key press */ + {FALSE, FALSE, FALSE, FALSE, /* expect: */ FALSE, TRUE}, + /* 1: peeked at least once: GetKeyState catches key press */ + { TRUE, FALSE, FALSE, FALSE, /* expect: */ TRUE, TRUE}, + /* 2: peeking in fgnd thread: GetKeyState catches key press */ + { TRUE, TRUE, FALSE, FALSE, /* expect: */ TRUE, TRUE}, + /* 3: peeking in bgnd thread: GetKeyState catches key press */ + { TRUE, FALSE, TRUE, FALSE, /* expect: */ TRUE, TRUE}, + /* 4: creating window in bgnd but not peeking messages: GetKeyState miss key press */ + {FALSE, FALSE, FALSE, TRUE, /* expect: */ FALSE, FALSE}, + /* 5: creating window in bgnd and peeking bgnd messages: GetKeyState catches key press */ + {FALSE, FALSE, TRUE, TRUE, /* expect: */ TRUE, TRUE}, + /* 6: creating window in bgnd and peeking fgnd messages: GetKeyState miss key press */ + {FALSE, TRUE, FALSE, TRUE, /* expect: */ FALSE, FALSE}, +}; + +struct get_key_state_thread_params +{ + HANDLE semaphores[2]; + int index; +}; + static DWORD WINAPI get_key_state_thread(void *arg) { - HANDLE *semaphores = arg; + struct get_key_state_thread_params *params = arg; + struct get_key_state_test_desc* test; + HANDLE *semaphores = params->semaphores; DWORD result; + HWND hwnd; + MSG msg; + int i = params->index; + + test = get_key_state_tests + i; + if (!test->create_window) hwnd = NULL; + else + { + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 10, 10, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowA failed %u\n", GetLastError()); + empty_message_queue(); + } + if (test->peek_message_init) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); + if (test->peek_message_thread) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); result = GetKeyState('X'); - ok((result & 0x8000) || broken(!(result & 0x8000)), /* > Win 2003 */ - "expected that highest bit is set, got %x\n", result); - - ok((SHORT)(result & 0x007e) == 0, - "expected that undefined bits are unset, got %x\n", result); + if (test->expect) + todo_wine ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); + else + todo_wine_if(test->todo) ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); + if (test->peek_message_thread) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); result = GetKeyState('X'); - ok(!(result & 0x8000), "expected that highest bit is unset, got %x\n", result); - - ok((SHORT)(result & 0x007e) == 0, - "expected that undefined bits are unset, got %x\n", result); + ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); + if (hwnd) DestroyWindow(hwnd); return 0; } static void test_GetKeyState(void) { - HANDLE semaphores[2]; + struct get_key_state_thread_params params; HANDLE thread; DWORD result; HWND hwnd; + MSG msg; + int i; - semaphores[0] = CreateSemaphoreA(NULL, 0, 1, NULL); - ok(semaphores[0] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); - semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL); - ok(semaphores[1] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + params.semaphores[0] = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(params.semaphores[0] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + params.semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(params.semaphores[1] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindowA failed %u\n", GetLastError()); + empty_message_queue(); - thread = CreateThread(NULL, 0, get_key_state_thread, semaphores, 0, NULL); - ok(thread != NULL, "CreateThread failed %u\n", GetLastError()); - result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + for (i = 0; i < ARRAY_SIZE(get_key_state_tests); ++i) + { + struct get_key_state_test_desc* test = get_key_state_tests + i; + + params.index = i; + thread = CreateThread(NULL, 0, get_key_state_thread, &params, 0, NULL); + ok(thread != NULL, "CreateThread failed %u\n", GetLastError()); - SetForegroundWindow(hwnd); - SetFocus(hwnd); - keybd_event('X', 0, 0, 0); + result = WaitForSingleObject(params.semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - ReleaseSemaphore(semaphores[1], 1, NULL); - result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + SetForegroundWindow(hwnd); + SetFocus(hwnd); - keybd_event('X', 0, KEYEVENTF_KEYUP, 0); + keybd_event('X', 0, 0, 0); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ReleaseSemaphore(semaphores[1], 1, NULL); - result = WaitForSingleObject(thread, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - CloseHandle(thread); + ReleaseSemaphore(params.semaphores[1], 1, NULL); + result = WaitForSingleObject(params.semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); + + keybd_event('X', 0, KEYEVENTF_KEYUP, 0); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + ReleaseSemaphore(params.semaphores[1], 1, NULL); + + result = WaitForSingleObject(thread, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + CloseHandle(thread); + } DestroyWindow(hwnd); - CloseHandle(semaphores[0]); - CloseHandle(semaphores[1]); + CloseHandle(params.semaphores[0]); + CloseHandle(params.semaphores[1]); } static void test_OemKeyScan(void) -- 2.30.0

2 2

[PATCH 14/18] ntdll: Don't use NtSetContextThread in NtContinue.
by Jacek Caban Feb. 5, 2021

Feb. 5, 2021

NtSetContextThread, unlike NtContinue, should not set nonvolatile registers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/signal_arm.c | 18 +++++++++++++----- dlls/ntdll/unix/signal_arm64.c | 20 ++++++++++++++------ dlls/ntdll/unix/signal_i386.c | 14 +++++++++++++- dlls/ntdll/unix/signal_x86_64.c | 15 ++++++++++++++- dlls/ntdll/unix/unix_private.h | 1 + 6 files changed, 56 insertions(+), 14 deletions(-)

2 3

[tools 1/2] testbot/reporttest: Fix the spelling of a comment in the generated report.
by Francois Gouget Feb. 5, 2021

Feb. 5, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/reporttest/reporttest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/reporttest/reporttest.c b/testbot/src/reporttest/reporttest.c index fecaa50fb..b2e7a78bf 100644 --- a/testbot/src/reporttest/reporttest.c +++ b/testbot/src/reporttest/reporttest.c @@ -241,7 +241,7 @@ int main(int argc, char** argv) unit[strlen(unit)-1] = '\0'; fprintf(logfile, "%s:%s start fake/%s/%s.c -\n", line+5, unit, line+5, unit); fprintf(logfile, "----- A standard successful unit test\n"); - fprintf(logfile, "----- Expected assessement: Success\n"); + fprintf(logfile, "----- Expected assessment: Success\n"); fprintf(logfile, "1234:%s: 2 tests executed (0 marked as todo, 0 failures), 0 skipped.\n", unit); fprintf(logfile, "%s:%s:1234 done (0) in 0s\n", line+5, unit); } -- 2.20.1

1 1