- Wine-Commits - list.winehq.org

Nikolay Sivov : vkd3d-compiler: Dynamically allocate options array.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: c837f007e2096b7917b222b659fd7ec660bd389b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c837f007e2096b7917b222b659fd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 18:50:03 2023 +0200 vkd3d-compiler: Dynamically allocate options array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index fbc81078..2e5f2b97 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -35,8 +35,6 @@ #include <term.h> #endif -#define MAX_COMPILE_OPTIONS 6 - enum { OPTION_HELP = CHAR_MAX + 1, @@ -233,7 +231,7 @@ struct options uint32_t formatting; bool explicit_colour; - struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; + struct vkd3d_shader_compile_option *compile_options; unsigned int compile_option_count; }; @@ -242,6 +240,7 @@ static void add_compile_option(struct options *options, { struct vkd3d_shader_compile_option *o; unsigned int i; + size_t size; for (i = 0; i < options->compile_option_count; ++i) { @@ -254,9 +253,10 @@ static void add_compile_option(struct options *options, } } - if (options->compile_option_count >= ARRAY_SIZE(options->compile_options)) + size = (options->compile_option_count + 1) * sizeof(*o); + if (!(options->compile_options = realloc(options->compile_options, size))) { - fprintf(stderr, "Ignoring option.\n"); + fprintf(stderr, "Out of memory.\n"); return; }

1 0

Nikolay Sivov : vkd3d-shader/tpf: Convert some of the semantic names to system values names when in compatibility mode.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: e242b46922c8bc7553183e6f7b7f3b7c69ce2d43 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e242b46922c8bc7553183e6f7b7f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 28 16:26:00 2023 +0200 vkd3d-shader/tpf: Convert some of the semantic names to system values names when in compatibility mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/vkd3d_shader.h | 27 +++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl.c | 4 ++++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/tpf.c | 7 ++++--- libs/vkd3d-utils/vkd3d_utils_main.c | 9 ++++++++- programs/vkd3d-compiler/main.c | 14 +++++++++++++- 6 files changed, 58 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index f112e7c7..94f79c7c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -154,6 +154,25 @@ enum vkd3d_shader_compile_option_pack_matrix_order VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ORDER), }; +/** Individual options to enable various backward compatibility features. \since 1.10 */ +enum vkd3d_shader_compile_option_backward_compatibility +{ + /** + * Causes compiler to convert SM1-3 semantics to corresponding System Value semantics, + * when compiling HLSL sources for SM4+ targets. + * + * This option does the following conversions: + * + * - POSITION to SV_Position for vertex shader outputs, pixel shader inputs, + * and geometry shader inputs and outputs; + * - COLORN to SV_TargetN for pixel shader outputs; + * - DEPTH to SV_Depth for pixel shader outputs. + */ + VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES = 0x00000001, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_BACKWARD_COMPATIBILITY), +}; + enum vkd3d_shader_compile_option_name { /** @@ -193,6 +212,14 @@ enum vkd3d_shader_compile_option_name * \since 1.9 */ VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ORDER = 0x00000007, + /** + * This option is used to enable various backward compatibility features. + * + * \a value is a mask of values from enum vkd3d_shader_compile_option_backward_compatibility. + * + * \since 1.10 + */ + VKD3D_SHADER_COMPILE_OPTION_BACKWARD_COMPATIBILITY = 0x00000008, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), }; diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index b42e3088..2d383bc2 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3421,6 +3421,10 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct vkd3d_shader_compil else if (option->value == VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_COLUMN_MAJOR) ctx->matrix_majority = HLSL_MODIFIER_COLUMN_MAJOR; } + else if (option->name == VKD3D_SHADER_COMPILE_OPTION_BACKWARD_COMPATIBILITY) + { + ctx->semantic_compat_mapping = option->value & VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES; + } } return true; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 9f1a3fe2..9e83b8b7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -862,6 +862,8 @@ struct hlsl_ctx uint32_t in_state_block : 1; /* Whether the numthreads() attribute has been provided in the entry-point function. */ uint32_t found_numthreads : 1; + + bool semantic_compat_mapping; }; struct hlsl_resource_load_params diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index bf4c03c0..845b4423 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2762,20 +2762,21 @@ bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semant {"position", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_POSITION}, {"sv_position", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_POSITION}, }; + bool needs_compat_mapping = ascii_strncasecmp(semantic->name, "sv_", 3); for (i = 0; i < ARRAY_SIZE(semantics); ++i) { if (!ascii_strcasecmp(semantic->name, semantics[i].name) && output == semantics[i].output - && ctx->profile->type == semantics[i].shader_type - && !ascii_strncasecmp(semantic->name, "sv_", 3)) + && (ctx->semantic_compat_mapping == needs_compat_mapping || !needs_compat_mapping) + && ctx->profile->type == semantics[i].shader_type) { *usage = semantics[i].usage; return true; } } - if (!ascii_strncasecmp(semantic->name, "sv_", 3)) + if (!needs_compat_mapping) return false; *usage = D3D_NAME_UNDEFINED; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 45b1a0ce..ed0f637c 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -187,7 +187,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen { struct vkd3d_shader_preprocess_info preprocess_info; struct vkd3d_shader_hlsl_source_info hlsl_info; - struct vkd3d_shader_compile_option options[3]; + struct vkd3d_shader_compile_option options[4]; struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_compile_option *option; struct vkd3d_shader_code byte_code; @@ -302,6 +302,13 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen option->value |= VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_COLUMN_MAJOR; } + if (flags & D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY) + { + option = &options[compile_info.option_count++]; + option->name = VKD3D_SHADER_COMPILE_OPTION_BACKWARD_COMPATIBILITY; + option->value = VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES; + } + ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages); if (messages && messages_blob) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index eea0c3ab..fbc81078 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -35,7 +35,7 @@ #include <term.h> #endif -#define MAX_COMPILE_OPTIONS 5 +#define MAX_COMPILE_OPTIONS 6 enum { @@ -47,6 +47,7 @@ enum OPTION_PRINT_SOURCE_TYPES, OPTION_PRINT_TARGET_TYPES, OPTION_PROFILE, + OPTION_SEMANTIC_COMPAT_MAP, OPTION_STRIP_DEBUG, OPTION_VERSION, OPTION_TEXT_FORMATTING, @@ -186,6 +187,8 @@ static void print_usage(const char *program_name) " --matrix-storage-order=<order>\n" " Specify default matrix storage order. Valid values are\n" " 'column' (default) and 'row'.\n" + " --semantic-compat-map Enable semantic mapping compatibility mode to use SM4+ system values\n" + " instead of SM1-3 style semantic names when compiling from HLSL sources.\n" " -e, --entry=<name> Use <name> as the entry point (default is \"main\").\n" " -E Preprocess the source code instead of compiling it.\n" " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" @@ -439,6 +442,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) { enum vkd3d_shader_compile_option_pack_matrix_order pack_matrix_order; enum vkd3d_shader_compile_option_buffer_uav buffer_uav; + unsigned int compat_options = 0; int option; static struct option long_options[] = @@ -454,6 +458,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) {"profile", required_argument, NULL, OPTION_PROFILE}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, {"version", no_argument, NULL, OPTION_VERSION}, + {"semantic-compat-map", no_argument, NULL, OPTION_SEMANTIC_COMPAT_MAP}, {NULL, 0, NULL, 0}, }; @@ -533,6 +538,10 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->print_target_types = true; break; + case OPTION_SEMANTIC_COMPAT_MAP: + compat_options |= VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES; + break; + case OPTION_STRIP_DEBUG: add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, 1); break; @@ -555,6 +564,9 @@ static bool parse_command_line(int argc, char **argv, struct options *options) } } + if (compat_options) + add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_BACKWARD_COMPATIBILITY, compat_options); + if (optind < argc) options->filename = argv[argc - 1];

1 0

Eric Pouech : mmdevapi: Don't fail when no audio backends are present.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: 984032823b1e47c90117e355ade778f79c8ad411 URL: https://gitlab.winehq.org/wine/wine/-/commit/984032823b1e47c90117e355ade778… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Oct 17 19:58:17 2023 +0200 mmdevapi: Don't fail when no audio backends are present. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/mmdevapi/main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index dfc6183aa7d..36c94908d67 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -295,10 +295,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) unsigned int i = 0; TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if(!InitOnceExecuteOnce(&init_once, init_driver, NULL, NULL)) { - ERR("Driver initialization failed\n"); - return E_FAIL; - } + InitOnceExecuteOnce(&init_once, init_driver, NULL, NULL); if (ppv == NULL) { WARN("invalid parameter\n");

1 0

Nikolay Sivov : maintainers: Add EVR to the Media Foundation section.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: 0c7a09cb1f92d55d8381ff6460e13ed085d434db URL: https://gitlab.winehq.org/wine/wine/-/commit/0c7a09cb1f92d55d8381ff6460e13e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 17 20:17:50 2023 +0200 maintainers: Add EVR to the Media Foundation section. --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index dc5c85cc4ec..4bab36bfdf9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -373,6 +373,7 @@ F: dlls/wmvcore/ Windows Media Foundation M: Nikolay Sivov <nsivov(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> +F: dlls/evr/ F: dlls/mf/ F: dlls/mferror/ F: dlls/mfmediaengine/

1 0

Eric Pouech : dsound: Forward error code when device cannot be found.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: 79264b27c173c7e44c13af5e32fc18e1c84bd862 URL: https://gitlab.winehq.org/wine/wine/-/commit/79264b27c173c7e44c13af5e32fc18… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Oct 17 19:58:17 2023 +0200 dsound: Forward error code when device cannot be found. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dsound/dsound.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 0b8edaaaf06..b35f9c7cbdd 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -288,9 +288,10 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU IsEqualGUID(lpcGUID, &DSDEVID_DefaultVoiceCapture)) return DSERR_NODRIVER; - if (GetDeviceID(lpcGUID, &devGUID) != DS_OK) { + hr = GetDeviceID(lpcGUID, &devGUID); + if (FAILED(hr)) { WARN("invalid parameter: lpcGUID\n"); - return DSERR_INVALIDPARAM; + return hr; } hr = get_mmdevice(eRender, &devGUID, &mmdevice);

1 0

Paul Gofman : winegstreamer: Add AVDecVideoAcceleration_H264 attribute for h264 decoder MFT.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: deff1303fb822085b84653870194144ebce81067 URL: https://gitlab.winehq.org/wine/wine/-/commit/deff1303fb822085b8465387019414… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 13 18:56:48 2023 -0600 winegstreamer: Add AVDecVideoAcceleration_H264 attribute for h264 decoder MFT. --- dlls/mf/tests/transform.c | 3 +++ dlls/winegstreamer/h264_decoder.c | 7 +++++++ include/codecapi.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index e798601a8b5..3f5524784cc 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -45,6 +45,8 @@ #include "initguid.h" +#include "codecapi.h" + #include "d3d11_4.h" DEFINE_GUID(DMOVideoFormat_RGB24,D3DFMT_R8G8B8,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70); @@ -3933,6 +3935,7 @@ static void test_h264_decoder(void) ATTR_UINT32(MF_SA_D3D11_AWARE, 1), ATTR_UINT32(MFT_DECODER_EXPOSE_OUTPUT_TYPES_IN_NATIVE_ORDER, 0, .todo = TRUE), /* more H264 decoder specific attributes from CODECAPI */ + ATTR_UINT32(AVDecVideoAcceleration_H264, 1), {0}, }; static const DWORD input_width = 120, input_height = 248; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 6d8f2a146da..5c48130eee9 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -26,6 +26,10 @@ #include "wine/debug.h" +#include "initguid.h" + +#include "codecapi.h" + WINE_DEFAULT_DEBUG_CHANNEL(mfplat); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -881,6 +885,9 @@ HRESULT h264_decoder_create(REFIID riid, void **ret) goto failed; if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &MF_SA_D3D11_AWARE, TRUE))) goto failed; + if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &AVDecVideoAcceleration_H264, TRUE))) + goto failed; + if (FAILED(hr = MFCreateAttributes(&decoder->output_attributes, 0))) goto failed; if (FAILED(hr = wg_sample_queue_create(&decoder->wg_sample_queue))) diff --git a/include/codecapi.h b/include/codecapi.h index 9719389b081..a9fe7c9de3f 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -61,4 +61,6 @@ enum eAVEncH264VLevel eAVEncH264VLevel5_2 = 52 }; +DEFINE_GUID(AVDecVideoAcceleration_H264, 0xf7db8a2f, 0x4f48, 0x4ee8, 0xae, 0x31, 0x8b, 0x6e, 0xbe, 0x55, 0x8a, 0xe2); + #endif /* __CODECAPI_H */

1 0

Eric Pouech : quartz: Return correct error when no audio devices are present.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: a23402f6e79a04185f06c0e63e1b4d834e96d227 URL: https://gitlab.winehq.org/wine/wine/-/commit/a23402f6e79a04185f06c0e63e1b4d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Oct 17 19:58:17 2023 +0200 quartz: Return correct error when no audio devices are present. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 38a7d6f7ad7..10eed43422e 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1015,7 +1015,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) IUnknown_Release(object->system_clock); strmbase_filter_cleanup(&object->filter); free(object); - return hr; + return hr == DSERR_NODRIVER ? VFW_E_NO_AUDIO_HARDWARE : hr; } if (FAILED(hr = IDirectSound8_SetCooperativeLevel(object->dsound,

1 0

Rémi Bernon : dmime: Use latency time to decide when to process messages.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: 1014bab951f89a51226a17ec1d6d8d1225c46c5c URL: https://gitlab.winehq.org/wine/wine/-/commit/1014bab951f89a51226a17ec1d6d8d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 16 11:41:34 2023 +0200 dmime: Use latency time to decide when to process messages. --- dlls/dmime/performance.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a56a35a2f45..dc6ef575713 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -89,10 +89,10 @@ static HRESULT performance_process_message(struct performance *This, DMUS_PMSG * do { - REFERENCE_TIME current, offset = 0; + REFERENCE_TIME latency, offset = 0; IDirectMusicTool *tool; - if (FAILED(hr = IDirectMusicPerformance_GetTime(performance, &current, NULL))) return hr; + if (FAILED(hr = IDirectMusicPerformance_GetLatencyTime(performance, &latency))) return hr; if (!(tool = msg->pTool)) tool = &This->IDirectMusicTool_iface; switch (msg->dwFlags & delivery_flags) @@ -107,9 +107,9 @@ static HRESULT performance_process_message(struct performance *This, DMUS_PMSG * offset = This->dwBumperLength * 10000; /* fallthrough */ case DMUS_PMSGF_TOOL_ATTIME: - if (msg->rtTime >= offset && msg->rtTime - offset >= current) + if (msg->rtTime >= offset && msg->rtTime - offset >= latency) { - if (timeout) *timeout = (msg->rtTime - offset - current) / 10000; + if (timeout) *timeout = (msg->rtTime - offset - latency) / 10000; return DMUS_S_REQUEUE; }

1 0

Alexandre Julliard : ntdll: Also send segment registers to the server on suspend.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: fba6b7a1ed560c63236e9451010ad1ecf960e0bd URL: https://gitlab.winehq.org/wine/wine/-/commit/fba6b7a1ed560c63236e9451010ad1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 17 20:18:28 2023 +0200 ntdll: Also send segment registers to the server on suspend. Fixes some test failures in wow64 mode. --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 79d69d11547..eac5d961a07 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2117,7 +2117,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) if (is_inside_syscall( ucontext )) { DECLSPEC_ALIGN(64) XSTATE xs; - context.c.ContextFlags = CONTEXT_FULL; + context.c.ContextFlags = CONTEXT_FULL | CONTEXT_SEGMENTS; context_init_xstate( &context.c, &xs ); NtGetContextThread( GetCurrentThread(), &context.c );

1 0

Rémi Bernon : dmusic: Set synth sink master clock when creating port.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: f00d8639e6f34f81d0acd16a8a0e6f05f210fda8 URL: https://gitlab.winehq.org/wine/wine/-/commit/f00d8639e6f34f81d0acd16a8a0e6f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 4 16:20:57 2023 +0200 dmusic: Set synth sink master clock when creating port. --- dlls/dmusic/port.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index b23a3f5d4dd..28c5c3cff17 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -714,6 +714,9 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param if (SUCCEEDED(hr)) hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->parent->master_clock); + if (SUCCEEDED(hr)) + hr = IDirectMusicSynthSink_SetMasterClock(obj->synth_sink, obj->parent->master_clock); + if (SUCCEEDED(hr)) hr = IDirectMusicSynth_Open(obj->synth, port_params);

1 0