- Wine-Commits - list.winehq.org

Alexandre Julliard : dxtrans: Add correct C++ mangled names for all platforms.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: c6e4a6e8cda87c2bea3b2b3fb66e10f914d15c7a URL: https://gitlab.winehq.org/wine/wine/-/commit/c6e4a6e8cda87c2bea3b2b3fb66e10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 18:17:52 2024 +0200 dxtrans: Add correct C++ mangled names for all platforms. --- dlls/dxtrans/dxtrans.spec | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/dxtrans/dxtrans.spec b/dlls/dxtrans/dxtrans.spec index b8ff0297a1b..87396a9cb32 100644 --- a/dlls/dxtrans/dxtrans.spec +++ b/dlls/dxtrans/dxtrans.spec @@ -1,9 +1,21 @@ -@ stub ?DXConstOverArray@@YGXPAVDXPMSAMPLE@@ABV1(a)K@Z -@ stub ?DXConstUnderArray@@YGXPAVDXPMSAMPLE@@ABV1(a)K@Z -@ stub ?DXDitherArray@@YGXPBUDXDITHERDESC@@@Z -@ stub ?DXLinearInterpolateArray@@YGXPBVDXBASESAMPLE@@PAUDXLIMAPINFO@@PAV1(a)K@Z -@ stub ?DXOverArray@@YGXPAVDXPMSAMPLE@@PBV1(a)K@Z -@ stub ?DXOverArrayMMX@@YGXPAVDXPMSAMPLE@@PBV1(a)K@Z +@ stub -arch=arm ?DXConstOverArray@@YAXPAVDXPMSAMPLE@@ABV1(a)K@Z +@ stub -arch=i386 ?DXConstOverArray@@YGXPAVDXPMSAMPLE@@ABV1(a)K@Z +@ stub -arch=win64 ?DXConstOverArray@@YAXPEAVDXPMSAMPLE@@AEBV1(a)K@Z +@ stub -arch=arm ?DXConstUnderArray@@YAXPAVDXPMSAMPLE@@ABV1(a)K@Z +@ stub -arch=i386 ?DXConstUnderArray@@YGXPAVDXPMSAMPLE@@ABV1(a)K@Z +@ stub -arch=win64 ?DXConstUnderArray@@YAXPEAVDXPMSAMPLE@@AEBV1(a)K@Z +@ stub -arch=arm ?DXDitherArray@@YAXPBUDXDITHERDESC@@@Z +@ stub -arch=i386 ?DXDitherArray@@YGXPBUDXDITHERDESC@@@Z +@ stub -arch=win64 ?DXDitherArray@@YAXPEBUDXDITHERDESC@@@Z +@ stub -arch=arm ?DXLinearInterpolateArray@@YAXPBVDXBASESAMPLE@@PAUDXLIMAPINFO@@PAV1(a)K@Z +@ stub -arch=i386 ?DXLinearInterpolateArray@@YGXPBVDXBASESAMPLE@@PAUDXLIMAPINFO@@PAV1(a)K@Z +@ stub -arch=win64 ?DXLinearInterpolateArray@@YAXPEBVDXBASESAMPLE@@PEAUDXLIMAPINFO@@PEAV1(a)K@Z +@ stub -arch=arm ?DXOverArray@@YAXPAVDXPMSAMPLE@@PBV1(a)K@Z +@ stub -arch=i386 ?DXOverArray@@YGXPAVDXPMSAMPLE@@PBV1(a)K@Z +@ stub -arch=win64 ?DXOverArray@@YAXPEAVDXPMSAMPLE@@PEBV1(a)K@Z +@ stub -arch=arm ?DXOverArrayMMX@@YAXPAVDXPMSAMPLE@@PBV1(a)K@Z +@ stub -arch=i386 ?DXOverArrayMMX@@YGXPAVDXPMSAMPLE@@PBV1(a)K@Z +@ stub -arch=win64 ?DXOverArrayMMX@@YAXPEAVDXPMSAMPLE@@PEBV1(a)K@Z @ stdcall -private DllCanUnloadNow() @ stub DllEnumClassObjects @ stdcall -private DllGetClassObject(ptr ptr ptr)

1 0

Alexandre Julliard : msmpeg2vdec: Add correct C++ mangled names for all platforms.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 69125808c74ab1a630354553e84b078d80ebe3f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/69125808c74ab1a630354553e84b07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 18:19:52 2024 +0200 msmpeg2vdec: Add correct C++ mangled names for all platforms. --- dlls/msmpeg2vdec/msmpeg2vdec.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msmpeg2vdec/msmpeg2vdec.spec b/dlls/msmpeg2vdec/msmpeg2vdec.spec index b81b77ce108..f8c37779585 100644 --- a/dlls/msmpeg2vdec/msmpeg2vdec.spec +++ b/dlls/msmpeg2vdec/msmpeg2vdec.spec @@ -1,7 +1,13 @@ @ stub GetH264DecoderFunctionTable -@ stub ?GetSurface(a)CVIDEOfilter@@QEAAJHPEAEJ(a)Z -@ stub ?GetSurfaceSize(a)CVIDEOfilter@@QEAAJHPEAJ(a)Z -@ stub ?LoadSurface(a)CVIDEOfilter@@QEAAJHPEAEK(a)Z +@ stub -arch=arm ?GetSurface(a)CVIDEOfilter@@QAAJHPAEJ(a)Z +@ stub -arch=i386 ?GetSurface(a)CVIDEOfilter@@QAEJHPAEJ(a)Z +@ stub -arch=win64 ?GetSurface(a)CVIDEOfilter@@QEAAJHPEAEJ(a)Z +@ stub -arch=arm ?GetSurfaceSize(a)CVIDEOfilter@@QAAJHPAJ(a)Z +@ stub -arch=i386 ?GetSurfaceSize(a)CVIDEOfilter@@QAEJHPAJ(a)Z +@ stub -arch=win64 ?GetSurfaceSize(a)CVIDEOfilter@@QEAAJHPEAJ(a)Z +@ stub -arch=arm ?LoadSurface(a)CVIDEOfilter@@QAAJHPAEK(a)Z +@ stub -arch=i386 ?LoadSurface(a)CVIDEOfilter@@QAEJHPAEK(a)Z +@ stub -arch=win64 ?LoadSurface(a)CVIDEOfilter@@QEAAJHPEAEK(a)Z @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer()

1 0

Alexandre Julliard : msvcrt: Fix bad_cast_copy_ctor spec entry on ARM.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 39cdf5d78ea2e5f11e3b71812ec583c8b1290709 URL: https://gitlab.winehq.org/wine/wine/-/commit/39cdf5d78ea2e5f11e3b71812ec583… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 26 21:56:13 2024 +0200 msvcrt: Fix bad_cast_copy_ctor spec entry on ARM. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 010d222d665..55002757da9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -83,7 +83,7 @@ @ cdecl -arch=arm ??0bad_cast(a)std@@AAA(a)PBQBD@Z(ptr ptr) bad_cast_ctor @ thiscall -arch=i386 ??0bad_cast(a)std@@AAE(a)PBQBD@Z(ptr ptr) bad_cast_ctor @ cdecl -arch=win64 ??0bad_cast(a)std@@AEAA(a)PEBQEBD@Z(ptr ptr) bad_cast_ctor -@ cdecl -arch=arm ??0bad_cast(a)std@@QAA(a)ABV01@@Z(ptr ptr) bad_cast_ctor +@ cdecl -arch=arm ??0bad_cast(a)std@@QAA(a)ABV01@@Z(ptr ptr) bad_cast_copy_ctor @ thiscall -arch=i386 ??0bad_cast(a)std@@QAE(a)ABV01@@Z(ptr ptr) bad_cast_copy_ctor @ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) bad_cast_copy_ctor @ cdecl -arch=arm ??0bad_cast(a)std@@QAA(a)PBD@Z(ptr str) bad_cast_ctor_charptr diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index caddf750038..2062989fb47 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -80,7 +80,7 @@ @ cdecl -arch=arm ??0bad_cast(a)std@@AAA(a)PBQBD@Z(ptr ptr) bad_cast_ctor @ thiscall -arch=i386 ??0bad_cast(a)std@@AAE(a)PBQBD@Z(ptr ptr) bad_cast_ctor @ cdecl -arch=win64 ??0bad_cast(a)std@@AEAA(a)PEBQEBD@Z(ptr ptr) bad_cast_ctor -@ cdecl -arch=arm ??0bad_cast(a)std@@QAA(a)ABV01@@Z(ptr ptr) bad_cast_ctor +@ cdecl -arch=arm ??0bad_cast(a)std@@QAA(a)ABV01@@Z(ptr ptr) bad_cast_copy_ctor @ thiscall -arch=i386 ??0bad_cast(a)std@@QAE(a)ABV01@@Z(ptr ptr) bad_cast_copy_ctor @ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) bad_cast_copy_ctor @ cdecl -arch=arm ??0bad_cast(a)std@@QAA(a)PBD@Z(ptr str) bad_cast_ctor_charptr diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0cd2ad6da89..a96c1b6a902 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -13,7 +13,7 @@ @ cdecl -arch=arm ??0bad_cast@@QAA(a)ABQBD@Z(ptr ptr) bad_cast_ctor @ thiscall -arch=i386 ??0bad_cast@@QAE(a)ABQBD@Z(ptr ptr) bad_cast_ctor @ cdecl -arch=win64 ??0bad_cast@@QEAA(a)AEBQEBD@Z(ptr ptr) bad_cast_ctor -@ cdecl -arch=arm ??0bad_cast@@QAA(a)ABV0@@Z(ptr ptr) bad_cast_ctor +@ cdecl -arch=arm ??0bad_cast@@QAA(a)ABV0@@Z(ptr ptr) bad_cast_copy_ctor @ thiscall -arch=i386 ??0bad_cast@@QAE(a)ABV0@@Z(ptr ptr) bad_cast_copy_ctor @ cdecl -arch=win64 ??0bad_cast@@QEAA(a)AEBV0@@Z(ptr ptr) bad_cast_copy_ctor @ cdecl -arch=arm ??0bad_cast@@QAA(a)PBD@Z(ptr str) bad_cast_ctor_charptr diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 0c0f8570fbc..c1d454c56c7 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -6,9 +6,11 @@ @ thiscall -arch=i386 ??0__non_rtti_object@@QAE(a)PBD@Z(ptr ptr) __non_rtti_object_ctor @ cdecl -arch=win64 ??0__non_rtti_object@@QEAA(a)PEBD@Z(ptr ptr) __non_rtti_object_ctor @ thiscall -arch=win32 ??0bad_cast@@QAE(a)ABQBD@Z(ptr ptr) bad_cast_ctor +@ cdecl -arch=win64 ??0bad_cast@@QEAA(a)AEBQEBD@Z(ptr ptr) bad_cast_ctor @ cdecl -arch=win64 ??0bad_cast@@AEAA(a)PEBQEBD@Z(ptr ptr) bad_cast_ctor +@ cdecl -arch=arm ??0bad_cast@@QAA(a)ABV0@@Z(ptr ptr) bad_cast_copy_ctor @ thiscall -arch=i386 ??0bad_cast@@QAE(a)ABV0@@Z(ptr ptr) bad_cast_copy_ctor -@ cdecl -arch=win64 ??0bad_cast@@QEAA(a)AEBQEBD@Z(ptr ptr) bad_cast_ctor +@ cdecl -arch=win64 ??0bad_cast@@QEAA(a)AEBV0@@Z(ptr ptr) bad_cast_copy_ctor @ thiscall -arch=i386 ??0bad_typeid@@QAE(a)ABV0@@Z(ptr ptr) bad_typeid_copy_ctor @ cdecl -arch=win64 ??0bad_typeid@@QEAA(a)AEBV0@@Z(ptr ptr) bad_typeid_copy_ctor @ thiscall -arch=i386 ??0bad_typeid@@QAE(a)PBD@Z(ptr str) bad_typeid_ctor

1 0

Alexandre Julliard : vssapi: Add correct C++ mangled names for all platforms.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 1fec2db82d44a80ce6b845d558af7722a04f64ff URL: https://gitlab.winehq.org/wine/wine/-/commit/1fec2db82d44a80ce6b845d558af77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 18:07:18 2024 +0200 vssapi: Add correct C++ mangled names for all platforms. --- dlls/vssapi/vssapi.spec | 253 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 190 insertions(+), 63 deletions(-)

1 0

Alexandre Julliard : adsldpc: Add correct C++ mangled names for all platforms.
by Alexandre Julliard May 27, 2024

May 27, 2024

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(a)XZ -@ stub ??1CLexer@@QAE(a)XZ +@ stub -arch=arm ??0CLexer@@QAA(a)XZ +@ stub -arch=i386 ??0CLexer@@QAE(a)XZ +@ stub -arch=win64 ??0CLexer@@QEAA(a)XZ +@ stub -arch=arm ??1CLexer@@QAA(a)XZ +@ stub -arch=i386 ??1CLexer@@QAE(a)XZ +@ stub -arch=win64 ??1CLexer@@QEAA(a)XZ @ stub ADSIPrint @ stub ADsAbandonSearch @ stub ADsCloseSearchHandle @@ -53,11 +57,15 @@ @ stub GetDisplayName @ stub GetDomainDNSNameForDomain @ stub GetLDAPTypeName -@ stub ?GetNextToken(a)CLexer@@QAEJPAGPAK(a)Z +@ stub -arch=arm ?GetNextToken(a)CLexer@@QAAJPAGPAK(a)Z +@ stub -arch=i386 ?GetNextToken(a)CLexer@@QAEJPAGPAK(a)Z +@ stub -arch=win64 ?GetNextToken(a)CLexer@@QEAAJPEAGPEAK(a)Z @ stub GetServerAndPort @ stub GetSyntaxOfAttribute @ stub InitObjectInfo -@ stub ?InitializePath(a)CLexer@@QAEJPAG(a)Z +@ stub -arch=arm ?InitializePath(a)CLexer@@QAAJPAG(a)Z +@ stub -arch=i386 ?InitializePath(a)CLexer@@QAEJPAG(a)Z +@ stub -arch=win64 ?InitializePath(a)CLexer@@QEAAJPEAG(a)Z @ stub IsGCNamespace @ stub LdapAddExtS @ stub LdapAddS @@ -136,9 +144,15 @@ @ stub SchemaGetSyntaxOfAttribute @ stub SchemaIsClassAContainer @ stub SchemaOpen -@ stub ?SetAtDisabler(a)CLexer@@QAEXH(a)Z -@ stub ?SetExclaimnationDisabler(a)CLexer@@QAEXH(a)Z -@ stub ?SetFSlashDisabler(a)CLexer@@QAEXH(a)Z +@ stub -arch=arm ?SetAtDisabler(a)CLexer@@QAAXH(a)Z +@ stub -arch=i386 ?SetAtDisabler(a)CLexer@@QAEXH(a)Z +@ stub -arch=win64 ?SetAtDisabler(a)CLexer@@QEAAXH(a)Z +@ stub -arch=arm ?SetExclaimnationDisabler(a)CLexer@@QAAXH(a)Z +@ stub -arch=i386 ?SetExclaimnationDisabler(a)CLexer@@QAEXH(a)Z +@ stub -arch=win64 ?SetExclaimnationDisabler(a)CLexer@@QEAAXH(a)Z +@ stub -arch=arm ?SetFSlashDisabler(a)CLexer@@QAAXH(a)Z +@ stub -arch=i386 ?SetFSlashDisabler(a)CLexer@@QAEXH(a)Z +@ stub -arch=win64 ?SetFSlashDisabler(a)CLexer@@QEAAXH(a)Z @ stub SortAndRemoveDuplicateOIDs @ stub UnMarshallLDAPToLDAPSynID @ stub intcmp

1 0

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

May 24, 2024

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

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

May 24, 2024

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

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

May 24, 2024

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

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

May 24, 2024

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

May 24, 2024

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