October 2022 - Wine-commits

Nikolay Sivov : dxva2/tests: Add another render target format to fix a test failure.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: 3adf638c610cad80a1e9758f990bb6c889b6c357 URL: https://gitlab.winehq.org/wine/wine/-/commit/3adf638c610cad80a1e9758f990bb6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 14 22:04:13 2022 +0300 dxva2/tests: Add another render target format to fix a test failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/tests/dxva2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index cc5bc3cd76f..db48f331772 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -580,11 +580,12 @@ static void test_progressive_device(void) MAKEFOURCC('N','V','1','2'), }; - static const D3DFORMAT support_rt_formats[] = + static const D3DFORMAT supported_rt_formats[] = { D3DFMT_X8R8G8B8, MAKEFOURCC('N','V','1','2'), D3DFMT_YUY2, + D3DFMT_A2R10G10B10, }; window = create_window(); @@ -647,7 +648,7 @@ static void test_progressive_device(void) ok(count > 0, "Unexpected format count %u.\n", count); for (j = 0; j < count; ++j) { - ok(check_format_list(rt_formats[j], support_rt_formats, ARRAY_SIZE(support_rt_formats)), + ok(check_format_list(rt_formats[j], supported_rt_formats, ARRAY_SIZE(supported_rt_formats)), "Unexpected rt format %#x for input format %#x.\n", rt_formats[j], input_formats[i]); } CoTaskMemFree(rt_formats);

1 0

Rémi Bernon : mf/tests: Check sample grabber RGB / NV12 orientation.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: 1af56869c2a6ea7b1420c3e1b547a93cdaeea752 URL: https://gitlab.winehq.org/wine/wine/-/commit/1af56869c2a6ea7b1420c3e1b547a9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 21 11:54:06 2022 +0200 mf/tests: Check sample grabber RGB / NV12 orientation. --- dlls/mf/tests/mf.c | 267 ++++++++++++++++++++++++++++++++++- dlls/mf/tests/mf_test.h | 43 +++++- dlls/mf/tests/nv12frame-grabber.bmp | Bin 0 -> 22582 bytes dlls/mf/tests/resource.rc | 17 +++ dlls/mf/tests/rgb32frame-grabber.bmp | Bin 0 -> 16438 bytes dlls/mf/tests/test.mp4 | Bin 0 -> 3983 bytes dlls/mf/tests/transform.c | 100 +++++-------- 7 files changed, 361 insertions(+), 66 deletions(-)

1 0

Rémi Bernon : mfmediaengine/tests: Pass a device manager and output format to create_media_engine.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: 31871d713a56f1f2924f3bd5b074173f15b4043d URL: https://gitlab.winehq.org/wine/wine/-/commit/31871d713a56f1f2924f3bd5b07417… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 16 09:48:09 2022 +0200 mfmediaengine/tests: Pass a device manager and output format to create_media_engine. --- dlls/mfmediaengine/tests/mfmediaengine.c | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 008ee58849c..bd8fb577ccb 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -138,37 +138,37 @@ static struct media_engine_notify *create_callback(void) return object; } -static IMFMediaEngine *create_media_engine(IMFMediaEngineNotify *callback) +static IMFMediaEngine *create_media_engine(IMFMediaEngineNotify *callback, IMFDXGIDeviceManager *manager, UINT32 output_format) { - IMFDXGIDeviceManager *manager; IMFMediaEngine *media_engine; IMFAttributes *attributes; - UINT token; HRESULT hr; - hr = pMFCreateDXGIDeviceManager(&token, &manager); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = MFCreateAttributes(&attributes, 3); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (manager) + { + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_DXGI_MANAGER, (IUnknown *)manager); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + } + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)callback); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); + hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, output_format); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineClassFactory_CreateInstance(factory, 0, attributes, &media_engine); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFAttributes_Release(attributes); - IMFDXGIDeviceManager_Release(manager); return media_engine; } -static IMFMediaEngineEx *create_media_engine_ex(IMFMediaEngineNotify *callback) +static IMFMediaEngineEx *create_media_engine_ex(IMFMediaEngineNotify *callback, IMFDXGIDeviceManager *manager, UINT32 output_format) { - IMFMediaEngine *engine = create_media_engine(callback); + IMFMediaEngine *engine = create_media_engine(callback, manager, output_format); IMFMediaEngineEx *engine_ex = NULL; if (engine) @@ -331,7 +331,7 @@ static void test_Shutdown(void) notify = create_callback(); - media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); + media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface, NULL, DXGI_FORMAT_UNKNOWN); hr = IMFMediaEngine_Shutdown(media_engine); ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); @@ -518,7 +518,7 @@ static void test_Play(void) notify = create_callback(); - media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); + media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface, NULL, DXGI_FORMAT_UNKNOWN); hr = IMFMediaEngine_GetBuffered(media_engine, &range); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -567,7 +567,7 @@ static void test_Play(void) IMFMediaEngine_Release(media_engine); /* Play -> Pause */ - media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); + media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface, NULL, DXGI_FORMAT_UNKNOWN); hr = IMFMediaEngine_Play(media_engine); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -594,7 +594,7 @@ static void test_playback_rate(void) notify = create_callback(); - media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); + media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface, NULL, DXGI_FORMAT_UNKNOWN); rate = IMFMediaEngine_GetDefaultPlaybackRate(media_engine); ok(rate == 1.0, "Unexpected default rate.\n"); @@ -624,7 +624,7 @@ static void test_mute(void) notify = create_callback(); - media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); + media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface, NULL, DXGI_FORMAT_UNKNOWN); ret = IMFMediaEngine_GetMuted(media_engine); ok(!ret, "Unexpected state.\n"); @@ -655,7 +655,7 @@ static void test_error(void) notify = create_callback(); - media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); + media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface, NULL, DXGI_FORMAT_UNKNOWN); eo = (void *)0xdeadbeef; hr = IMFMediaEngine_GetError(media_engine, &eo); @@ -917,7 +917,7 @@ static void test_SetSourceFromByteStream(void) notify = create_callback(); - media_engine = create_media_engine_ex(&notify->IMFMediaEngineNotify_iface); + media_engine = create_media_engine_ex(&notify->IMFMediaEngineNotify_iface, NULL, DXGI_FORMAT_UNKNOWN); if (!media_engine) { win_skip("IMFMediaEngineEx is not supported.\n"); @@ -953,7 +953,7 @@ static void test_audio_configuration(void) notify = create_callback(); - media_engine = create_media_engine_ex(&notify->IMFMediaEngineNotify_iface); + media_engine = create_media_engine_ex(&notify->IMFMediaEngineNotify_iface, NULL, DXGI_FORMAT_UNKNOWN); if (!media_engine) { IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface);

1 0

Rémi Bernon : mfmediaengine/tests: Check IMFMediaEngine_TransferVideoFrames output orientation.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: ae4ecbe59e4031554ad4a172e1e2e65c92193af9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae4ecbe59e4031554ad4a172e1e2e6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 14 08:04:14 2022 +0200 mfmediaengine/tests: Check IMFMediaEngine_TransferVideoFrames output orientation. --- dlls/mfmediaengine/tests/Makefile.in | 2 + dlls/mfmediaengine/tests/i420-64x64.avi | Bin 0 -> 25472 bytes dlls/mfmediaengine/tests/mfmediaengine.c | 347 ++++++++++++++++++++++++++++++- dlls/mfmediaengine/tests/resource.rc | 32 +++ dlls/mfmediaengine/tests/rgb32frame.bmp | Bin 0 -> 16438 bytes 5 files changed, 379 insertions(+), 2 deletions(-)

1 0

Rémi Bernon : mfmediaengine: Remove vertical flipping of video frames.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: 2f5d06af1d176ad0ef0be7427efb0b7a33757811 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f5d06af1d176ad0ef0be7427efb0b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 19 14:22:07 2022 +0200 mfmediaengine: Remove vertical flipping of video frames. --- dlls/mfmediaengine/main.c | 38 +++++++++++++++----------------- dlls/mfmediaengine/tests/mfmediaengine.c | 7 +++--- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index a191448b69f..b2ddc376db8 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -284,38 +284,36 @@ static HRESULT media_engine_create_d3d11_video_frame_resources(struct media_engi if (position.x < dst.x || position.x > dst.z) return backcolor; if (position.y < dst.y || position.y > dst.w) return backcolor; p.x = (position.x - dst.x) / (dst.z - dst.x); - p.y = 1.0f - (position.y - dst.y) / (dst.w - dst.y); + p.y = (position.y - dst.y) / (dst.w - dst.y); p.x = src.x + p.x * (src.z - src.x); p.y = src.y + p.y * (src.w - src.y); return t.Sample(s, p); } #endif - 0x43425844, 0x5892e3b1, 0x24c17f7c, 0x9999f143, 0x49667872, 0x00000001, 0x0000032c, 0x00000003, + 0x43425844, 0xae2162b7, 0x0fd69625, 0x6784c41a, 0x84ae95de, 0x00000001, 0x000002f8, 0x00000003, 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, - 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000290, 0x00000040, - 0x000000a4, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x0300005a, 0x00106000, 0x00000000, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x0000025c, 0x00000040, + 0x00000097, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x08000031, 0x00100012, 0x00000000, 0x0010100a, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x08000031, 0x00100022, 0x00000000, 0x0020802a, 0x00000000, 0x00000000, 0x0010100a, 0x00000000, 0x0700003c, 0x00100012, 0x00000000, - 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0304001f, 0x0010000a, 0x00000000, 0x06000036, - 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000002, 0x0100003e, 0x01000015, 0x08000031, - 0x00100012, 0x00000000, 0x0010101a, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x08000031, - 0x00100022, 0x00000000, 0x0020803a, 0x00000000, 0x00000000, 0x0010101a, 0x00000000, 0x0700003c, - 0x00100012, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0304001f, 0x0010000a, - 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000002, 0x0100003e, - 0x01000015, 0x09000000, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x80208046, 0x00000041, - 0x00000000, 0x00000000, 0x0a000000, 0x001000c2, 0x00000000, 0x80208406, 0x00000041, 0x00000000, - 0x00000000, 0x00208ea6, 0x00000000, 0x00000000, 0x0700000e, 0x00100032, 0x00000000, 0x00100046, - 0x00000000, 0x00100ae6, 0x00000000, 0x08000000, 0x00100022, 0x00000000, 0x8010001a, 0x00000041, - 0x00000000, 0x00004001, 0x3f800000, 0x0a000000, 0x001000c2, 0x00000000, 0x80208406, 0x00000041, - 0x00000000, 0x00000001, 0x00208ea6, 0x00000000, 0x00000001, 0x0a000032, 0x00100012, 0x00000001, - 0x0010000a, 0x00000000, 0x0010002a, 0x00000000, 0x0020800a, 0x00000000, 0x00000001, 0x0a000032, - 0x00100022, 0x00000001, 0x0010001a, 0x00000000, 0x0010003a, 0x00000000, 0x0020801a, 0x00000000, - 0x00000001, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000001, 0x00107e46, 0x00000000, - 0x00106000, 0x00000000, 0x0100003e, + 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x09000000, 0x00100062, 0x00000000, 0x00101106, + 0x00000000, 0x80208106, 0x00000041, 0x00000000, 0x00000000, 0x0a000000, 0x00100032, 0x00000001, + 0x80208046, 0x00000041, 0x00000000, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x0700000e, + 0x00100062, 0x00000000, 0x00100656, 0x00000000, 0x00100106, 0x00000001, 0x0a000000, 0x00100032, + 0x00000001, 0x80208046, 0x00000041, 0x00000000, 0x00000001, 0x00208ae6, 0x00000000, 0x00000001, + 0x0a000032, 0x00100062, 0x00000000, 0x00100656, 0x00000000, 0x00100106, 0x00000001, 0x00208106, + 0x00000000, 0x00000001, 0x09000045, 0x001000f2, 0x00000001, 0x00100596, 0x00000000, 0x00107e46, + 0x00000000, 0x00106000, 0x00000000, 0x0304001f, 0x0010000a, 0x00000000, 0x06000036, 0x001020f2, + 0x00000000, 0x00208e46, 0x00000000, 0x00000002, 0x0100003e, 0x01000015, 0x08000031, 0x00100012, + 0x00000000, 0x0010101a, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x08000031, 0x00100022, + 0x00000000, 0x0020803a, 0x00000000, 0x00000000, 0x0010101a, 0x00000000, 0x0700003c, 0x00100012, + 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0304001f, 0x0010000a, 0x00000000, + 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000002, 0x0100003e, 0x01000015, + 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x0100003e, }; D3D11_SUBRESOURCE_DATA resource_data; D3D11_TEXTURE2D_DESC texture_desc; diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index fc8e5eb1c24..3a5b2bf8253 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -124,8 +124,8 @@ static void dump_rgb32(const BYTE *data, DWORD length, const RECT *rect, HANDLE ok(written == length, "written %lu bytes\n", written); } -#define check_rgb32_data(a, b, c, d, e) check_rgb32_data_(__LINE__, a, b, c, d, e) -static void check_rgb32_data_(int line, const WCHAR *filename, const BYTE *data, DWORD length, const RECT *rect, BOOL todo) +#define check_rgb32_data(a, b, c, d) check_rgb32_data_(__LINE__, a, b, c, d) +static void check_rgb32_data_(int line, const WCHAR *filename, const BYTE *data, DWORD length, const RECT *rect) { WCHAR output_path[MAX_PATH]; const BYTE *expect_data; @@ -146,7 +146,6 @@ static void check_rgb32_data_(int line, const WCHAR *filename, const BYTE *data, expect_data = LockResource(LoadResource(GetModuleHandleW(NULL), resource)); diff = compare_rgb32(data, &length, rect, expect_data); - todo_wine_if(todo) ok_(__FILE__, line)(diff == 0, "Unexpected %lu%% diff\n", diff); } @@ -1298,7 +1297,7 @@ static void test_TransferVideoFrames(void) ok(!!map_desc.pData, "got pData %p\n", map_desc.pData); ok(map_desc.DepthPitch == 16384, "got DepthPitch %u\n", map_desc.DepthPitch); ok(map_desc.RowPitch == desc.Width * 4, "got RowPitch %u\n", map_desc.RowPitch); - check_rgb32_data(L"rgb32frame.bmp", map_desc.pData, map_desc.RowPitch * desc.Height, &dst_rect, TRUE); + check_rgb32_data(L"rgb32frame.bmp", map_desc.pData, map_desc.RowPitch * desc.Height, &dst_rect); ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)rb_texture, 0); ID3D11DeviceContext_Release(context);

1 0

Rémi Bernon : opengl32: Split trace generation to separate functions.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: db2e56cd0da9e7c482f3f57a7a97e2a275f3cc50 URL: https://gitlab.winehq.org/wine/wine/-/commit/db2e56cd0da9e7c482f3f57a7a97e2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 5 19:42:15 2022 +0200 opengl32: Split trace generation to separate functions. --- dlls/opengl32/make_opengl | 73 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 09531731f8d..ba1f5d7231a 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -171,41 +171,70 @@ sub ConvertType($) return $ret; } -# -# This functions generates the thunk for a given function. -# -sub GenerateThunk($$$) +sub get_func_trace($$) { - my ($name, $func_ref, $prefix) = @_; - my $call_arg = ""; - my $trace_call_arg = ""; + my ($name, $func) = @_; + my $trace_fmt = ""; my $trace_arg = ""; - - my $ret = get_func_proto( "%s WINAPI %s(%s)", $name, $func_ref, 0 ); - foreach my $arg (@{$func_ref->[1]}) { + foreach my $arg (@{$func->[1]}) + { my $ptype = get_arg_type( $arg ); my $pname = get_arg_name( $arg ); my $param = $arg->textContent(); - $call_arg .= " " . $pname . ","; - if ($param =~ /\*/ || $param =~ /\[/) { - $trace_arg .= ", %p"; - $trace_call_arg .= ", " . $pname; - } elsif (defined $arg_types{$ptype}) { + if ($param =~ /\*/ || $param =~ /\[/) + { + $trace_fmt .= ", %p"; + $trace_arg .= ", $pname"; + } + elsif (defined $arg_types{$ptype}) + { my $format = ${$arg_types{$ptype}}[1]; - $trace_arg .= ", " . ($format =~ /^%/ ? $format : "%s"); - $trace_call_arg .= ", " . sprintf $format =~ /^%/ ? "%s" : $format, $pname; + $trace_fmt .= ", " . ($format =~ /^%/ ? $format : "%s"); + $trace_arg .= ", " . (sprintf $format =~ /^%/ ? "%s" : $format, $pname); } else { printf "Unknown type %s in %s\n", $param, $name; } } - $call_arg =~ s/,$/ /; - $trace_arg =~ s/^, //; + $trace_fmt =~ s/^, //; + return "TRACE( \"($trace_fmt)\\n\"$trace_arg );\n"; +} + +sub get_func_args($$$) +{ + my ($func, $decl_args, $convert_args) = @_; + my $ret = ""; + foreach my $arg (@{$func->[1]}) + { + my $pname = get_arg_name( $arg ); + if ($decl_args) + { + $ret .= " " . ($convert_args ? ConvertType( $arg ) : $arg->textContent()) . ","; + } + else + { + $ret .= " $pname,"; + } + } + $ret =~ s/,$/ /; + $ret ||= "void" if $decl_args; + return $ret; +} + +# +# This functions generates the thunk for a given function. +# +sub GenerateThunk($$$) +{ + my ($name, $func_ref, $prefix) = @_; + my $call_args = get_func_args( $func_ref, 0, 0 ); + + my $ret = get_func_proto( "%s WINAPI %s(%s)", $name, $func_ref, 0 ); $ret .= "\n{\n"; # special case for functions that take an HDC as first parameter if (@{$func_ref->[1]} && get_arg_type( ${$func_ref->[1]}[0] ) eq "HDC") { my $pname = get_arg_name( ${$func_ref->[1]}[0] ); $ret .= " const struct opengl_funcs *funcs = get_dc_funcs( $pname );\n"; - $ret .= " TRACE( \"($trace_arg)\\n\"$trace_call_arg );\n" if $gen_traces; + $ret .= " " . get_func_trace( $name, $func_ref ) if $gen_traces; $ret .= " if (!funcs || !funcs->$prefix.p_$name) return"; $ret .= " 0" unless is_void_func( $func_ref ); $ret .= ";\n"; @@ -213,11 +242,11 @@ sub GenerateThunk($$$) else { $ret .= " const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;\n"; - $ret .= " TRACE( \"($trace_arg)\\n\"$trace_call_arg );\n" if $gen_traces; + $ret .= " " . get_func_trace( $name, $func_ref ) if $gen_traces; } $ret .= " "; $ret .= "return " unless is_void_func( $func_ref ); - $ret .= "funcs->$prefix.p_$name($call_arg);\n"; + $ret .= "funcs->$prefix.p_$name($call_args);\n"; $ret .= "}\n\n"; return $ret; }

1 0

Rémi Bernon : opengl32: Consistently use $func instead of $func_ref.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: f2bd9917a1325612006990b4ff655374e4828cfa URL: https://gitlab.winehq.org/wine/wine/-/commit/f2bd9917a1325612006990b4ff6553… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 5 19:56:28 2022 +0200 opengl32: Consistently use $func instead of $func_ref. --- dlls/opengl32/make_opengl | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index ba1f5d7231a..fd02aceafb8 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -224,28 +224,28 @@ sub get_func_args($$$) # sub GenerateThunk($$$) { - my ($name, $func_ref, $prefix) = @_; - my $call_args = get_func_args( $func_ref, 0, 0 ); + my ($name, $func, $prefix) = @_; + my $call_args = get_func_args( $func, 0, 0 ); - my $ret = get_func_proto( "%s WINAPI %s(%s)", $name, $func_ref, 0 ); + my $ret = get_func_proto( "%s WINAPI %s(%s)", $name, $func, 0 ); $ret .= "\n{\n"; # special case for functions that take an HDC as first parameter - if (@{$func_ref->[1]} && get_arg_type( ${$func_ref->[1]}[0] ) eq "HDC") + if (@{$func->[1]} && get_arg_type( ${$func->[1]}[0] ) eq "HDC") { - my $pname = get_arg_name( ${$func_ref->[1]}[0] ); + my $pname = get_arg_name( ${$func->[1]}[0] ); $ret .= " const struct opengl_funcs *funcs = get_dc_funcs( $pname );\n"; - $ret .= " " . get_func_trace( $name, $func_ref ) if $gen_traces; + $ret .= " " . get_func_trace( $name, $func ) if $gen_traces; $ret .= " if (!funcs || !funcs->$prefix.p_$name) return"; - $ret .= " 0" unless is_void_func( $func_ref ); + $ret .= " 0" unless is_void_func( $func ); $ret .= ";\n"; } else { $ret .= " const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;\n"; - $ret .= " " . get_func_trace( $name, $func_ref ) if $gen_traces; + $ret .= " " . get_func_trace( $name, $func ) if $gen_traces; } $ret .= " "; - $ret .= "return " unless is_void_func( $func_ref ); + $ret .= "return " unless is_void_func( $func ); $ret .= "funcs->$prefix.p_$name($call_args);\n"; $ret .= "}\n\n"; return $ret; @@ -253,18 +253,18 @@ sub GenerateThunk($$$) sub generate_null_func($$$) { - my ($name, $func_ref, $callconv) = @_; + my ($name, $func, $callconv) = @_; my $ret; return "" if $name eq "glDebugEntry"; - $ret = get_func_proto( "static %s$callconv null_%s(%s)", $name, $func_ref, 1 ); + $ret = get_func_proto( "static %s$callconv null_%s(%s)", $name, $func, 1 ); $ret .= " {"; if ($name eq "glGetError") { $ret .= " return GL_INVALID_OPERATION;"; } - elsif (!is_void_func( $func_ref )) + elsif (!is_void_func( $func )) { $ret .= " return 0;"; } @@ -800,8 +800,8 @@ print EXT $wrappers; print EXT "\nconst OpenGL_extension extension_registry[$count] = {\n"; my $i = 0; foreach (sort keys %ext_functions) { - my $func_ref = $ext_functions{$_}; - printf EXT " { \"%s\", \"%s\", %s }", $_, join(" ", sort @{$func_ref->[2]}), $_; + my $func = $ext_functions{$_}; + printf EXT " { \"%s\", \"%s\", %s }", $_, join(" ", sort @{$func->[2]}), $_; if ($i != $count-1) { print EXT ","; }

1 0

Rémi Bernon : opengl32: Replace get_function_proto helper with get_func_(args|ret).
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: 3f17c701a20a20a157790d85128d6a9dfc337851 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f17c701a20a20a157790d85128d6a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 5 20:00:59 2022 +0200 opengl32: Replace get_function_proto helper with get_func_(args|ret). --- dlls/opengl32/make_opengl | 55 ++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index fd02aceafb8..d836118a14d 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -219,6 +219,14 @@ sub get_func_args($$$) return $ret; } +sub get_func_ret($$) +{ + my ($func, $convert_args) = @_; + my $ret = $convert_args ? ConvertType( $func->[0] ) : $func->[0]->textContent(); + $ret =~ s/ $//; + return $ret; +} + # # This functions generates the thunk for a given function. # @@ -226,8 +234,11 @@ sub GenerateThunk($$$) { my ($name, $func, $prefix) = @_; my $call_args = get_func_args( $func, 0, 0 ); + my $decl_args = get_func_args( $func, 1, 0 ); + my $func_ret = get_func_ret( $func, 0 ); + my $ret = ""; - my $ret = get_func_proto( "%s WINAPI %s(%s)", $name, $func, 0 ); + $ret .= "$func_ret WINAPI $name($decl_args)"; $ret .= "\n{\n"; # special case for functions that take an HDC as first parameter if (@{$func->[1]} && get_arg_type( ${$func->[1]}[0] ) eq "HDC") @@ -254,11 +265,13 @@ sub GenerateThunk($$$) sub generate_null_func($$$) { my ($name, $func, $callconv) = @_; - my $ret; + my $decl_args = get_func_args( $func, 1, 1 ); + my $func_ret = get_func_ret( $func, 1 ); + my $ret = ""; return "" if $name eq "glDebugEntry"; - $ret = get_func_proto( "static %s$callconv null_%s(%s)", $name, $func, 1 ); + $ret .= "static $func_ret$callconv null_$name($decl_args)"; $ret .= " {"; if ($name eq "glGetError") { @@ -313,22 +326,6 @@ sub get_arg_name($) return $name[0]->textContent(); } -sub get_func_proto($$$$) -{ - my ($format, $name, $func, $convert_args) = @_; - die "unknown func $name" unless defined $func->[0]; - my $proto = $convert_args ? ConvertType( $func->[0] ) : $func->[0]->textContent(); - $proto =~ s/ $//; - my $args = ""; - foreach my $arg (@{$func->[1]}) - { - $args .= " " . ($convert_args ? ConvertType( $arg ) : $arg->textContent()) . ","; - } - $args =~ s/,$/ /; - $args ||= "void"; - return sprintf $format, $proto, $name, $args; -} - # # Extract and checks the number of arguments # @@ -646,7 +643,9 @@ print HEADER " struct\n {\n"; foreach (sort keys %wgl_functions) { next unless defined $supported_wgl_functions{$_}; - print HEADER get_func_proto(" %-10s (WINAPI *p_%s)(%s);\n", $_, $wgl_functions{$_}, 1); + my $decl_args = get_func_args( $wgl_functions{$_}, 1, 1 ); + my $func_ret = get_func_ret( $wgl_functions{$_}, 1 ); + printf HEADER " %-10s (WINAPI *p_$_)($decl_args);\n", $func_ret; } print HEADER " } wgl;\n\n"; @@ -654,14 +653,18 @@ print HEADER " struct\n {\n"; foreach (sort keys %norm_functions) { next if $_ eq "glDebugEntry"; - print HEADER get_func_proto(" %-10s (WINE_GLAPI *p_%s)(%s);\n", $_, $norm_functions{$_}, 1); + my $decl_args = get_func_args( $norm_functions{$_}, 1, 1 ); + my $func_ret = get_func_ret( $norm_functions{$_}, 1 ); + printf HEADER " %-10s (WINE_GLAPI *p_$_)($decl_args);\n", $func_ret; } print HEADER " } gl;\n\n"; print HEADER " struct\n {\n"; foreach (sort keys %ext_functions) { - print HEADER get_func_proto(" %-10s (WINE_GLAPI *p_%s)(%s);\n", $_, $ext_functions{$_}, 1); + my $decl_args = get_func_args( $ext_functions{$_}, 1, 1 ); + my $func_ret = get_func_ret( $ext_functions{$_}, 1 ); + printf HEADER " %-10s (WINE_GLAPI *p_$_)($decl_args);\n", $func_ret; } print HEADER " } ext;\n"; print HEADER "};\n\n"; @@ -708,7 +711,9 @@ print HEADER "\n"; foreach (sort keys %norm_functions) { - printf HEADER "%s;\n", get_func_proto("%-10s GLAPIENTRY %s(%s)", $_, $norm_functions{$_}, 0); + my $decl_args = get_func_args( $norm_functions{$_}, 1, 0 ); + my $func_ret = get_func_ret( $norm_functions{$_}, 0 ); + printf HEADER "%-10s GLAPIENTRY $_($decl_args);\n", $func_ret; } print HEADER "\n#endif /* __WINE_WGL_H */\n"; @@ -787,7 +792,9 @@ print EXT "const int extension_registry_size = $count;\n\n"; foreach (sort keys %ext_functions) { if (needs_wrapper( $_, $ext_functions{$_} )) { - $wrappers .= get_func_proto("extern %s WINAPI %s(%s) DECLSPEC_HIDDEN;\n", $_, $ext_functions{$_}, 0); + my $decl_args = get_func_args( $ext_functions{$_}, 1, 0 ); + my $func_ret = get_func_ret( $ext_functions{$_}, 0 ); + $wrappers .= "extern $func_ret WINAPI $_($decl_args) DECLSPEC_HIDDEN;\n"; } else {

1 0

Rémi Bernon : opengl32: List the manually written functions instead of the excluded.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: 241c26396b78f05862fd19f0652be512f21baf9f URL: https://gitlab.winehq.org/wine/wine/-/commit/241c26396b78f05862fd19f0652be5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 18:05:10 2022 +0200 opengl32: List the manually written functions instead of the excluded. --- dlls/opengl32/make_opengl | 71 +++++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index d836118a14d..cb6882b3774 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -381,18 +381,23 @@ my %wgl_functions; my %gl_enums; my (%gl_types, @gl_types); # also use an array to preserve declaration order -my %supported_wgl_functions = +my %manual_win_functions = ( - "wglCopyContext" => 1, - "wglCreateContext" => 1, - "wglDeleteContext" => 1, - "wglDescribePixelFormat" => 1, - "wglGetPixelFormat" => 1, - "wglGetProcAddress" => 1, - "wglMakeCurrent" => 1, - "wglSetPixelFormat" => 1, - "wglShareLists" => 1, - "wglSwapBuffers" => 1, + "glDebugEntry" => 1, + "wglChoosePixelFormat" => 1, + "wglCreateLayerContext" => 1, + "wglDescribeLayerPlane" => 1, + "wglGetCurrentContext" => 1, + "wglGetCurrentDC" => 1, + "wglGetDefaultProcAddress" => 1, + "wglGetLayerPaletteEntries" => 1, + "wglRealizeLayerPalette" => 1, + "wglSetLayerPaletteEntries" => 1, + "wglSwapLayerBuffers" => 1, + "wglUseFontBitmapsA" => 1, + "wglUseFontBitmapsW" => 1, + "wglUseFontOutlinesA" => 1, + "wglUseFontOutlinesW" => 1, ); my %remapped_wgl_functions = @@ -642,7 +647,7 @@ print HEADER "struct opengl_funcs\n{\n"; print HEADER " struct\n {\n"; foreach (sort keys %wgl_functions) { - next unless defined $supported_wgl_functions{$_}; + next if defined $manual_win_functions{$_}; my $decl_args = get_func_args( $wgl_functions{$_}, 1, 1 ); my $func_ret = get_func_ret( $wgl_functions{$_}, 1 ); printf HEADER " %-10s (WINAPI *p_$_)($decl_args);\n", $func_ret; @@ -652,7 +657,7 @@ print HEADER " } wgl;\n\n"; print HEADER " struct\n {\n"; foreach (sort keys %norm_functions) { - next if $_ eq "glDebugEntry"; + next if defined $manual_win_functions{$_}; my $decl_args = get_func_args( $norm_functions{$_}, 1, 1 ); my $func_ret = get_func_ret( $norm_functions{$_}, 1 ); printf HEADER " %-10s (WINE_GLAPI *p_$_)($decl_args);\n", $func_ret; @@ -662,6 +667,7 @@ print HEADER " } gl;\n\n"; print HEADER " struct\n {\n"; foreach (sort keys %ext_functions) { + next if defined $manual_win_functions{$_}; my $decl_args = get_func_args( $ext_functions{$_}, 1, 1 ); my $func_ret = get_func_ret( $ext_functions{$_}, 1 ); printf HEADER " %-10s (WINE_GLAPI *p_$_)($decl_args);\n", $func_ret; @@ -672,7 +678,7 @@ print HEADER "};\n\n"; print HEADER "#define ALL_WGL_FUNCS"; foreach (sort keys %norm_functions) { - next if $_ eq "glDebugEntry"; + next if defined $manual_win_functions{$_}; printf HEADER " \\\n USE_GL_FUNC(\%s)", $_; } print HEADER "\n\n"; @@ -724,10 +730,12 @@ close HEADER; # open(SPEC, ">$spec_file") or die "cannot create $spec_file"; -foreach (sort keys %norm_functions) { +foreach (sort keys %norm_functions) +{ printf SPEC "%s\n", generate_spec_entry( $_, $norm_functions{$_} ); } -foreach (sort keys %wgl_functions) { +foreach (sort keys %wgl_functions) +{ printf SPEC "%s\n", generate_spec_entry( $_, $wgl_functions{$_} ); } @@ -749,32 +757,47 @@ $file_header .= "WINE_DEFAULT_DEBUG_CHANNEL(opengl);\n\n" if $gen_traces; open(NORM, ">$norm_file") or die "cannot create $norm_file"; print NORM $file_header; -foreach (sort keys %norm_functions) { +foreach (sort keys %norm_functions) +{ + next if defined $manual_win_functions{$_}; next if needs_wrapper( $_, $norm_functions{$_} ); print NORM GenerateThunk($_, $norm_functions{$_}, "gl"); } -foreach (sort keys %wgl_functions) { - next unless defined $supported_wgl_functions{$_}; +foreach (sort keys %wgl_functions) +{ + next if defined $manual_win_functions{$_}; print NORM generate_null_func($_, $wgl_functions{$_}, " WINAPI"); } -foreach (sort keys %norm_functions) { +foreach (sort keys %norm_functions) +{ + next if defined $manual_win_functions{$_}; print NORM generate_null_func($_, $norm_functions{$_}, ""); } -foreach (sort keys %ext_functions) { +foreach (sort keys %ext_functions) +{ + next if defined $manual_win_functions{$_}; print NORM generate_null_func($_, $ext_functions{$_}, ""); } print NORM "\nstruct opengl_funcs null_opengl_funcs =\n{\n {\n"; foreach (sort keys %wgl_functions) { - next unless defined $supported_wgl_functions{$_}; + next if defined $manual_win_functions{$_}; print NORM " null_$_,\n"; } print NORM " },\n {\n"; -foreach (sort keys %norm_functions) { print NORM " null_$_,\n" unless $_ eq "glDebugEntry"; } +foreach (sort keys %norm_functions) +{ + next if defined $manual_win_functions{$_}; + print NORM " null_$_,\n"; +} print NORM " },\n {\n"; -foreach (sort keys %ext_functions) { print NORM " null_$_,\n"; } +foreach (sort keys %ext_functions) +{ + next if defined $manual_win_functions{$_}; + print NORM " null_$_,\n"; +} print NORM " }\n};\n"; close(NORM);

1 0

Rémi Bernon : win32u: Asynchronously send the WM_DISPLAYCHANGE to the desktop window.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: 4e8844529c5ea361ad6a0b5ac19d28cb88670456 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e8844529c5ea361ad6a0b5ac19d28… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 13 21:17:54 2022 +0200 win32u: Asynchronously send the WM_DISPLAYCHANGE to the desktop window. --- dlls/win32u/message.c | 2 +- dlls/win32u/sysparams.c | 4 ++-- dlls/win32u/win32u_private.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 51967d2598a..caffd837c8b 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -3047,7 +3047,7 @@ LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) } /* see SendNotifyMessageW */ -static BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) +BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) { struct send_message_info info; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 1c81dda9dd3..6b5a6f65aef 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2487,8 +2487,8 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod user_driver->pGetCurrentDisplaySettings( adapter->dev.device_name, &current_mode ); adapter_release( adapter ); - send_message( NtUserGetDesktopWindow(), WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, - MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ) ); + send_notify_message( NtUserGetDesktopWindow(), WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, + MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ), FALSE ); send_message_timeout( HWND_BROADCAST, WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ), SMTO_ABORTIFHUNG, 2000, FALSE ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 298cafcf7bf..4be068b968d 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -308,6 +308,7 @@ extern LRESULT send_internal_message_timeout( DWORD dest_pid, DWORD dest_tid, UI LPARAM lparam, UINT flags, UINT timeout, PDWORD_PTR res_ptr ) DECLSPEC_HIDDEN; extern LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; +extern BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) DECLSPEC_HIDDEN; extern LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, UINT flags, UINT timeout, BOOL ansi );

1 0