- Wine-Commits - list.winehq.org

Mohamad Al-Jaf : windows.media: Partially implement IClosedCaptionPropertiesStatics_get_BackgroundColor.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 16d90e06c85289859463f304265ab5760f453227 URL: https://gitlab.winehq.org/wine/wine/-/commit/16d90e06c85289859463f304265ab5… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Nov 24 03:55:57 2022 -0500 windows.media: Partially implement IClosedCaptionPropertiesStatics_get_BackgroundColor. --- dlls/windows.media/captions.c | 6 ++++-- dlls/windows.media/tests/captions.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media/captions.c b/dlls/windows.media/captions.c index d3954eb1b4f..b18c2dce820 100644 --- a/dlls/windows.media/captions.c +++ b/dlls/windows.media/captions.c @@ -174,8 +174,10 @@ static HRESULT WINAPI captions_get_FontEffect( IClosedCaptionPropertiesStatics * static HRESULT WINAPI captions_get_BackgroundColor( IClosedCaptionPropertiesStatics *iface, ClosedCaptionColor *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + FIXME( "iface %p, value %p semi-stub.\n", iface, value ); + + *value = ClosedCaptionColor_Default; + return S_OK; } static HRESULT WINAPI captions_get_ComputedBackgroundColor( IClosedCaptionPropertiesStatics *iface, Color *value ) diff --git a/dlls/windows.media/tests/captions.c b/dlls/windows.media/tests/captions.c index 323d77dd3b8..127f5380259 100644 --- a/dlls/windows.media/tests/captions.c +++ b/dlls/windows.media/tests/captions.c @@ -117,8 +117,8 @@ static void test_CaptionStatics(void) color = 0xdeadbeef; hr = IClosedCaptionPropertiesStatics_get_BackgroundColor( caption_statics, &color ); - todo_wine ok( hr == S_OK, "get_BackgroundColor returned %#lx\n", hr ); - todo_wine ok( color == ClosedCaptionColor_Default, "expected default background color, got %d\n", color ); + ok( hr == S_OK, "get_BackgroundColor returned %#lx\n", hr ); + ok( color == ClosedCaptionColor_Default, "expected default background color, got %d\n", color ); hr = IClosedCaptionPropertiesStatics_get_ComputedBackgroundColor( caption_statics, &computed_color ); todo_wine ok( hr == E_INVALIDARG, "get_ComputedBackgroundColor returned %#lx\n", hr );

1 0

Mohamad Al-Jaf : windows.media: Partially implement IClosedCaptionPropertiesStatics_get_BackgroundOpacity.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 216df6b9b785e649de102b67b0808667e56690f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/216df6b9b785e649de102b67b08086… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Nov 24 03:57:04 2022 -0500 windows.media: Partially implement IClosedCaptionPropertiesStatics_get_BackgroundOpacity. --- dlls/windows.media/captions.c | 6 ++++-- dlls/windows.media/tests/captions.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media/captions.c b/dlls/windows.media/captions.c index b18c2dce820..13a88da34ff 100644 --- a/dlls/windows.media/captions.c +++ b/dlls/windows.media/captions.c @@ -188,8 +188,10 @@ static HRESULT WINAPI captions_get_ComputedBackgroundColor( IClosedCaptionProper static HRESULT WINAPI captions_get_BackgroundOpacity( IClosedCaptionPropertiesStatics *iface, ClosedCaptionOpacity *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + FIXME( "iface %p, value %p semi-stub.\n", iface, value ); + + *value = ClosedCaptionOpacity_Default; + return S_OK; } static HRESULT WINAPI captions_get_RegionColor( IClosedCaptionPropertiesStatics *iface, ClosedCaptionColor *value ) diff --git a/dlls/windows.media/tests/captions.c b/dlls/windows.media/tests/captions.c index 127f5380259..26e9ae9ab21 100644 --- a/dlls/windows.media/tests/captions.c +++ b/dlls/windows.media/tests/captions.c @@ -127,8 +127,8 @@ static void test_CaptionStatics(void) opacity = 0xdeadbeef; hr = IClosedCaptionPropertiesStatics_get_BackgroundOpacity( caption_statics, &opacity ); - todo_wine ok( hr == S_OK, "get_BackgroundOpacity returned %#lx\n", hr ); - todo_wine ok( opacity == ClosedCaptionOpacity_Default, "expected default background opacity, got %d\n", opacity ); + ok( hr == S_OK, "get_BackgroundOpacity returned %#lx\n", hr ); + ok( opacity == ClosedCaptionOpacity_Default, "expected default background opacity, got %d\n", opacity ); color = 0xdeadbeef; hr = IClosedCaptionPropertiesStatics_get_RegionColor( caption_statics, &color );

1 0

Mohamad Al-Jaf : windows.media: Partially implement IClosedCaptionPropertiesStatics_get_FontColor.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 3f1d5000175c38a4a650db12e54fc0088ae243f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f1d5000175c38a4a650db12e54fc0… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Nov 24 03:48:10 2022 -0500 windows.media: Partially implement IClosedCaptionPropertiesStatics_get_FontColor. --- dlls/windows.media/captions.c | 6 ++++-- dlls/windows.media/tests/captions.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media/captions.c b/dlls/windows.media/captions.c index 2e68948209e..41f14944ec0 100644 --- a/dlls/windows.media/captions.c +++ b/dlls/windows.media/captions.c @@ -128,8 +128,10 @@ DEFINE_IINSPECTABLE( captions, IClosedCaptionPropertiesStatics, struct captions_ static HRESULT WINAPI captions_get_FontColor( IClosedCaptionPropertiesStatics *iface, ClosedCaptionColor *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + FIXME( "iface %p, value %p semi-stub.\n", iface, value ); + + *value = ClosedCaptionColor_Default; + return S_OK; } static HRESULT WINAPI captions_get_ComputedFontColor( IClosedCaptionPropertiesStatics *iface, Color *value ) diff --git a/dlls/windows.media/tests/captions.c b/dlls/windows.media/tests/captions.c index 647e5eee1e5..875bfa41d20 100644 --- a/dlls/windows.media/tests/captions.c +++ b/dlls/windows.media/tests/captions.c @@ -87,8 +87,8 @@ static void test_CaptionStatics(void) color = 0xdeadbeef; hr = IClosedCaptionPropertiesStatics_get_FontColor( caption_statics, &color ); - todo_wine ok( hr == S_OK, "get_FontColor returned %#lx\n", hr ); - todo_wine ok( color == ClosedCaptionColor_Default, "expected default font color, got %d\n", color ); + ok( hr == S_OK, "get_FontColor returned %#lx\n", hr ); + ok( color == ClosedCaptionColor_Default, "expected default font color, got %d\n", color ); hr = IClosedCaptionPropertiesStatics_get_ComputedFontColor( caption_statics, &computed_color ); todo_wine ok( hr == E_INVALIDARG, "get_ComputedFontColor returned %#lx\n", hr );

1 0

Mohamad Al-Jaf : windows.media: Partially implement IClosedCaptionPropertiesStatics_get_FontOpacity.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: c15f9b9a20e26708bec1c601e93aeb1f2132309d URL: https://gitlab.winehq.org/wine/wine/-/commit/c15f9b9a20e26708bec1c601e93aeb… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Nov 24 03:50:13 2022 -0500 windows.media: Partially implement IClosedCaptionPropertiesStatics_get_FontOpacity. --- dlls/windows.media/captions.c | 6 ++++-- dlls/windows.media/tests/captions.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media/captions.c b/dlls/windows.media/captions.c index 41f14944ec0..43a421f0fa8 100644 --- a/dlls/windows.media/captions.c +++ b/dlls/windows.media/captions.c @@ -142,8 +142,10 @@ static HRESULT WINAPI captions_get_ComputedFontColor( IClosedCaptionPropertiesSt static HRESULT WINAPI captions_get_FontOpacity( IClosedCaptionPropertiesStatics *iface, ClosedCaptionOpacity *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + FIXME( "iface %p, value %p semi-stub.\n", iface, value ); + + *value = ClosedCaptionOpacity_Default; + return S_OK; } static HRESULT WINAPI captions_get_FontSize( IClosedCaptionPropertiesStatics *iface, ClosedCaptionSize *value ) diff --git a/dlls/windows.media/tests/captions.c b/dlls/windows.media/tests/captions.c index 875bfa41d20..df2e02b644b 100644 --- a/dlls/windows.media/tests/captions.c +++ b/dlls/windows.media/tests/captions.c @@ -97,8 +97,8 @@ static void test_CaptionStatics(void) opacity = 0xdeadbeef; hr = IClosedCaptionPropertiesStatics_get_FontOpacity( caption_statics, &opacity ); - todo_wine ok( hr == S_OK, "get_FontOpacity returned %#lx\n", hr ); - todo_wine ok( opacity == ClosedCaptionOpacity_Default, "expected default font opacity, got %d\n", opacity ); + ok( hr == S_OK, "get_FontOpacity returned %#lx\n", hr ); + ok( opacity == ClosedCaptionOpacity_Default, "expected default font opacity, got %d\n", opacity ); size = 0xdeadbeef; hr = IClosedCaptionPropertiesStatics_get_FontSize( caption_statics, &size );

1 0

Mohamad Al-Jaf : windows.media/tests: Add Closed Caption Properties tests.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 10af2e50c81a5dadcd95f1a49caf7c61bdcb41c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/10af2e50c81a5dadcd95f1a49caf7c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Nov 24 02:51:57 2022 -0500 windows.media/tests: Add Closed Caption Properties tests. --- dlls/windows.media/tests/captions.c | 70 +++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/windows.media/tests/captions.c b/dlls/windows.media/tests/captions.c index b1e1f4fd334..647e5eee1e5 100644 --- a/dlls/windows.media/tests/captions.c +++ b/dlls/windows.media/tests/captions.c @@ -26,7 +26,10 @@ #include "roapi.h" #define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" +#define WIDL_using_Windows_UI +#include "windows.ui.h" #define WIDL_using_Windows_Media_ClosedCaptioning #include "windows.media.closedcaptioning.h" @@ -55,6 +58,13 @@ static void test_CaptionStatics(void) HSTRING str; HRESULT hr; LONG ref; + /* Properties */ + ClosedCaptionColor color; + ClosedCaptionOpacity opacity; + ClosedCaptionSize size; + ClosedCaptionStyle style; + ClosedCaptionEdgeEffect effect; + Color computed_color; hr = WindowsCreateString( caption_properties_name, wcslen( caption_properties_name ), &str ); ok( hr == S_OK, "got hr %#lx.\n", hr ); @@ -75,6 +85,66 @@ static void test_CaptionStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_IClosedCaptionPropertiesStatics, (void **)&caption_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + color = 0xdeadbeef; + hr = IClosedCaptionPropertiesStatics_get_FontColor( caption_statics, &color ); + todo_wine ok( hr == S_OK, "get_FontColor returned %#lx\n", hr ); + todo_wine ok( color == ClosedCaptionColor_Default, "expected default font color, got %d\n", color ); + + hr = IClosedCaptionPropertiesStatics_get_ComputedFontColor( caption_statics, &computed_color ); + todo_wine ok( hr == E_INVALIDARG, "get_ComputedFontColor returned %#lx\n", hr ); + hr = IClosedCaptionPropertiesStatics_get_ComputedFontColor( caption_statics, NULL ); + todo_wine ok( hr == E_INVALIDARG, "get_ComputedFontColor returned %#lx\n", hr ); + + opacity = 0xdeadbeef; + hr = IClosedCaptionPropertiesStatics_get_FontOpacity( caption_statics, &opacity ); + todo_wine ok( hr == S_OK, "get_FontOpacity returned %#lx\n", hr ); + todo_wine ok( opacity == ClosedCaptionOpacity_Default, "expected default font opacity, got %d\n", opacity ); + + size = 0xdeadbeef; + hr = IClosedCaptionPropertiesStatics_get_FontSize( caption_statics, &size ); + todo_wine ok( hr == S_OK, "get_FontSize returned %#lx\n", hr ); + todo_wine ok( size == ClosedCaptionSize_Default, "expected default font size, got %d\n", size ); + + style = 0xdeadbeef; + hr = IClosedCaptionPropertiesStatics_get_FontStyle( caption_statics, &style ); + todo_wine ok( hr == S_OK, "get_FontStyle returned %#lx\n", hr ); + todo_wine ok( style == ClosedCaptionStyle_Default, "expected default font style, got %d\n", style ); + + effect = 0xdeadbeef; + hr = IClosedCaptionPropertiesStatics_get_FontEffect( caption_statics, &effect ); + todo_wine ok( hr == S_OK, "get_FontEffect returned %#lx\n", hr ); + todo_wine ok( effect == ClosedCaptionEdgeEffect_Default, "expected default font effect, got %d\n", effect ); + + color = 0xdeadbeef; + hr = IClosedCaptionPropertiesStatics_get_BackgroundColor( caption_statics, &color ); + todo_wine ok( hr == S_OK, "get_BackgroundColor returned %#lx\n", hr ); + todo_wine ok( color == ClosedCaptionColor_Default, "expected default background color, got %d\n", color ); + + hr = IClosedCaptionPropertiesStatics_get_ComputedBackgroundColor( caption_statics, &computed_color ); + todo_wine ok( hr == E_INVALIDARG, "get_ComputedBackgroundColor returned %#lx\n", hr ); + hr = IClosedCaptionPropertiesStatics_get_ComputedBackgroundColor( caption_statics, NULL ); + todo_wine ok( hr == E_INVALIDARG, "get_ComputedBackgroundColor returned %#lx\n", hr ); + + opacity = 0xdeadbeef; + hr = IClosedCaptionPropertiesStatics_get_BackgroundOpacity( caption_statics, &opacity ); + todo_wine ok( hr == S_OK, "get_BackgroundOpacity returned %#lx\n", hr ); + todo_wine ok( opacity == ClosedCaptionOpacity_Default, "expected default background opacity, got %d\n", opacity ); + + color = 0xdeadbeef; + hr = IClosedCaptionPropertiesStatics_get_RegionColor( caption_statics, &color ); + todo_wine ok( hr == S_OK, "get_RegionColor returned %#lx\n", hr ); + todo_wine ok( color == ClosedCaptionColor_Default, "expected default region color, got %d\n", color ); + + hr = IClosedCaptionPropertiesStatics_get_ComputedRegionColor( caption_statics, &computed_color ); + todo_wine ok( hr == E_INVALIDARG, "get_ComputedRegionColor returned %#lx\n", hr ); + hr = IClosedCaptionPropertiesStatics_get_ComputedRegionColor( caption_statics, NULL ); + todo_wine ok( hr == E_INVALIDARG, "get_ComputedRegionColor returned %#lx\n", hr ); + + opacity = 0xdeadbeef; + hr = IClosedCaptionPropertiesStatics_get_RegionOpacity( caption_statics, &opacity ); + todo_wine ok( hr == S_OK, "get_RegionOpacity returned %#lx\n", hr ); + todo_wine ok( opacity == ClosedCaptionOpacity_Default, "expected default region opacity, got %d\n", opacity ); + ref = IClosedCaptionPropertiesStatics_Release( caption_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0

Alexandre Julliard : ws2_32: Use the Unix call helpers.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 12a129586baf9b8c626602b5f5e1030a35e1312a URL: https://gitlab.winehq.org/wine/wine/-/commit/12a129586baf9b8c626602b5f5e103… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 25 10:18:08 2022 +0100 ws2_32: Use the Unix call helpers. --- dlls/ws2_32/protocol.c | 4 +--- dlls/ws2_32/socket.c | 3 +-- dlls/ws2_32/ws2_32_private.h | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 6e7e8eee18a..1f840832c7a 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -27,9 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); WINE_DECLARE_DEBUG_CHANNEL(winediag); -unixlib_handle_t ws_unix_handle = 0; - -#define WS_CALL(func, params) __wine_unix_call( ws_unix_handle, ws_unix_ ## func, params ) +#define WS_CALL(func, params) WINE_UNIX_CALL( ws_unix_ ## func, params ) static char *get_fqdn(void) { diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 115451c3b58..e8a04e2e714 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -582,8 +582,7 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) switch (reason) { case DLL_PROCESS_ATTACH: - return !NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, - &ws_unix_handle, sizeof(ws_unix_handle), NULL ); + return !__wine_init_unix_call(); case DLL_THREAD_DETACH: free_per_thread_data(); diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index b21936a34e1..41d9e512488 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -145,6 +145,4 @@ enum ws_unix_funcs ws_unix_getnameinfo, }; -extern unixlib_handle_t ws_unix_handle DECLSPEC_HIDDEN; - #endif

1 0

Alexandre Julliard : opengl32: Use the Unix call helpers.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: e9c065e590133d5c19365c77b48eda99b7be367e URL: https://gitlab.winehq.org/wine/wine/-/commit/e9c065e590133d5c19365c77b48eda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 25 10:14:36 2022 +0100 opengl32: Use the Unix call helpers. --- dlls/opengl32/make_opengl | 3 +-- dlls/opengl32/unixlib.h | 3 +-- dlls/opengl32/wgl.c | 12 ++---------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 5d995495abd..5564b4b8526 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -1054,8 +1054,7 @@ print OUT " GLsizei length;\n"; print OUT " const GLchar *message;\n"; print OUT "};\n\n"; -print OUT "extern unixlib_handle_t unixlib_handle DECLSPEC_HIDDEN;\n"; -print OUT "#define UNIX_CALL( func, params ) __wine_unix_call( unixlib_handle, unix_ ## func, params )\n\n"; +print OUT "#define UNIX_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )\n\n"; print OUT "#endif /* __WINE_OPENGL32_UNIXLIB_H */\n"; close OUT; diff --git a/dlls/opengl32/unixlib.h b/dlls/opengl32/unixlib.h index e7f21383f86..59f75b93c54 100644 --- a/dlls/opengl32/unixlib.h +++ b/dlls/opengl32/unixlib.h @@ -25351,7 +25351,6 @@ struct wine_gl_debug_message_params const GLchar *message; }; -extern unixlib_handle_t unixlib_handle DECLSPEC_HIDDEN; -#define UNIX_CALL( func, params ) __wine_unix_call( unixlib_handle, unix_ ## func, params ) +#define UNIX_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) #endif /* __WINE_OPENGL32_UNIXLIB_H */ diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 27efa6df745..1e7767374d5 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -39,8 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl); WINE_DECLARE_DEBUG_CHANNEL(fps); -unixlib_handle_t unixlib_handle = 0; - static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; #ifndef _WIN64 @@ -1257,8 +1255,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: - if ((status = NtQueryVirtualMemory( GetCurrentProcess(), hinst, MemoryWineUnixFuncs, - &unixlib_handle, sizeof(unixlib_handle), NULL ))) + if ((status = __wine_init_unix_call())) { ERR( "Failed to load unixlib, status %#lx\n", status ); return FALSE; @@ -1276,12 +1273,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) break; case DLL_PROCESS_DETACH: - if (!unixlib_handle) return TRUE; - if ((status = UNIX_CALL( process_detach, NULL ))) - { - WARN( "Failed to detach opengl32 unixlib, status %#lx\n", status ); - return FALSE; - } + UNIX_CALL( process_detach, NULL ); #ifndef _WIN64 cleanup_wow64_strings(); #endif

1 0

Alexandre Julliard : winecrt0: Call __wine_unix_call through an explicit pointer in the helper macro.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 7c0b3a408c75e6760f2e4e9b76e8ba007e95986d URL: https://gitlab.winehq.org/wine/wine/-/commit/7c0b3a408c75e6760f2e4e9b76e8ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 25 10:23:38 2022 +0100 winecrt0: Call __wine_unix_call through an explicit pointer in the helper macro. --- dlls/winecrt0/unix_lib.c | 45 +++++++++++++++------------------------------ dlls/winevulkan/loader.c | 7 ++++--- include/wine/unixlib.h | 3 ++- 3 files changed, 21 insertions(+), 34 deletions(-) diff --git a/dlls/winecrt0/unix_lib.c b/dlls/winecrt0/unix_lib.c index 10be32899ba..1c8e2117dd0 100644 --- a/dlls/winecrt0/unix_lib.c +++ b/dlls/winecrt0/unix_lib.c @@ -27,34 +27,6 @@ #include "winternl.h" #include "wine/unixlib.h" -#ifdef __WINE_PE_BUILD - -static NTSTATUS (WINAPI *p__wine_unix_call)( unixlib_handle_t, unsigned int, void * ); - -static void load_func( void **func, const char *name, void *def ) -{ - if (!*func) - { - HMODULE module = GetModuleHandleW( L"ntdll.dll" ); - void *proc = GetProcAddress( module, name ); - InterlockedExchangePointer( func, proc ? proc : def ); - } -} -#define LOAD_FUNC(name) load_func( (void **)&p ## name, #name, fallback ## name ) - -static NTSTATUS __cdecl fallback__wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) -{ - return STATUS_DLL_NOT_FOUND; -} - -NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) -{ - LOAD_FUNC( __wine_unix_call ); - return p__wine_unix_call( handle, code, args ); -} - -#endif /* __WINE_PE_BUILD */ - static inline void *image_base(void) { #ifdef __WINE_PE_BUILD @@ -66,10 +38,23 @@ static inline void *image_base(void) #endif } +static NTSTATUS WINAPI unix_call_fallback( unixlib_handle_t handle, unsigned int code, void *args ) +{ + return STATUS_DLL_NOT_FOUND; +} + unixlib_handle_t __wine_unixlib_handle = 0; +NTSTATUS (WINAPI *__wine_unix_call_ptr)( unixlib_handle_t, unsigned int, void * ) = unix_call_fallback; NTSTATUS WINAPI __wine_init_unix_call(void) { - return NtQueryVirtualMemory( GetCurrentProcess(), image_base(), MemoryWineUnixFuncs, - &__wine_unixlib_handle, sizeof(__wine_unixlib_handle), NULL ); + NTSTATUS status; + HMODULE module = GetModuleHandleW( L"ntdll.dll" ); + void *proc = GetProcAddress( module, "__wine_unix_call" ); + + if (!proc) return STATUS_DLL_NOT_FOUND; + status = NtQueryVirtualMemory( GetCurrentProcess(), image_base(), MemoryWineUnixFuncs, + &__wine_unixlib_handle, sizeof(__wine_unixlib_handle), NULL ); + if (!status) __wine_unix_call_ptr = proc; + return status; } diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 6714502e428..f168e824ae8 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); -NTSTATUS (WINAPI *p_vk_direct_unix_call)(unixlib_handle_t handle, unsigned int code, void *args) = __wine_unix_call; +NTSTATUS (WINAPI *p_vk_direct_unix_call)(unixlib_handle_t handle, unsigned int code, void *args) = NULL; static HINSTANCE hinstance; @@ -234,9 +234,10 @@ VkResult WINAPI vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supported_ver static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) { - if (__wine_init_unix_call()) - return FALSE; + NTSTATUS status = __wine_init_unix_call(); + p_vk_direct_unix_call = __wine_unix_call_ptr; + if (status) return FALSE; return !vk_unix_call(unix_init, &p_vk_direct_unix_call); } diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index fcb25422524..977dabc77f3 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -268,9 +268,10 @@ static inline ULONG ntdll_wcstoul( const WCHAR *s, WCHAR **end, int base ) #else /* WINE_UNIX_LIB */ extern unixlib_handle_t __wine_unixlib_handle DECLSPEC_HIDDEN; +extern NTSTATUS (WINAPI *__wine_unix_call_ptr)( unixlib_handle_t, unsigned int, void * ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI __wine_init_unix_call(void) DECLSPEC_HIDDEN; -#define WINE_UNIX_CALL(code,args) __wine_unix_call( __wine_unixlib_handle, (code), (args) ) +#define WINE_UNIX_CALL(code,args) __wine_unix_call_ptr( __wine_unixlib_handle, (code), (args) ) #endif /* WINE_UNIX_LIB */

1 0

Alexandre Julliard : winevulkan: Use the Unix call helpers.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 006eae345b9f5f49a18da3f05ade9f709811972b URL: https://gitlab.winehq.org/wine/wine/-/commit/006eae345b9f5f49a18da3f05ade9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 25 10:17:27 2022 +0100 winevulkan: Use the Unix call helpers. --- dlls/winevulkan/loader.c | 4 +- dlls/winevulkan/loader_thunks.c | 452 ++++++++++++++++++++-------------------- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_loader.h | 7 +- 4 files changed, 233 insertions(+), 232 deletions(-)

1 0

Alexandre Julliard : secur32: Use the Unix call helpers.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: f82dc3d7c419a0760001a6d994789f62a9160373 URL: https://gitlab.winehq.org/wine/wine/-/commit/f82dc3d7c419a0760001a6d994789f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 25 10:16:06 2022 +0100 secur32: Use the Unix call helpers. --- dlls/secur32/schannel.c | 16 ++++------------ dlls/secur32/secur32.c | 3 --- dlls/secur32/secur32_priv.h | 2 -- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 98c6f93bc1c..23917626497 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -40,9 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); -static unixlib_handle_t gnutls_handle; - -#define GNUTLS_CALL( func, params ) __wine_unix_call( gnutls_handle, unix_ ## func, params ) +#define GNUTLS_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) #define SCHAN_INVALID_HANDLE ~0UL @@ -1685,15 +1683,10 @@ void SECUR32_initSchannelSP(void) }; SecureProvider *provider; - if (!gnutls_handle) + if (__wine_init_unix_call() || GNUTLS_CALL( process_attach, NULL )) { - if (NtQueryVirtualMemory( GetCurrentProcess(), hsecur32, MemoryWineUnixFuncs, - &gnutls_handle, sizeof(gnutls_handle), NULL ) || - GNUTLS_CALL( process_attach, NULL )) - { - ERR( "no schannel support, expect problems\n" ); - return; - } + ERR( "no schannel support, expect problems\n" ); + return; } schan_handle_table = malloc(64 * sizeof(*schan_handle_table)); @@ -1751,5 +1744,4 @@ void SECUR32_deinitSchannelSP(void) } free(schan_handle_table); GNUTLS_CALL( process_detach, NULL ); - gnutls_handle = 0; } diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 4875ce85651..d703757bae7 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -40,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); -HINSTANCE hsecur32; - /** * Type definitions */ @@ -1183,7 +1181,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) switch (reason) { case DLL_PROCESS_ATTACH: - hsecur32 = hinstDLL; DisableThreadLibraryCalls(hinstDLL); SECUR32_initializeProviders(); break; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index c43b1f446c4..258454560fe 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -26,8 +26,6 @@ #include "schannel.h" #include "wine/list.h" -extern HINSTANCE hsecur32 DECLSPEC_HIDDEN; - typedef struct _SecureProvider { struct list entry;

1 0