November 2022 - Wine-commits

Rémi Bernon : winebuild: Split output_static_lib into output_(import|static)_lib.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: fd7cee3e319374d73638dedc724c5a4931b12504 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd7cee3e319374d73638dedc724c5a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Oct 2 22:08:36 2022 +0200 winebuild: Split output_static_lib into output_(import|static)_lib. --- tools/winebuild/build.h | 3 ++- tools/winebuild/import.c | 24 ++++++++++-------------- tools/winebuild/main.c | 4 ++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 9918c2341f4..7ce502143e3 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -305,7 +305,8 @@ extern void output_module( DLLSPEC *spec ); extern void output_stubs( DLLSPEC *spec ); extern void output_syscalls( DLLSPEC *spec ); extern void output_imports( DLLSPEC *spec ); -extern void output_static_lib( DLLSPEC *spec, struct strarray files ); +extern void output_import_lib( DLLSPEC *spec, struct strarray files ); +extern void output_static_lib( const char *output_name, struct strarray files, int create ); extern void output_exports( DLLSPEC *spec ); extern int load_res32_file( const char *name, DLLSPEC *spec ); extern void output_resources( DLLSPEC *spec ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index b1c14db9cab..a2ada71ae36 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1552,7 +1552,7 @@ static void assemble_files( const char *prefix ) } /* build a library from the current asm files and any additional object files in argv */ -static void build_library( const char *output_name, struct strarray files, int create ) +void output_static_lib( const char *output_name, struct strarray files, int create ) { struct strarray args; @@ -1582,7 +1582,7 @@ static void build_library( const char *output_name, struct strarray files, int c } /* create a Windows-style import library */ -static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec ) +static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) { struct strarray args; char *def_file; @@ -1623,10 +1623,12 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec ) } spawn( args ); + + if (files.count) output_static_lib( output_file_name, files, 0 ); } /* create a Unix-style import library */ -static void build_unix_import_lib( DLLSPEC *spec ) +static void build_unix_import_lib( DLLSPEC *spec, struct strarray files ) { int i, total; const char *name, *prefix; @@ -1679,19 +1681,13 @@ static void build_unix_import_lib( DLLSPEC *spec ) assemble_files( spec->file_name ); free( dll_name ); + + output_static_lib( output_file_name, files, 1 ); } /* output an import library for a Win32 module and additional object files */ -void output_static_lib( DLLSPEC *spec, struct strarray files ) +void output_import_lib( DLLSPEC *spec, struct strarray files ) { - if (is_pe()) - { - if (spec) build_windows_import_lib( output_file_name, spec ); - if (files.count || !spec) build_library( output_file_name, files, !spec ); - } - else - { - if (spec) build_unix_import_lib( spec ); - build_library( output_file_name, files, 1 ); - } + if (!is_pe()) build_unix_import_lib( spec, files ); + else build_windows_import_lib( output_file_name, spec, files ); } diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index cfccee6cf8b..cbe1e4669c1 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -669,10 +669,10 @@ int main(int argc, char **argv) case MODE_IMPLIB: if (!spec_file_name) fatal_error( "missing .spec file\n" ); if (!parse_input_file( spec )) break; - output_static_lib( spec, files ); + output_import_lib( spec, files ); break; case MODE_STATICLIB: - output_static_lib( NULL, files ); + output_static_lib( output_file_name, files, 1 ); break; case MODE_BUILTIN: if (!files.count) fatal_error( "missing file argument for --builtin option\n" );

1 0

Brendan Shanks : ntdll: Set the QoS class of the main Wine thread on macOS.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: ed666db8d8d6afd740a266584a38e08622474821 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed666db8d8d6afd740a266584a38e0… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Nov 2 11:09:00 2022 -0700 ntdll: Set the QoS class of the main Wine thread on macOS. --- dlls/ntdll/unix/loader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index bca6db5bfe8..3295f7f918b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2335,6 +2335,9 @@ static void apple_create_wine_thread( void *arg ) pthread_attr_init( &attr ); pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ); + /* Use the same QoS class as the process main thread (user-interactive). */ + if (pthread_attr_set_qos_class_np) + pthread_attr_set_qos_class_np( &attr, QOS_CLASS_USER_INTERACTIVE, 0 ); if (pthread_create( &thread, &attr, apple_wine_thread, NULL )) exit(1); pthread_attr_destroy( &attr ); }

1 0

Rémi Bernon : opengl32: Create a unixlib interface for GL functions.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: 7dcc6ccf5eb6938e672c7ffc479400b7bd003d6d URL: https://gitlab.winehq.org/wine/wine/-/commit/7dcc6ccf5eb6938e672c7ffc479400… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 18:06:35 2022 +0200 opengl32: Create a unixlib interface for GL functions. --- dlls/opengl32/Makefile.in | 2 + dlls/opengl32/make_opengl | 233 +++- dlls/opengl32/opengl_norm.c | 2340 --------------------------------- dlls/opengl32/thunks.c | 2695 ++++++++++++++++++++++++++++++++++++++ dlls/opengl32/unix_thunks.c | 3013 +++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/unixlib.h | 2486 +++++++++++++++++++++++++++++++++++ 6 files changed, 8402 insertions(+), 2367 deletions(-)

1 0

Rémi Bernon : opengl32: Use the unixlib for glGet(String|Integerv).
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: cd93ca033c900ddfdd31283da1e8b9a748e244ae URL: https://gitlab.winehq.org/wine/wine/-/commit/cd93ca033c900ddfdd31283da1e8b9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 18:19:47 2022 +0200 opengl32: Use the unixlib for glGet(String|Integerv). --- dlls/opengl32/make_opengl | 4 ---- dlls/opengl32/unix_thunks.c | 18 ++++++++++++++++++ dlls/opengl32/unixlib.h | 14 ++++++++++++++ dlls/opengl32/wgl.c | 43 +++++++++++++++++++++++++++++-------------- 4 files changed, 61 insertions(+), 18 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 4c1fb10f0ef..f1506b25cbf 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -935,7 +935,6 @@ print OUT "#include \"wine/unixlib.h\"\n\n"; foreach (sort keys %norm_functions) { next if defined $manual_win_functions{$_}; - next if needs_wrapper( $_, $norm_functions{$_} ); print OUT generate_func_params($_, $norm_functions{$_}); } @@ -944,7 +943,6 @@ print OUT "{\n"; foreach (sort keys %norm_functions) { next if defined $manual_win_functions{$_}; - next if needs_wrapper( $_, $norm_functions{$_} ); printf OUT " unix_%s,\n", $_; } print OUT "};\n\n"; @@ -1005,7 +1003,6 @@ print OUT "#include \"opengl_ext.h\"\n\n"; foreach (sort keys %norm_functions) { next if defined $manual_win_functions{$_}; - next if needs_wrapper( $_, $norm_functions{$_} ); print OUT generate_unix_thunk($_, $norm_functions{$_}, "gl"); } @@ -1014,7 +1011,6 @@ print OUT "{\n"; foreach (sort keys %norm_functions) { next if defined $manual_win_functions{$_}; - next if needs_wrapper( $_, $norm_functions{$_} ); printf OUT " &gl_%s,\n", $_; } print OUT "};\n"; diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 45bff7f40c0..d8e8a772c3b 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -841,6 +841,14 @@ static NTSTATUS gl_glGetFloatv( void *args ) return STATUS_SUCCESS; } +static NTSTATUS gl_glGetIntegerv( void *args ) +{ + struct glGetIntegerv_params *params = args; + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + funcs->gl.p_glGetIntegerv( params->pname, params->data ); + return STATUS_SUCCESS; +} + static NTSTATUS gl_glGetLightfv( void *args ) { struct glGetLightfv_params *params = args; @@ -937,6 +945,14 @@ static NTSTATUS gl_glGetPolygonStipple( void *args ) return STATUS_SUCCESS; } +static NTSTATUS gl_glGetString( void *args ) +{ + struct glGetString_params *params = args; + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + params->ret = funcs->gl.p_glGetString( params->name ); + return STATUS_SUCCESS; +} + static NTSTATUS gl_glGetTexEnvfv( void *args ) { struct glGetTexEnvfv_params *params = args; @@ -2780,6 +2796,7 @@ const unixlib_function_t __wine_unix_call_funcs[] = &gl_glGetDoublev, &gl_glGetError, &gl_glGetFloatv, + &gl_glGetIntegerv, &gl_glGetLightfv, &gl_glGetLightiv, &gl_glGetMapdv, @@ -2792,6 +2809,7 @@ const unixlib_function_t __wine_unix_call_funcs[] = &gl_glGetPixelMapusv, &gl_glGetPointerv, &gl_glGetPolygonStipple, + &gl_glGetString, &gl_glGetTexEnvfv, &gl_glGetTexEnviv, &gl_glGetTexGendv, diff --git a/dlls/opengl32/unixlib.h b/dlls/opengl32/unixlib.h index 59de686daa7..a99d9c8e729 100644 --- a/dlls/opengl32/unixlib.h +++ b/dlls/opengl32/unixlib.h @@ -669,6 +669,12 @@ struct glGetFloatv_params GLfloat *data; }; +struct glGetIntegerv_params +{ + GLenum pname; + GLint *data; +}; + struct glGetLightfv_params { GLenum light; @@ -747,6 +753,12 @@ struct glGetPolygonStipple_params GLubyte *mask; }; +struct glGetString_params +{ + GLenum name; + const GLubyte *ret; +}; + struct glGetTexEnvfv_params { GLenum target; @@ -2247,6 +2259,7 @@ enum unix_funcs unix_glGetDoublev, unix_glGetError, unix_glGetFloatv, + unix_glGetIntegerv, unix_glGetLightfv, unix_glGetLightiv, unix_glGetMapdv, @@ -2259,6 +2272,7 @@ enum unix_funcs unix_glGetPixelMapusv, unix_glGetPointerv, unix_glGetPolygonStipple, + unix_glGetString, unix_glGetTexEnvfv, unix_glGetTexEnviv, unix_glGetTexGendv, diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index c7058322b8c..2c2be3e0ace 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -26,6 +26,8 @@ #include <sys/types.h> #include <math.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -35,6 +37,9 @@ #include "winnt.h" #include "opengl_ext.h" + +#include "unixlib.h" + #include "wine/gdi_driver.h" #include "wine/glu.h" #include "wine/debug.h" @@ -835,27 +840,32 @@ static BOOL filter_extensions( const char *extensions, GLubyte **exts_list, GLui void WINAPI glGetIntegerv(GLenum pname, GLint *data) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + struct glGetIntegerv_params args = { .pname = pname, .data = data, }; + NTSTATUS status; + + TRACE( "pname %d, data %p\n", pname, data ); - TRACE("(%d, %p)\n", pname, data); if (pname == GL_NUM_EXTENSIONS) { struct wgl_handle *ptr = get_current_context_ptr(); + GLuint **disabled = &ptr->u.context->disabled_exts; - if (ptr->u.context->disabled_exts || - filter_extensions(NULL, NULL, &ptr->u.context->disabled_exts)) + if (*disabled || filter_extensions( NULL, NULL, disabled )) { - const GLuint *disabled_exts = ptr->u.context->disabled_exts; + const GLuint *disabled_exts = *disabled; GLint count, disabled_count = 0; - funcs->gl.p_glGetIntegerv(pname, &count); + args.data = &count; + if ((status = UNIX_CALL( glGetIntegerv, &args ))) WARN( "glGetIntegerv returned %#x\n", status ); + while (*disabled_exts++ != ~0u) disabled_count++; *data = count - disabled_count; return; } } - funcs->gl.p_glGetIntegerv(pname, data); + + if ((status = UNIX_CALL( glGetIntegerv, &args ))) WARN( "glGetIntegerv returned %#x\n", status ); } const GLubyte * WINAPI glGetStringi(GLenum name, GLuint index) @@ -1739,17 +1749,22 @@ GLint WINAPI glDebugEntry( GLint unknown1, GLint unknown2 ) */ const GLubyte * WINAPI glGetString( GLenum name ) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - const GLubyte *ret = funcs->gl.p_glGetString( name ); + struct glGetString_params args = { .name = name, }; + NTSTATUS status; + + TRACE( "name %d\n", name ); - if (name == GL_EXTENSIONS && ret) + if ((status = UNIX_CALL( glGetString, &args ))) WARN( "glGetString returned %#x\n", status ); + + if (name == GL_EXTENSIONS && args.ret) { struct wgl_handle *ptr = get_current_context_ptr(); - if (ptr->u.context->extensions || - filter_extensions((const char *)ret, &ptr->u.context->extensions, &ptr->u.context->disabled_exts)) - ret = ptr->u.context->extensions; + GLubyte **extensions = &ptr->u.context->extensions; + GLuint **disabled = &ptr->u.context->disabled_exts; + if (*extensions || filter_extensions( (const char *)args.ret, extensions, disabled )) return *extensions; } - return ret; + + return args.ret; } /* wrapper for glDebugMessageCallback* functions */

1 0

Rémi Bernon : opengl32: Move the null functions to unix_thunks.c.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: 30aada25da6c603f5ab8d9c8ab1441e0b3a1b025 URL: https://gitlab.winehq.org/wine/wine/-/commit/30aada25da6c603f5ab8d9c8ab1441… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 18:07:18 2022 +0200 opengl32: Move the null functions to unix_thunks.c. --- dlls/opengl32/Makefile.in | 1 - dlls/opengl32/make_opengl | 102 +- dlls/opengl32/opengl_norm.c | 6098 ------------------------------------------- dlls/opengl32/unix_thunks.c | 6091 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 6137 insertions(+), 6155 deletions(-)

1 0

Rémi Bernon : opengl32: Use the unixlib interface for EXT functions.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: dceaa225cd09c2a7b3cf8a139269729f86c46b19 URL: https://gitlab.winehq.org/wine/wine/-/commit/dceaa225cd09c2a7b3cf8a13926972… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 18 12:14:54 2022 +0200 opengl32: Use the unixlib interface for EXT functions. --- dlls/opengl32/Makefile.in | 1 - dlls/opengl32/make_opengl | 154 +- dlls/opengl32/opengl_ext.c | 21484 ------------------------------------- dlls/opengl32/thunks.c | 24306 ++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/unix_thunks.c | 24218 +++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/unixlib.h | 22763 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 71348 insertions(+), 21578 deletions(-)

1 0

Rémi Bernon : opengl32: Use the unixlib interface for WGL functions.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: 28de0a56ae056f09ae4f7c05e5ee108be973daf7 URL: https://gitlab.winehq.org/wine/wine/-/commit/28de0a56ae056f09ae4f7c05e5ee10… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 18:31:48 2022 +0200 opengl32: Use the unixlib interface for WGL functions. --- dlls/opengl32/make_opengl | 29 ++++++++++++++ dlls/opengl32/opengl_ext.h | 2 + dlls/opengl32/thunks.c | 18 +++++++++ dlls/opengl32/unix_thunks.c | 96 +++++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/unixlib.h | 79 +++++++++++++++++++++++++++++++++++++ dlls/opengl32/wgl.c | 43 +++++++------------- 6 files changed, 238 insertions(+), 29 deletions(-)

1 0

wuliande : msvcp90: Make _Condition_variable_* function pointers static.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: ce125cc4f58a282b601af79c4a9e36b2dd4a307f URL: https://gitlab.winehq.org/wine/wine/-/commit/ce125cc4f58a282b601af79c4a9e36… Author: wuliande <m13552573542(a)163.com> Date: Wed Nov 2 21:51:30 2022 +0800 msvcp90: Make _Condition_variable_* function pointers static. --- dlls/msvcp90/msvcp_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 4c9faec9e26..8717384c2c6 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -88,10 +88,10 @@ static bool (__thiscall *critical_section_trylock)(critical_section*); static _Condition_variable* (__thiscall *_Condition_variable_ctor)(_Condition_variable*); static void (__thiscall *_Condition_variable_dtor)(_Condition_variable*); static void (__thiscall *_Condition_variable_wait)(_Condition_variable*, critical_section*); -bool (__thiscall *_Condition_variable_wait_for)(_Condition_variable*, +static bool (__thiscall *_Condition_variable_wait_for)(_Condition_variable*, critical_section*, unsigned int); -void (__thiscall *_Condition_variable_notify_one)(_Condition_variable*); -void (__thiscall *_Condition_variable_notify_all)(_Condition_variable*); +static void (__thiscall *_Condition_variable_notify_one)(_Condition_variable*); +static void (__thiscall *_Condition_variable_notify_all)(_Condition_variable*); void cs_init(cs *cs) {

1 0

Nikolay Sivov : mf/session: Add support for MESessionScrubSampleComplete event.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: de1d2223c4ec4baa1b5e25f21593207745b9f686 URL: https://gitlab.winehq.org/wine/wine/-/commit/de1d2223c4ec4baa1b5e25f2159320… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 3 08:34:36 2022 +0300 mf/session: Add support for MESessionScrubSampleComplete event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index b410a5fe861..d5ff3384299 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -160,6 +160,7 @@ struct transform_stream enum topo_node_flags { TOPO_NODE_END_OF_STREAM = 0x1, + TOPO_NODE_SCRUB_SAMPLE_COMPLETE = 0x2, }; struct topo_node @@ -3317,6 +3318,30 @@ static BOOL session_nodes_is_mask_set(struct media_session *session, MF_TOPOLOGY return TRUE; } +static void session_nodes_unset_mask(struct media_session *session, MF_TOPOLOGY_TYPE node_type, unsigned int flags) +{ + struct media_source *source; + struct topo_node *node; + + if (node_type == MF_TOPOLOGY_MAX) + { + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + source->flags &= ~flags; + } + } + else + { + LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) + { + if (node->type == node_type) + { + node->flags &= ~flags; + } + } + } +} + static void session_raise_end_of_presentation(struct media_session *session) { if (!(session_nodes_is_mask_set(session, MF_TOPOLOGY_SOURCESTREAM_NODE, TOPO_NODE_END_OF_STREAM))) @@ -3387,6 +3412,28 @@ static void session_sink_stream_marker(struct media_session *session, IMFStreamS } } +static void session_sink_stream_scrub_complete(struct media_session *session, IMFStreamSink *stream_sink) +{ + struct topo_node *node; + + if (!(node = session_get_node_object(session, (IUnknown *)stream_sink, MF_TOPOLOGY_OUTPUT_NODE)) + || node->flags & TOPO_NODE_SCRUB_SAMPLE_COMPLETE) + { + return; + } + + node->flags |= TOPO_NODE_SCRUB_SAMPLE_COMPLETE; + + /* Scrubbing event is not limited to the started state transition, or even the started state. + Events are processed and forwarded at any point after transition from initial idle state. */ + if (session->presentation.flags & SESSION_FLAG_SOURCES_SUBSCRIBED && + session_nodes_is_mask_set(session, MF_TOPOLOGY_OUTPUT_NODE, TOPO_NODE_SCRUB_SAMPLE_COMPLETE)) + { + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionScrubSampleComplete, &GUID_NULL, S_OK, NULL); + session_nodes_unset_mask(session, MF_TOPOLOGY_OUTPUT_NODE, TOPO_NODE_SCRUB_SAMPLE_COMPLETE); + } +} + static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); @@ -3523,6 +3570,12 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM session_request_sample(session, (IMFStreamSink *)event_source); LeaveCriticalSection(&session->cs); + break; + case MEStreamSinkScrubSampleComplete: + + EnterCriticalSection(&session->cs); + session_sink_stream_scrub_complete(session, (IMFStreamSink *)event_source); + LeaveCriticalSection(&session->cs); break; case MEMediaSample:

1 0

Rémi Bernon : win32u: Lock display devices while applying display settings.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: 3468e96d3b3f6fd34eb346cd592e83b73459fb2f URL: https://gitlab.winehq.org/wine/wine/-/commit/3468e96d3b3f6fd34eb346cd592e83… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 27 18:26:39 2022 +0200 win32u: Lock display devices while applying display settings. --- dlls/win32u/sysparams.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index f7bca4d9e73..990d9e090fb 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2211,10 +2211,8 @@ static DEVMODEW *get_display_settings( const WCHAR *devname, const DEVMODEW *dev struct adapter *adapter; BOOL ret; - if (!lock_display_devices()) return NULL; - /* allocate an extra mode for easier iteration */ - if (!(displays = calloc( list_count( &adapters ) + 1, sizeof(DEVMODEW) ))) goto done; + if (!(displays = calloc( list_count( &adapters ) + 1, sizeof(DEVMODEW) ))) return NULL; mode = displays; LIST_FOR_EACH_ENTRY( adapter, &adapters, struct adapter, entry ) @@ -2226,20 +2224,18 @@ static DEVMODEW *get_display_settings( const WCHAR *devname, const DEVMODEW *dev { if (!devname) ret = adapter_get_registry_settings( adapter, mode ); else ret = adapter_get_current_settings( adapter, mode ); - if (!ret) goto done; + if (!ret) + { + free( displays ); + return NULL; + } } lstrcpyW( mode->dmDeviceName, adapter->dev.device_name ); mode = NEXT_DEVMODEW(mode); } - unlock_display_devices(); return displays; - -done: - unlock_display_devices(); - free( displays ); - return NULL; } static INT offset_length( POINT offset ) @@ -2433,15 +2429,21 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod HWND hwnd, DWORD flags, void *lparam ) { WCHAR primary_name[CCHDEVICENAME]; + struct display_device *primary; struct adapter *adapter; DEVMODEW *displays; LONG ret; - displays = get_display_settings( devname, devmode ); - if (!displays) return DISP_CHANGE_FAILED; + if (!lock_display_devices()) return DISP_CHANGE_FAILED; + if (!(displays = get_display_settings( devname, devmode ))) + { + unlock_display_devices(); + return DISP_CHANGE_FAILED; + } if (all_detached_settings( displays )) { + unlock_display_devices(); WARN( "Detaching all modes is not permitted.\n" ); free( displays ); return DISP_CHANGE_SUCCESSFUL; @@ -2449,14 +2451,11 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod place_all_displays( displays ); - if (!(adapter = find_adapter( NULL ))) primary_name[0] = 0; - else - { - wcscpy( primary_name, adapter->dev.device_name ); - adapter_release( adapter ); - } + if (!(primary = find_adapter_device_by_id( 0 ))) primary_name[0] = 0; + else wcscpy( primary_name, primary->device_name ); ret = user_driver->pChangeDisplaySettings( displays, primary_name, hwnd, flags, lparam ); + unlock_display_devices(); free( displays ); if (ret) return ret;

1 0