winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
May 2024
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
705 discussions
Start a n
N
ew thread
Alexandre Julliard : adsldpc: Add correct C++ mangled names for all platforms.
by Alexandre Julliard
27 May '24
27 May '24
Module: wine Branch: master Commit: 2dad131c5ec385886038c6a3688094f09d456132 URL:
https://gitlab.winehq.org/wine/wine/-/commit/2dad131c5ec385886038c6a3688094…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 18:14:20 2024 +0200 adsldpc: Add correct C++ mangled names for all platforms. --- dlls/adsldpc/adsldpc.spec | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/adsldpc/adsldpc.spec b/dlls/adsldpc/adsldpc.spec index 6b14e474a23..5941520a0aa 100644 --- a/dlls/adsldpc/adsldpc.spec +++ b/dlls/adsldpc/adsldpc.spec @@ -1,5 +1,9 @@ -@ stub ??0CLexer@@QAE@XZ -@ stub ??1CLexer@@QAE@XZ +@ stub -arch=arm ??0CLexer@@QAA@XZ +@ stub -arch=i386 ??0CLexer@@QAE@XZ +@ stub -arch=win64 ??0CLexer@@QEAA@XZ +@ stub -arch=arm ??1CLexer@@QAA@XZ +@ stub -arch=i386 ??1CLexer@@QAE@XZ +@ stub -arch=win64 ??1CLexer@@QEAA@XZ @ stub ADSIPrint @ stub ADsAbandonSearch @ stub ADsCloseSearchHandle @@ -53,11 +57,15 @@ @ stub GetDisplayName @ stub GetDomainDNSNameForDomain @ stub GetLDAPTypeName -@ stub ?GetNextToken@CLexer@@QAEJPAGPAK@Z +@ stub -arch=arm ?GetNextToken@CLexer@@QAAJPAGPAK@Z +@ stub -arch=i386 ?GetNextToken@CLexer@@QAEJPAGPAK@Z +@ stub -arch=win64 ?GetNextToken@CLexer@@QEAAJPEAGPEAK@Z @ stub GetServerAndPort @ stub GetSyntaxOfAttribute @ stub InitObjectInfo -@ stub ?InitializePath@CLexer@@QAEJPAG@Z +@ stub -arch=arm ?InitializePath@CLexer@@QAAJPAG@Z +@ stub -arch=i386 ?InitializePath@CLexer@@QAEJPAG@Z +@ stub -arch=win64 ?InitializePath@CLexer@@QEAAJPEAG@Z @ stub IsGCNamespace @ stub LdapAddExtS @ stub LdapAddS @@ -136,9 +144,15 @@ @ stub SchemaGetSyntaxOfAttribute @ stub SchemaIsClassAContainer @ stub SchemaOpen -@ stub ?SetAtDisabler@CLexer@@QAEXH@Z -@ stub ?SetExclaimnationDisabler@CLexer@@QAEXH@Z -@ stub ?SetFSlashDisabler@CLexer@@QAEXH@Z +@ stub -arch=arm ?SetAtDisabler@CLexer@@QAAXH@Z +@ stub -arch=i386 ?SetAtDisabler@CLexer@@QAEXH@Z +@ stub -arch=win64 ?SetAtDisabler@CLexer@@QEAAXH@Z +@ stub -arch=arm ?SetExclaimnationDisabler@CLexer@@QAAXH@Z +@ stub -arch=i386 ?SetExclaimnationDisabler@CLexer@@QAEXH@Z +@ stub -arch=win64 ?SetExclaimnationDisabler@CLexer@@QEAAXH@Z +@ stub -arch=arm ?SetFSlashDisabler@CLexer@@QAAXH@Z +@ stub -arch=i386 ?SetFSlashDisabler@CLexer@@QAEXH@Z +@ stub -arch=win64 ?SetFSlashDisabler@CLexer@@QEAAXH@Z @ stub SortAndRemoveDuplicateOIDs @ stub UnMarshallLDAPToLDAPSynID @ stub intcmp
1
0
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
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(¤t_format, stream->desired_caps); + ret = wg_format_compare(&format, ¤t_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
0
0
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
0
0
← Newer
1
...
14
15
16
17
18
19
20
...
71
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
Results per page:
10
25
50
100
200