- Wine-Commits - list.winehq.org

Rémi Bernon : winegstreamer: Rename get_preferred_format to get_current_format.
by Alexandre Julliard May 24, 2024

May 24, 2024

Module: wine Branch: master Commit: 08730dae2ebf96b5ec470642018b702cca11518c URL: https://gitlab.winehq.org/wine/wine/-/commit/08730dae2ebf96b5ec470642018b70… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 10 17:19:43 2024 +0200 winegstreamer: Rename get_preferred_format to get_current_format. --- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/main.c | 6 +++--- dlls/winegstreamer/media_source.c | 2 +- dlls/winegstreamer/quartz_parser.c | 16 ++++++++-------- dlls/winegstreamer/unixlib.h | 4 ++-- dlls/winegstreamer/wg_parser.c | 14 +++++++------- dlls/winegstreamer/wm_reader.c | 12 ++++++------ 7 files changed, 28 insertions(+), 28 deletions(-)

1 0

Rémi Bernon : user32: Fix SetProcessDpiAwarenessContext.
by Alexandre Julliard May 24, 2024

May 24, 2024

Module: wine Branch: master Commit: d78f7454228d99ef764cd5fbdf5fe29f22e7a6a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/d78f7454228d99ef764cd5fbdf5fe2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 20 13:20:57 2024 +0200 user32: Fix SetProcessDpiAwarenessContext. --- dlls/user32/sysparams.c | 43 ++++++++++++++++--------------------------- dlls/user32/tests/sysparams.c | 1 - 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index f5f6bf2eec9..149498e66d3 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -576,38 +576,27 @@ BOOL WINAPI EnumDisplaySettingsExW( const WCHAR *device, DWORD mode, return NtUserEnumDisplaySettings( &str, mode, dev_mode, flags ); } -/********************************************************************** - * SetProcessDpiAwarenessContext (USER32.@) - */ -BOOL WINAPI SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) +static UINT get_ntuser_dpi_context( DPI_AWARENESS_CONTEXT context ) { - ULONG awareness; - - switch (GetAwarenessFromDpiAwarenessContext( context )) + switch ((UINT_PTR)context) { - case DPI_AWARENESS_UNAWARE: - awareness = NTUSER_DPI_UNAWARE; - break; - case DPI_AWARENESS_SYSTEM_AWARE: - awareness = NTUSER_DPI_SYSTEM_AWARE; - break; - case DPI_AWARENESS_PER_MONITOR_AWARE: - awareness = context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 - ? NTUSER_DPI_PER_MONITOR_AWARE_V2 : NTUSER_DPI_PER_MONITOR_AWARE; - break; - default: - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; + case (UINT_PTR)DPI_AWARENESS_CONTEXT_UNAWARE: return NTUSER_DPI_UNAWARE; + case (UINT_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: return NTUSER_DPI_SYSTEM_AWARE; + case (UINT_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: return NTUSER_DPI_PER_MONITOR_AWARE; + case (UINT_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: return NTUSER_DPI_PER_MONITOR_AWARE_V2; + case (UINT_PTR)DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED: return NTUSER_DPI_PER_UNAWARE_GDISCALED; } - if (!NtUserSetProcessDpiAwarenessContext( awareness, 0 )) - { - SetLastError( ERROR_ACCESS_DENIED ); - return FALSE; - } + return (UINT_PTR)context; +} - TRACE( "set to %p\n", context ); - return TRUE; +/********************************************************************** + * SetProcessDpiAwarenessContext (USER32.@) + */ +BOOL WINAPI SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) +{ + UINT value = get_ntuser_dpi_context( context ); + return NtUserSetProcessDpiAwarenessContext( value, 0 ); } /********************************************************************** diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 596b4b60b7a..2393c8bd130 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3936,7 +3936,6 @@ static void test_SetProcessDpiAwarenessContext( ULONG arg ) SetLastError( 0xdeadbeef ); ret = pSetProcessDpiAwarenessContext( contexts[i] ); ok( !ret, "SetProcessDpiAwarenessContext succeeded\n" ); - todo_wine_if( i < 3 ) ok( GetLastError() == ERROR_ACCESS_DENIED, "got %#lx\n", GetLastError() ); ctx = pGetThreadDpiAwarenessContext(); todo_wine_if( arg != 0x12 && context != DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE )

1 0

Rémi Bernon : user32/tests: Add more SetThreadDpiAwarenessContext tests.
by Alexandre Julliard May 24, 2024

May 24, 2024

Module: wine Branch: master Commit: b3739dcc9cc6f0238ac636d0c0e8f2213b5f423b URL: https://gitlab.winehq.org/wine/wine/-/commit/b3739dcc9cc6f0238ac636d0c0e8f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 20:28:19 2024 +0200 user32/tests: Add more SetThreadDpiAwarenessContext tests. --- dlls/user32/tests/sysparams.c | 169 ++++++++++++++++++++++++++++++------------ 1 file changed, 122 insertions(+), 47 deletions(-)

1 0

Rémi Bernon : winegstreamer: Use a GstCaps for wg_parser_stream codec format.
by Alexandre Julliard May 24, 2024

May 24, 2024

Module: wine Branch: master Commit: 2d3910d4cd128062a248706af805c22fe20248c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d3910d4cd128062a248706af805c2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 30 14:18:53 2024 +0200 winegstreamer: Use a GstCaps for wg_parser_stream codec format. --- dlls/winegstreamer/wg_parser.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 7d5dcce83f0..431a8b74cb2 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -107,7 +107,7 @@ struct wg_parser_stream GstPad *my_sink; GstElement *flip, *decodebin; GstSegment segment; - struct wg_format codec_format; + GstCaps *codec_caps; GstCaps *current_caps; GstCaps *desired_caps; @@ -131,11 +131,17 @@ static struct wg_parser_stream *get_stream(wg_parser_stream_t stream) return (struct wg_parser_stream *)(ULONG_PTR)stream; } -static bool format_is_compressed(struct wg_format *format) +static bool caps_is_compressed(GstCaps *caps) { - return format->major_type != WG_MAJOR_TYPE_UNKNOWN - && format->major_type != WG_MAJOR_TYPE_VIDEO - && format->major_type != WG_MAJOR_TYPE_AUDIO; + struct wg_format format; + + if (!caps) + return false; + wg_format_from_caps(&format, caps); + + return format.major_type != WG_MAJOR_TYPE_UNKNOWN + && format.major_type != WG_MAJOR_TYPE_VIDEO + && format.major_type != WG_MAJOR_TYPE_AUDIO; } static NTSTATUS wg_parser_get_stream_count(void *args) @@ -238,8 +244,8 @@ static NTSTATUS wg_parser_stream_get_codec_format(void *args) struct wg_parser_stream_get_codec_format_params *params = args; struct wg_parser_stream *stream = get_stream(params->stream); - if (format_is_compressed(&stream->codec_format)) - *params->format = stream->codec_format; + if (caps_is_compressed(stream->codec_caps)) + wg_format_from_caps(params->format, stream->codec_caps); else if (stream->current_caps) wg_format_from_caps(params->format, stream->current_caps); else @@ -519,11 +525,7 @@ static bool parser_no_more_pads(struct wg_parser *parser) static gboolean autoplug_continue_cb(GstElement * decodebin, GstPad *pad, GstCaps * caps, gpointer user) { - struct wg_format format; - - wg_format_from_caps(&format, caps); - - return !format_is_compressed(&format); + return !caps_is_compressed(caps); } static GstAutoplugSelectResult autoplug_select_cb(GstElement *bin, GstPad *pad, @@ -980,7 +982,6 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user) { struct wg_parser_stream *stream; struct wg_parser *parser = user; - GstCaps *caps; GST_LOG("parser %p, element %p, pad %p.", parser, element, pad); @@ -989,13 +990,10 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user) if (!(stream = create_stream(parser))) return; - - caps = gst_pad_query_caps(pad, NULL); - wg_format_from_caps(&stream->codec_format, caps); - gst_caps_unref(caps); + stream->codec_caps = gst_pad_query_caps(pad, NULL); /* For compressed stream, create an extra decodebin to decode it. */ - if (!parser->output_compressed && format_is_compressed(&stream->codec_format)) + if (!parser->output_compressed && caps_is_compressed(stream->codec_caps)) { if (!stream_decodebin_create(stream)) {

1 0

Marcus Meissner : shell32/tests: Fixed sizeof to GetModuleFileName.
by Alexandre Julliard May 24, 2024

May 24, 2024

Module: wine Branch: master Commit: 4f8f6e1b3422353bccc75498ef3502ffd6e8e045 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f8f6e1b3422353bccc75498ef3502… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Apr 2 16:51:47 2024 +0200 shell32/tests: Fixed sizeof to GetModuleFileName. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/shell32/tests/shellpath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index ef3d2a78256..2d9450652a1 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -3016,9 +3016,9 @@ static void test_PathResolve(void) return; } - ret = GetModuleFileNameW(NULL, argv0_dir, sizeof(argv0_dir)); - ok(ret != 0 && ret < sizeof(argv0_dir), "GetModuleFileName failed\n"); - if (ret != 0 && ret < sizeof(argv0_dir)) + ret = GetModuleFileNameW(NULL, argv0_dir, ARRAY_SIZE(argv0_dir)); + ok(ret != 0 && ret < ARRAY_SIZE(argv0_dir), "GetModuleFileName failed\n"); + if (ret != 0 && ret < ARRAY_SIZE(argv0_dir)) { argv0_basep = wcsrchr(argv0_dir, '\\'); *argv0_basep = 0;

1 0

Rémi Bernon : winegstreamer: Implement WMA DMO Get(Input|Output)CurrentType.
by Alexandre Julliard May 24, 2024

May 24, 2024

Module: wine Branch: master Commit: 52ae7e7b642195777b62986110f878b437b7d194 URL: https://gitlab.winehq.org/wine/wine/-/commit/52ae7e7b642195777b62986110f878… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 24 12:01:08 2024 +0200 winegstreamer: Implement WMA DMO Get(Input|Output)CurrentType. --- dlls/mf/tests/transform.c | 33 +++++---------------------------- dlls/winegstreamer/wma_decoder.c | 26 ++++++++++++++++++++++---- 2 files changed, 27 insertions(+), 32 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index e7d8f924b70..0291fe16e18 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -3519,37 +3519,26 @@ static void test_wma_decoder_dmo_input_type(void) hr = IMediaObject_SetInputType(dmo, 0, NULL, DMO_SET_TYPEF_CLEAR); ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); hr = IMediaObject_GetInputCurrentType(dmo, 1, NULL); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputCurrentType returned %#lx.\n", hr); hr = IMediaObject_GetInputCurrentType(dmo, 0, NULL); - todo_wine ok(hr == DMO_E_TYPE_NOT_SET, "GetInputCurrentType returned %#lx.\n", hr); hr = IMediaObject_GetInputCurrentType(dmo, 1, &type); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputCurrentType returned %#lx.\n", hr); hr = IMediaObject_GetInputCurrentType(dmo, 0, &type); - todo_wine ok(hr == DMO_E_TYPE_NOT_SET, "GetInputCurrentType returned %#lx.\n", hr); hr = IMediaObject_SetInputType(dmo, 0, good_input_type, 0); ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); hr = IMediaObject_GetInputCurrentType(dmo, 1, NULL); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputCurrentType returned %#lx.\n", hr); hr = IMediaObject_GetInputCurrentType(dmo, 0, NULL); - todo_wine ok(hr == E_POINTER, "GetInputCurrentType returned %#lx.\n", hr); hr = IMediaObject_GetInputCurrentType(dmo, 1, &type); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputCurrentType returned %#lx.\n", hr); hr = IMediaObject_GetInputCurrentType(dmo, 0, &type); - todo_wine ok(hr == S_OK, "GetInputCurrentType returned %#lx.\n", hr); - if (hr == S_OK) - { - check_dmo_media_type(&type, good_input_type); - MoFreeMediaType(&type); - } + check_dmo_media_type(&type, good_input_type); + MoFreeMediaType(&type); /* Cleanup. */ ret = IMediaObject_Release(dmo); @@ -3721,8 +3710,6 @@ static void test_wma_decoder_dmo_output_type(void) /* Test GetOutputCurrentType. */ hr = IMediaObject_SetOutputType(dmo, 0, NULL, DMO_SET_TYPEF_CLEAR); ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); - todo_wine - { hr = IMediaObject_GetOutputCurrentType(dmo, 1, NULL); ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetOutputCurrentType returned %#lx.\n", hr); hr = IMediaObject_GetOutputCurrentType(dmo, 0, NULL); @@ -3731,12 +3718,9 @@ static void test_wma_decoder_dmo_output_type(void) ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetOutputCurrentType returned %#lx.\n", hr); hr = IMediaObject_GetOutputCurrentType(dmo, 0, &type); ok(hr == DMO_E_TYPE_NOT_SET, "GetOutputCurrentType returned %#lx.\n", hr); - } hr = IMediaObject_SetOutputType(dmo, 0, good_output_type, 0); ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); - todo_wine - { hr = IMediaObject_GetOutputCurrentType(dmo, 1, NULL); ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetOutputCurrentType returned %#lx.\n", hr); hr = IMediaObject_GetOutputCurrentType(dmo, 0, NULL); @@ -3745,12 +3729,8 @@ static void test_wma_decoder_dmo_output_type(void) ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetOutputCurrentType returned %#lx.\n", hr); hr = IMediaObject_GetOutputCurrentType(dmo, 0, &type); ok(hr == S_OK, "GetOutputCurrentType returned %#lx.\n", hr); - } - if (hr == S_OK) - { - check_dmo_media_type(&type, good_output_type); - MoFreeMediaType(&type); - } + check_dmo_media_type(&type, good_output_type); + MoFreeMediaType(&type); /* Test GetOutputSizeInfo. */ hr = IMediaObject_GetOutputSizeInfo(dmo, 1, NULL, NULL); @@ -3767,20 +3747,17 @@ static void test_wma_decoder_dmo_output_type(void) ok(alignment == 1, "Unexpected alignment %lu.\n", alignment); hr = IMediaObject_GetInputCurrentType(dmo, 0, input_type); - todo_wine ok(hr == S_OK, "GetInputCurrentType returned %#lx.\n", hr); hr = IMediaObject_SetInputType(dmo, 0, input_type, 0); ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); hr = IMediaObject_GetOutputCurrentType(dmo, 0, &type); - todo_wine ok(hr == S_OK, "GetOutputCurrentType returned %#lx.\n", hr); init_dmo_media_type_audio(input_type, input_subtype, channel_count, rate * 2, 32); hr = IMediaObject_SetInputType(dmo, 0, input_type, 0); ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); hr = IMediaObject_GetOutputCurrentType(dmo, 0, &type); - todo_wine - ok(hr == DMO_E_TYPE_NOT_SET, "GetOutputCurrentType returned %#lx.\n", hr); + todo_wine ok(hr == DMO_E_TYPE_NOT_SET, "GetOutputCurrentType returned %#lx.\n", hr); /* Cleanup. */ ret = IMediaObject_Release(dmo); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index bc11383fc64..8aa55b9b137 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -813,14 +813,32 @@ static HRESULT WINAPI media_object_SetOutputType(IMediaObject *iface, DWORD inde static HRESULT WINAPI media_object_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %lu, type %p stub!\n", iface, index, type); - return E_NOTIMPL; + struct wma_decoder *decoder = impl_from_IMediaObject(iface); + + TRACE("iface %p, index %lu, type %p\n", iface, index, type); + + if (index) + return DMO_E_INVALIDSTREAMINDEX; + if (IsEqualGUID(&decoder->input_type.majortype, &GUID_NULL)) + return DMO_E_TYPE_NOT_SET; + if (!type) + return E_POINTER; + return MoCopyMediaType(type, &decoder->input_type); } static HRESULT WINAPI media_object_GetOutputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %lu, type %p stub!\n", iface, index, type); - return E_NOTIMPL; + struct wma_decoder *decoder = impl_from_IMediaObject(iface); + + TRACE("iface %p, index %lu, type %p\n", iface, index, type); + + if (index) + return DMO_E_INVALIDSTREAMINDEX; + if (IsEqualGUID(&decoder->output_type.majortype, &GUID_NULL)) + return DMO_E_TYPE_NOT_SET; + if (!type) + return E_POINTER; + return MoCopyMediaType(type, &decoder->output_type); } static HRESULT WINAPI media_object_GetInputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size,

1 0

Rémi Bernon : user32/tests: Add some SetProcessDpiAwarenessContext tests.
by Alexandre Julliard May 24, 2024

May 24, 2024

Module: wine Branch: master Commit: 6b68b55ce34c67ce95586a7cccee58ac2f6ee5f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b68b55ce34c67ce95586a7cccee58… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 14:57:58 2024 +0200 user32/tests: Add some SetProcessDpiAwarenessContext tests. --- dlls/user32/tests/sysparams.c | 155 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 151 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 2528d4d4398..7714b41010e 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -173,6 +173,24 @@ static int last_bpp; static BOOL displaychange_ok = FALSE, displaychange_test_active = FALSE; static HANDLE displaychange_sem = 0; +#define run_in_process( a, b ) run_in_process_( __FILE__, __LINE__, a, b ) +static void run_in_process_( const char *file, int line, char **argv, const char *args ) +{ + STARTUPINFOA startup = {.cb = sizeof(STARTUPINFOA)}; + PROCESS_INFORMATION info = {0}; + char cmdline[MAX_PATH * 2]; + DWORD ret; + + sprintf( cmdline, "%s %s %s", argv[0], argv[1], args ); + ret = CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); + ok_(file, line)( ret, "CreateProcessA failed, error %lu\n", GetLastError() ); + if (!ret) return; + + wait_child_process( info.hProcess ); + CloseHandle( info.hThread ); + CloseHandle( info.hProcess ); +} + static BOOL get_reg_dword(HKEY base, const char *key_name, const char *value_name, DWORD *value) { HKEY key; @@ -194,13 +212,19 @@ static BOOL get_reg_dword(HKEY base, const char *key_name, const char *value_nam static DWORD get_real_dpi(void) { + DPI_AWARENESS_CONTEXT ctx; DWORD dpi; if (pSetThreadDpiAwarenessContext) { - DPI_AWARENESS_CONTEXT context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); + ctx = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); + todo_wine ok( ctx == (DPI_AWARENESS_CONTEXT)0x80006010, "got %p\n", ctx ); dpi = pGetDpiForSystem(); - pSetThreadDpiAwarenessContext( context ); + ok( dpi, "GetDpiForSystem failed\n" ); + /* restore process-wide DPI awareness context */ + ctx = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x80006010 ); + todo_wine ok( ctx == (DPI_AWARENESS_CONTEXT)((UINT_PTR)0x11 | (dpi << 8)), "got %p\n", ctx ); + if (!ctx) pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x80000010 ); return dpi; } if (get_reg_dword(HKEY_CURRENT_USER, "Control Panel\\Desktop", "LogPixels", &dpi)) @@ -3871,6 +3895,102 @@ static void test_AreDpiAwarenessContextsEqual(ULONG_PTR flags) } } +static void test_SetProcessDpiAwarenessContext( ULONG arg ) +{ + DPI_AWARENESS_CONTEXT contexts[] = + { + (DPI_AWARENESS_CONTEXT)0x6010, + (DPI_AWARENESS_CONTEXT)0x40006010, + (DPI_AWARENESS_CONTEXT)((UINT_PTR)0x11 | (real_dpi << 8)), + (DPI_AWARENESS_CONTEXT)0x12, + (DPI_AWARENESS_CONTEXT)0x22, + }; + DPI_AWARENESS_CONTEXT context, ctx, expect_ctx; + UINT ret, i; + + /* 0x11 is system aware DPI and only works with the current system DPI */ + if (arg == 0x11) context = contexts[2]; + else context = LongToHandle( arg ) /* sign-extend */; + + if (context == DPI_AWARENESS_CONTEXT_UNAWARE) expect_ctx = contexts[0]; + else if (context == DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED) expect_ctx = contexts[1]; + else if (context == DPI_AWARENESS_CONTEXT_SYSTEM_AWARE) expect_ctx = contexts[2]; + else if (context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE) expect_ctx = contexts[3]; + else if (context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2) expect_ctx = contexts[4]; + else if ((arg & 0xff000000) == 0x80000000) expect_ctx = ULongToHandle( arg ) /* no sign-extend */; + else expect_ctx = context; + + winetest_push_context( "%#lx", arg ); + + ctx = pGetThreadDpiAwarenessContext(); + todo_wine ok( ctx == (DPI_AWARENESS_CONTEXT)0x6010, "got %p\n", ctx ); + + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( 0 ); + ok( !ret, "SetProcessDpiAwarenessContext succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x11 ); + ok( !ret, "SetProcessDpiAwarenessContext succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ACCESS_DENIED, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x21 ); + ok( !ret, "SetProcessDpiAwarenessContext succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x32 ); + ok( !ret, "SetProcessDpiAwarenessContext succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x6012 ); + ok( !ret, "SetProcessDpiAwarenessContext succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x6022 ); + ok( !ret, "SetProcessDpiAwarenessContext succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x40006011 ); + ok( !ret, "SetProcessDpiAwarenessContext succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x40000012 ); + ok( !ret, "SetProcessDpiAwarenessContext succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x7810 ); + ok( !ret, "SetProcessDpiAwarenessContext succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x1ff11 ); + ok( !ret, "SetProcessDpiAwarenessContext succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_ACCESS_DENIED, "got %#lx\n", GetLastError() ); + ctx = pGetThreadDpiAwarenessContext(); + todo_wine ok( ctx == (DPI_AWARENESS_CONTEXT)0x6010, "got %p\n", ctx ); + + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( context ); + todo_wine ok( ret, "SetProcessDpiAwarenessContext failed, error %lu\n", GetLastError() ); + todo_wine ok( GetLastError() == 0xdeadbeef, "got %#lx\n", GetLastError() ); + ctx = pGetThreadDpiAwarenessContext(); + todo_wine_if( arg != 0x12 && context != DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ) + ok( ctx == expect_ctx, "got %p\n", ctx ); + + for (i = 0; i < ARRAY_SIZE(contexts); i++) + { + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( contexts[i] ); + ok( !ret, "SetProcessDpiAwarenessContext succeeded\n" ); + todo_wine_if( i < 3 ) + ok( GetLastError() == ERROR_ACCESS_DENIED, "got %#lx\n", GetLastError() ); + ctx = pGetThreadDpiAwarenessContext(); + todo_wine_if( arg != 0x12 && context != DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ) + ok( ctx == expect_ctx, "got %p\n", ctx ); + } + + winetest_pop_context(); +} + static void test_dpi_context(void) { DPI_AWARENESS awareness; @@ -4320,7 +4440,6 @@ START_TEST(sysparams) hdc = GetDC(0); dpi = GetDeviceCaps( hdc, LOGPIXELSY); real_dpi = get_real_dpi(); - trace("dpi %d real_dpi %d\n", dpi, real_dpi); ReleaseDC( 0, hdc); /* This test requires interactivity, if we don't have it, give up */ @@ -4329,7 +4448,14 @@ START_TEST(sysparams) argc = winetest_get_mainargs(&argv); strict=(argc >= 3 && strcmp(argv[2],"strict")==0); - trace("strict=%d\n",strict); + + if (argc > 3 && !strcmp( argv[2], "SetProcessDpiAwarenessContext" )) + { + test_SetProcessDpiAwarenessContext( strtoul( argv[3], NULL, 16 ) ); + return; + } + + trace("dpi %d real_dpi %d, strict %d\n", dpi, real_dpi, strict); test_LOGFONT_charset(); @@ -4379,4 +4505,25 @@ START_TEST(sysparams) else win_skip( "SetThreadDpiAwarenessContext not supported\n" ); test_dpi_aware(); + + if (!pSetProcessDpiAwarenessContext || !pSetThreadDpiAwarenessContext || !pGetThreadDpiAwarenessContext) + win_skip( "SetProcessDpiAwarenessContext not supported\n" ); + else + { + run_in_process( argv, "SetProcessDpiAwarenessContext 0x6010" ); + run_in_process( argv, "SetProcessDpiAwarenessContext 0x11" ); + run_in_process( argv, "SetProcessDpiAwarenessContext 0x12" ); + run_in_process( argv, "SetProcessDpiAwarenessContext 0x22" ); + run_in_process( argv, "SetProcessDpiAwarenessContext 0x40006010" ); + run_in_process( argv, "SetProcessDpiAwarenessContext 0x80006010" ); + run_in_process( argv, "SetProcessDpiAwarenessContext 0x80000012" ); + run_in_process( argv, "SetProcessDpiAwarenessContext 0x80000022" ); + + /* user32 allows abstract DPI contexts to be used */ + run_in_process( argv, "SetProcessDpiAwarenessContext 0xffffffff" ); + run_in_process( argv, "SetProcessDpiAwarenessContext 0xfffffffe" ); + run_in_process( argv, "SetProcessDpiAwarenessContext 0xfffffffd" ); + run_in_process( argv, "SetProcessDpiAwarenessContext 0xfffffffc" ); + run_in_process( argv, "SetProcessDpiAwarenessContext 0xfffffffb" ); + } }

1 0

Rémi Bernon : win32u/tests: Add NtUser(Get|Set)ProcessDpiAwarenessContext tests.
by Alexandre Julliard May 24, 2024

May 24, 2024

Module: wine Branch: master Commit: d75f9dfbb81ccf1145a0c52c07f3a8a7efd4cada URL: https://gitlab.winehq.org/wine/wine/-/commit/d75f9dfbb81ccf1145a0c52c07f3a8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 13:18:40 2024 +0200 win32u/tests: Add NtUser(Get|Set)ProcessDpiAwarenessContext tests. --- dlls/win32u/tests/win32u.c | 135 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 78d2f21295c..7606b7d23ba 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -2043,6 +2043,126 @@ static void test_wndproc_hook(void) UnregisterClassW( L"TestLParamClass", NULL ); } +static DWORD get_real_dpi(void) +{ + DPI_AWARENESS_CONTEXT ctx; + DWORD dpi; + + ctx = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); + todo_wine ok( ctx == (DPI_AWARENESS_CONTEXT)0x80006010, "got %p\n", ctx ); + dpi = GetDpiForSystem(); + ok( dpi, "GetDpiForSystem failed\n" ); + /* restore process-wide DPI awareness context */ + ctx = SetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x80006010 ); + todo_wine ok( ctx == (DPI_AWARENESS_CONTEXT)((UINT_PTR)0x11 | (dpi << 8)), "got %p\n", ctx ); + if (!ctx) SetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x80000010 ); + + return dpi; +} + +static void test_NtUserSetProcessDpiAwarenessContext( ULONG context ) +{ + UINT contexts[] = + { + 0x6010, + 0x40006010, + 0x11 | (get_real_dpi() << 8), + 0x12, + 0x22, + }; + UINT ret, i; + + /* 0x11 is system aware DPI and only works with the current system DPI */ + if (context == 0x11) context = contexts[1]; + + winetest_push_context( "%#lx", context ); + + ret = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ); + todo_wine ok( ret == 0x6010, "got %#x\n", ret ); + + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( 0, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + + /* win32u doesn't allow abstract DPI awareness contexts */ + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( (LONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( (LONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( (LONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( (LONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( (LONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( 0x11, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( 0x21, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( 0x32, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( 0x6012, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( 0x6022, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( 0x40006011, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( 0x40000012, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( 0x7810, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserSetProcessDpiAwarenessContext( 0x1ff11, 0 ); + ok( ret == 0, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); + ret = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ); + todo_wine ok( ret == 0x6010, "got %#x\n", ret ); + + ret = NtUserSetProcessDpiAwarenessContext( context, 0 ); + todo_wine ok( ret == 1, "got %#x\n", ret ); + ret = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ); + todo_wine_if( context != 0x12 ) + ok( ret == context, "got %#x\n", ret ); + + for (i = 0; i < ARRAY_SIZE(contexts); i++) + { + ret = NtUserSetProcessDpiAwarenessContext( contexts[i], 0 ); + ok( !ret, "got %#x\n", ret ); + ret = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ); + todo_wine_if( context != 0x12 ) + ok( ret == context, "got %#x\n", ret ); + } + + winetest_pop_context(); +} + START_TEST(win32u) { char **argv; @@ -2066,6 +2186,12 @@ START_TEST(win32u) return; } + if (argc > 3 && !strcmp( argv[2], "NtUserSetProcessDpiAwarenessContext" )) + { + test_NtUserSetProcessDpiAwarenessContext( strtoul( argv[3], NULL, 16 ) ); + return; + } + test_NtUserEnumDisplayDevices(); test_window_props(); test_class(); @@ -2086,4 +2212,13 @@ START_TEST(win32u) run_in_process( argv, "NtUserEnableMouseInPointer 0" ); run_in_process( argv, "NtUserEnableMouseInPointer 1" ); + + run_in_process( argv, "NtUserSetProcessDpiAwarenessContext 0x6010" ); + run_in_process( argv, "NtUserSetProcessDpiAwarenessContext 0x11" ); + run_in_process( argv, "NtUserSetProcessDpiAwarenessContext 0x12" ); + run_in_process( argv, "NtUserSetProcessDpiAwarenessContext 0x22" ); + run_in_process( argv, "NtUserSetProcessDpiAwarenessContext 0x40006010" ); + run_in_process( argv, "NtUserSetProcessDpiAwarenessContext 0x80006010" ); + run_in_process( argv, "NtUserSetProcessDpiAwarenessContext 0x80000012" ); + run_in_process( argv, "NtUserSetProcessDpiAwarenessContext 0x80000022" ); }

1 0

Rémi Bernon : win32u: Fix NtUserSetProcessDpiAwarenessContext.
by Alexandre Julliard May 24, 2024

May 24, 2024

Module: wine Branch: master Commit: 6ee5c60d5dd4d7ff86d21f847a1c589f034c94f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ee5c60d5dd4d7ff86d21f847a1c58… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 13:32:45 2024 +0200 win32u: Fix NtUserSetProcessDpiAwarenessContext. --- dlls/user32/sysparams.c | 12 ++++++---- dlls/win32u/sysparams.c | 59 ++++++++++++++++++++++++++++++++++++------------- include/ntuser.h | 21 +++++++++++++----- 3 files changed, 67 insertions(+), 25 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index a3f768ff66d..f5f6bf2eec9 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -615,7 +615,8 @@ BOOL WINAPI SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) */ BOOL WINAPI GetProcessDpiAwarenessInternal( HANDLE process, DPI_AWARENESS *awareness ) { - *awareness = NtUserGetProcessDpiAwarenessContext( process ) & 3; + ULONG context = NtUserGetProcessDpiAwarenessContext( process ); + *awareness = NTUSER_DPI_CONTEXT_GET_AWARENESS( context ); return TRUE; } @@ -732,9 +733,12 @@ UINT WINAPI GetDpiForSystem(void) DPI_AWARENESS_CONTEXT WINAPI GetThreadDpiAwarenessContext(void) { struct ntuser_thread_info *info = NtUserGetThreadInfo(); + ULONG context; if (info->dpi_awareness) return ULongToHandle( info->dpi_awareness ); - return UlongToHandle( (NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ) & 3 ) | 0x10 ); + + context = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ); + return UlongToHandle( NTUSER_DPI_CONTEXT_GET_AWARENESS( context ) | 0x10 ); } /********************************************************************** @@ -753,8 +757,8 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT } if (!(prev = info->dpi_awareness)) { - prev = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ) & 3; - prev |= 0x80000010; /* restore to process default */ + ULONG process_ctx = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ); + prev = NTUSER_DPI_CONTEXT_GET_AWARENESS( process_ctx ) | 0x80000010; /* restore to process default */ } if (((ULONG_PTR)context & ~(ULONG_PTR)0x33) == 0x80000000) info->dpi_awareness = 0; else if (context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 || context == (DPI_AWARENESS_CONTEXT)0x22) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index c6eb09c4268..c51275a294f 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2107,6 +2107,35 @@ UINT get_win_monitor_dpi( HWND hwnd ) return system_dpi; } +/* keep in sync with user32 */ +static BOOL is_valid_dpi_awareness_context( UINT context, UINT dpi ) +{ + switch (NTUSER_DPI_CONTEXT_GET_AWARENESS( context )) + { + case DPI_AWARENESS_UNAWARE: + if (NTUSER_DPI_CONTEXT_GET_FLAGS( context ) & ~NTUSER_DPI_CONTEXT_FLAG_VALID_MASK) return FALSE; + if (NTUSER_DPI_CONTEXT_GET_VERSION( context ) != 1) return FALSE; + if (NTUSER_DPI_CONTEXT_GET_DPI( context ) != USER_DEFAULT_SCREEN_DPI) return FALSE; + return TRUE; + + case DPI_AWARENESS_SYSTEM_AWARE: + if (NTUSER_DPI_CONTEXT_GET_FLAGS( context ) & ~NTUSER_DPI_CONTEXT_FLAG_VALID_MASK) return FALSE; + if (NTUSER_DPI_CONTEXT_GET_FLAGS( context ) & NTUSER_DPI_CONTEXT_FLAG_GDISCALED) return FALSE; + if (NTUSER_DPI_CONTEXT_GET_VERSION( context ) != 1) return FALSE; + if (dpi && NTUSER_DPI_CONTEXT_GET_DPI( context ) != dpi) return FALSE; + return TRUE; + + case DPI_AWARENESS_PER_MONITOR_AWARE: + if (NTUSER_DPI_CONTEXT_GET_FLAGS( context ) & ~NTUSER_DPI_CONTEXT_FLAG_VALID_MASK) return FALSE; + if (NTUSER_DPI_CONTEXT_GET_FLAGS( context ) & NTUSER_DPI_CONTEXT_FLAG_GDISCALED) return FALSE; + if (NTUSER_DPI_CONTEXT_GET_VERSION( context ) != 1 && NTUSER_DPI_CONTEXT_GET_VERSION( context ) != 2) return FALSE; + if (NTUSER_DPI_CONTEXT_GET_DPI( context )) return FALSE; + return TRUE; + } + + return FALSE; +} + /* copied from user32 GetAwarenessFromDpiAwarenessContext, make sure to keep that in sync */ static DPI_AWARENESS get_awareness_from_dpi_awareness_context( DPI_AWARENESS_CONTEXT context ) { @@ -6202,27 +6231,27 @@ BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *va } -static LONG dpi_awareness; +static LONG dpi_context; /*********************************************************************** * NtUserSetProcessDpiAwarenessContext (win32u.@) */ -BOOL WINAPI NtUserSetProcessDpiAwarenessContext( ULONG awareness, ULONG unknown ) +BOOL WINAPI NtUserSetProcessDpiAwarenessContext( ULONG context, ULONG unknown ) { - switch (awareness) + if (!is_valid_dpi_awareness_context( context, system_dpi )) { - case NTUSER_DPI_UNAWARE: - case NTUSER_DPI_SYSTEM_AWARE: - case NTUSER_DPI_PER_MONITOR_AWARE: - case NTUSER_DPI_PER_MONITOR_AWARE_V2: - case NTUSER_DPI_PER_UNAWARE_GDISCALED: - break; - default: RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); return FALSE; } - return !InterlockedCompareExchange( &dpi_awareness, awareness, 0 ); + if (InterlockedCompareExchange( &dpi_context, context, 0 )) + { + RtlSetLastWin32Error( ERROR_ACCESS_DENIED ); + return FALSE; + } + + TRACE( "set to %#x\n", (UINT)context ); + return TRUE; } /*********************************************************************** @@ -6230,7 +6259,7 @@ BOOL WINAPI NtUserSetProcessDpiAwarenessContext( ULONG awareness, ULONG unknown */ ULONG WINAPI NtUserGetProcessDpiAwarenessContext( HANDLE process ) { - DPI_AWARENESS val; + ULONG context; if (process && process != GetCurrentProcess()) { @@ -6238,9 +6267,9 @@ ULONG WINAPI NtUserGetProcessDpiAwarenessContext( HANDLE process ) return NTUSER_DPI_UNAWARE; } - val = ReadNoFence( &dpi_awareness ); - if (!val) return NTUSER_DPI_UNAWARE; - return val; + context = ReadNoFence( &dpi_context ); + if (!context) return NTUSER_DPI_UNAWARE; + return context; } BOOL message_beep( UINT i ) diff --git a/include/ntuser.h b/include/ntuser.h index f947fec7fea..419ba2e86c3 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -281,12 +281,21 @@ struct unpack_dde_message_result LPARAM lparam; }; -/* process DPI awareness contexts */ -#define NTUSER_DPI_UNAWARE 0x00006010 -#define NTUSER_DPI_SYSTEM_AWARE 0x00006011 -#define NTUSER_DPI_PER_MONITOR_AWARE 0x00000012 -#define NTUSER_DPI_PER_MONITOR_AWARE_V2 0x00000022 -#define NTUSER_DPI_PER_UNAWARE_GDISCALED 0x40006010 +/* DPI awareness contexts */ +#define MAKE_NTUSER_DPI_CONTEXT( awareness, version, dpi, flags ) ((awareness) | ((version) << 4) | ((dpi) << 8) | (flags)) +#define NTUSER_DPI_CONTEXT_GET_AWARENESS( ctx ) ((ctx) & 0x0f) +#define NTUSER_DPI_CONTEXT_GET_VERSION( ctx ) (((ctx) & 0xf0) >> 4) +#define NTUSER_DPI_CONTEXT_GET_DPI( ctx ) ((((ctx) & 0x1ff00) >> 8)) +#define NTUSER_DPI_CONTEXT_GET_FLAGS( ctx ) ((ctx) & 0xfffe0000) +#define NTUSER_DPI_CONTEXT_FLAG_GDISCALED 0x40000000 +#define NTUSER_DPI_CONTEXT_FLAG_PROCESS 0x80000000 +#define NTUSER_DPI_CONTEXT_FLAG_VALID_MASK (NTUSER_DPI_CONTEXT_FLAG_PROCESS | NTUSER_DPI_CONTEXT_FLAG_GDISCALED) + +#define NTUSER_DPI_UNAWARE MAKE_NTUSER_DPI_CONTEXT( DPI_AWARENESS_UNAWARE, 1, USER_DEFAULT_SCREEN_DPI, 0 ) +#define NTUSER_DPI_SYSTEM_AWARE MAKE_NTUSER_DPI_CONTEXT( DPI_AWARENESS_SYSTEM_AWARE, 1, system_dpi, 0 ) +#define NTUSER_DPI_PER_MONITOR_AWARE MAKE_NTUSER_DPI_CONTEXT( DPI_AWARENESS_PER_MONITOR_AWARE, 1, 0, 0 ) +#define NTUSER_DPI_PER_MONITOR_AWARE_V2 MAKE_NTUSER_DPI_CONTEXT( DPI_AWARENESS_PER_MONITOR_AWARE, 2, 0, 0 ) +#define NTUSER_DPI_PER_UNAWARE_GDISCALED MAKE_NTUSER_DPI_CONTEXT( DPI_AWARENESS_UNAWARE, 1, USER_DEFAULT_SCREEN_DPI, NTUSER_DPI_CONTEXT_FLAG_GDISCALED ) /* message spy definitions */ #define SPY_DISPATCHMESSAGE 0x0100

1 0

Rémi Bernon : win32u/tests: Introduce a new run_in_process helper.
by Alexandre Julliard May 24, 2024

May 24, 2024

Module: wine Branch: master Commit: ef224f1dd8033dc76fb8ac7b76ce50b3de70480a URL: https://gitlab.winehq.org/wine/wine/-/commit/ef224f1dd8033dc76fb8ac7b76ce50… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 13:18:40 2024 +0200 win32u/tests: Introduce a new run_in_process helper. --- dlls/win32u/tests/win32u.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index f7fe74ed34c..78d2f21295c 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -29,6 +29,24 @@ #define check_member( val, exp, fmt, member ) \ check_member_( __FILE__, __LINE__, val, exp, fmt, member ) +#define run_in_process( a, b ) run_in_process_( __FILE__, __LINE__, a, b ) +static void run_in_process_( const char *file, int line, char **argv, const char *args ) +{ + STARTUPINFOA startup = {.cb = sizeof(STARTUPINFOA)}; + PROCESS_INFORMATION info = {0}; + char cmdline[MAX_PATH * 2]; + DWORD ret; + + sprintf( cmdline, "%s %s %s", argv[0], argv[1], args ); + ret = CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); + ok_(file, line)( ret, "CreateProcessA failed, error %lu\n", GetLastError() ); + if (!ret) return; + + wait_child_process( info.hProcess ); + CloseHandle( info.hThread ); + CloseHandle( info.hProcess ); +} + static void flush_events(void) { int min_timeout = 100, diff = 200; @@ -1305,7 +1323,7 @@ done: ok( ret, "UnregisterClassW failed: %lu\n", GetLastError() ); } -static void test_NtUserEnableMouseInPointer_process( const char *arg ) +static void test_NtUserEnableMouseInPointer( const char *arg ) { DWORD enable = strtoul( arg, 0, 10 ); BOOL ret; @@ -1339,23 +1357,6 @@ static void test_NtUserEnableMouseInPointer_process( const char *arg ) test_NtUserGetPointerInfoList( enable ); } -static void test_NtUserEnableMouseInPointer( char **argv, BOOL enable ) -{ - STARTUPINFOA startup = {.cb = sizeof(STARTUPINFOA)}; - PROCESS_INFORMATION info = {0}; - char cmdline[MAX_PATH * 2]; - BOOL ret; - - sprintf( cmdline, "%s %s NtUserEnableMouseInPointer %u", argv[0], argv[1], enable ); - ret = CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); - ok( ret, "CreateProcessA failed, error %lu\n", GetLastError() ); - if (!ret) return; - - wait_child_process( info.hProcess ); - CloseHandle( info.hThread ); - CloseHandle( info.hProcess ); -} - struct lparam_hook_test { const char *name; @@ -2060,7 +2061,7 @@ START_TEST(win32u) if (argc > 3 && !strcmp( argv[2], "NtUserEnableMouseInPointer" )) { winetest_push_context( "enable %s", argv[3] ); - test_NtUserEnableMouseInPointer_process( argv[3] ); + test_NtUserEnableMouseInPointer( argv[3] ); winetest_pop_context(); return; } @@ -2083,6 +2084,6 @@ START_TEST(win32u) test_NtUserCloseWindowStation(); test_NtUserDisplayConfigGetDeviceInfo(); - test_NtUserEnableMouseInPointer( argv, FALSE ); - test_NtUserEnableMouseInPointer( argv, TRUE ); + run_in_process( argv, "NtUserEnableMouseInPointer 0" ); + run_in_process( argv, "NtUserEnableMouseInPointer 1" ); }

1 0