July 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll/tests: Add thread context test for ARM platforms.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: eee92591bcf4eb7e1f0d91e24c47b5021a9c81fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=eee92591bcf4eb7e1f0d91e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 14:16:53 2020 +0200 ntdll/tests: Add thread context test for ARM platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 3 +- dlls/ntdll/signal_arm64.c | 1 + dlls/ntdll/tests/exception.c | 262 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 261 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eee92591bcf4eb7e1f0d…

1 0

Gijs Vermeulen : qdvd: Add a stub IDvdInfo2 interface.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: d05ec6b2780144c5f1c56a702e0c1c502c6cb78a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d05ec6b2780144c5f1c56a70… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jul 28 10:29:58 2020 +0200 qdvd: Add a stub IDvdInfo2 interface. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/navigator.c | 436 ++++++++++++++++++++++++++++++++++++++++++++ dlls/qdvd/tests/navigator.c | 2 +- 2 files changed, 437 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d05ec6b2780144c5f1c5…

1 0

Jacek Caban : condrv: Rename condrv_write_output_params to condrv_output_params.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 7a31d401391c9c66173a599cadbbb6946f607927 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a31d401391c9c66173a599c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 28 17:09:57 2020 +0200 condrv: Rename condrv_write_output_params to condrv_output_params. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 2 +- dlls/kernelbase/console.c | 6 +++--- include/wine/condrv.h | 2 +- server/console.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 8fc158ac22..c4583d1d9c 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -691,7 +691,7 @@ LONG CALLBACK CONSOLE_HandleCtrlC( EXCEPTION_POINTERS *eptr ) */ static int CONSOLE_WriteChars(HANDLE handle, const WCHAR *str, size_t length, COORD *coord) { - struct condrv_write_output_params *params; + struct condrv_output_params *params; DWORD written = 0, size; if (!length) return 0; diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index b7443ce9ae..23f0696124 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1486,7 +1486,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputA( HANDLE handle, const CHAR_INF BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputW( HANDLE handle, const CHAR_INFO *buffer, COORD size, COORD coord, SMALL_RECT *region ) { - struct condrv_write_output_params *params; + struct condrv_output_params *params; unsigned int width, height, y; size_t params_size; BOOL ret; @@ -1533,7 +1533,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputW( HANDLE handle, const CHAR_INF BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputAttribute( HANDLE handle, const WORD *attr, DWORD length, COORD coord, DWORD *written ) { - struct condrv_write_output_params *params; + struct condrv_output_params *params; size_t size; BOOL ret; @@ -1600,7 +1600,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterA( HANDLE handle, LPCST BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterW( HANDLE handle, LPCWSTR str, DWORD length, COORD coord, DWORD *written ) { - struct condrv_write_output_params *params; + struct condrv_output_params *params; size_t size; BOOL ret; diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 922550f6f5..a47a4f2775 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -84,7 +84,7 @@ struct condrv_input_info_params }; /* IOCTL_CONDRV_WRITE_OUTPUT */ -struct condrv_write_output_params +struct condrv_output_params { unsigned int x; /* destination position */ unsigned int y; diff --git a/server/console.c b/server/console.c index e74340d122..14fbd67e22 100644 --- a/server/console.c +++ b/server/console.c @@ -1249,7 +1249,7 @@ static struct fd *screen_buffer_get_fd( struct object *obj ) } /* write data into a screen buffer */ -static void write_console_output( struct screen_buffer *screen_buffer, const struct condrv_write_output_params *params, +static void write_console_output( struct screen_buffer *screen_buffer, const struct condrv_output_params *params, data_size_t size ) { unsigned int i, entry_size, entry_cnt, x, y; @@ -1677,7 +1677,7 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return 1; case IOCTL_CONDRV_WRITE_OUTPUT: - if (get_req_data_size() < sizeof(struct condrv_write_output_params) || + if (get_req_data_size() < sizeof(struct condrv_output_params) || (get_reply_max_size() != sizeof(SMALL_RECT) && get_reply_max_size() != sizeof(unsigned int))) { set_error( STATUS_INVALID_PARAMETER ); @@ -1688,7 +1688,7 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; } - write_console_output( screen_buffer, get_req_data(), get_req_data_size() - sizeof(struct condrv_write_output_params) ); + write_console_output( screen_buffer, get_req_data(), get_req_data_size() - sizeof(struct condrv_output_params) ); return !get_error(); case IOCTL_CONDRV_GET_OUTPUT_INFO:

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_READ_OUTPUT ioctl.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 44052219aa0e6412a0f595f830c0cdf6e82ea70c URL: https://source.winehq.org/git/wine.git/?a=commit;h=44052219aa0e6412a0f595f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 28 17:10:23 2020 +0200 server: Introduce IOCTL_CONDRV_READ_OUTPUT ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 3 +- server/console.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++-- server/trace.c | 1 + 3 files changed, 90 insertions(+), 4 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index a47a4f2775..839db84ea5 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -37,6 +37,7 @@ #define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 16, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) /* console output ioctls */ +#define IOCTL_CONDRV_READ_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_READ_DATA) #define IOCTL_CONDRV_WRITE_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 31, METHOD_BUFFERED, FILE_WRITE_DATA) #define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) #define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) @@ -83,7 +84,7 @@ struct condrv_input_info_params struct condrv_input_info info; /* input_info */ }; -/* IOCTL_CONDRV_WRITE_OUTPUT */ +/* IOCTL_CONDRV_WRITE_OUTPUT and IOCTL_CONDRV_READ_OUTPUT params */ struct condrv_output_params { unsigned int x; /* destination position */ diff --git a/server/console.c b/server/console.c index 14fbd67e22..207e333ec3 100644 --- a/server/console.c +++ b/server/console.c @@ -1248,6 +1248,73 @@ static struct fd *screen_buffer_get_fd( struct object *obj ) return NULL; } +/* read data from a screen buffer */ +static void read_console_output( struct screen_buffer *screen_buffer, unsigned int x, unsigned int y, + enum char_info_mode mode, unsigned int width ) +{ + unsigned int i, count; + char_info_t *src; + + if (x >= screen_buffer->width || y >= screen_buffer->height) + { + if (width) set_error( STATUS_INVALID_PARAMETER ); + return; + } + src = screen_buffer->data + y * screen_buffer->width + x; + + switch(mode) + { + case CHAR_INFO_MODE_TEXT: + { + WCHAR *data; + count = min( screen_buffer->data + screen_buffer->height * screen_buffer->width - src, + get_reply_max_size() / sizeof(*data) ); + if ((data = set_reply_data_size( count * sizeof(*data) ))) + { + for (i = 0; i < count; i++) data[i] = src[i].ch; + } + } + break; + case CHAR_INFO_MODE_ATTR: + { + unsigned short *data; + count = min( screen_buffer->data + screen_buffer->height * screen_buffer->width - src, + get_reply_max_size() / sizeof(*data) ); + if ((data = set_reply_data_size( count * sizeof(*data) ))) + { + for (i = 0; i < count; i++) data[i] = src[i].attr; + } + } + break; + case CHAR_INFO_MODE_TEXTATTR: + { + char_info_t *data; + SMALL_RECT *region; + if (!width || get_reply_max_size() < sizeof(*region)) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + count = min( (get_reply_max_size() - sizeof(*region)) / (width * sizeof(*data)), screen_buffer->height - y ); + width = min( width, screen_buffer->width - x ); + if (!(region = set_reply_data_size( sizeof(*region) + width * count * sizeof(*data) ))) return; + region->Left = x; + region->Top = y; + region->Right = x + width - 1; + region->Bottom = y + count - 1; + data = (char_info_t *)(region + 1); + for (i = 0; i < count; i++) + { + memcpy( &data[i * width], &src[i * screen_buffer->width], width * sizeof(*data) ); + } + } + break; + default: + set_error( STATUS_INVALID_PARAMETER ); + break; + } +} + /* write data into a screen buffer */ static void write_console_output( struct screen_buffer *screen_buffer, const struct condrv_output_params *params, data_size_t size ) @@ -1378,8 +1445,8 @@ static int fill_console_output( struct screen_buffer *screen_buffer, char_info_t } /* read data from a screen buffer */ -static void read_console_output( struct screen_buffer *screen_buffer, int x, int y, - enum char_info_mode mode, int wrap ) +static void read_console_output_req( struct screen_buffer *screen_buffer, int x, int y, + enum char_info_mode mode, int wrap ) { int i; char_info_t *end, *src = screen_buffer->data + y * screen_buffer->width + x; @@ -1676,6 +1743,23 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * screen_buffer->mode = *(unsigned int *)get_req_data(); return 1; + case IOCTL_CONDRV_READ_OUTPUT: + { + const struct condrv_output_params *params = get_req_data(); + if (get_req_data_size() != sizeof(*params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (console_input_is_bare( screen_buffer->input )) + { + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + return 0; + } + read_console_output( screen_buffer, params->x, params->y, params->mode, params->width ); + return !get_error(); + } + case IOCTL_CONDRV_WRITE_OUTPUT: if (get_req_data_size() < sizeof(struct condrv_output_params) || (get_reply_max_size() != sizeof(SMALL_RECT) && get_reply_max_size() != sizeof(unsigned int))) @@ -2150,7 +2234,7 @@ DECL_HANDLER(read_console_output) release_object( screen_buffer ); return; } - read_console_output( screen_buffer, req->x, req->y, req->mode, req->wrap ); + read_console_output_req( screen_buffer, req->x, req->y, req->mode, req->wrap ); reply->width = screen_buffer->width; reply->height = screen_buffer->height; release_object( screen_buffer ); diff --git a/server/trace.c b/server/trace.c index 7cff5bf5f4..ab5a40bef8 100644 --- a/server/trace.c +++ b/server/trace.c @@ -124,6 +124,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) CASE(IOCTL_CONDRV_GET_TITLE); CASE(IOCTL_CONDRV_PEEK); CASE(IOCTL_CONDRV_READ_INPUT); + CASE(IOCTL_CONDRV_READ_OUTPUT); CASE(IOCTL_CONDRV_SET_MODE); CASE(IOCTL_CONDRV_SET_OUTPUT_INFO); CASE(IOCTL_CONDRV_WRITE_INPUT);

1 0

Alexandre Julliard : ntdll/tests: Fix vectored exception handler usage.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 94ca95a6d444e8cd1592bd41f09cba2e1ae49902 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94ca95a6d444e8cd1592bd41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 14:12:36 2020 +0200 ntdll/tests: Fix vectored exception handler usage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index fce1de385e..c498d628ff 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1747,6 +1747,7 @@ void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *contex static void test_kiuserexceptiondispatcher(void) { + PVOID vectored_handler; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); static BYTE except_code[] = { @@ -1874,7 +1875,7 @@ static void test_kiuserexceptiondispatcher(void) record.ExceptionAddress = NULL; /* does not matter, copied return address */ record.NumberParameters = 0; - AddVectoredExceptionHandler(TRUE, dbg_except_continue_vectored_handler); + vectored_handler = AddVectoredExceptionHandler(TRUE, dbg_except_continue_vectored_handler); memcpy(pKiUserExceptionDispatcher, patched_KiUserExceptionDispatcher_bytes, sizeof(patched_KiUserExceptionDispatcher_bytes)); @@ -1886,7 +1887,7 @@ static void test_kiuserexceptiondispatcher(void) ok(got_exception, "Handler was not called.\n"); ok(hook_called || broken(!hook_called) /* 2003 */, "Hook was not called.\n"); - RemoveVectoredExceptionHandler(dbg_except_continue_vectored_handler); + RemoveVectoredExceptionHandler(vectored_handler); ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), old_protect2, &old_protect2); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); @@ -2971,6 +2972,7 @@ void WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *conte static void test_kiuserexceptiondispatcher(void) { + LPVOID vectored_handler; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); static BYTE except_code[] = { @@ -3099,7 +3101,7 @@ static void test_kiuserexceptiondispatcher(void) record.ExceptionAddress = NULL; record.NumberParameters = 0; - AddVectoredExceptionHandler(TRUE, dbg_except_continue_vectored_handler); + vectored_handler = AddVectoredExceptionHandler(TRUE, dbg_except_continue_vectored_handler); memcpy(pKiUserExceptionDispatcher, patched_KiUserExceptionDispatcher_bytes, sizeof(patched_KiUserExceptionDispatcher_bytes)); @@ -3126,7 +3128,7 @@ static void test_kiuserexceptiondispatcher(void) || broken(!hook_exception_address) /* 2008 */, "Got unexpected addresses %p, %p.\n", hook_KiUserExceptionDispatcher_rip, hook_exception_address); - RemoveVectoredExceptionHandler(dbg_except_continue_vectored_handler); + RemoveVectoredExceptionHandler(vectored_handler); memcpy(pKiUserExceptionDispatcher, patched_KiUserExceptionDispatcher_bytes, sizeof(patched_KiUserExceptionDispatcher_bytes));

1 0

Alexandre Julliard : winebuild: Store the syscall frame in the thread data on i386.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 8e3b5183cc79b99ac74e2cb3f665f8e46a076495 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e3b5183cc79b99ac74e2cb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 13:00:50 2020 +0200 winebuild: Store the syscall frame in the thread data on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 14 +++++++++++++- tools/winebuild/import.c | 15 +++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index a258c5d8dc..519c1a76d9 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -473,6 +473,17 @@ enum i386_trap_code #endif }; +struct syscall_frame +{ + struct syscall_frame *prev_frame; + DWORD edi; + DWORD esi; + DWORD ebx; + DWORD ebp; + DWORD thunk_addr; + DWORD ret_addr; +}; + struct x86_thread_data { DWORD fs; /* 1d4 TEB selector */ @@ -484,12 +495,13 @@ struct x86_thread_data DWORD dr6; /* 1ec */ DWORD dr7; /* 1f0 */ void *exit_frame; /* 1f4 exit frame pointer */ - /* the ntdll_thread_data structure follows here */ + struct syscall_frame *syscall_frame; /* 1f8 frame pointer on syscall entry */ }; C_ASSERT( sizeof(struct x86_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, gs ) == 0x1d8 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, exit_frame ) == 0x1f4 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, syscall_frame ) == 0x1f8 ); static inline struct x86_thread_data *x86_thread_data(void) { diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 278de20522..cb0b80a6f7 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1446,10 +1446,14 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_rel_offset %%ebp,0\n" ); output( "\tmovl %%esp,%%ebp\n" ); output_cfi( ".cfi_def_cfa_register %%ebp\n" ); + output( "\tpushl %%ebx\n" ); + output_cfi( ".cfi_rel_offset %%ebx,-4\n" ); output( "\tpushl %%esi\n" ); - output_cfi( ".cfi_rel_offset %%esi,-4\n" ); + output_cfi( ".cfi_rel_offset %%esi,-8\n" ); output( "\tpushl %%edi\n" ); - output_cfi( ".cfi_rel_offset %%edi,-8\n" ); + output_cfi( ".cfi_rel_offset %%edi,-12\n" ); + output( "\tpushl %%fs:0x1f8\n" ); /* x86_thread_data()->syscall_frame */ + output( "\tmovl %%esp,%%fs:0x1f8\n" ); output( "\tcmpl $%u,%%eax\n", count ); output( "\tjae 3f\n" ); if (UsePIC) @@ -1471,11 +1475,14 @@ void output_syscalls( DLLSPEC *spec ) output( "\tcall *.Lsyscall_table-1b(%%eax,%%edx,4)\n" ); else output( "\tcall *.Lsyscall_table(,%%eax,4)\n" ); - output( "\tleal -8(%%ebp),%%esp\n" ); - output( "2:\tpopl %%edi\n" ); + output( "\tleal -16(%%ebp),%%esp\n" ); + output( "2:\tpopl %%fs:0x1f8\n" ); + output( "\tpopl %%edi\n" ); output_cfi( ".cfi_same_value %%edi\n" ); output( "\tpopl %%esi\n" ); output_cfi( ".cfi_same_value %%esi\n" ); + output( "\tpopl %%ebx\n" ); + output_cfi( ".cfi_same_value %%ebx\n" ); output( "\tpopl %%ebp\n" ); output_cfi( ".cfi_def_cfa %%esp,4\n" ); output_cfi( ".cfi_same_value %%ebp\n" );

1 0

Zebediah Figura : dsdmo: Add a stub I3DL2 reverb effect.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: eb6709dab41e7b2efe528a47e80c2d01f98d7384 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb6709dab41e7b2efe528a47… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 27 20:26:00 2020 -0500 dsdmo: Add a stub I3DL2 reverb effect. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/dsdmo.idl | 8 ++++++++ dlls/dsdmo/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl index a967186af3..e5735b42f7 100644 --- a/dlls/dsdmo/dsdmo.idl +++ b/dlls/dsdmo/dsdmo.idl @@ -18,6 +18,14 @@ #pragma makedep register +[ + threading(both), + progid("Microsoft.DirectSoundI3DL2ReverbDMO.1"), + vi_progid("Microsoft.DirectSoundI3DL2ReverbDMO"), + uuid(ef985e71-d5c7-42d4-ba4d-2d073e2e96f4) +] +coclass DirectSoundI3DL2ReverbDMO {} + [ threading(both), progid("Microsoft.DirectSoundWavesReverbDMO.1"), diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 1e992fe541..f42d29f58b 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -434,6 +434,48 @@ static void effect_init(struct effect *effect, IUnknown *outer, const struct eff effect->ops = ops; } +struct reverb +{ + struct effect effect; +}; + +static struct reverb *impl_reverb_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct reverb, effect); +} + +static void *reverb_query_interface(struct effect *iface, REFIID iid) +{ + return NULL; +} + +static void reverb_destroy(struct effect *iface) +{ + struct reverb *effect = impl_reverb_from_effect(iface); + + free(effect); +} + +static const struct effect_ops reverb_ops = +{ + .destroy = reverb_destroy, + .query_interface = reverb_query_interface, +}; + +static HRESULT reverb_create(IUnknown *outer, IUnknown **out) +{ + struct reverb *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &reverb_ops); + + TRACE("Created I3DL2 reverb effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + struct waves_reverb { struct effect effect; @@ -628,6 +670,7 @@ static struct } class_factories[] = { + {&GUID_DSFX_STANDARD_I3DL2REVERB, {{&class_factory_vtbl}, reverb_create}}, {&GUID_DSFX_WAVES_REVERB, {{&class_factory_vtbl}, waves_reverb_create}}, };

1 0

Alexandre Julliard : winebuild: Store the syscall frame in the thread data on x86_64.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 9a7c56d9e7f8e49dc98dace53b10d0753f0e27a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a7c56d9e7f8e49dc98dace5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 13:01:24 2020 +0200 winebuild: Store the syscall frame in the thread data on x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 34 +++++++++++++++++++++++++++------- tools/winebuild/import.c | 41 +++++++++++++++++++++++++++++++++-------- 2 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 630f8e22f3..b954ef9458 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -240,19 +240,39 @@ struct stack_layout C_ASSERT( sizeof(struct stack_layout) == 0x630 ); /* Should match the size in call_user_exception_dispatcher(). */ +struct syscall_frame +{ + struct syscall_frame *prev_frame; + ULONG64 pad; + ULONG64 xmm[10 * 2]; /* xmm6-xmm15 */ + ULONG64 mxcsr; + ULONG64 r12; + ULONG64 r13; + ULONG64 r14; + ULONG64 r15; + ULONG64 rdi; + ULONG64 rsi; + ULONG64 rbx; + ULONG64 rbp; + ULONG64 thunk_addr; + ULONG64 ret_addr; +}; + struct amd64_thread_data { - DWORD_PTR dr0; /* 02f0 debug registers */ - DWORD_PTR dr1; - DWORD_PTR dr2; - DWORD_PTR dr3; - DWORD_PTR dr6; - DWORD_PTR dr7; - void *exit_frame; /* 0320 exit frame pointer */ + DWORD_PTR dr0; /* 02f0 debug registers */ + DWORD_PTR dr1; /* 02f8 */ + DWORD_PTR dr2; /* 0300 */ + DWORD_PTR dr3; /* 0308 */ + DWORD_PTR dr6; /* 0310 */ + DWORD_PTR dr7; /* 0318 */ + void *exit_frame; /* 0320 exit frame pointer */ + struct syscall_frame *syscall_frame; /* 0328 syscall frame pointer */ }; C_ASSERT( sizeof(struct amd64_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, exit_frame ) == 0x320 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, syscall_frame ) == 0x328 ); static inline struct amd64_thread_data *amd64_thread_data(void) { diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index cb0b80a6f7..09cb320b5d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1496,10 +1496,31 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_rel_offset %%rbp,0" ); output( "\tmovq %%rsp,%%rbp\n" ); output_cfi( ".cfi_def_cfa_register %%rbp" ); - output( "\tpushq %%rsi\n" ); - output_cfi( ".cfi_rel_offset %%rsi,-8" ); - output( "\tpushq %%rdi\n" ); - output_cfi( ".cfi_rel_offset %%rdi,-16" ); + output( "\tleaq -0xe8(%%rbp),%%rsp\n" ); + output( "\tmovq %%gs:0x30,%%rcx\n" ); + output( "\tpushq 0x328(%%rcx)\n" ); /* amd64_thread_data()->syscall_frame */ + output( "\tmovq %%rsp,0x328(%%rcx)\n" ); + output( "\tmovdqu %%xmm6,-0xe0(%%rbp)\n" ); + output( "\tmovdqu %%xmm7,-0xd0(%%rbp)\n" ); + output( "\tmovdqu %%xmm8,-0xc0(%%rbp)\n" ); + output( "\tmovdqu %%xmm9,-0xb0(%%rbp)\n" ); + output( "\tmovdqu %%xmm10,-0xa0(%%rbp)\n" ); + output( "\tmovdqu %%xmm11,-0x90(%%rbp)\n" ); + output( "\tmovdqu %%xmm12,-0x80(%%rbp)\n" ); + output( "\tmovdqu %%xmm13,-0x70(%%rbp)\n" ); + output( "\tmovdqu %%xmm14,-0x60(%%rbp)\n" ); + output( "\tmovdqu %%xmm15,-0x50(%%rbp)\n" ); + output( "\tstmxcsr -0x40(%%rbp)\n" ); + output( "\tmovq %%r12,-0x38(%%rbp)\n" ); + output( "\tmovq %%r13,-0x30(%%rbp)\n" ); + output( "\tmovq %%r14,-0x28(%%rbp)\n" ); + output( "\tmovq %%r15,-0x20(%%rbp)\n" ); + output( "\tmovq %%rdi,-0x18(%%rbp)\n" ); + output_cfi( ".cfi_rel_offset %%rdi,-24" ); + output( "\tmovq %%rsi,-0x10(%%rbp)\n" ); + output_cfi( ".cfi_rel_offset %%rsi,-16" ); + output( "\tmovq %%rbx,-0x08(%%rbp)\n" ); + output_cfi( ".cfi_rel_offset %%rbx,-8" ); /* Legends of Runeterra hooks the first system call return instruction, and * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x8(%%rbp)\n" ); @@ -1522,13 +1543,17 @@ void output_syscalls( DLLSPEC *spec ) output( "\tsubq $0x20,%%rsp\n" ); output( "\tleaq .Lsyscall_table(%%rip),%%r10\n" ); output( "\tcallq *(%%r10,%%rax,8)\n" ); - output( "3:\tleaq -0x10(%%rbp),%%rsp\n" ); - output( "\tpopq %%rdi\n" ); + output( "3:\tpushq -0xf0(%%rbp)\n" ); + output( "\tmovq %%gs:0x30,%%rcx\n" ); + output( "\tpopq 0x328(%%rcx)\n" ); /* prev frame */ + output( "\tmovq -0x18(%%rbp),%%rdi\n" ); output_cfi( ".cfi_same_value %%rdi" ); - output( "\tpopq %%rsi\n" ); + output( "\tmovq -0x10(%%rbp),%%rsi\n" ); output_cfi( ".cfi_same_value %%rsi" ); + output( "\tmovq -0x8(%%rbp),%%rbx\n" ); + output_cfi( ".cfi_same_value %%rbx" ); output_cfi( ".cfi_def_cfa_register %%rsp" ); - output( "\tpopq %%rbp\n" ); + output( "\tleave\n" ); output_cfi( ".cfi_adjust_cfa_offset -8" ); output_cfi( ".cfi_same_value %%rbp" ); output( "\tret\n" );

1 0

Gijs Vermeulen : wbemprox: Support retrieving more than one object in IEnumWbemClassObject::Next().
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 84d85adeea578cac37bded97984409f44c7985ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=84d85adeea578cac37bded97… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jul 28 11:35:08 2020 +0200 wbemprox: Support retrieving more than one object in IEnumWbemClassObject::Next(). Patch by GitHub user pnevmoslon with some modifications. Fixes gamepad support in Mortal Kombat 11. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 23 ++++++++++++++--------- dlls/wbemprox/tests/query.c | 12 ++++++------ 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index ba7720b098..db6017e0c9 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -116,24 +116,29 @@ static HRESULT WINAPI enum_class_object_Next( struct table *table; static int once = 0; HRESULT hr; + ULONG i, j; TRACE("%p, %d, %u, %p, %p\n", iface, lTimeout, uCount, apObjects, puReturned); - if (!uCount) return WBEM_S_FALSE; if (!apObjects || !puReturned) return WBEM_E_INVALID_PARAMETER; if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n"); *puReturned = 0; - if (ec->index >= view->result_count) return WBEM_S_FALSE; - table = get_view_table( view, ec->index ); - hr = create_class_object( table->name, iface, ec->index, NULL, apObjects ); - if (hr != S_OK) return hr; + for (i = 0; i < uCount; i++) + { + if (ec->index >= view->result_count) return WBEM_S_FALSE; + table = get_view_table( view, ec->index ); + hr = create_class_object( table->name, iface, ec->index, NULL, &apObjects[i] ); + if (hr != S_OK) + { + for (j = 0; j < i; j++) IWbemClassObject_Release( apObjects[j] ); + return hr; + } + ec->index++; + (*puReturned)++; + } - ec->index++; - *puReturned = 1; - if (ec->index == view->result_count && uCount > 1) return WBEM_S_FALSE; - if (uCount > 1) return WBEM_S_TIMEDOUT; return WBEM_S_NO_ERROR; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e99e221c30..e48722f3bc 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -181,8 +181,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) count = 2; hr = IEnumWbemClassObject_Next( result, 10000, 0, &obj1, &count ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( count == 0, "expected 0, got %u\n", count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 0, "expected 0, got %u\n", count ); for (;;) { @@ -199,8 +199,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) count = 0; hr = IEnumWbemClassObject_Next( result, 10000, num_objects, obj, &count ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); for (i = 0; i < count; i++) IWbemClassObject_Release( obj[i] ); @@ -210,8 +210,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) count = 0; hr = IEnumWbemClassObject_Next( result, 10000, num_objects + 1, obj, &count ); - todo_wine ok( hr == S_FALSE, "got %08x\n", hr ); - todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + ok( hr == S_FALSE, "got %08x\n", hr ); + ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); for (i = 0; i < count; i++) IWbemClassObject_Release( obj[i] );

1 0

Zebediah Figura : dsdmo: Stub IDirectSoundFXParamEq.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 861cfee25db57d4b89adb5efcf0215722fc462d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=861cfee25db57d4b89adb5ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 27 20:26:04 2020 -0500 dsdmo: Stub IDirectSoundFXParamEq. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/main.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 17 +++++++------- dlls/dsound/tests/dsound8.c | 10 ++++---- 3 files changed, 69 insertions(+), 14 deletions(-) diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 482b8202db..ff103be159 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -437,6 +437,57 @@ static void effect_init(struct effect *effect, IUnknown *outer, const struct eff struct eq { struct effect effect; + IDirectSoundFXParamEq IDirectSoundFXParamEq_iface; +}; + +static struct eq *impl_from_IDirectSoundFXParamEq(IDirectSoundFXParamEq *iface) +{ + return CONTAINING_RECORD(iface, struct eq, IDirectSoundFXParamEq_iface); +} + +static HRESULT WINAPI eq_params_QueryInterface(IDirectSoundFXParamEq *iface, REFIID iid, void **out) +{ + struct eq *effect = impl_from_IDirectSoundFXParamEq(iface); + return IUnknown_QueryInterface(effect->effect.outer_unk, iid, out); +} + +static ULONG WINAPI eq_params_AddRef(IDirectSoundFXParamEq *iface) +{ + struct eq *effect = impl_from_IDirectSoundFXParamEq(iface); + return IUnknown_AddRef(effect->effect.outer_unk); +} + +static ULONG WINAPI eq_params_Release(IDirectSoundFXParamEq *iface) +{ + struct eq *effect = impl_from_IDirectSoundFXParamEq(iface); + return IUnknown_Release(effect->effect.outer_unk); +} + +static HRESULT WINAPI eq_params_SetAllParameters(IDirectSoundFXParamEq *iface, const DSFXParamEq *params) +{ + struct eq *effect = impl_from_IDirectSoundFXParamEq(iface); + + FIXME("effect %p, params %p, stub!\n", effect, params); + + return E_NOTIMPL; +} + +static HRESULT WINAPI eq_params_GetAllParameters(IDirectSoundFXParamEq *iface, DSFXParamEq *params) +{ + struct eq *effect = impl_from_IDirectSoundFXParamEq(iface); + + FIXME("effect %p, params %p, stub!\n", effect, params); + + return E_NOTIMPL; +} + +static const IDirectSoundFXParamEqVtbl eq_params_vtbl = +{ + eq_params_QueryInterface, + eq_params_AddRef, + eq_params_Release, + eq_params_SetAllParameters, + eq_params_GetAllParameters, }; static struct eq *impl_eq_from_effect(struct effect *iface) @@ -446,6 +497,10 @@ static struct eq *impl_eq_from_effect(struct effect *iface) static void *eq_query_interface(struct effect *iface, REFIID iid) { + struct eq *effect = impl_eq_from_effect(iface); + + if (IsEqualGUID(iid, &IID_IDirectSoundFXParamEq)) + return &effect->IDirectSoundFXParamEq_iface; return NULL; } @@ -470,6 +525,7 @@ static HRESULT eq_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; effect_init(&object->effect, outer, &eq_ops); + object->IDirectSoundFXParamEq_iface.lpVtbl = &eq_params_vtbl; TRACE("Created equalizer effect %p.\n", object); *out = &object->effect.IUnknown_inner; diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index 349e300f02..c59361e5fc 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -450,15 +450,16 @@ static void test_eq_parameters(void) hr = CoCreateInstance(&GUID_DSFX_STANDARD_PARAMEQ, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFXParamEq, (void **)&eq); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr != S_OK) - return; + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectSoundFXParamEq_GetAllParameters(eq, &params); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(params.fCenter == 8000.0f, "Got center frequency %.8e Hz.\n", params.fCenter); - ok(params.fBandwidth == 12.0f, "Got band width %.8e semitones.\n", params.fBandwidth); - ok(params.fGain == 0.0f, "Got gain %.8e.\n", params.fGain); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + ok(params.fCenter == 8000.0f, "Got center frequency %.8e Hz.\n", params.fCenter); + ok(params.fBandwidth == 12.0f, "Got band width %.8e semitones.\n", params.fBandwidth); + ok(params.fGain == 0.0f, "Got gain %.8e.\n", params.fGain); + } ref = IDirectSoundFXParamEq_Release(eq); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -526,7 +527,7 @@ START_TEST(dsdmo) {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger, TRUE}, {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle, TRUE}, {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb}, - {&GUID_DSFX_STANDARD_PARAMEQ, &IID_IDirectSoundFXParamEq, TRUE}, + {&GUID_DSFX_STANDARD_PARAMEQ, &IID_IDirectSoundFXParamEq}, {&GUID_DSFX_WAVES_REVERB, &IID_IDirectSoundFXWavesReverb}, }; unsigned int i; diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 05dfabbd25..fcac31ba63 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1724,15 +1724,13 @@ static void test_effects(void) todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IDirectSoundFXParamEq, (void **)&unk); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - if (hr == DS_OK) - IUnknown_Release(unk); + ok(hr == DS_OK, "Got hr %#x.\n", hr); + IUnknown_Release(unk); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IDirectSoundFXParamEq, (void **)&unk); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - if (hr == DS_OK) - IUnknown_Release(unk); + ok(hr == DS_OK, "Got hr %#x.\n", hr); + IUnknown_Release(unk); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IDirectSoundFXI3DL2Reverb, (void **)&unk);

1 0