May 2024 - Wine-commits - list.winehq.org

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

24 May '24

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 : winegstreamer: Use a GstCaps for wg_parser current_format.
by Alexandre Julliard 24 May '24

24 May '24

Module: wine Branch: master Commit: 4f96f2f5546c7cd32623a3a23c9112968f2fbcf0 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f96f2f5546c7cd32623a3a23c9112… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 30 14:06:35 2024 +0200 winegstreamer: Use a GstCaps for wg_parser current_format. And rename it desired_caps as this is the caps that has been requested, not necessarily the current stream caps. --- dlls/winegstreamer/wg_parser.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index c017edf3f86..4456dfab332 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -107,7 +107,8 @@ struct wg_parser_stream GstPad *my_sink; GstElement *flip, *decodebin; GstSegment segment; - struct wg_format preferred_format, current_format, codec_format; + struct wg_format preferred_format, codec_format; + GstCaps *desired_caps; pthread_cond_t event_cond, event_empty_cond; GstBuffer *buffer; @@ -246,7 +247,7 @@ static NTSTATUS wg_parser_stream_enable(void *args) pthread_mutex_lock(&parser->mutex); - stream->current_format = *format; + stream->desired_caps = wg_format_to_caps(format); stream->enabled = true; pthread_mutex_unlock(&parser->mutex); @@ -269,7 +270,11 @@ static NTSTATUS wg_parser_stream_disable(void *args) pthread_mutex_lock(&parser->mutex); stream->enabled = false; - stream->current_format.major_type = WG_MAJOR_TYPE_UNKNOWN; + if (stream->desired_caps) + { + gst_caps_unref(stream->desired_caps); + stream->desired_caps = NULL; + } pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&stream->event_empty_cond); return S_OK; @@ -728,11 +733,12 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_caps(query, &filter); pthread_mutex_lock(&parser->mutex); - caps = wg_format_to_caps(&stream->current_format); - pthread_mutex_unlock(&parser->mutex); - - if (!caps) + if (!stream->desired_caps || !(caps = gst_caps_copy(stream->desired_caps))) + { + pthread_mutex_unlock(&parser->mutex); return FALSE; + } + pthread_mutex_unlock(&parser->mutex); /* Clear some fields that shouldn't prevent us from connecting. */ for (i = 0; i < gst_caps_get_size(caps); ++i) @@ -755,13 +761,13 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) case GST_QUERY_ACCEPT_CAPS: { - struct wg_format format; + struct wg_format format, current_format; gboolean ret = TRUE; GstCaps *caps; pthread_mutex_lock(&parser->mutex); - if (stream->current_format.major_type == WG_MAJOR_TYPE_UNKNOWN) + if (!stream->desired_caps) { pthread_mutex_unlock(&parser->mutex); gst_query_set_accept_caps_result(query, TRUE); @@ -770,7 +776,8 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_accept_caps(query, &caps); wg_format_from_caps(&format, caps); - ret = wg_format_compare(&format, &stream->current_format); + wg_format_from_caps(&current_format, stream->desired_caps); + ret = wg_format_compare(&format, &current_format); pthread_mutex_unlock(&parser->mutex); @@ -802,7 +809,6 @@ static struct wg_parser_stream *create_stream(struct wg_parser *parser) stream->parser = parser; stream->number = parser->stream_count; stream->no_more_pads = true; - stream->current_format.major_type = WG_MAJOR_TYPE_UNKNOWN; pthread_cond_init(&stream->event_cond, NULL); pthread_cond_init(&stream->event_empty_cond, NULL);

1 0

Rémi Bernon : winegstreamer: Use a GstCaps instead of preferred_format.
by Alexandre Julliard 24 May '24

24 May '24

Module: wine Branch: master Commit: 60b2f0848566a8e95f406ae4ddbab1590c70103f URL: https://gitlab.winehq.org/wine/wine/-/commit/60b2f0848566a8e95f406ae4ddbab1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 30 14:11:36 2024 +0200 winegstreamer: Use a GstCaps instead of preferred_format. And rename it current_caps as this is the actual current stream caps. --- dlls/winegstreamer/wg_parser.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 4456dfab332..3ed9b29ebf6 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -107,14 +107,15 @@ struct wg_parser_stream GstPad *my_sink; GstElement *flip, *decodebin; GstSegment segment; - struct wg_format preferred_format, codec_format; + struct wg_format codec_format; + GstCaps *current_caps; GstCaps *desired_caps; pthread_cond_t event_cond, event_empty_cond; GstBuffer *buffer; GstMapInfo map_info; - bool flushing, eos, enabled, has_caps, has_tags, has_buffer, no_more_pads; + bool flushing, eos, enabled, has_tags, has_buffer, no_more_pads; uint64_t duration; gchar *tags[WG_PARSER_TAG_COUNT]; @@ -222,8 +223,13 @@ static NTSTATUS wg_parser_push_data(void *args) static NTSTATUS wg_parser_stream_get_preferred_format(void *args) { const struct wg_parser_stream_get_preferred_format_params *params = args; + struct wg_parser_stream *stream = get_stream(params->stream); + + if (stream->current_caps) + wg_format_from_caps(params->format, stream->current_caps); + else + memset(params->format, 0, sizeof(*params->format)); - *params->format = get_stream(params->stream)->preferred_format; return S_OK; } @@ -232,9 +238,13 @@ 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); - *params->format = format_is_compressed(&stream->codec_format) ? - stream->codec_format : - stream->preferred_format; + if (format_is_compressed(&stream->codec_format)) + *params->format = stream->codec_format; + else if (stream->current_caps) + wg_format_from_caps(params->format, stream->current_caps); + else + memset(params->format, 0, sizeof(*params->format)); + return S_OK; } @@ -637,8 +647,7 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) gst_event_parse_caps(event, &caps); pthread_mutex_lock(&parser->mutex); - wg_format_from_caps(&stream->preferred_format, caps); - stream->has_caps = true; + stream->current_caps = gst_caps_ref(caps); pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); break; @@ -1627,7 +1636,7 @@ static NTSTATUS wg_parser_connect(void *args) gint64 duration; /* If we received a buffer, waiting for tags or caps does not make sense anymore. */ - while ((!stream->has_caps || !stream->has_tags) && !parser->error && !stream->has_buffer) + while ((!stream->current_caps || !stream->has_tags) && !parser->error && !stream->has_buffer) pthread_cond_wait(&parser->init_cond, &parser->mutex); /* GStreamer doesn't actually provide any guarantees about when duration

1 0

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

24 May '24

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 : winegstreamer: Use a GstCaps for wg_parser_stream codec format.
by Alexandre Julliard 24 May '24

24 May '24

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

Esme Povirk : user32/tests: Rename winevent_hook_todo to msg_todo.
by Alexandre Julliard 24 May '24

24 May '24

Module: wine Branch: master Commit: 4bfdf2a073ba30e5123d1329b082301f811e8a34 URL: https://gitlab.winehq.org/wine/wine/-/commit/4bfdf2a073ba30e5123d1329b08230… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue May 21 15:22:15 2024 -0500 user32/tests: Rename winevent_hook_todo to msg_todo. --- dlls/user32/tests/msg.c | 916 ++++++++++++++++++++++++------------------------ 1 file changed, 458 insertions(+), 458 deletions(-)

1 0

Esme Povirk : user32/tests: Mark some Wine-todo messages.
by Alexandre Julliard 24 May '24

24 May '24

Module: wine Branch: master Commit: 1592a58431d433ea4a45b488fb6764c192faf754 URL: https://gitlab.winehq.org/wine/wine/-/commit/1592a58431d433ea4a45b488fb6764… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue May 21 16:10:01 2024 -0500 user32/tests: Mark some Wine-todo messages. A few of these are not sent on Windows sometimes. Comments implying Wine is broken for not sending them have been removed. --- dlls/user32/tests/msg.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 789c916f5c9..786babb1b5b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -421,7 +421,7 @@ static const struct message WmSWP_FrameChanged_clip[] = { { WM_NCCALCSIZE, sent|wparam|parent, 1 }, { WM_NCPAINT, sent|parent|optional }, /* wparam != 1 */ { WM_GETTEXT, sent|parent|defwinproc|optional }, - { WM_ERASEBKGND, sent|parent|optional }, /* FIXME: remove optional once Wine is fixed */ + { WM_ERASEBKGND, sent|parent|msg_todo }, { WM_NCPAINT, sent }, /* wparam != 1 */ { WM_ERASEBKGND, sent }, { WM_WINDOWPOSCHANGED, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, @@ -6554,8 +6554,8 @@ static const struct message WmSetTextGroupSeq[] = { WM_SETTEXT, sent }, { WM_CTLCOLORSTATIC, sent|parent }, { EVENT_OBJECT_NAMECHANGE, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, - { WM_CTLCOLORSTATIC, sent|parent|optional }, /* FIXME: Missing in Wine */ - { WM_CTLCOLORSTATIC, sent|parent|optional }, /* FIXME: Missing in Wine */ + { WM_CTLCOLORSTATIC, sent|parent|msg_todo }, /* FIXME: Missing in Wine */ + { WM_CTLCOLORSTATIC, sent|parent|msg_todo }, /* FIXME: Missing in Wine */ { 0 } }; static const struct message WmSetTextInvisibleSeq[] = @@ -7245,9 +7245,9 @@ static const struct message auto_radio_button_BM_CLICK[] = { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO2, BN_CLICKED) }, - { WM_NCHITTEST, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ - { WM_SETCURSOR, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ - { WM_MOUSEMOVE, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_NCHITTEST, sent|optional, 0, 0 }, + { WM_SETCURSOR, sent|optional, 0, 0 }, + { WM_MOUSEMOVE, sent|optional, 0, 0 }, { 0 } }; @@ -7348,9 +7348,9 @@ static const struct message auto_radio_button_VK_DOWN_dialog[] = { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO1, BN_CLICKED) }, - { WM_NCHITTEST, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ - { WM_SETCURSOR, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ - { WM_MOUSEMOVE, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_NCHITTEST, sent|optional, 0, 0 }, + { WM_SETCURSOR, sent|optional, 0, 0 }, + { WM_MOUSEMOVE, sent|optional, 0, 0 }, { WM_PAINT, sent }, { WM_CTLCOLORSTATIC, sent|parent }, { 0 } @@ -15675,7 +15675,7 @@ static const struct message WmCreateDialogParamSeq_1[] = { { WM_MOVE, sent }, { WM_SETFONT, sent }, { WM_INITDIALOG, sent }, - { WM_GETDLGCODE, sent|wparam|lparam|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_GETDLGCODE, sent|wparam|lparam|msg_todo, 0, 0 }, /* FIXME: Wine doesn't send it */ { HCBT_SETFOCUS, hook }, { HCBT_ACTIVATE, hook }, { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|msg_todo, 0, 0 },

1 0

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

24 May '24

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

Jacek Caban : gitlab: Use --enable-werror for Clang builds.
by Alexandre Julliard 24 May '24

24 May '24

Module: wine Branch: master Commit: b210a204137dec8d2126ca909d762454fd47e963 URL: https://gitlab.winehq.org/wine/wine/-/commit/b210a204137dec8d2126ca909d7624… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 24 13:33:59 2024 +0200 gitlab: Use --enable-werror for Clang builds. --- tools/gitlab/build-clang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gitlab/build-clang b/tools/gitlab/build-clang index a8bb41693f8..9f5a738448a 100755 --- a/tools/gitlab/build-clang +++ b/tools/gitlab/build-clang @@ -11,6 +11,6 @@ set -Eeuxo pipefail autoreconf -f cd build64 -../configure -q -C --enable-archs=i386,x86_64,aarch64 --with-mingw=clang +../configure -q -C --enable-werror --enable-archs=i386,x86_64,aarch64 --with-mingw=clang make -s -j$(nproc) cd ..

1 0

Alexandre Julliard : kernelbase: Fix the name of the default system locale.
by Alexandre Julliard 24 May '24

24 May '24

Module: wine Branch: master Commit: b9638ebc1c32a8828ec1c2f5dc156ef0bb9c3106 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9638ebc1c32a8828ec1c2f5dc156e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 11:13:11 2024 +0200 kernelbase: Fix the name of the default system locale. --- dlls/kernel32/tests/locale.c | 19 +++++++++++++------ dlls/kernelbase/locale.c | 9 +++++++++ include/winnls.h | 4 ++-- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index bebd857dfa4..5760d7c9eb1 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2964,9 +2964,9 @@ static void test_LocaleNameToLCID(void) buffer[0] = 0; SetLastError(0xdeadbeef); - lcid = pLocaleNameToLCID(LOCALE_NAME_SYSTEM_DEFAULT, 0); - ok(!lcid && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected lcid == 0, got %08lx, error %ld\n", lcid, GetLastError()); + lcid = LocaleNameToLCID(LOCALE_NAME_SYSTEM_DEFAULT, 0); + ok(lcid == GetSystemDefaultLCID(), + "Expected lcid == %08lx, got %08lx, error %ld\n", GetSystemDefaultLCID(), lcid, GetLastError()); ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); ok(ret > 0, "Expected ret > 0, got %d, error %ld\n", ret, GetLastError()); trace("%08lx, %s\n", lcid, wine_dbgstr_w(buffer)); @@ -5817,10 +5817,9 @@ static void test_ResolveLocaleName(void) { L"zz+XX", NULL }, { L"zz.XX", NULL }, { LOCALE_NAME_INVARIANT, L"" }, - { LOCALE_NAME_SYSTEM_DEFAULT, NULL }, }; INT i, ret; - WCHAR buffer[LOCALE_NAME_MAX_LENGTH]; + WCHAR buffer[LOCALE_NAME_MAX_LENGTH], system[LOCALE_NAME_MAX_LENGTH]; if (!pResolveLocaleName) { @@ -5831,7 +5830,7 @@ static void test_ResolveLocaleName(void) { SetLastError( 0xdeadbeef ); memset( buffer, 0xcc, sizeof(buffer) ); - ret = pResolveLocaleName( tests[i].name, buffer, sizeof(buffer) ); + ret = pResolveLocaleName( tests[i].name, buffer, ARRAY_SIZE(buffer) ); if (tests[i].exp) { ok( !wcscmp( buffer, tests[i].exp ) || broken( tests[i].broken ), @@ -5847,6 +5846,14 @@ static void test_ResolveLocaleName(void) "%s: wrong error %lu\n", debugstr_w(tests[i].name), GetLastError() ); } } + SetLastError( 0xdeadbeef ); + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pResolveLocaleName( LOCALE_NAME_SYSTEM_DEFAULT, buffer, ARRAY_SIZE(buffer) ); + ok( ret, "failed err %lu\n", GetLastError() ); + GetSystemDefaultLocaleName( system, ARRAY_SIZE(system) ); + ok( !wcscmp( buffer, system ), "got wrong syslocale %s / %s\n", debugstr_w(buffer), debugstr_w(system)); + ok( ret == wcslen(system) + 1, "wrong len %u / %Iu\n", ret, wcslen(system) + 1 ); + SetLastError( 0xdeadbeef ); ret = pResolveLocaleName( L"en-US", buffer, 4 ); ok( !ret, "got %u\n", ret ); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 44af29f163d..568f34d8979 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -648,6 +648,11 @@ static const NLS_LOCALE_DATA *get_locale_by_name( const WCHAR *name, LCID *lcid *lcid = user_lcid; return user_locale; } + if (name[0] == '!' && !compare_locale_names( name, LOCALE_NAME_SYSTEM_DEFAULT )) + { + *lcid = system_lcid; + return system_locale; + } if (!(entry = find_lcname_entry( name ))) return NULL; *lcid = entry->id; return get_locale_data( entry->idx ); @@ -671,6 +676,10 @@ static const struct sortguid *get_language_sort( const WCHAR *name ) if (current_locale_sort) return current_locale_sort; name = locale_strings + user_locale->sname + 1; } + else if (name[0] == '!' && !compare_locale_names( name, LOCALE_NAME_SYSTEM_DEFAULT )) + { + name = locale_strings + system_locale->sname + 1; + } if (!(entry = find_lcname_entry( name ))) { diff --git a/include/winnls.h b/include/winnls.h index 872fdcc3406..185a02a6bc4 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -336,9 +336,9 @@ static const WCHAR LOCALE_NAME_INVARIANT[] = { 0 }; #endif #if defined(_MSC_VER) || defined(__MINGW32__) -# define LOCALE_NAME_SYSTEM_DEFAULT L"!sys-default-locale" +# define LOCALE_NAME_SYSTEM_DEFAULT L"!x-sys-default-locale" #else -static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e','f','a','u','l','t','-','l','o','c','a','l','e',0}; +static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','x','-','s','y','s','-','d','e','f','a','u','l','t','-','l','o','c','a','l','e',0}; #endif #define LOCALE_NAME_USER_DEFAULT NULL

1 0