August 2022 - Wine-Commits - list.winehq.org

Nikolay Sivov : d2d1/commandlist: Fix primitive blend playback.
by Alexandre Julliard Aug. 4, 2022

Aug. 4, 2022

Module: wine Branch: master Commit: d418657e2c76dcc5f780ca8695a1c71960c40e16 URL: https://gitlab.winehq.org/wine/wine/-/commit/d418657e2c76dcc5f780ca8695a1c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 23:50:27 2022 +0300 d2d1/commandlist: Fix primitive blend playback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/command_list.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c index 0d40b59b2c1..664b2f1a412 100644 --- a/dlls/d2d1/command_list.c +++ b/dlls/d2d1/command_list.c @@ -297,7 +297,38 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface case D2D_COMMAND_SET_PRIMITIVE_BLEND: { const struct d2d_command_set_primitive_blend *c = data; - hr = ID2D1CommandSink_SetPrimitiveBlend(sink, c->primitive_blend); + ID2D1CommandSink1 *sink1; + ID2D1CommandSink4 *sink4; + + switch (c->primitive_blend) + { + case D2D1_PRIMITIVE_BLEND_SOURCE_OVER: + case D2D1_PRIMITIVE_BLEND_COPY: + hr = ID2D1CommandSink_SetPrimitiveBlend(sink, c->primitive_blend); + break; + case D2D1_PRIMITIVE_BLEND_MIN: + case D2D1_PRIMITIVE_BLEND_ADD: + if (SUCCEEDED(ID2D1CommandSink_QueryInterface(sink, &IID_ID2D1CommandSink1, (void **)&sink1))) + { + hr = ID2D1CommandSink1_SetPrimitiveBlend1(sink1, c->primitive_blend); + ID2D1CommandSink1_Release(sink1); + } + else + hr = ID2D1CommandSink_SetPrimitiveBlend(sink, D2D1_PRIMITIVE_BLEND_SOURCE_OVER); + break; + case D2D1_PRIMITIVE_BLEND_MAX: + if (SUCCEEDED(ID2D1CommandSink_QueryInterface(sink, &IID_ID2D1CommandSink4, (void **)&sink4))) + { + hr = ID2D1CommandSink4_SetPrimitiveBlend2(sink4, c->primitive_blend); + ID2D1CommandSink4_Release(sink4); + } + else + hr = ID2D1CommandSink_SetPrimitiveBlend(sink, D2D1_PRIMITIVE_BLEND_SOURCE_OVER); + break; + default: + FIXME("Unexpected blend mode %u.\n", c->primitive_blend); + hr = E_UNEXPECTED; + } break; } case D2D_COMMAND_SET_UNIT_MODE:

1 0

Hans Leidekker : bcrypt: Add AES CFB chaining mode support.
by Alexandre Julliard Aug. 4, 2022

Aug. 4, 2022

Module: wine Branch: master Commit: d3638d426b1a7c829d59c24241414cd44f9ca7de URL: https://gitlab.winehq.org/wine/wine/-/commit/d3638d426b1a7c829d59c24241414c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 3 12:12:42 2022 +0200 bcrypt: Add AES CFB chaining mode support. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53483 --- dlls/bcrypt/bcrypt_internal.h | 3 +- dlls/bcrypt/bcrypt_main.c | 6 ++ dlls/bcrypt/gnutls.c | 5 ++ dlls/bcrypt/tests/bcrypt.c | 168 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 179 insertions(+), 3 deletions(-)

1 0

Rémi Bernon : winegstreamer: Leave the stream CS while waiting for a sample.
by Alexandre Julliard Aug. 3, 2022

Aug. 3, 2022

Module: wine Branch: master Commit: efe0504f5f04a349473557e90a7484c4cac294c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/efe0504f5f04a349473557e90a7484… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 2 11:59:16 2022 +0200 winegstreamer: Leave the stream CS while waiting for a sample. This may call AllocateForOutput/Stream callbacks, and it may block. --- dlls/winegstreamer/wm_asyncreader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 9d8c2be45cb..a4dc077d341 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -88,7 +88,9 @@ static DWORD WINAPI stream_thread(void *arg) while (reader->running) { + LeaveCriticalSection(&reader->stream_cs); hr = wm_reader_get_stream_sample(&reader->reader, callback_advanced, 0, &sample, &pts, &duration, &flags, &stream_number); + EnterCriticalSection(&reader->stream_cs); if (hr != S_OK) break;

1 0

Arkadiusz Hiler : winebus.sys/sdl: Use the 8 absolute axes supported by DIJOYSTATE2.
by Alexandre Julliard Aug. 3, 2022

Aug. 3, 2022

Module: wine Branch: master Commit: 3df433843b33277306f290f59cf58863fd287f93 URL: https://gitlab.winehq.org/wine/wine/-/commit/3df433843b33277306f290f59cf588… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Aug 1 18:51:05 2022 +0300 winebus.sys/sdl: Use the 8 absolute axes supported by DIJOYSTATE2. Most games use c_dfDIJoystick2 which can support up to 8 absolute axes, 6 directional ones and 2 sliders. With this change we now have 8 usable axes instead of six and we FIXME if device exposes more than that. --- dlls/winebus.sys/bus_sdl.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 5d810d25205..39432ce9f17 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -249,17 +249,14 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) const USAGE_AND_PAGE device_usage = {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_JOYSTICK}; static const USAGE_AND_PAGE absolute_usages[] = { - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, - {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_THROTTLE}, - {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_RUDDER}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, - {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_ACCELERATOR}, - {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_BRAKE}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, }; static const USAGE_AND_PAGE relative_usages[] = {

1 0

Rémi Bernon : winegstreamer: Make IWMReader state transitions asynchronous.
by Alexandre Julliard Aug. 3, 2022

Aug. 3, 2022

Module: wine Branch: master Commit: b95158b23ca884322a02be69826a58edb5e3923e URL: https://gitlab.winehq.org/wine/wine/-/commit/b95158b23ca884322a02be69826a58… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 3 10:18:06 2022 +0200 winegstreamer: Make IWMReader state transitions asynchronous. --- dlls/winegstreamer/wm_asyncreader.c | 248 ++++++++++++++++++++++++------------ dlls/wmvcore/tests/wmvcore.c | 40 ++---- 2 files changed, 178 insertions(+), 110 deletions(-)

1 0

Rémi Bernon : wmvcore/tests: Add more IWMReader_(Open|Start|Stop|Close) async checks.
by Alexandre Julliard Aug. 3, 2022

Aug. 3, 2022

Module: wine Branch: master Commit: 4a43312278c221d2ad313ded043d32d48338cb32 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a43312278c221d2ad313ded043d32… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jul 6 16:28:44 2022 +0200 wmvcore/tests: Add more IWMReader_(Open|Start|Stop|Close) async checks. --- dlls/wmvcore/tests/wmvcore.c | 214 ++++++++++++++++++++++++++++++++----------- 1 file changed, 158 insertions(+), 56 deletions(-)

1 0

Rémi Bernon : winegstreamer: Move IWMReaderCallbackAdvanced *callback_advanced to a local variable.
by Alexandre Julliard Aug. 3, 2022

Aug. 3, 2022

Module: wine Branch: master Commit: 488c9c669c03b266047cc002d04ef012af5f525e URL: https://gitlab.winehq.org/wine/wine/-/commit/488c9c669c03b266047cc002d04ef0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jul 6 18:35:58 2022 +0200 winegstreamer: Move IWMReaderCallbackAdvanced *callback_advanced to a local variable. --- dlls/winegstreamer/gst_private.h | 4 +--- dlls/winegstreamer/wm_asyncreader.c | 27 +++++++++++++++------------ dlls/winegstreamer/wm_reader.c | 7 +------ dlls/winegstreamer/wm_syncreader.c | 2 +- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 7b8f05dc09c..cd42fbe58f4 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -181,8 +181,6 @@ struct wm_reader struct wm_stream *streams; WORD stream_count; - IWMReaderCallbackAdvanced *callback_advanced; - const struct wm_reader_ops *ops; }; @@ -202,7 +200,7 @@ HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps **props); struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader, WORD stream_number); -HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream_number, +HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackAdvanced *callback_advanced, WORD stream_number, INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number); HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, WORD stream_number, WMT_STREAM_SELECTION *selection); diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index ef6e445a51b..9d8c2be45cb 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -57,22 +57,17 @@ static REFERENCE_TIME get_current_time(const struct async_reader *reader) static void open_stream(struct async_reader *reader, IWMReaderCallback *callback, void *context) { static const DWORD zero; - HRESULT hr; IWMReaderCallback_AddRef(reader->callback = callback); reader->context = context; IWMReaderCallback_OnStatus(callback, WMT_OPENED, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, context); - - if (FAILED(hr = IWMReaderCallback_QueryInterface(callback, - &IID_IWMReaderCallbackAdvanced, (void **)&reader->reader.callback_advanced))) - reader->reader.callback_advanced = NULL; - TRACE("Querying for IWMReaderCallbackAdvanced returned %#lx.\n", hr); } static DWORD WINAPI stream_thread(void *arg) { struct async_reader *reader = arg; IWMReaderCallback *callback = reader->callback; + IWMReaderCallbackAdvanced *callback_advanced; REFERENCE_TIME start_time; struct wm_stream *stream; static const DWORD zero; @@ -86,9 +81,14 @@ static DWORD WINAPI stream_thread(void *arg) EnterCriticalSection(&reader->stream_cs); + if (FAILED(hr = IWMReaderCallback_QueryInterface(callback, + &IID_IWMReaderCallbackAdvanced, (void **)&callback_advanced))) + callback_advanced = NULL; + TRACE("Querying for IWMReaderCallbackAdvanced returned %#lx.\n", hr); + while (reader->running) { - hr = wm_reader_get_stream_sample(&reader->reader, 0, &sample, &pts, &duration, &flags, &stream_number); + hr = wm_reader_get_stream_sample(&reader->reader, callback_advanced, 0, &sample, &pts, &duration, &flags, &stream_number); if (hr != S_OK) break; @@ -98,10 +98,10 @@ static DWORD WINAPI stream_thread(void *arg) { QWORD user_time = reader->user_time; - if (pts > user_time && reader->reader.callback_advanced) + if (pts > user_time && callback_advanced) { LeaveCriticalSection(&reader->stream_cs); - IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, user_time, reader->context); + IWMReaderCallbackAdvanced_OnTime(callback_advanced, user_time, reader->context); EnterCriticalSection(&reader->stream_cs); } @@ -126,7 +126,7 @@ static DWORD WINAPI stream_thread(void *arg) { LeaveCriticalSection(&reader->stream_cs); if (stream->read_compressed) - hr = IWMReaderCallbackAdvanced_OnStreamSample(reader->reader.callback_advanced, + hr = IWMReaderCallbackAdvanced_OnStreamSample(callback_advanced, stream_number, pts, duration, flags, sample, reader->context); else hr = IWMReaderCallback_OnSample(callback, stream_number - 1, pts, duration, @@ -148,12 +148,12 @@ static DWORD WINAPI stream_thread(void *arg) IWMReaderCallback_OnStatus(callback, WMT_EOF, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); - if (reader->user_clock && reader->reader.callback_advanced) + if (reader->user_clock && callback_advanced) { /* We can only get here if user_time is greater than the PTS * of all samples, in which case we cannot have sent this * notification already. */ - IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, + IWMReaderCallbackAdvanced_OnTime(callback_advanced, reader->user_time, reader->context); } @@ -164,6 +164,9 @@ static DWORD WINAPI stream_thread(void *arg) ERR("Failed to get sample, hr %#lx.\n", hr); } + if (callback_advanced) + IWMReaderCallbackAdvanced_Release(callback_advanced); + TRACE("Reader is stopping; exiting.\n"); return 0; } diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 03adea8a318..8038b61f7a7 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1607,10 +1607,6 @@ HRESULT wm_reader_close(struct wm_reader *reader) CloseHandle(reader->read_thread); reader->read_thread = NULL; - if (reader->callback_advanced) - IWMReaderCallbackAdvanced_Release(reader->callback_advanced); - reader->callback_advanced = NULL; - wg_parser_destroy(reader->wg_parser); reader->wg_parser = NULL; @@ -1871,10 +1867,9 @@ static WORD get_earliest_buffer(struct wm_reader *reader, struct wg_parser_buffe return stream_number; } -HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream_number, +HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackAdvanced *callback_advanced, WORD stream_number, INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number) { - IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; struct wg_parser_stream *wg_stream; struct wg_parser_buffer wg_buffer; struct wm_stream *stream; diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index c7cccd52c4f..c80574b87fd 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -92,7 +92,7 @@ static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, EnterCriticalSection(&reader->reader.cs); - hr = wm_reader_get_stream_sample(&reader->reader, stream_number, sample, pts, duration, flags, &stream_number); + hr = wm_reader_get_stream_sample(&reader->reader, NULL, stream_number, sample, pts, duration, flags, &stream_number); if (output_number && hr == S_OK) *output_number = stream_number - 1; if (ret_stream_number && (hr == S_OK || stream_number))

1 0

Brendan Shanks : ntdll: Fix floating point and extended registers not being restored under Wow64.
by Alexandre Julliard Aug. 3, 2022

Aug. 3, 2022

Module: wine Branch: master Commit: bc90f8715f2c640be4c5965eb59fef96907e7ccb URL: https://gitlab.winehq.org/wine/wine/-/commit/bc90f8715f2c640be4c5965eb59fef… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Aug 1 11:03:32 2022 -0700 ntdll: Fix floating point and extended registers not being restored under Wow64. --- dlls/ntdll/unix/signal_x86_64.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 8d85525b224..1c2db47c95d 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2078,10 +2078,12 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) if (flags & CONTEXT_I386_EXTENDED_REGISTERS) { memcpy( &frame->xsave, context->ExtendedRegisters, sizeof(frame->xsave) ); + frame->restore_flags |= CONTEXT_FLOATING_POINT; } else if (flags & CONTEXT_I386_FLOATING_POINT) { fpu_to_fpux( &frame->xsave, &context->FloatSave ); + frame->restore_flags |= CONTEXT_FLOATING_POINT; } if (flags & CONTEXT_I386_XSTATE) {

1 0

Santino Mazza : bcrypt: Initial RSA encryption implementation.
by Alexandre Julliard Aug. 3, 2022

Aug. 3, 2022

Module: wine Branch: master Commit: dd61c5638a0e597a488ca74e48f1ac97bc008f93 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd61c5638a0e597a488ca74e48f1ac… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Fri Jul 29 14:42:49 2022 -0300 bcrypt: Initial RSA encryption implementation. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/bcrypt/bcrypt_internal.h | 11 +++++++ dlls/bcrypt/bcrypt_main.c | 33 +++++++++++++++------ dlls/bcrypt/gnutls.c | 69 ++++++++++++++++++++++++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 2 ++ 4 files changed, 105 insertions(+), 10 deletions(-)

1 0

Connor McAdams : include: Add UI Automation COM client interface definitions.
by Alexandre Julliard Aug. 3, 2022

Aug. 3, 2022

Module: wine Branch: master Commit: 3079c6bebae30be0da439fd1fb9a63523d09b9a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3079c6bebae30be0da439fd1fb9a63… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Aug 1 10:52:16 2022 -0400 include: Add UI Automation COM client interface definitions. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationclient.idl | 1059 ++++++++++++++++++++++++++++++++++++++++ include/uiautomationcore.idl | 52 ++ 2 files changed, 1111 insertions(+)

1 0