wine-devel December 2021

wine-devel@winehq.org

85 participants
585 discussions

[PATCH] server: Remove workarounds for Mac OS X 10.4.
by Brendan Shanks 01 Dec '21

01 Dec '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- These were already removed from signal_i386. server/mach.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/server/mach.c b/server/mach.c index 77f1fdcdb86..d31e4025776 100644 --- a/server/mach.c +++ b/server/mach.c @@ -193,22 +193,12 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int else #endif { -/* work around silly renaming of struct members in OS X 10.5 */ -#if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) context->debug.i386_regs.dr0 = state.uds.ds32.__dr0; context->debug.i386_regs.dr1 = state.uds.ds32.__dr1; context->debug.i386_regs.dr2 = state.uds.ds32.__dr2; context->debug.i386_regs.dr3 = state.uds.ds32.__dr3; context->debug.i386_regs.dr6 = state.uds.ds32.__dr6; context->debug.i386_regs.dr7 = state.uds.ds32.__dr7; -#else - context->debug.i386_regs.dr0 = state.uds.ds32.dr0; - context->debug.i386_regs.dr1 = state.uds.ds32.dr1; - context->debug.i386_regs.dr2 = state.uds.ds32.dr2; - context->debug.i386_regs.dr3 = state.uds.ds32.dr3; - context->debug.i386_regs.dr6 = state.uds.ds32.dr6; - context->debug.i386_regs.dr7 = state.uds.ds32.dr7; -#endif } context->flags |= SERVER_CTX_DEBUG_REGISTERS; } @@ -262,7 +252,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.dsh.flavor = x86_DEBUG_STATE32; state.dsh.count = sizeof(state.uds.ds32) / sizeof(int); -#if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) state.uds.ds32.__dr0 = context->debug.i386_regs.dr0; state.uds.ds32.__dr1 = context->debug.i386_regs.dr1; state.uds.ds32.__dr2 = context->debug.i386_regs.dr2; @@ -271,16 +260,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.uds.ds32.__dr5 = 0; state.uds.ds32.__dr6 = context->debug.i386_regs.dr6; state.uds.ds32.__dr7 = dr7; -#else - state.uds.ds32.dr0 = context->debug.i386_regs.dr0; - state.uds.ds32.dr1 = context->debug.i386_regs.dr1; - state.uds.ds32.dr2 = context->debug.i386_regs.dr2; - state.uds.ds32.dr3 = context->debug.i386_regs.dr3; - state.uds.ds32.dr4 = 0; - state.uds.ds32.dr5 = 0; - state.uds.ds32.dr6 = context->debug.i386_regs.dr6; - state.uds.ds32.dr7 = dr7; -#endif } thread_set_state( port, x86_DEBUG_STATE, (thread_state_t)&state, count ); mach_port_deallocate( mach_task_self(), port ); -- 2.30.1 (Apple Git-130)

1 0

[PATCH 1/5] configure: Try to detect MinGW zlib using pkg-config if --with-system-dllpath is specified.
by Zebediah Figura 01 Dec '21

01 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- aclocal.m4 | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 12 +++++++++ 2 files changed, 83 insertions(+) diff --git a/aclocal.m4 b/aclocal.m4 index 07a0359a3f1..611909253c7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -64,6 +64,15 @@ AC_CHECK_TOOL(READELF,[readelf],true)]) AC_DEFUN([WINE_PATH_PKG_CONFIG], [WINE_CHECK_HOST_TOOL(PKG_CONFIG,[pkg-config])]) +AC_DEFUN([WINE_PATH_MINGW_PKG_CONFIG], +[case "$host_cpu" in + i[[3456789]]86*) + ac_prefix_list="m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-w64-mingw32-pkg-config ])" ;; + *) + ac_prefix_list="$host_cpu-w64-mingw32-pkg-config" ;; +esac +AC_CHECK_PROGS(MINGW_PKG_CONFIG,[$ac_prefix_list],false)]) + dnl **** Extract the soname of a library **** dnl dnl Usage: WINE_CHECK_SONAME(library, function, [action-if-found, [action-if-not-found, [other_libraries, [pattern]]]]) @@ -124,6 +133,30 @@ CPPFLAGS=$ac_save_CPPFLAGS AS_VAR_POPDEF([ac_libs])dnl AS_VAR_POPDEF([ac_cflags])])dnl +dnl **** Get flags from MinGW pkg-config or alternate xxx-config program **** +dnl +dnl Usage: WINE_MINGW_PACKAGE_FLAGS(var,pkg-name,[default-lib,[cflags-alternate,libs-alternate,[checks]]]) +dnl +AC_DEFUN([WINE_MINGW_PACKAGE_FLAGS], +[AC_REQUIRE([WINE_PATH_MINGW_PKG_CONFIG])dnl +AS_VAR_PUSHDEF([ac_cflags],[[$1]_PE_CFLAGS])dnl +AS_VAR_PUSHDEF([ac_libs],[[$1]_PE_LIBS])dnl +AS_VAR_IF([ac_cflags],[], + [AS_VAR_SET_IF([MINGW_PKG_CONFIG], + [ac_cflags=`$MINGW_PKG_CONFIG --cflags [$2] 2>/dev/null`])]) +m4_ifval([$4],[test "$cross_compiling" = yes || ac_cflags=[$]{ac_cflags:-[$4]}]) +AS_VAR_IF([ac_libs],[], + [AS_VAR_SET_IF([MINGW_PKG_CONFIG], + [ac_libs=`$MINGW_PKG_CONFIG --libs [$2] 2>/dev/null`])]) +m4_ifval([$5],[test "$cross_compiling" = yes || ac_libs=[$]{ac_libs:-[$5]}]) +m4_ifval([$3],[ac_libs=[$]{ac_libs:-"$3"}]) +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $ac_cflags" +$6 +CPPFLAGS=$ac_save_CPPFLAGS +AS_VAR_POPDEF([ac_libs])dnl +AS_VAR_POPDEF([ac_cflags])])dnl + dnl **** Get flags for an external lib program **** dnl dnl Usage: WINE_EXTLIB_FLAGS(var,pkg-name,default-libs,default-cflags) @@ -189,6 +222,44 @@ ac_exeext=$ac_wine_try_cflags_saved_exeext]) AS_VAR_IF([ac_var],[yes],[m4_default([$2], [EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS $1"])], [$3])dnl AS_VAR_POPDEF([ac_var])]) +dnl **** Check whether the given MinGW header is available **** +dnl +dnl Usage: WINE_CHECK_MINGW_HEADER(header,[action-if-found],[action-if-not-found],[other-includes]) +dnl +AC_DEFUN([WINE_CHECK_MINGW_HEADER], +[AS_VAR_PUSHDEF([ac_var],[ac_cv_mingw_header_$1])dnl +AC_CACHE_CHECK([for MinGW $1], ac_var, +[ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$4 +#include <$1>]])],[AS_VAR_SET([ac_var],[yes])],[AS_VAR_SET([ac_var],[no])]) +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext]) +AS_VAR_IF([ac_var],[yes],[$2],[$3])dnl +AS_VAR_POPDEF([ac_var])]) + +dnl **** Check whether the given MinGW library is available **** +dnl +dnl Usage: WINE_CHECK_MINGW_LIB(library,function,[action-if-found],[action-if-not-found],[other-libraries]) +dnl +AC_DEFUN([WINE_CHECK_MINGW_LIB], +[AS_VAR_PUSHDEF([ac_var],[ac_cv_mingw_lib_$1])dnl +AC_CACHE_CHECK([for $2 in MinGW -l$1], ac_var, +[ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-l$1 $5 $LIBS" +AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],[AS_VAR_SET([ac_var],[yes])],[AS_VAR_SET([ac_var],[no])]) +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs]) +AS_VAR_IF([ac_var],[yes],[$3],[$4])dnl +AS_VAR_POPDEF([ac_var])]) + dnl **** Check if we can link an empty shared lib (no main) with special CFLAGS **** dnl dnl Usage: WINE_TRY_SHLIB_FLAGS(flags,[action-if-yes,[action-if-no]]) diff --git a/configure.ac b/configure.ac index 163d06fc327..5c32f71e672 100644 --- a/configure.ac +++ b/configure.ac @@ -1033,6 +1033,18 @@ WINE_NOTICE_WITH(mingw,[test "x$CROSSTARGET" = "x"], dnl **** External libraries **** +if test "x$with_system_dllpath" != "x" -a "$CROSSCC" != "false" +then + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz],,, + [WINE_CHECK_MINGW_HEADER(zlib.h, + [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])], + [ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""])]) + if test "x$ZLIB_PE_LIBS" = "x" + then + WINE_NOTICE([zlib ${notice_platform}MinGW development files not found; using bundled version.]) + fi +fi + WINE_EXTLIB_FLAGS(FAUDIO, faudio, "faudio mfplat mfreadwrite mfuuid propsys", "-I\$(top_srcdir)/libs/faudio/include") WINE_EXTLIB_FLAGS(GSM, gsm, gsm, "-I\$(top_srcdir)/libs/gsm/inc") WINE_EXTLIB_FLAGS(JPEG, jpeg, jpeg, "-I\$(top_srcdir)/libs/jpeg") -- 2.34.0

1 4

[PATCH v2 1/2] ntdll: Add tests for \Device\NamedPipe\ root directory.
by Jinoh Kang 01 Dec '21

01 Dec '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/tests/om.c | 109 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 77eb58a23b5..681f3784974 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -22,6 +22,7 @@ #include "ntdll_test.h" #include "winternl.h" #include "winuser.h" +#include "winioctl.h" #include "ddk/wdm.h" #include "stdio.h" #include "winnt.h" @@ -197,6 +198,104 @@ static void test_namespace_pipe(void) pNtClose(pipe); } +static NTSTATUS fsctl(HANDLE handle, ULONG code, void *inbuf, ULONG insize, void *outbuf, ULONG outsize) +{ + HANDLE event; + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK iosb; + + InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); + status = pNtCreateEvent(&event, GENERIC_ALL, &attr, NotificationEvent, FALSE); + ok(status == STATUS_SUCCESS, "NtCreateEvent failure: %08x\n", status); + + memset(&iosb, 0, sizeof(iosb)); + iosb.Status = STATUS_PENDING; + status = NtFsControlFile(handle, event, NULL, NULL, &iosb, FSCTL_PIPE_WAIT, + inbuf, insize, outbuf, outsize); + if (status == STATUS_PENDING) + { + while ((status = iosb.Status) == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + } + } + else if (status == STATUS_SUCCESS) + { + status = iosb.Status; + } + + pNtClose(event); + return status; +} + +static void test_pipe_device_file_as_root(void) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + IO_STATUS_BLOCK iosb; + NTSTATUS status; + LARGE_INTEGER timeout; + HANDLE pipe, root, h; + union { + FILE_PIPE_WAIT_FOR_BUFFER d; + unsigned char buf[offsetof(FILE_PIPE_WAIT_FOR_BUFFER, Name[32])]; + } pipe_wait; + + timeout.QuadPart = -10000; + + pRtlInitUnicodeString(&str, L"\\Device\\NamedPipe"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtOpenFile(&root, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); + ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded, but got %08x\n", status); + + memset( &pipe_wait.d, 0, sizeof(pipe_wait.d) ); + pipe_wait.d.Timeout.QuadPart = 0; + pipe_wait.d.TimeoutSpecified = TRUE; + wcscpy( pipe_wait.d.Name, L"nonexistent" ); + pipe_wait.d.NameLength = wcslen(pipe_wait.d.Name); + + status = fsctl(root, FSCTL_PIPE_WAIT, &pipe_wait, sizeof(pipe_wait), NULL, 0); + todo_wine ok(status == STATUS_ILLEGAL_FUNCTION, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe: %08x\n", status); + + pRtlInitUnicodeString(&str, L"test3\\pipe"); + InitializeObjectAttributes(&attr, &str, 0, root, NULL); + status = pNtCreateNamedPipeFile(&pipe, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout); + ok(status == STATUS_OBJECT_NAME_INVALID, "unexpected status from NtCreateNamedPipeFile: %08x\n", status); + + if (SUCCEEDED(status)) pNtClose(pipe); + pNtClose(root); + + pRtlInitUnicodeString(&str, L"\\Device\\NamedPipe\\"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtOpenFile(&root, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); + ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded, but got %08x\n", status); + + memset( &pipe_wait.d, 0, sizeof(pipe_wait.d) ); + pipe_wait.d.Timeout.QuadPart = 0; + pipe_wait.d.TimeoutSpecified = TRUE; + wcscpy( pipe_wait.d.Name, L"nonexistent_pipe" ); + pipe_wait.d.NameLength = wcslen(pipe_wait.d.Name); + + status = fsctl(root, FSCTL_PIPE_WAIT, &pipe_wait, sizeof(pipe_wait), NULL, 0); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe\\: %08x\n", status); + + pRtlInitUnicodeString(&str, L"test3\\pipe"); + InitializeObjectAttributes(&attr, &str, 0, root, NULL); + status = pNtCreateNamedPipeFile(&pipe, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout); + todo_wine ok(status == STATUS_SUCCESS, "unexpected failure from NtCreateNamedPipeFile: %08x\n", status); + + h = CreateFileA("\\\\.\\pipe\\test3\\pipe", GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + todo_wine ok(h != INVALID_HANDLE_VALUE, "Failed to open NamedPipe (%u)\n", GetLastError()); + + pNtClose(h); + pNtClose(pipe); + pNtClose(root); +} + #define check_create_open_dir(parent, name, status) check_create_open_dir_(__LINE__, parent, name, status) static void check_create_open_dir_( int line, HANDLE parent, const WCHAR *name, NTSTATUS expect ) { @@ -1870,6 +1969,15 @@ static void test_query_object(void) pNtClose( handle ); + handle = CreateFileA( "\\\\.\\pipe\\", 0, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + + test_object_name( handle, L"\\Device\\NamedPipe\\", TRUE ); + test_object_type( handle, L"File" ); + test_file_info( handle ); + + pNtClose( handle ); + RtlInitUnicodeString( &path, L"\\REGISTRY\\Machine" ); status = pNtCreateKey( &handle, KEY_READ, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed status %x\n", status ); @@ -2434,6 +2542,7 @@ START_TEST(om) test_case_sensitive(); test_namespace_pipe(); + test_pipe_device_file_as_root(); test_name_collisions(); test_name_limits(); test_directory(); -- 2.31.1

2 2

[PATCH] winemac.drv: Use UpdateDisplayDevices driver entry point for registering devices.
by Jacek Caban 01 Dec '21

01 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/display.c | 594 ++++----------------------------- dlls/winemac.drv/gdi.c | 1 + dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_main.c | 2 +- 5 files changed, 64 insertions(+), 537 deletions(-)

1 0

[PATCH] gameux/tests: Skip gamestatistic tests on win10 >= 1803
by André Zwing 01 Dec '21

01 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51716 Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/gameux/tests/gamestatistics.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index c29c6b44470..aa10156f1ab 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -158,6 +158,12 @@ static void test_gamestatisticsmgr( void ) /* this should fail, because statistics don't exist yet */ gs = (void *)0xdeadbeef; hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs); + if (hr != HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + /* With win10 1803 game explorer functionality was removed and gameux became a stub */ + win_skip("gameux is partially stubbed, skipping tests\n"); + return; + } ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "GetGameStatistics returned unexpected value: 0x%08x\n", hr); ok(gs == NULL, "Expected output pointer to be NULL, got %s\n", (gs == (void *)0xdeadbeef ? "deadbeef" : "neither NULL nor deadbeef")); -- 2.25.1

1 0

[PATCH] ntdll: Set rcx on exit from syscall dispatcher on x64.
by Paul Gofman 01 Dec '21

01 Dec '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 220540. Changes: - leave r11 alone for now; - also test NtSetContextThread with CONTEXT_INTEGER; - don't assume same stack pointer and non-volatile registers between test function calls in the test. dlls/ntdll/tests/exception.c | 76 +++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 11 +++-- 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0362cb9f0a9..3019c1a40cb 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4917,6 +4917,81 @@ static void test_unwind_from_apc(void) ok(pass == 4, "Got unexpected pass %d.\n", pass); ok(test_unwind_apc_called, "Test user APC was not called.\n"); } + +static void test_syscall_clobbered_regs(void) +{ + struct regs + { + UINT64 rcx; + }; + static const BYTE code[] = + { + 0x48, 0x8d, 0x05, 0x00, 0x10, 0x00, 0x00, + /* leaq 0x1000(%rip),%rax */ + 0x48, 0x25, 0x00, 0xf0, 0xff, 0xff, + /* andq $~0xfff,%rax */ + 0x48, 0x83, 0xe8, 0x08, /* subq $8,%rax */ + 0x48, 0x89, 0x20, /* movq %rsp,0(%rax) */ + 0x48, 0x89, 0xc4, /* movq %rax,%rsp */ + 0x41, 0x50, /* push %r8 */ + 0x53, 0x55, 0x57, 0x56, 0x41, 0x54, 0x41, 0x55, 0x41, 0x56, 0x41, 0x57, + /* push %rbx, %rbp, %rdi, %rsi, %r12, %r13, %r14, %r15 */ + 0x41, 0xff, 0xd1, /* callq *r9 */ + 0x41, 0x5f, 0x41, 0x5e, 0x41, 0x5d, 0x41, 0x5c, 0x5e, 0x5f, 0x5d, 0x5b, + /* pop %r15, %r14, %r13, %r12, %rsi, %rdi, %rbp, %rbx */ + 0x41, 0x58, /* pop %r8 */ + 0x49, 0x89, 0x48, 0x00, /* mov %rcx,(%r8) */ + 0x5c, /* pop %rsp */ + 0xc3, /* ret */ + }; + + NTSTATUS (WINAPI *func)(void *arg1, void *arg2, struct regs *, void *call_addr); + NTSTATUS (WINAPI *pNtCancelTimer)(HANDLE, BOOLEAN *); + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + struct regs regs; + CONTEXT context; + NTSTATUS status; + + pNtCancelTimer = (void *)GetProcAddress(hntdll, "NtCancelTimer"); + ok(!!pNtCancelTimer, "NtCancelTimer not found.\n"); + memcpy(code_mem, code, sizeof(code)); + func = code_mem; + memset(&regs, 0, sizeof(regs)); + status = func((HANDLE)0xdeadbeef, NULL, &regs, pNtCancelTimer); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status); + + /* After the syscall instruction rcx contains the address of the instruction next after syscall. */ + ok((BYTE *)regs.rcx > (BYTE *)pNtCancelTimer && (BYTE *)regs.rcx < (BYTE *)pNtCancelTimer + 0x20, + "Got unexpected rcx %s, pNtCancelTimer %p.\n", wine_dbgstr_longlong(regs.rcx), pNtCancelTimer); + + status = func((HANDLE)0xdeadbeef, (BOOLEAN *)0xdeadbeef, &regs, pNtCancelTimer); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtCancelTimer && (BYTE *)regs.rcx < (BYTE *)pNtCancelTimer + 0x20, + "Got unexpected rcx %s, pNtCancelTimer %p.\n", wine_dbgstr_longlong(regs.rcx), pNtCancelTimer); + + context.ContextFlags = CONTEXT_CONTROL; + status = func(GetCurrentThread(), &context, &regs, pNtGetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, + "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); + + status = func(GetCurrentThread(), &context, &regs, pNtSetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, + "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); + + context.ContextFlags = CONTEXT_INTEGER; + status = func(GetCurrentThread(), &context, &regs, pNtGetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, + "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); + + status = func(GetCurrentThread(), &context, &regs, pNtSetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtSetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtSetContextThread + 0x20, + "Got unexpected rcx %s, pNtSetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtSetContextThread); + +} #elif defined(__arm__) #define UNW_FLAG_NHANDLER 0 @@ -10737,6 +10812,7 @@ START_TEST(exception) test_extended_context(); test_copy_context(); test_unwind_from_apc(); + test_syscall_clobbered_regs(); #elif defined(__aarch64__) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 4310c1c6a2f..69625af1e24 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -3236,18 +3236,21 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "testl $0x3,%edx\n\t" /* CONTEXT_CONTROL | CONTEXT_INTEGER */ "jnz 1f\n\t" "movq 0x88(%rcx),%rsp\n\t" - "jmpq *0x70(%rcx)\n" /* frame->rip */ + "movq 0x70(%rcx),%rcx\n\t" /* frame->rip */ + "jmpq *%rcx\n\t" "1:\tleaq 0x70(%rcx),%rsp\n\t" "testl $0x2,%edx\n\t" /* CONTEXT_INTEGER */ - "jz 1f\n\t" - "movq 0x00(%rcx),%rax\n\t" + "jnz 1f\n\t" + "movq (%rsp),%rcx\n\t" /* frame->rip */ + "iretq\n" + "1:\tmovq 0x00(%rcx),%rax\n\t" "movq 0x18(%rcx),%rdx\n\t" "movq 0x30(%rcx),%r8\n\t" "movq 0x38(%rcx),%r9\n\t" "movq 0x40(%rcx),%r10\n\t" "movq 0x48(%rcx),%r11\n\t" "movq 0x10(%rcx),%rcx\n" - "1:\tiretq\n" + "iretq\n" "5:\tmovl $0xc000000d,%edx\n\t" /* STATUS_INVALID_PARAMETER */ "movq %rsp,%rcx\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" -- 2.33.1

2 6

[PATCH 2/3] win32u: Move NtUserEnumDisplaySettings implementation from user32.
by Jacek Caban 01 Dec '21

01 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 7 +------ dlls/user32/sysparams.c | 39 ++++++------------------------------ dlls/win32u/driver.c | 35 +++++++++++++++++--------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 33 ++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 10 ++++++++- dlls/win32u/wrappers.c | 15 ++++++-------- include/ntuser.h | 2 ++ 9 files changed, 78 insertions(+), 66 deletions(-)

2 1

[PATCH 1/3] user32: Use NtUserGetDisplayConfigBufferSizes.
by Jacek Caban 01 Dec '21

01 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 57 ----------------------------------------- dlls/user32/user32.spec | 2 +- 2 files changed, 1 insertion(+), 58 deletions(-)

2 1

[PATCH vkd3d 1/3] vkd3d-shader/hlsl: Write the else block only if it isn't empty.
by Giovanni Mascellani 01 Dec '21

01 Dec '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index e597425a..c56a74d4 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1446,11 +1446,14 @@ static void write_sm4_if(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf write_sm4_block(ctx, buffer, &iff->then_instrs); - instr.opcode = VKD3D_SM4_OP_ELSE; - instr.src_count = 0; - write_sm4_instruction(buffer, &instr); + if (!list_empty(&iff->else_instrs.instrs)) + { + instr.opcode = VKD3D_SM4_OP_ELSE; + instr.src_count = 0; + write_sm4_instruction(buffer, &instr); - write_sm4_block(ctx, buffer, &iff->else_instrs); + write_sm4_block(ctx, buffer, &iff->else_instrs); + } instr.opcode = VKD3D_SM4_OP_ENDIF; write_sm4_instruction(buffer, &instr); -- 2.33.1

4 17

[PATCH vkd3d v6 1/6] vkd3d-shader/hlsl: Remove trivial swizzles.
by Giovanni Mascellani 01 Dec '21

01 Dec '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 24b8205c..f8b977b0 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -475,6 +475,27 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_swizzle *swizzle; + unsigned int i; + + if (instr->type != HLSL_IR_SWIZZLE) + return false; + swizzle = hlsl_ir_swizzle(instr); + + if (instr->data_type->dimx != swizzle->val.node->data_type->dimx) + return false; + + for (i = 0; i < instr->data_type->dimx; ++i) + if (((swizzle->swizzle >> (2 * i)) & 3) != i) + return false; + + replace_node(instr, swizzle->val.node); + + return true; +} + /* Lower DIV to RCP + MUL. */ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { @@ -1355,6 +1376,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun } while (progress); while (transform_ir(ctx, fold_constants, body, NULL)); + transform_ir(ctx, remove_trivial_swizzles, body, NULL); if (ctx->profile->major_version < 4) transform_ir(ctx, lower_division, body, NULL); -- 2.33.1

3 10

[PATCH] po: Update Dutch translation.
by Floris Renaud 01 Dec '21

01 Dec '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/po/nl.po b/po/nl.po index 40227b8c909..e2b195fc896 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-11-10 00:03+0100\n" +"PO-Revision-Date: 2021-12-01 16:10+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -13263,13 +13263,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "Actieve codetabel: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "Ongeldig bericht.\n" +msgstr "Ongeldige codetabel\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13282,6 +13280,14 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [nummer]\n" +"\n" +" De actieve codetabel weergeven of instellen.\n" +"\n" +" nummer Stel het nummer van de codetabel in.\n" +"\n" +" Gebruik CHCP zonder nummer om de huidige codetabel te laten zien.\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" -- 2.34.1

1 0

[PATCH 3/3] wineandroid.drv: Use UpdateDisplayDevices driver entry point for registering devices.
by Jacek Caban 01 Dec '21

01 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/Makefile.in | 2 +- dlls/wineandroid.drv/init.c | 62 ++++++++++++++------------------ 2 files changed, 28 insertions(+), 36 deletions(-)

1 0

[PATCH 6/6] winecoreaudio: Build with msvcrt.
by Huw Davies 01 Dec '21

01 Dec '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/Makefile.in | 2 -- dlls/winecoreaudio.drv/midi.c | 6 +----- dlls/winecoreaudio.drv/mmdevdrv.c | 25 ++++++++++--------------- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index 8162eae67d7..4be396c489c 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(COREAUDIO_LIBS) -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ coreaudio.c \ coremidi.c \ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 6191885553a..6c6752c0c76 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -21,23 +21,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "config.h" -#include "wine/port.h" - #include <string.h> #include <stdarg.h> #include <stdio.h> #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wingdi.h" #include "winuser.h" #include "winnls.h" #include "mmddk.h" #include "mmdeviceapi.h" #include "audioclient.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/unixlib.h" #include "coreaudio.h" diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index b4cf325c9d2..128396fbe29 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -21,11 +21,11 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winnls.h" #include "winreg.h" #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "wine/list.h" #include "wine/unixlib.h" @@ -126,10 +126,7 @@ typedef struct _SessionMgr { IMMDevice *device; } SessionMgr; -static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','c','o','r','e','a','u','d','i','o','.','d','r','v','\\','d','e','v','i','c','e','s',0}; -static const WCHAR guidW[] = {'g','u','i','d',0}; +static const WCHAR *drv_key_devicesW = L"Software\\Wine\\Drivers\\winecoreaudio.drv\\devices"; static HANDLE g_timer_q; @@ -253,7 +250,7 @@ static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, goto exit; } - lr = RegSetValueExW(key, guidW, 0, REG_BINARY, (BYTE*)guid, + lr = RegSetValueExW(key, L"guid", 0, REG_BINARY, (BYTE*)guid, sizeof(GUID)); if(lr != ERROR_SUCCESS) ERR("RegSetValueEx(%s\\guid) failed: %u\n", wine_dbgstr_w(key_name), lr); @@ -270,19 +267,17 @@ static void get_device_guid(EDataFlow flow, DWORD device_id, GUID *guid) DWORD type, size = sizeof(*guid); WCHAR key_name[256]; - static const WCHAR key_fmt[] = {'%','u',0}; - if(flow == eCapture) key_name[0] = '1'; else key_name[0] = '0'; key_name[1] = ','; - sprintfW(key_name + 2, key_fmt, device_id); + swprintf(key_name + 2, ARRAY_SIZE(key_name), L"%u", device_id); if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ - if(RegQueryValueExW(dev_key, guidW, 0, &type, + if(RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE*)guid, &size) == ERROR_SUCCESS){ if(type == REG_BINARY){ RegCloseKey(dev_key); @@ -322,8 +317,8 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, { struct get_endpoint_ids_params params; unsigned int i; - GUID *guids; - WCHAR **ids; + GUID *guids = NULL; + WCHAR **ids = NULL; TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); @@ -346,7 +341,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, } for(i = 0; i < params.num; i++){ - int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); ids[i] = heap_alloc(size); if(!ids[i]){ params.result = E_OUTOFMEMORY; @@ -402,7 +397,7 @@ static BOOL get_deviceid_by_guid(GUID *guid, DWORD *id, EDataFlow *flow) } size = sizeof(reg_guid); - if(RegQueryValueExW(key, guidW, 0, &type, + if(RegQueryValueExW(key, L"guid", 0, &type, (BYTE*)&reg_guid, &size) == ERROR_SUCCESS){ if(IsEqualGUID(&reg_guid, guid)){ RegCloseKey(key); @@ -419,7 +414,7 @@ static BOOL get_deviceid_by_guid(GUID *guid, DWORD *id, EDataFlow *flow) return FALSE; } - *id = strtoulW(key_name + 2, NULL, 10); + *id = wcstoul(key_name + 2, NULL, 10); return TRUE; } -- 2.23.0

2 1

[PATCH 5/6] winecoreaudio: Always start the notification thread.
by Huw Davies 01 Dec '21

01 Dec '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coremidi.c | 9 ++------- dlls/winecoreaudio.drv/midi.c | 7 +------ dlls/winecoreaudio.drv/unixlib.h | 1 - 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 5777236bd26..8c09d4a2c1b 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -417,19 +417,14 @@ NTSTATUS midi_init(void *args) dests[i].caps.wNotes = 0; } - params->num_srcs = num_srcs; - *params->err = DRV_SUCCESS; return STATUS_SUCCESS; } NTSTATUS midi_release(void *args) { - if (num_srcs) - { - /* stop the notify_wait thread */ - notify_post(NULL); - } + /* stop the notify_wait thread */ + notify_post(NULL); if (midi_client) MIDIClientDispose(midi_client); /* MIDIClientDispose will close all ports */ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 262713dd003..6191885553a 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -45,8 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -static DWORD MIDIIn_NumDevs = 0; - static void notify_client(struct notify_context *notify) { TRACE("dev_id=%d msg=%d param1=%04lX param2=%04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -87,10 +85,7 @@ static LONG CoreAudio_MIDIInit(void) return err; } - MIDIIn_NumDevs = params.num_srcs; - - if (MIDIIn_NumDevs > 0) - CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); + CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); return err; } diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index d44a7a013e8..bd9a5ce03bd 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -186,7 +186,6 @@ struct set_volumes_params struct midi_init_params { DWORD *err; - UINT num_srcs; }; struct notify_context -- 2.23.0

2 1

[PATCH 4/6] winecoreaudio: Switch midi_in_lock() away from a syscall prototype.
by Huw Davies 01 Dec '21

01 Dec '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coremidi.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index ae8b71e002b..5777236bd26 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -136,13 +136,10 @@ static struct notify_context *notify_read, *notify_write; #define MAX_MIDI_SYNTHS 1 -NTSTATUS midi_in_lock(void *args) +static void midi_in_lock(BOOL lock) { - BOOL lock = !!args; - if (lock) pthread_mutex_lock(&midi_in_mutex); else pthread_mutex_unlock(&midi_in_mutex); - return STATUS_SUCCESS; } static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, @@ -228,7 +225,7 @@ static void process_sysex_packet(struct midi_src *src, MIDIPacket *packet) src->state |= 2; - midi_in_lock((void *)TRUE); + midi_in_lock(TRUE); while (len) { @@ -253,7 +250,7 @@ static void process_sysex_packet(struct midi_src *src, MIDIPacket *packet) } } - midi_in_lock((void *)FALSE); + midi_in_lock(FALSE); } static void process_small_packet(struct midi_src *src, MIDIPacket *packet) @@ -981,13 +978,13 @@ static DWORD midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) hdr->dwBytesRecorded = 0; hdr->lpNext = NULL; - midi_in_lock((void *)TRUE); + midi_in_lock(TRUE); next = &srcs[dev_id].lpQueueHdr; while (*next) next = &(*next)->lpNext; *next = hdr; - midi_in_lock((void *)FALSE); + midi_in_lock(FALSE); return MMSYSERR_NOERROR; } @@ -1090,7 +1087,7 @@ static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) } src = srcs + dev_id; - midi_in_lock((void *)TRUE); + midi_in_lock(TRUE); if (src->lpQueueHdr) { @@ -1102,7 +1099,7 @@ static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) if (src->lpQueueHdr) err = ERROR_RETRY; /* ask the client to call again */ } - midi_in_lock((void *)FALSE); + midi_in_lock(FALSE); return err; } -- 2.23.0

2 1

[PATCH 3/6] winecoreaudio: Move the midi input event processing to the unixlib.
by Huw Davies 01 Dec '21

01 Dec '21

Notifications of incoming data are now directly added to a notify ring-buffer by macOS's midi read callback. The ring-buffer is implemented with an unused sentinel directly before the read ptr to distinguish between the full vs empty state. Notifications are processed by the client's notify thread via the midi_notify_wait syscall. Note that the read callback thread is not a Win32 thread, so the Win32 api cannot be used in anything that it calls. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 2 - dlls/winecoreaudio.drv/coremidi.c | 163 +++++++++++++++++++---- dlls/winecoreaudio.drv/coremidi.h | 86 ------------ dlls/winecoreaudio.drv/midi.c | 204 +---------------------------- dlls/winecoreaudio.drv/unixlib.h | 6 +- 5 files changed, 140 insertions(+), 321 deletions(-) delete mode 100644 dlls/winecoreaudio.drv/coremidi.h diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 1efcfdba3f4..e6ce5c33e36 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1634,6 +1634,4 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_out_message, midi_in_message, midi_notify_wait, - - midi_in_lock, /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index bb8cb23f83b..ae8b71e002b 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -89,7 +89,6 @@ #include "wine/unixlib.h" #include "coreaudio.h" -#include "coremidi.h" #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(midi); @@ -107,12 +106,24 @@ struct midi_dest WORD wFlags; }; +struct midi_src +{ + MIDIEndpointRef source; + + WORD wDevID; + int state; /* 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ + MIDIINCAPSW caps; + MIDIOPENDESC midiDesc; + LPMIDIHDR lpQueueHdr; + WORD wFlags; + DWORD startTime; +}; + static MIDIClientRef midi_client; static MIDIPortRef midi_out_port, midi_in_port; static UINT num_dests, num_srcs; static struct midi_dest *dests; static struct midi_src *srcs; -static CFStringRef midi_in_thread_port_name; static pthread_mutex_t midi_in_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -123,6 +134,8 @@ static BOOL notify_quit; static struct notify_context notify_buffer[NOTIFY_BUFFER_SIZE]; static struct notify_context *notify_read, *notify_write; +#define MAX_MIDI_SYNTHS 1 + NTSTATUS midi_in_lock(void *args) { BOOL lock = !!args; @@ -146,11 +159,49 @@ static void set_in_notify(struct notify_context *notify, struct midi_src *src, W notify->instance = src->midiDesc.dwInstance; } +/* + * notify buffer: The notification ring buffer is implemented so that + * there is always at least one unused sentinel before the current + * read position in order to allow detection of the full vs empty + * state. + */ +static struct notify_context *notify_buffer_next(struct notify_context *notify) +{ + if (++notify >= notify_buffer + ARRAY_SIZE(notify_buffer)) + notify = notify_buffer; + + return notify; +} + +static void notify_buffer_add(struct notify_context *notify) +{ + struct notify_context *next = notify_buffer_next(notify_write); + + if (next == notify_read) /* buffer is full - we can't issue a WARN() in a non-Win32 thread */ + notify_read = notify_buffer_next(notify_read); /* drop the oldest notification */ + *notify_write = *notify; + notify_write = next; +} + +static BOOL notify_buffer_empty(void) +{ + return notify_read == notify_write; +} + +static BOOL notify_buffer_remove(struct notify_context *notify) +{ + if (notify_buffer_empty()) return FALSE; + + *notify = *notify_read; + notify_read = notify_buffer_next(notify_read); + return TRUE; +} + static void notify_post(struct notify_context *notify) { pthread_mutex_lock(&notify_mutex); - if (notify) FIXME("Not yet handled\n"); + if (notify) notify_buffer_add(notify); else notify_quit = TRUE; pthread_cond_signal(&notify_cond); @@ -169,29 +220,94 @@ static uint64_t get_time_ms(void) return mach_absolute_time() / 1000000 * timebase.numer / timebase.denom; } +static void process_sysex_packet(struct midi_src *src, MIDIPacket *packet) +{ + unsigned int pos = 0, len = packet->length, copy_len; + DWORD current_time = get_time_ms() - src->startTime; + struct notify_context notify; + + src->state |= 2; + + midi_in_lock((void *)TRUE); + + while (len) + { + MIDIHDR *hdr = src->lpQueueHdr; + if (!hdr) break; + + copy_len = min(len, hdr->dwBufferLength - hdr->dwBytesRecorded); + memcpy(hdr->lpData + hdr->dwBytesRecorded, packet->data + pos, copy_len); + hdr->dwBytesRecorded += copy_len; + len -= copy_len; + pos += copy_len; + + if ((hdr->dwBytesRecorded == hdr->dwBufferLength) || + (*(BYTE*)(hdr->lpData + hdr->dwBytesRecorded - 1) == 0xf7)) + { /* buffer full or end of sysex message */ + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_in_notify(&notify, src, src->wDevID, MIM_LONGDATA, (DWORD_PTR)hdr, current_time); + notify_post(&notify); + src->state &= ~2; + } + } + + midi_in_lock((void *)FALSE); +} + +static void process_small_packet(struct midi_src *src, MIDIPacket *packet) +{ + DWORD current_time = get_time_ms() - src->startTime, data; + struct notify_context notify; + unsigned int pos = 0; + + while (pos < packet->length) + { + data = 0; + switch (packet->data[pos] & 0xf0) + { + case 0xf0: + data = packet->data[pos]; + pos++; + break; + case 0xc0: + case 0xd0: + data = (packet->data[pos + 1] << 8) | packet->data[pos]; + pos += 2; + break; + default: + data = (packet->data[pos + 2] << 16) | (packet->data[pos + 1] << 8) | + packet->data[pos]; + pos += 3; + break; + } + set_in_notify(&notify, src, src->wDevID, MIM_DATA, data, current_time); + notify_post(&notify); + } +} + static void midi_in_read_proc(const MIDIPacketList *pktlist, void *refCon, void *connRefCon) { - CFMessagePortRef msg_port = CFMessagePortCreateRemote(kCFAllocatorDefault, midi_in_thread_port_name); MIDIPacket *packet = (MIDIPacket *)pktlist->packet; - CFMutableDataRef data; - MIDIMessage msg; + WORD dev_id = *(WORD *)connRefCon; + struct midi_src *src; unsigned int i; + if (dev_id >= num_srcs) return; + src = srcs + dev_id; + if (src->state < 1) /* input not started */ + return; + for (i = 0; i < pktlist->numPackets; ++i) { - msg.devID = *(UInt16 *)connRefCon; - msg.length = packet->length; - data = CFDataCreateMutable(kCFAllocatorDefault, sizeof(msg) + packet->length); - if (data) - { - CFDataAppendBytes(data, (UInt8 *)&msg, sizeof(msg)); - CFDataAppendBytes(data, packet->data, packet->length); - CFMessagePortSendRequest(msg_port, 0, data, 0.0, 0.0, NULL, NULL); - CFRelease(data); - } + if (packet->data[0] == 0xf0 || src->state & 2) + process_sysex_packet(src, packet); + else + process_small_packet(src, packet); + packet = MIDIPacketNext(packet); } - CFRelease(msg_port); } NTSTATUS midi_init(void *args) @@ -225,7 +341,6 @@ NTSTATUS midi_init(void *args) if (num_srcs > 0) { - midi_in_thread_port_name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("MIDIInThreadPortName.%u"), getpid()); name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("WineInputPort.%u"), getpid()); MIDIInputPortCreate(midi_client, name, midi_in_read_proc, NULL, &midi_in_port); CFRelease(name); @@ -306,8 +421,6 @@ NTSTATUS midi_init(void *args) } params->num_srcs = num_srcs; - params->srcs = srcs; - params->midi_in_port = (void *)midi_in_port; *params->err = DRV_SUCCESS; return STATUS_SUCCESS; @@ -315,15 +428,8 @@ NTSTATUS midi_init(void *args) NTSTATUS midi_release(void *args) { - CFMessagePortRef msg_port; - if (num_srcs) { - /* Stop CFRunLoop in MIDIIn_MessageThread */ - msg_port = CFMessagePortCreateRemote(kCFAllocatorDefault, midi_in_thread_port_name); - CFMessagePortSendRequest(msg_port, 1, NULL, 0.0, 0.0, NULL, NULL); - CFRelease(msg_port); - /* stop the notify_wait thread */ notify_post(NULL); } @@ -1114,10 +1220,11 @@ NTSTATUS midi_notify_wait(void *args) pthread_mutex_lock(&notify_mutex); - while (!notify_quit) + while (!notify_quit && notify_buffer_empty()) pthread_cond_wait(&notify_cond, &notify_mutex); *params->quit = notify_quit; + if (!notify_quit) notify_buffer_remove(params->notify); pthread_mutex_unlock(&notify_mutex); diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h deleted file mode 100644 index e6d5c8c18c8..00000000000 --- a/dlls/winecoreaudio.drv/coremidi.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Wine Midi driver for Mac OS X - * - * Copyright 2006 Emmanuel Maillard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef WINE_COREMIDI_H -#define WINE_COREMIDI_H - -#include <CoreFoundation/CoreFoundation.h> - -#define MAX_MIDI_SYNTHS 1 - -#ifdef WINE_DEFINITIONS -/* - * Due to CoreMIDI headers conflict redefine some types for Wine - */ -typedef void *MIDIClientRef; -typedef void *MIDIEndpointRef; -typedef void *MIDIPortRef; -typedef void *MIDIObjectRef; - -typedef struct MIDIPacketList MIDIPacketList; - -/* - * functions - */ -extern OSStatus MIDIClientDispose(MIDIClientRef client); -extern unsigned MIDIGetNumberOfDestinations(void); -extern MIDIEndpointRef MIDIGetDestination(unsigned i); -extern unsigned MIDIGetNumberOfSources(void); -extern MIDIEndpointRef MIDIGetSource(unsigned i); -extern OSStatus MIDIOutputPortCreate(MIDIClientRef client, CFStringRef portName, MIDIPortRef *outPort); - -typedef void (*MIDIReadProc)(const MIDIPacketList *pktlist, void *readProcRefCon, void *srcConnRefCon); -extern OSStatus MIDIInputPortCreate(MIDIClientRef client, CFStringRef portName, MIDIReadProc readProc, void *refCon, MIDIPortRef *outPort); - -extern OSStatus MIDIObjectGetProperties(MIDIObjectRef obj, CFPropertyListRef *outProperties, Boolean deep); - -extern OSStatus MIDIPortConnectSource(MIDIPortRef port, MIDIEndpointRef source, void *connRefCon); - -/* - * Due to AudioUnit headers conflict redefine some types. - */ -typedef void *AudioUnit; -typedef void *AUGraph; - -extern OSStatus MusicDeviceMIDIEvent(AudioUnit au, UInt32 inStatus, UInt32 inData1, UInt32 inData2, UInt32 inOffsetSampleFrame); -extern OSStatus MusicDeviceSysEx(AudioUnit au, const UInt8 *inData, UInt32 inLength); -#endif - -/* midi.c */ -typedef struct midi_src -{ - MIDIEndpointRef source; - - WORD wDevID; - int state; /* 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ - MIDIINCAPSW caps; - MIDIOPENDESC midiDesc; - LPMIDIHDR lpQueueHdr; - WORD wFlags; - DWORD startTime; -} MIDISource; - -typedef struct { - UInt16 devID; - UInt16 length; - Byte data[]; -} MIDIMessage; - -#endif diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index e9cdb2a8ec4..262713dd003 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -45,31 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -#include <mach/mach_time.h> -#include <CoreAudio/CoreAudio.h> - -#define WINE_DEFINITIONS -#include "coremidi.h" - static DWORD MIDIIn_NumDevs = 0; - -static CFStringRef MIDIInThreadPortName; - -static DWORD WINAPI MIDIIn_MessageThread(LPVOID p); - -static MIDIPortRef MIDIInPort = NULL; - -MIDISource *sources; - -static uint64_t get_time_ms(void) -{ - static mach_timebase_info_data_t timebase; - - if (!timebase.denom) mach_timebase_info(&timebase); - return mach_absolute_time() / 1000000 * timebase.numer / timebase.denom; -} - static void notify_client(struct notify_context *notify) { TRACE("dev_id=%d msg=%d param1=%04lX param2=%04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -81,14 +58,17 @@ static void notify_client(struct notify_context *notify) static DWORD WINAPI notify_thread(void *p) { struct midi_notify_wait_params params; + struct notify_context notify; BOOL quit; + params.notify = &notify; params.quit = &quit; while (1) { UNIX_CALL(midi_notify_wait, &params); if (quit) break; + if (notify.send_notify) notify_client(&notify); } return 0; } @@ -108,15 +88,10 @@ static LONG CoreAudio_MIDIInit(void) } MIDIIn_NumDevs = params.num_srcs; - sources = params.srcs; - MIDIInPort = params.midi_in_port; if (MIDIIn_NumDevs > 0) - { - MIDIInThreadPortName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("MIDIInThreadPortName.%u"), getpid()); - CloseHandle( CreateThread(NULL, 0, MIDIIn_MessageThread, NULL, 0, NULL)); CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); - } + return err; } @@ -125,181 +100,10 @@ static LONG CoreAudio_MIDIRelease(void) TRACE("\n"); UNIX_CALL(midi_release, NULL); - sources = NULL; return DRV_SUCCESS; } - -/************************************************************************** - * MIDI_NotifyClient [internal] - */ -static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - DWORD_PTR dwCallBack; - UINT uFlags; - HANDLE hDev; - DWORD_PTR dwInstance; - - TRACE("wDevID=%d wMsg=%d dwParm1=%04lX dwParam2=%04lX\n", wDevID, wMsg, dwParam1, dwParam2); - - switch (wMsg) { - case MIM_DATA: - case MIM_LONGDATA: - case MIM_ERROR: - case MIM_LONGERROR: - case MIM_MOREDATA: - dwCallBack = sources[wDevID].midiDesc.dwCallback; - uFlags = sources[wDevID].wFlags; - hDev = sources[wDevID].midiDesc.hMidi; - dwInstance = sources[wDevID].midiDesc.dwInstance; - break; - default: - ERR("Unsupported MSW-MIDI message %u\n", wMsg); - return; - } - - DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); -} - -static void midi_lock( BOOL lock ) -{ - UNIX_CALL(midi_in_lock, (void *)lock); -} - -/* - * MIDI In Mach message handling - */ -static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFDataRef data, void *info) -{ - MIDIMessage *msg = NULL; - int i = 0; - MIDISource *src = NULL; - DWORD sendData = 0; - int pos = 0; - DWORD currentTime; - BOOL sysexStart; - - switch (msgid) - { - case 0: - msg = (MIDIMessage *) CFDataGetBytePtr(data); - TRACE("devID=%d\n", msg->devID); - for (i = 0; i < msg->length; ++i) { - TRACE("%02X ", msg->data[i]); - } - TRACE("\n"); - src = &sources[msg->devID]; - if (src->state < 1) - { - TRACE("input not started, thrown away\n"); - return NULL; - } - - sysexStart = (msg->data[0] == 0xF0); - - if (sysexStart || src->state & 2) { - int pos = 0; - int len = msg->length; - - if (sysexStart) { - TRACE("Receiving sysex message\n"); - src->state |= 2; - } - - midi_lock( TRUE ); - currentTime = get_time_ms() - src->startTime; - - while (len) { - LPMIDIHDR lpMidiHdr = src->lpQueueHdr; - - if (lpMidiHdr != NULL) { - int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); - memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, msg->data + pos, copylen); - lpMidiHdr->dwBytesRecorded += copylen; - len -= copylen; - pos += copylen; - - TRACE("Copied %d bytes of sysex message\n", copylen); - - if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || - (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { - TRACE("Sysex message complete (or buffer limit reached), dispatching %d bytes\n", lpMidiHdr->dwBytesRecorded); - src->lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(msg->devID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, currentTime); - src->state &= ~2; - } - } - else { - FIXME("Sysex data received but no buffer to store it!\n"); - break; - } - } - - midi_lock( FALSE ); - return NULL; - } - - midi_lock( TRUE ); - currentTime = get_time_ms() - src->startTime; - - while (pos < msg->length) - { - sendData = 0; - switch (msg->data[pos] & 0xF0) - { - case 0xF0: - sendData = (msg->data[pos] << 0); - pos++; - break; - - case 0xC0: - case 0xD0: - sendData = (msg->data[pos + 1] << 8) | (msg->data[pos] << 0); - pos += 2; - break; - default: - sendData = (msg->data[pos + 2] << 16) | - (msg->data[pos + 1] << 8) | - (msg->data[pos] << 0); - pos += 3; - break; - } - MIDI_NotifyClient(msg->devID, MIM_DATA, sendData, currentTime); - } - midi_lock( FALSE ); - break; - default: - CFRunLoopStop(CFRunLoopGetCurrent()); - break; - } - return NULL; -} - -static DWORD WINAPI MIDIIn_MessageThread(LPVOID p) -{ - CFMessagePortRef local; - CFRunLoopSourceRef source; - Boolean info; - - local = CFMessagePortCreateLocal(kCFAllocatorDefault, MIDIInThreadPortName, &MIDIIn_MessageHandler, NULL, &info); - - source = CFMessagePortCreateRunLoopSource(kCFAllocatorDefault, local, 0); - CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopDefaultMode); - - CFRunLoopRun(); - - CFRunLoopSourceInvalidate(source); - CFRelease(source); - CFRelease(local); - CFRelease(MIDIInThreadPortName); - MIDIInThreadPortName = NULL; - - return 0; -} - /************************************************************************** * modMessage */ diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 67fcc35ce4c..d44a7a013e8 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -187,8 +187,6 @@ struct midi_init_params { DWORD *err; UINT num_srcs; - void *srcs; - void *midi_in_port; }; struct notify_context @@ -228,6 +226,7 @@ struct midi_in_message_params struct midi_notify_wait_params { + struct notify_context *notify; BOOL *quit; }; @@ -258,8 +257,6 @@ enum unix_funcs unix_midi_out_message, unix_midi_in_message, unix_midi_notify_wait, - - unix_midi_in_lock, /* temporary */ }; NTSTATUS midi_init( void * ) DECLSPEC_HIDDEN; @@ -267,7 +264,6 @@ NTSTATUS midi_release( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_out_message( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_in_message( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_notify_wait( void * ) DECLSPEC_HIDDEN; -NTSTATUS midi_in_lock( void * ) DECLSPEC_HIDDEN; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 2/6] winecoreaudio: Introduce a notification thread.
by Huw Davies 01 Dec '21

01 Dec '21

Currently the thread just blocks until told to quit by midi_release. Eventually, this thread will dispatch the MIM_DATA and MIM_LONGDATA notifications and essentially replace the existing RunLoop-based mechanism. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 1 + dlls/winecoreaudio.drv/coremidi.c | 42 ++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 16 ++++++++++++ dlls/winecoreaudio.drv/unixlib.h | 7 +++++ 4 files changed, 66 insertions(+) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 420021a53ea..1efcfdba3f4 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1633,6 +1633,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_release, midi_out_message, midi_in_message, + midi_notify_wait, midi_in_lock, /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 2e92d9ac2cb..bb8cb23f83b 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -116,6 +116,13 @@ static CFStringRef midi_in_thread_port_name; static pthread_mutex_t midi_in_mutex = PTHREAD_MUTEX_INITIALIZER; +#define NOTIFY_BUFFER_SIZE 64 + 1 /* + 1 for the sentinel */ +static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_cond_t notify_cond = PTHREAD_COND_INITIALIZER; +static BOOL notify_quit; +static struct notify_context notify_buffer[NOTIFY_BUFFER_SIZE]; +static struct notify_context *notify_read, *notify_write; + NTSTATUS midi_in_lock(void *args) { BOOL lock = !!args; @@ -139,6 +146,17 @@ static void set_in_notify(struct notify_context *notify, struct midi_src *src, W notify->instance = src->midiDesc.dwInstance; } +static void notify_post(struct notify_context *notify) +{ + pthread_mutex_lock(&notify_mutex); + + if (notify) FIXME("Not yet handled\n"); + else notify_quit = TRUE; + pthread_cond_signal(&notify_cond); + + pthread_mutex_unlock(&notify_mutex); +} + /* * CoreMIDI IO threaded callback, * we can't call Wine debug channels, critical section or anything using NtCurrentTeb here. @@ -183,6 +201,11 @@ NTSTATUS midi_init(void *args) OSStatus sc; UINT i; + pthread_mutex_lock(&notify_mutex); + notify_quit = FALSE; + notify_read = notify_write = notify_buffer; + pthread_mutex_unlock(&notify_mutex); + sc = MIDIClientCreate(name, NULL /* FIXME use notify proc */, NULL, &midi_client); CFRelease(name); if (sc) @@ -300,6 +323,9 @@ NTSTATUS midi_release(void *args) msg_port = CFMessagePortCreateRemote(kCFAllocatorDefault, midi_in_thread_port_name); CFMessagePortSendRequest(msg_port, 1, NULL, 0.0, 0.0, NULL, NULL); CFRelease(msg_port); + + /* stop the notify_wait thread */ + notify_post(NULL); } if (midi_client) MIDIClientDispose(midi_client); /* MIDIClientDispose will close all ports */ @@ -1081,3 +1107,19 @@ NTSTATUS midi_in_message(void *args) return STATUS_SUCCESS; } + +NTSTATUS midi_notify_wait(void *args) +{ + struct midi_notify_wait_params *params = args; + + pthread_mutex_lock(&notify_mutex); + + while (!notify_quit) + pthread_cond_wait(&notify_cond, &notify_mutex); + + *params->quit = notify_quit; + + pthread_mutex_unlock(&notify_mutex); + + return STATUS_SUCCESS; +} diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index b3adb09886d..e9cdb2a8ec4 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -78,6 +78,21 @@ static void notify_client(struct notify_context *notify) notify->instance, notify->param_1, notify->param_2); } +static DWORD WINAPI notify_thread(void *p) +{ + struct midi_notify_wait_params params; + BOOL quit; + + params.quit = &quit; + + while (1) + { + UNIX_CALL(midi_notify_wait, &params); + if (quit) break; + } + return 0; +} + static LONG CoreAudio_MIDIInit(void) { struct midi_init_params params; @@ -100,6 +115,7 @@ static LONG CoreAudio_MIDIInit(void) { MIDIInThreadPortName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("MIDIInThreadPortName.%u"), getpid()); CloseHandle( CreateThread(NULL, 0, MIDIIn_MessageThread, NULL, 0, NULL)); + CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); } return err; } diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 2f0464ad322..67fcc35ce4c 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -226,6 +226,11 @@ struct midi_in_message_params struct notify_context *notify; }; +struct midi_notify_wait_params +{ + BOOL *quit; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -252,6 +257,7 @@ enum unix_funcs unix_midi_release, unix_midi_out_message, unix_midi_in_message, + unix_midi_notify_wait, unix_midi_in_lock, /* temporary */ }; @@ -260,6 +266,7 @@ NTSTATUS midi_init( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_release( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_out_message( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_in_message( void * ) DECLSPEC_HIDDEN; +NTSTATUS midi_notify_wait( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_in_lock( void * ) DECLSPEC_HIDDEN; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 1/6] winecoreaudio: Introduce a helper to retrieve the time.
by Huw Davies 01 Dec '21

01 Dec '21

The motivation is that this will need to be called from a non-Win32 thread and so shouldn't use the Win32 API. An added benefit is that it will eliminate the 16ms jitter associated with GetTickCount(). The instance of the helper on the user-side is temporary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coremidi.c | 12 ++++++++++-- dlls/winecoreaudio.drv/midi.c | 13 +++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 9dc9f452c29..2e92d9ac2cb 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -143,6 +143,14 @@ static void set_in_notify(struct notify_context *notify, struct midi_src *src, W * CoreMIDI IO threaded callback, * we can't call Wine debug channels, critical section or anything using NtCurrentTeb here. */ +static uint64_t get_time_ms(void) +{ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info(&timebase); + return mach_absolute_time() / 1000000 * timebase.numer / timebase.denom; +} + static void midi_in_read_proc(const MIDIPacketList *pktlist, void *refCon, void *connRefCon) { CFMessagePortRef msg_port = CFMessagePortCreateRemote(kCFAllocatorDefault, midi_in_thread_port_name); @@ -917,7 +925,7 @@ static DWORD midi_in_start(WORD dev_id) return MMSYSERR_BADDEVICEID; } srcs[dev_id].state = 1; - srcs[dev_id].startTime = NtGetTickCount(); + srcs[dev_id].startTime = get_time_ms(); return MMSYSERR_NOERROR; } @@ -936,7 +944,7 @@ static DWORD midi_in_stop(WORD dev_id) static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) { - DWORD cur_time = NtGetTickCount(); + DWORD cur_time = get_time_ms(); DWORD err = MMSYSERR_NOERROR; struct midi_src *src; MIDIHDR *hdr; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index dcb9a7e1b69..b3adb09886d 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -45,6 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); +#include <mach/mach_time.h> #include <CoreAudio/CoreAudio.h> #define WINE_DEFINITIONS @@ -61,6 +62,14 @@ static MIDIPortRef MIDIInPort = NULL; MIDISource *sources; +static uint64_t get_time_ms(void) +{ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info(&timebase); + return mach_absolute_time() / 1000000 * timebase.numer / timebase.denom; +} + static void notify_client(struct notify_context *notify) { TRACE("dev_id=%d msg=%d param1=%04lX param2=%04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -183,7 +192,7 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD } midi_lock( TRUE ); - currentTime = GetTickCount() - src->startTime; + currentTime = get_time_ms() - src->startTime; while (len) { LPMIDIHDR lpMidiHdr = src->lpQueueHdr; @@ -218,7 +227,7 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD } midi_lock( TRUE ); - currentTime = GetTickCount() - src->startTime; + currentTime = get_time_ms() - src->startTime; while (pos < msg->length) { -- 2.23.0

2 1

Re: [PATCH vkd3d 1/6] vkd3d-shader/hlsl: Write SM4 sample instructions.
by Francisco Casas 01 Dec '21

01 Dec '21

Hi, > + instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), > instr.dsts[0].writemask); > + > + sm4_register_from_deref(ctx, &instr.srcs[2].reg, &writemask, > + &instr.srcs[1].swizzle_type, sampler, sampler->var->data_type); > + > + instr.src_count = 3; Probably &instr.srcs[1].swizzle_type shall be &instr.srcs[2].swizzle_type there. >Here you pass the swizzle_type field to sm4_register_from_deref, as >write_sm4_ld already does. However, it seems that >sm4_register_from_deref currently ignores swizzle_type in its texture >branch, so that's going to remain uninitialized (swizzle_type is also >ignored in another branch of sm4_register_from_deref). I missed that. I think they weren't explicitly handled on master. I will make them default to VKD3D_SM4_SWIZZLE_VEC4 on an upcoming patch, probably after Mystral's big batch.

1 0

[PATCH 01/13] programs/winedbg: be more strict when detecting a string from an array
by Eric Pouech 01 Dec '21

01 Dec '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/types.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 5e9188ccc6e..0ee6ab05f0f 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -519,24 +519,29 @@ void print_value(const struct dbg_lvalue* lvalue, char format, int level) count = 1; size = 1; types_get_info(&type, TI_GET_COUNT, &count); types_get_info(&type, TI_GET_LENGTH, &size); + lvalue_field = *lvalue; + types_get_info(&lvalue_field.type, TI_GET_TYPE, &lvalue_field.type.id); + types_get_real_type(&lvalue_field.type, &tag); - if (size == count) - { - unsigned len; - char buffer[256]; - /* - * Special handling for character arrays. - */ - /* FIXME should check basic type here (should be a char!!!!)... */ - len = min(count, sizeof(buffer)); - memory_get_string(dbg_curr_process, - memory_to_linear_addr(&lvalue->addr), - lvalue->cookie == DLV_TARGET, TRUE, buffer, len); - dbg_printf("\"%s%s\"", buffer, (len < count) ? "..." : ""); - break; + if (size == count && tag == SymTagBaseType) + { + DWORD basetype; + + types_get_info(&lvalue_field.type, TI_GET_BASETYPE, &basetype); + if (basetype == btChar) + { + char buffer[256]; + /* + * Special handling for character arrays. + */ + unsigned len = min(count, sizeof(buffer)); + memory_get_string(dbg_curr_process, + memory_to_linear_addr(&lvalue->addr), + lvalue->cookie == DLV_TARGET, TRUE, buffer, len); + dbg_printf("\"%s%s\"", buffer, (len < count) ? "..." : ""); + break; + } } - lvalue_field = *lvalue; - types_get_info(&type, TI_GET_TYPE, &lvalue_field.type.id); dbg_printf("{"); for (i = 0; i < count; i++) {

1 12

[PATCH 1/7] dinput8/tests: Provide an explicit test context to the driver.
by Rémi Bernon 01 Dec '21

01 Dec '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/driver_hid.c | 51 ++++++++++++++++------- dlls/dinput8/tests/driver_hid.h | 2 +- dlls/dinput8/tests/hid.c | 73 +++++++++++++++++++-------------- 3 files changed, 80 insertions(+), 46 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index db7b3185906..9a58b1c7d44 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -56,6 +56,7 @@ struct expect_queue struct hid_expect spurious; struct hid_expect *buffer; IRP *pending_wait; + char context[64]; }; static void expect_queue_init( struct expect_queue *queue ) @@ -93,6 +94,7 @@ static void expect_queue_cleanup( struct expect_queue *queue ) static void expect_queue_reset( struct expect_queue *queue, void *buffer, unsigned int size ) { struct hid_expect *missing, *missing_end, *tmp; + char context[64]; KIRQL irql; missing = ExAllocatePool( PagedPool, EXPECT_QUEUE_BUFFER_SIZE ); @@ -108,12 +110,13 @@ static void expect_queue_reset( struct expect_queue *queue, void *buffer, unsign if (size) memcpy( queue->end, buffer, size ); queue->end = queue->end + size / sizeof(struct hid_expect); + memcpy( context, queue->context, sizeof(context) ); KeReleaseSpinLock( &queue->lock, irql ); tmp = missing; while (tmp != missing_end) { - winetest_push_context( "%s expect[%d]", tmp->context, tmp - missing ); + winetest_push_context( "%s expect[%d]", context, tmp - missing ); if (tmp->broken) { todo_wine_if( tmp->todo ) @@ -180,7 +183,8 @@ static NTSTATUS expect_queue_wait( struct expect_queue *queue, IRP *irp ) } static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_PACKET *packet, - LONG *index, struct hid_expect *expect, BOOL compare_buf ) + LONG *index, struct hid_expect *expect, BOOL compare_buf, + char *context, ULONG context_size ) { struct hid_expect *missing, *missing_end, *tmp; ULONG len = packet->reportBufferLen; @@ -219,6 +223,7 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_ queue->pending_wait = NULL; if (!IoSetCancelRoutine( irp, NULL )) irp = NULL; } + memcpy( context, queue->context, context_size ); KeReleaseSpinLock( &queue->lock, irql ); if (irp) @@ -228,9 +233,9 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_ IoCompleteRequest( irp, IO_NO_INCREMENT ); } - ok( tmp != &queue->spurious, "got spurious packet\n" ); + ok( tmp != &queue->spurious, "%s got spurious packet\n", context ); - winetest_push_context( "%s expect[%d]", tmp->context, tmp - queue->buffer ); + winetest_push_context( "%s expect[%d]", context, tmp - queue->buffer ); todo_wine_if( tmp->todo ) ok( !tmp->wine_only, "found code %#x id %u len %u\n", tmp->code, tmp->report_id, tmp->report_len ); winetest_pop_context(); @@ -238,7 +243,7 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_ tmp = missing; while (tmp != missing_end) { - winetest_push_context( "%s expect[%d]", tmp->context, tmp - missing ); + winetest_push_context( "%s expect[%d]", context, tmp - missing ); if (tmp->broken) { todo_wine_if( tmp->todo ) @@ -471,6 +476,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ULONG out_size = stack->Parameters.DeviceIoControl.OutputBufferLength; const ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; struct hid_expect expect = {0}; + char context[64]; NTSTATUS ret; BOOL removed; KIRQL irql; @@ -563,8 +569,8 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( !out_size, "got output size %u\n", out_size ); ok( packet->reportBufferLen >= expected_size, "got report size %u\n", packet->reportBufferLen ); - expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE ); - winetest_push_context( "%s expect[%d]", expect.context, index ); + expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE, context, sizeof(context) ); + winetest_push_context( "%s expect[%d]", context, index ); ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); @@ -587,8 +593,8 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); - expect_queue_next( &expect_queue, code, packet, &index, &expect, FALSE ); - winetest_push_context( "%s expect[%d]", expect.context, index ); + expect_queue_next( &expect_queue, code, packet, &index, &expect, FALSE, context, sizeof(context) ); + winetest_push_context( "%s expect[%d]", context, index ); ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); @@ -610,8 +616,8 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); - expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE ); - winetest_push_context( "%s expect[%d]", expect.context, index ); + expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE, context, sizeof(context) ); + winetest_push_context( "%s expect[%d]", context, index ); ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); @@ -634,8 +640,8 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); - expect_queue_next( &expect_queue, code, packet, &index, &expect, FALSE ); - winetest_push_context( "%s expect[%d]", expect.context, index ); + expect_queue_next( &expect_queue, code, packet, &index, &expect, FALSE, context, sizeof(context) ); + winetest_push_context( "%s expect[%d]", context, index ); ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); @@ -657,8 +663,8 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); - expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE ); - winetest_push_context( "%s expect[%d]", expect.context, index ); + expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE, context, sizeof(context) ); + winetest_push_context( "%s expect[%d]", context, index ); ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); @@ -702,6 +708,7 @@ static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); ULONG in_size = stack->Parameters.DeviceIoControl.InputBufferLength; ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; + KIRQL irql; switch (code) { @@ -714,6 +721,14 @@ static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) return expect_queue_wait( &expect_queue, irp ); case IOCTL_WINETEST_HID_SEND_INPUT: input_queue_reset( &input_queue, irp->AssociatedIrp.SystemBuffer, in_size ); + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; + case IOCTL_WINETEST_HID_SET_CONTEXT: + KeAcquireSpinLock( &expect_queue.lock, &irql ); + memcpy( expect_queue.context, irp->AssociatedIrp.SystemBuffer, in_size ); + KeReleaseSpinLock( &expect_queue.lock, irql ); + irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest( irp, IO_NO_INCREMENT ); return STATUS_SUCCESS; @@ -837,6 +852,12 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) ok( !ret, "ZwQueryValueKey returned %#x\n", ret ); input_queue_reset( &input_queue, buffer + info_size, size - info_size ); + RtlInitUnicodeString( &name_str, L"Context" ); + size = info_size + sizeof(expect_queue.context); + ret = ZwQueryValueKey( hkey, &name_str, KeyValuePartialInformation, buffer, size, &size ); + ok( !ret, "ZwQueryValueKey returned %#x\n", ret ); + memcpy( expect_queue.context, buffer + info_size, size - info_size ); + driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput8/tests/driver_hid.h index 191c0c7bae2..3d31b4ee824 100644 --- a/dlls/dinput8/tests/driver_hid.h +++ b/dlls/dinput8/tests/driver_hid.h @@ -42,6 +42,7 @@ DEFINE_GUID(control_class,0xdeadbeef,0x29ef,0x4538,0xa5,0xfd,0xb6,0x95,0x73,0xa3 #define IOCTL_WINETEST_HID_SET_EXPECT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x800, METHOD_IN_DIRECT, FILE_ANY_ACCESS) #define IOCTL_WINETEST_HID_WAIT_EXPECT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x801, METHOD_NEITHER, FILE_ANY_ACCESS) #define IOCTL_WINETEST_HID_SEND_INPUT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x802, METHOD_IN_DIRECT, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_HID_SET_CONTEXT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x803, METHOD_IN_DIRECT, FILE_ANY_ACCESS) struct hid_expect { @@ -54,7 +55,6 @@ struct hid_expect BYTE report_id; BYTE report_len; BYTE report_buf[128]; - char context[64]; }; /* kernel/user shared data */ diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index a8ea8eaea9f..c0bfc8e8b30 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -765,21 +765,25 @@ static BOOL sync_ioctl_( int line, HANDLE file, DWORD code, void *in_buf, DWORD return ret; } +#define fill_context( line, a, b ) \ + do { \ + const char *source_file; \ + source_file = strrchr( __FILE__, '/' ); \ + if (!source_file) source_file = strrchr( __FILE__, '\\' ); \ + if (!source_file) source_file = __FILE__; \ + else source_file++; \ + snprintf( a, b, "%s:%d", source_file, line ); \ + } while (0) + #define set_hid_expect( a, b, c ) set_hid_expect_( __LINE__, a, b, c ) static void set_hid_expect_( int line, HANDLE file, struct hid_expect *expect, DWORD expect_size ) { - const char *source_file; + char context[64]; BOOL ret; - int i; - - source_file = strrchr( __FILE__, '/' ); - if (!source_file) source_file = strrchr( __FILE__, '\\' ); - if (!source_file) source_file = __FILE__; - else source_file++; - - for (i = 0; i < expect_size / sizeof(struct hid_expect); ++i) - snprintf( expect[i].context, ARRAY_SIZE(expect[i].context), "%s:%d", source_file, line ); + fill_context( line, context, ARRAY_SIZE(context) ); + ret = sync_ioctl_( line, file, IOCTL_WINETEST_HID_SET_CONTEXT, context, ARRAY_SIZE(context), NULL, 0, INFINITE ); + ok_(__FILE__, line)( ret, "IOCTL_WINETEST_HID_SET_CONTEXT failed, last error %u\n", GetLastError() ); ret = sync_ioctl_( line, file, IOCTL_WINETEST_HID_SET_EXPECT, expect, expect_size, NULL, 0, INFINITE ); ok_(__FILE__, line)( ret, "IOCTL_WINETEST_HID_SET_EXPECT failed, last error %u\n", GetLastError() ); } @@ -796,18 +800,12 @@ static void wait_hid_expect_( int line, HANDLE file, DWORD timeout ) #define send_hid_input( a, b, c ) send_hid_input_( __LINE__, a, b, c ) static void send_hid_input_( int line, HANDLE file, struct hid_expect *expect, DWORD expect_size ) { - const char *source_file; + char context[64]; BOOL ret; - int i; - - source_file = strrchr( __FILE__, '/' ); - if (!source_file) source_file = strrchr( __FILE__, '\\' ); - if (!source_file) source_file = __FILE__; - else source_file++; - - for (i = 0; i < expect_size / sizeof(struct hid_expect); ++i) - snprintf( expect[i].context, ARRAY_SIZE(expect[i].context), "%s:%d", source_file, line ); + fill_context( line, context, ARRAY_SIZE(context) ); + ret = sync_ioctl_( line, file, IOCTL_WINETEST_HID_SET_CONTEXT, context, ARRAY_SIZE(context), NULL, 0, INFINITE ); + ok_(__FILE__, line)( ret, "IOCTL_WINETEST_HID_SET_CONTEXT failed, last error %u\n", GetLastError() ); ret = sync_ioctl( file, IOCTL_WINETEST_HID_SEND_INPUT, expect, expect_size, NULL, 0, INFINITE ); ok( ret, "IOCTL_WINETEST_HID_SEND_INPUT failed, last error %u\n", GetLastError() ); } @@ -2750,6 +2748,7 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) }; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + char context[64]; LSTATUS status; HKEY hkey; @@ -2782,6 +2781,10 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, (void *)&expect_in, polled ? sizeof(expect_in) : 0 ); ok( !status, "RegSetValueExW returned %#x\n", status ); + fill_context( __LINE__, context, ARRAY_SIZE(context) ); + status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + if (pnp_driver_start( L"driver_hid.dll" )) test_hid_device( report_id, polled, &caps ); pnp_driver_stop(); @@ -3102,6 +3105,7 @@ static void test_hidp_kdr(void) PHIDP_PREPARSED_DATA preparsed_data; DWORD i, report_id = 0, polled = 0; struct hidp_kdr *kdr; + char context[64]; LSTATUS status; HDEVINFO set; HANDLE file; @@ -3137,6 +3141,10 @@ static void test_hidp_kdr(void) status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, NULL, 0 ); ok( !status, "RegSetValueExW returned %#x\n", status ); + fill_context( __LINE__, context, ARRAY_SIZE(context) ); + status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + if (!pnp_driver_start( L"driver_hid.dll" )) goto done; set = SetupDiGetClassDevsW( &GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); @@ -3291,8 +3299,9 @@ static void cleanup_registry_keys(void) RegCloseKey( root_key ); } -static BOOL dinput_driver_start( const BYTE *desc_buf, ULONG desc_len, const HIDP_CAPS *caps, - struct hid_expect *expect, ULONG expect_size ) +#define dinput_driver_start( a, b, c, d, e ) dinput_driver_start_( __LINE__, a, b, c, d, e ) +static BOOL dinput_driver_start_( int line, const BYTE *desc_buf, ULONG desc_len, const HIDP_CAPS *caps, + struct hid_expect *expect, ULONG expect_size ) { static const HID_DEVICE_ATTRIBUTES attributes = { @@ -3303,26 +3312,30 @@ static BOOL dinput_driver_start( const BYTE *desc_buf, ULONG desc_len, const HID }; DWORD report_id = 1; DWORD polled = 0; + char context[64]; LSTATUS status; HKEY hkey; status = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\winetest", 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL ); - ok( !status, "RegCreateKeyExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegCreateKeyExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"ReportID", 0, REG_DWORD, (void *)&report_id, sizeof(report_id) ); - ok( !status, "RegSetValueExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"PolledMode", 0, REG_DWORD, (void *)&polled, sizeof(polled) ); - ok( !status, "RegSetValueExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"Descriptor", 0, REG_BINARY, (void *)desc_buf, desc_len ); - ok( !status, "RegSetValueExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"Attributes", 0, REG_BINARY, (void *)&attributes, sizeof(attributes) ); - ok( !status, "RegSetValueExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"Caps", 0, REG_BINARY, (void *)caps, sizeof(*caps) ); - ok( !status, "RegSetValueExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, (void *)expect, expect_size ); - ok( !status, "RegSetValueExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, NULL, 0 ); - ok( !status, "RegSetValueExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); + fill_context( line, context, ARRAY_SIZE(context) ); + status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); return pnp_driver_start( L"driver_hid.dll" ); } -- 2.34.0

2 8

[PATCH v11 01/10] mshtml: Stringify attribute values in setAttribute using string hints in IE10+.
by Gabriel Ivăncescu 01 Dec '21

01 Dec '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmlelem.c | 36 ++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 1 - 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4605fda..9f56a56 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1043,7 +1043,7 @@ static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID return DISP_E_UNKNOWNNAME; } -static HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvider *caller) +HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvider *caller) { V_VT(dst) = VT_EMPTY; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d54f729..3f7c60b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6585,8 +6585,42 @@ static IHTMLEventObj *HTMLElement_set_current_event(DispatchEx *dispex, IHTMLEve return default_set_current_event(This->node.doc->window, event); } +static HRESULT IHTMLElement6_setAttribute_hook(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + VARIANT args[2]; + HRESULT hres; + DISPPARAMS new_dp = { args, NULL, 2, 0 }; + + if(!(flags & DISPATCH_METHOD) || dp->cArgs < 2 || dp->cNamedArgs) + return S_FALSE; + + switch(V_VT(&dp->rgvarg[dp->cArgs - 2])) { + case VT_EMPTY: + case VT_BSTR: + case VT_NULL: + return S_FALSE; + default: + break; + } + + hres = change_type(&args[0], &dp->rgvarg[dp->cArgs - 2], VT_BSTR, caller); + if(FAILED(hres)) + return hres; + args[1] = dp->rgvarg[dp->cArgs - 1]; + + hres = IDispatchEx_InvokeEx(&dispex->IDispatchEx_iface, DISPID_IHTMLELEMENT6_IE9_SETATTRIBUTE, + lcid, flags, &new_dp, res, ei, caller); + VariantClear(&args[0]); + return hres; +} + void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { + static const dispex_hook_t elem6_ie10_hooks[] = { + {DISPID_IHTMLELEMENT6_IE9_SETATTRIBUTE, IHTMLElement6_setAttribute_hook}, + {DISPID_UNKNOWN} + }; static const dispex_hook_t elem2_ie11_hooks[] = { {DISPID_IHTMLELEMENT2_DOSCROLL, NULL}, {DISPID_IHTMLELEMENT2_READYSTATE, NULL}, @@ -6601,7 +6635,7 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) dispex_info_add_interface(info, IElementSelector_tid, NULL); if(mode >= COMPAT_MODE_IE9) { - dispex_info_add_interface(info, IHTMLElement6_tid, NULL); + dispex_info_add_interface(info, IHTMLElement6_tid, mode >= COMPAT_MODE_IE10 ? elem6_ie10_hooks : NULL); dispex_info_add_interface(info, IElementTraversal_tid, NULL); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5cf53bb..6978ed7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -384,6 +384,7 @@ extern void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTr void init_dispatch(DispatchEx*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT change_type(VARIANT*,VARIANT*,VARTYPE,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**) DECLSPEC_HIDDEN; HRESULT get_dispids(tid_t,DWORD*,DISPID**) DECLSPEC_HIDDEN; HRESULT remove_attribute(DispatchEx*,DISPID,VARIANT_BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 08fcde4..c2fd8bd 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1136,7 +1136,6 @@ sync_test("elem_attr", function() { ok(r === (v < 8 ? arr : (v < 9 ? "arrval" : null)), "testattr with custom valueOf = " + r); elem.setAttribute("testattr", arr); r = elem.getAttribute("testattr"); - todo_wine_if(v >= 10). ok(r === (v < 8 ? arr : (v < 10 ? "arrval" : "42")), "testattr after setAttribute with custom valueOf = " + r); ok(elem.testattr === arr, "elem.testattr after setAttribute with custom valueOf = " + elem.testattr); r = elem.removeAttribute("testattr"); -- 2.31.1

3 21

[PATCH v4 2/2] scrrun: Implement folder_CreateTextFile.
by Robert Wilhelm 01 Dec '21

01 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51971 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- Supersedes 220458. v4: tests: Use ReadFile to check contents and minor cleanups as recommended by Nikolay. --- dlls/scrrun/filesystem.c | 16 ++++++- dlls/scrrun/tests/filesystem.c | 81 ++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 359d86bb8fd..7b0b2e110a6 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2518,9 +2518,21 @@ static HRESULT WINAPI folder_get_Files(IFolder *iface, IFileCollection **files) static HRESULT WINAPI folder_CreateTextFile(IFolder *iface, BSTR filename, VARIANT_BOOL overwrite, VARIANT_BOOL unicode, ITextStream **stream) { + DWORD disposition; + BSTR path; + HRESULT hres; + struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%s %x %x %p): stub\n", This, debugstr_w(filename), overwrite, unicode, stream); - return E_NOTIMPL; + + TRACE("%p %s %d %d %p\n", iface, debugstr_w(filename), overwrite, unicode, stream); + + hres = build_path(This->path, filename, &path); + if (FAILED(hres)) return hres; + + disposition = overwrite == VARIANT_TRUE ? CREATE_ALWAYS : CREATE_NEW; + hres = create_textstream(path, disposition, ForWriting, unicode ? TristateTrue : TristateFalse, stream); + SysFreeString(path); + return hres; } static const IFolderVtbl foldervtbl = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5c55965ce88..91729bb047f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1535,6 +1535,86 @@ static void test_CreateTextFile(void) SysFreeString(nameW); } +static void test_FolderCreateTextFile(void) +{ + WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10], buff2W[10]; + ITextStream *stream; + BSTR nameW, str; + HANDLE file; + IFolder *folder; + HRESULT hr; + BOOL ret; + DWORD r; + + get_temp_filepath(testfileW, pathW, dirW); + nameW = SysAllocString(L"foo.txt"); + lstrcpyW(pathW, dirW); + lstrcatW(pathW, nameW); + + ret = CreateDirectoryW(dirW, NULL); + ok(ret, "got %d, %d\n", ret, GetLastError()); + + str = SysAllocString(dirW); + hr = IFileSystem3_GetFolder(fs3, str, &folder); + ok(ret, "got %d, %d\n", ret, GetLastError()); + SysFreeString(str); + + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + test_provideclassinfo(stream, &CLSID_TextStream); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_FALSE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + ITextStream_Release(stream); + + /* check it's created */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + CloseHandle(file); + + /* try to create again with no-overwrite mode */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x\n", hr); + + /* now overwrite */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* overwrite in Unicode mode, check for BOM */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* check contents */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + r = 0; + ret = ReadFile(file, buffW, sizeof(buffW), &r, NULL); + ok(ret && r==2, "read %d, got %d, %d\n", r, ret, GetLastError()); + buffW[r/sizeof(WCHAR)] = 0; + + buff2W[0] = 0xfeff; + buff2W[1] = 0; + ok(!lstrcmpW(buff2W, buffW), "got %s, expected %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(buff2W)); + CloseHandle(file); + + DeleteFileW(pathW); + RemoveDirectoryW(dirW); + SysFreeString(nameW); +} + static void test_WriteLine(void) { WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; @@ -2516,6 +2596,7 @@ START_TEST(filesystem) test_FileCollection(); test_DriveCollection(); test_CreateTextFile(); + test_FolderCreateTextFile(); test_WriteLine(); test_ReadAll(); test_Read(); -- 2.31.1

2 1

[PATCH v4 1/2] scrrun: Extract code to new helper function build_path.
by Robert Wilhelm 01 Dec '21

01 Dec '21

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- Supersedes 220459. v4: Fix issues as pointed out by Nikolay: Leave EPOINTER check in original function and do not specify calling convention. --- dlls/scrrun/filesystem.c | 103 ++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 49 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 68ef1786af9..359d86bb8fd 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -223,6 +223,59 @@ static BSTR get_full_path(BSTR path, const WIN32_FIND_DATAW *data) return SysAllocString(buffW); } +static HRESULT build_path( BSTR Path, BSTR Name, BSTR *Result) +{ + BSTR ret; + + if (Path && Name) + { + int path_len = SysStringLen(Path), name_len = SysStringLen(Name); + + /* if both parts have backslashes strip one from Path */ + if (Path[path_len-1] == '\\' && Name[0] == '\\') + { + path_len -= 1; + + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + lstrcpyW(ret, Path); + ret[path_len] = 0; + lstrcatW(ret, Name); + } + } + else if (Path[path_len-1] != '\\' && Name[0] != '\\') + { + ret = SysAllocStringLen(NULL, path_len + name_len + 1); + if (ret) + { + lstrcpyW(ret, Path); + if (Path[path_len-1] != ':') + wcscat(ret, L"\\"); + lstrcatW(ret, Name); + } + } + else + { + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + lstrcpyW(ret, Path); + lstrcatW(ret, Name); + } + } + } + else if (Path || Name) + ret = SysAllocString(Path ? Path : Name); + else + ret = SysAllocStringLen(NULL, 0); + + if (!ret) return E_OUTOFMEMORY; + *Result = ret; + + return S_OK; +} + static BOOL textstream_check_iomode(struct textstream *This, enum iotype type) { if (type == IORead) @@ -3034,59 +3087,11 @@ static HRESULT WINAPI filesys_get_Drives(IFileSystem3 *iface, IDriveCollection * static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, BSTR Name, BSTR *Result) { - BSTR ret; - TRACE("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), Result); if (!Result) return E_POINTER; - if (Path && Name) - { - int path_len = SysStringLen(Path), name_len = SysStringLen(Name); - - /* if both parts have backslashes strip one from Path */ - if (Path[path_len-1] == '\\' && Name[0] == '\\') - { - path_len -= 1; - - ret = SysAllocStringLen(NULL, path_len + name_len); - if (ret) - { - lstrcpyW(ret, Path); - ret[path_len] = 0; - lstrcatW(ret, Name); - } - } - else if (Path[path_len-1] != '\\' && Name[0] != '\\') - { - ret = SysAllocStringLen(NULL, path_len + name_len + 1); - if (ret) - { - lstrcpyW(ret, Path); - if (Path[path_len-1] != ':') - wcscat(ret, L"\\"); - lstrcatW(ret, Name); - } - } - else - { - ret = SysAllocStringLen(NULL, path_len + name_len); - if (ret) - { - lstrcpyW(ret, Path); - lstrcatW(ret, Name); - } - } - } - else if (Path || Name) - ret = SysAllocString(Path ? Path : Name); - else - ret = SysAllocStringLen(NULL, 0); - - if (!ret) return E_OUTOFMEMORY; - *Result = ret; - - return S_OK; + return build_path(Path, Name, Result); } static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR path, BSTR *drive) -- 2.31.1

2 1

[PATCH v2 1/6] wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding in wined3d_texture_gl_allocate_mutable_storage().
by Zebediah Figura 01 Dec '21

01 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/texture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d4c7082912b..f0ef42065d3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -930,6 +930,9 @@ static void wined3d_texture_gl_allocate_mutable_storage(struct wined3d_texture_g else layer_count = texture_gl->t.layer_count; + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + for (layer = 0; layer < layer_count; ++layer) { target = wined3d_texture_gl_get_sub_resource_target(texture_gl, layer * level_count); -- 2.32.0

2 11

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