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

Alexandre Julliard : rpcss: Use fully interpreted IDL stubs.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: 3f4562e7e1a9118b01b894c7e35f29babc458e35 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f4562e7e1a9118b01b894c7e35f29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:20:15 2024 +0200 rpcss: Use fully interpreted IDL stubs. --- programs/rpcss/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in index e643f66f38d..92c88324232 100644 --- a/programs/rpcss/Makefile.in +++ b/programs/rpcss/Makefile.in @@ -2,6 +2,7 @@ MODULE = rpcss.exe IMPORTS = rpcrt4 advapi32 EXTRADLLFLAGS = -mconsole -municode +EXTRAIDLFLAGS = -Oicf SOURCES = \ epm.idl \

1 0

Alexandre Julliard : services: Use fully interpreted IDL stubs.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: cc038c1a40c5c1a885ed0be6b7daa2a0b6b08f75 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc038c1a40c5c1a885ed0be6b7daa2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:20:24 2024 +0200 services: Use fully interpreted IDL stubs. --- programs/services/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/services/Makefile.in b/programs/services/Makefile.in index c314b467d0a..a10fae8622d 100644 --- a/programs/services/Makefile.in +++ b/programs/services/Makefile.in @@ -2,6 +2,7 @@ MODULE = services.exe IMPORTS = rpcrt4 advapi32 userenv setupapi EXTRADLLFLAGS = -mwindows +EXTRAIDLFLAGS = -Oicf SOURCES = \ rpc.c \

1 0

Alexandre Julliard : ntdll/tests: Remove unnecessary shared header.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: 6f4c2b7f5ae9f18de37bf3fb4c0cb8ced2291f07 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f4c2b7f5ae9f18de37bf3fb4c0cb8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 23:02:02 2024 +0200 ntdll/tests: Remove unnecessary shared header. And remove some duplicate includes. --- dlls/ntdll/tests/env.c | 10 ++++++++-- dlls/ntdll/tests/generated.c | 7 ++++++- dlls/ntdll/tests/info.c | 21 ++++++++++++++------- dlls/ntdll/tests/large_int.c | 10 ++++++++-- dlls/ntdll/tests/ntdll_test.h | 32 -------------------------------- dlls/ntdll/tests/om.c | 13 +++++++++---- dlls/ntdll/tests/path.c | 9 ++++++++- dlls/ntdll/tests/reg.c | 16 +++++++++++----- dlls/ntdll/tests/rtl.c | 11 +++++++++-- dlls/ntdll/tests/rtlbitmap.c | 9 ++++++++- dlls/ntdll/tests/rtlstr.c | 8 +++++++- dlls/ntdll/tests/string.c | 8 +++++++- dlls/ntdll/tests/thread.c | 9 ++++++++- dlls/ntdll/tests/threadpool.c | 9 ++++++++- dlls/ntdll/tests/time.c | 9 ++++++++- dlls/ntdll/tests/wow64.c | 9 ++++++++- 16 files changed, 127 insertions(+), 63 deletions(-)

1 0

Akihiro Sagawa : quartz/tests: Add tests to reject unsupported contents for MPEG splitter.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 953af3af5f6fbd9ca7b4bcc350260e95a26bf242 URL: https://gitlab.winehq.org/wine/wine/-/commit/953af3af5f6fbd9ca7b4bcc350260e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 22 23:35:28 2024 +0900 quartz/tests: Add tests to reject unsupported contents for MPEG splitter. --- dlls/quartz/tests/mpegsplit.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 73d021b6297..c44eeb0dff5 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -2120,6 +2120,49 @@ static void test_video_file(void) ok(ret, "Failed to delete file, error %lu.\n", GetLastError()); } +static void test_no_acceptable_type(void) +{ + const WCHAR *filename = load_resource(L"test.wav"); + IBaseFilter *splitter = create_mpeg_splitter(); + IFileSourceFilter *filesource; + IFilterGraph2 *graph; + IBaseFilter *reader; + IPin *source, *sink; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&reader); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IBaseFilter_QueryInterface(reader, &IID_IFileSourceFilter, (void **)&filesource); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IFileSourceFilter_Load(filesource, filename, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IFilterGraph2_AddFilter(graph, reader, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IFilterGraph2_AddFilter(graph, splitter, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IBaseFilter_FindPin(splitter, L"Input", &sink); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IBaseFilter_FindPin(reader, L"Output", &source); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, source, sink, NULL); + todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#lx.\n", hr); + + IPin_Release(source); + IPin_Release(sink); + IBaseFilter_Release(reader); + IBaseFilter_Release(splitter); + IFileSourceFilter_Release(filesource); + IFilterGraph2_Release(graph); + DeleteFileW(filename); +} + START_TEST(mpegsplit) { IBaseFilter *filter; @@ -2147,6 +2190,7 @@ START_TEST(mpegsplit) test_streaming(); test_large_file(); test_video_file(); + test_no_acceptable_type(); CoUninitialize(); }

1 0

Akihiro Sagawa : winegstreamer: Reject unexpected formats on init.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 486f89b97d1c6a75a9558ed52da8ef9a5e1e88a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/486f89b97d1c6a75a9558ed52da8ef… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 22 23:55:02 2024 +0900 winegstreamer: Reject unexpected formats on init. --- dlls/quartz/tests/mpegsplit.c | 2 +- dlls/winegstreamer/quartz_parser.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index c44eeb0dff5..9e29dc1a54e 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -2152,7 +2152,7 @@ static void test_no_acceptable_type(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IFilterGraph2_ConnectDirect(graph, source, sink, NULL); - todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#lx.\n", hr); + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#lx.\n", hr); IPin_Release(source); IPin_Release(sink); diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index a64a906d4b8..c8f72a42c73 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -2387,7 +2387,11 @@ static BOOL mpeg_splitter_filter_init_gst(struct parser *filter) if (!create_pin(filter, wg_parser_get_stream(parser, i), L"Audio")) return FALSE; } - else FIXME("unexpected format %u\n", fmt.major_type); + else + { + TRACE("unexpected format %u\n", fmt.major_type); + return FALSE; + } } return TRUE;

1 0

Akihiro Sagawa : winegstreamer: Implement input media type enumeration in MPEG splitter.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 545b1c67b58d08d2e4bab40049cb20dd5ecfe8ad URL: https://gitlab.winehq.org/wine/wine/-/commit/545b1c67b58d08d2e4bab40049cb20… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Mar 31 21:02:37 2024 +0900 winegstreamer: Implement input media type enumeration in MPEG splitter. --- dlls/quartz/tests/mpegsplit.c | 75 +++++++++++++++----------------------- dlls/winegstreamer/quartz_parser.c | 23 ++++++++++++ 2 files changed, 53 insertions(+), 45 deletions(-) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 9e29dc1a54e..8fd0202c58e 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -556,40 +556,28 @@ static void test_media_types(void) expect_mt.lSampleSize = 1; hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); expect_mt.subtype = MEDIASUBTYPE_MPEG1System; - if (hr == S_OK) - { - ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); - CoTaskMemFree(pmt); - } + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); expect_mt.subtype = MEDIASUBTYPE_MPEG1VideoCD; - if (hr == S_OK) - { - ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); - CoTaskMemFree(pmt); - } + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); expect_mt.subtype = MEDIASUBTYPE_MPEG1Video; - if (hr == S_OK) - { - ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); - CoTaskMemFree(pmt); - } + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); expect_mt.subtype = MEDIASUBTYPE_MPEG1Audio; - if (hr == S_OK) - { - ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); - CoTaskMemFree(pmt); - } + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); @@ -655,13 +643,10 @@ static void test_media_types(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); expect_mt.subtype = MEDIASUBTYPE_MPEG1System; - if (hr == S_OK) - { - ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); - CoTaskMemFree(pmt); - } + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); IEnumMediaTypes_Release(enummt); IPin_Release(pin); @@ -866,8 +851,8 @@ static void test_enum_media_types(void) for (i = 0; i < 4; ++i) { hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr == S_OK) CoTaskMemFree(mts[0]); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + CoTaskMemFree(mts[0]); } hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); @@ -879,9 +864,9 @@ static void test_enum_media_types(void) for (i = 0; i < 4; ++i) { hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(count == 1, "Got count %lu.\n", count); - if (hr == S_OK) CoTaskMemFree(mts[0]); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 1, "Got count %lu.\n", count); + CoTaskMemFree(mts[0]); } hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); @@ -892,16 +877,16 @@ static void test_enum_media_types(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumMediaTypes_Next(enum1, 2, mts, &count); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(count == 2, "Got count %lu.\n", count); - if (count > 0) CoTaskMemFree(mts[0]); - if (count > 1) CoTaskMemFree(mts[1]); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 2, "Got count %lu.\n", count); + CoTaskMemFree(mts[0]); + CoTaskMemFree(mts[1]); hr = IEnumMediaTypes_Next(enum1, 3, mts, &count); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); - todo_wine ok(count == 2, "Got count %lu.\n", count); - if (count > 0) CoTaskMemFree(mts[0]); - if (count > 1) CoTaskMemFree(mts[1]); + ok(count == 2, "Got count %lu.\n", count); + CoTaskMemFree(mts[0]); + CoTaskMemFree(mts[1]); hr = IEnumMediaTypes_Next(enum1, 2, mts, &count); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); @@ -923,7 +908,7 @@ static void test_enum_media_types(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumMediaTypes_Skip(enum1, 4); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumMediaTypes_Skip(enum1, 1); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); @@ -932,8 +917,8 @@ static void test_enum_media_types(void) ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr == S_OK) CoTaskMemFree(mts[0]); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + CoTaskMemFree(mts[0]); IEnumMediaTypes_Release(enum1); IEnumMediaTypes_Release(enum2); diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index c8f72a42c73..32eb6e1a4a0 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -2358,9 +2358,32 @@ static HRESULT mpeg_splitter_sink_query_accept(struct strmbase_pin *iface, const return S_FALSE; } +static HRESULT mpeg_splitter_sink_get_media_type(struct strmbase_pin *pin, + unsigned int index, AM_MEDIA_TYPE *mt) +{ + static const GUID* const subtypes[] = { + &MEDIASUBTYPE_MPEG1System, + &MEDIASUBTYPE_MPEG1VideoCD, + &MEDIASUBTYPE_MPEG1Video, + &MEDIASUBTYPE_MPEG1Audio, + }; + if (index >= ARRAY_SIZE(subtypes)) + return S_FALSE; + + memset(mt, 0, sizeof(*mt)); + mt->majortype = MEDIATYPE_Stream; + mt->subtype = *subtypes[index]; + mt->bFixedSizeSamples = TRUE; + mt->bTemporalCompression = TRUE; + mt->lSampleSize = 1; + + return S_OK; +} + static const struct strmbase_sink_ops mpeg_splitter_sink_ops = { .base.pin_query_accept = mpeg_splitter_sink_query_accept, + .base.pin_get_media_type = mpeg_splitter_sink_get_media_type, .sink_connect = parser_sink_connect, .sink_disconnect = parser_sink_disconnect, };

1 0

Alistair Leslie-Hughes : include: Add atldef.h.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: c81c6fca50fcbd93fb54f4a3417630bb081578ff URL: https://gitlab.winehq.org/wine/wine/-/commit/c81c6fca50fcbd93fb54f4a3417630… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 30 09:37:34 2019 +1000 include: Add atldef.h. --- include/Makefile.in | 1 + include/atldef.h | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 80c380d993c..fa8c096eabd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -28,6 +28,7 @@ SOURCES = \ asysta.idl \ atlbase.h \ atlcom.h \ + atldef.h \ atliface.idl \ atlthunk.h \ atlwin.h \ diff --git a/include/atldef.h b/include/atldef.h new file mode 100644 index 00000000000..700aded1137 --- /dev/null +++ b/include/atldef.h @@ -0,0 +1,129 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __ATLDEF_H__ +#define __ATLDEF_H__ + + +#include "sal.h" + +#ifndef _ATL_USE_WINAPI_FAMILY_DESKTOP_APP +#define _ATL_USE_WINAPI_FAMILY_DESKTOP_APP +#endif + +#ifndef ATLPREFAST_SUPPRESS +#define ATLPREFAST_SUPPRESS(x) +#endif + +#ifndef ATLPREFAST_UNSUPPRESS +#define ATLPREFAST_UNSUPPRESS(x) +#endif + +#ifndef ATLASSERT +#define ATLASSERT(x) +#endif + +#ifndef ATLASSUME +#define ATLASSUME(x) +#endif + +#ifndef ATLENSURE +#define ATLENSURE(expr) +#endif + +#define ATL_NOINLINE + +#define _ATL_DECLSPEC_ALLOCATOR + +#ifndef _FormatMessage_format_string_ +#define _FormatMessage_format_string_ +#endif + +#define ATLAPI HRESULT __stdcall +#define ATLAPI_(x) x __stdcall +#define ATLINLINE inline + +/* Belongs elsewhere */ +#define ATLTRACE(...) + +#define ATL_MAKEINTRESOURCEA(i) ((LPSTR)((ULONG_PTR)((WORD)(i)))) +#define ATL_MAKEINTRESOURCEW(i) ((LPWSTR)((ULONG_PTR)((WORD)(i)))) +#ifndef RC_INVOKED +# ifdef WINE_NO_UNICODE_MACROS /* force using a cast */ +# define ATL_MAKEINTRESOURCE(i) ((ULONG_PTR)((WORD)(i))) +# else +# define ATL_MAKEINTRESOURCE WINELIB_NAME_AW(ATL_MAKEINTRESOURCE) +# endif +#endif + +#define ATL_IS_INTRESOURCE(x) (((ULONG_PTR)(x) >> 16) == 0) + +#define ATL_RT_CURSOR ATL_MAKEINTRESOURCEA(1) +#define ATL_RT_BITMAP ATL_MAKEINTRESOURCEA(2) +#define ATL_RT_ICON ATL_MAKEINTRESOURCEA(3) +#define ATL_RT_MENU ATL_MAKEINTRESOURCEA(4) +#define ATL_RT_DIALOG ATL_MAKEINTRESOURCEA(5) +#define ATL_RT_STRING ATL_MAKEINTRESOURCEA(6) +#define ATL_RT_FONTDIR ATL_MAKEINTRESOURCEA(7) +#define ATL_RT_FONT ATL_MAKEINTRESOURCEA(8) +#define ATL_RT_ACCELERATOR ATL_MAKEINTRESOURCEA(9) +#define ATL_RT_RCDATA ATL_MAKEINTRESOURCEA(10) +#define ATL_RT_MESSAGETABLE ATL_MAKEINTRESOURCEA(11) + +#define ATL_DIFFERENCE 11 +#define ATL_RT_GROUP_CURSOR ATL_MAKEINTRESOURCEW((ULONG_PTR)ATL_RT_CURSOR + ATL_DIFFERENCE) +#define ATL_RT_GROUP_ICON ATL_MAKEINTRESOURCEW((ULONG_PTR)ATL_RT_ICON + ATL_DIFFERENCE) +#define ATL_RT_VERSION ATL_MAKEINTRESOURCEA(16) +#define ATL_RT_DLGINCLUDE ATL_MAKEINTRESOURCEA(17) +#define ATL_RT_PLUGPLAY ATL_MAKEINTRESOURCEA(19) +#define ATL_RT_VXD ATL_MAKEINTRESOURCEA(20) +#define ATL_RT_ANICURSOR ATL_MAKEINTRESOURCEA(21) +#define ATL_RT_ANIICON ATL_MAKEINTRESOURCEA(22) +#define ATL_RT_HTML ATL_MAKEINTRESOURCEA(23) + +#ifndef AtlThrow +#ifndef _ATL_CUSTOM_THROW +#define AtlThrow ATL::AtlThrowImpl +#endif +#endif + +#ifdef __cplusplus + +template < typename T > +inline T* SAL_Assume_bytecap_for_opt_(T* buf, size_t dwLen) +{ + return buf; +} + +namespace ATL +{ + template <typename T> + inline T* SAL_Assume_notnull_for_opt_z_(T* buf) + { + ATLASSUME(buf!=0); + return buf; + } + +#ifndef _ATL_CUSTOM_THROW + ATL_NOINLINE DECLSPEC_NORETURN inline void WINAPI AtlThrowImpl(_In_ HRESULT hr); +#endif + ATL_NOINLINE DECLSPEC_NORETURN inline void WINAPI AtlThrowLastWin32(); +} + +#endif + +#endif /* __ATLDEF_H__ */

1 0

Rémi Bernon : win32u: Introduce a distinct vulkan interface between win32u and the user drivers.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 46713b03a79138dc93f46792a5841d22d300b71c URL: https://gitlab.winehq.org/wine/wine/-/commit/46713b03a79138dc93f46792a5841d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 24 12:54:14 2024 +0100 win32u: Introduce a distinct vulkan interface between win32u and the user drivers. --- dlls/win32u/driver.c | 6 ++-- dlls/win32u/vulkan.c | 73 ++++++++++++++++++++++++++++++++++----- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/vulkan.c | 33 ++++++++---------- dlls/winewayland.drv/vulkan.c | 51 +++++++++++++-------------- dlls/winewayland.drv/waylanddrv.h | 2 +- dlls/winex11.drv/vulkan.c | 33 ++++++++---------- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 4 ++- include/wine/vulkan_driver.h | 12 ++++++- 10 files changed, 140 insertions(+), 78 deletions(-)

1 0

Rémi Bernon : win32u: Introduce a new VkSurfaceKHR wrapping structure.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: d054ccc8a3ec83100dc69109042cb2d9c388ce7b URL: https://gitlab.winehq.org/wine/wine/-/commit/d054ccc8a3ec83100dc69109042cb2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 24 11:06:44 2024 +0200 win32u: Introduce a new VkSurfaceKHR wrapping structure. --- dlls/win32u/vulkan.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 9c02e72b0d7..8d63e8bbd14 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -48,6 +48,54 @@ static VkResult (*p_vkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *); static void *(*p_vkGetDeviceProcAddr)(VkDevice, const char *); static void *(*p_vkGetInstanceProcAddr)(VkInstance, const char *); +struct surface +{ + VkSurfaceKHR host_surface; + VkSurfaceKHR driver_surface; +}; + +static inline struct surface *surface_from_handle( VkSurfaceKHR handle ) +{ + return (struct surface *)(uintptr_t)handle; +} + +static inline VkSurfaceKHR surface_to_handle( struct surface *surface ) +{ + return (VkSurfaceKHR)(uintptr_t)surface; +} + +static VkResult win32u_vkCreateWin32SurfaceKHR( VkInstance instance, const VkWin32SurfaceCreateInfoKHR *info, + const VkAllocationCallbacks *allocator, VkSurfaceKHR *handle ) +{ + struct surface *surface; + VkResult res; + + TRACE( "instance %p, info %p, allocator %p, handle %p\n", instance, info, allocator, handle ); + if (allocator) FIXME( "Support for allocation callbacks not implemented yet\n" ); + + if (!(surface = calloc( 1, sizeof(*surface) ))) return VK_ERROR_OUT_OF_HOST_MEMORY; + if ((res = driver_funcs->p_vkCreateWin32SurfaceKHR( instance, info, NULL /* allocator */, &surface->driver_surface ))) + { + free( surface ); + return res; + } + + surface->host_surface = driver_funcs->p_wine_get_host_surface( surface->driver_surface ); + *handle = surface_to_handle( surface ); + return VK_SUCCESS; +} + +static void win32u_vkDestroySurfaceKHR( VkInstance instance, VkSurfaceKHR handle, const VkAllocationCallbacks *allocator ) +{ + struct surface *surface = surface_from_handle( handle ); + + TRACE( "instance %p, handle 0x%s, allocator %p\n", instance, wine_dbgstr_longlong(handle), allocator ); + if (allocator) FIXME( "Support for allocation callbacks not implemented yet\n" ); + + driver_funcs->p_vkDestroySurfaceKHR( instance, surface->driver_surface, NULL /* allocator */ ); + free( surface ); +} + static VkResult win32u_vkQueuePresentKHR( VkQueue queue, const VkPresentInfoKHR *present_info, HWND *surfaces ) { VkPresentInfoKHR host_present_info = *present_info; @@ -95,11 +143,20 @@ static void *win32u_vkGetInstanceProcAddr( VkInstance instance, const char *name return p_vkGetInstanceProcAddr( instance, name ); } +static VkSurfaceKHR win32u_wine_get_host_surface( VkSurfaceKHR handle ) +{ + struct surface *surface = surface_from_handle( handle ); + return surface->host_surface; +} + static struct vulkan_funcs vulkan_funcs = { + .p_vkCreateWin32SurfaceKHR = win32u_vkCreateWin32SurfaceKHR, + .p_vkDestroySurfaceKHR = win32u_vkDestroySurfaceKHR, .p_vkQueuePresentKHR = win32u_vkQueuePresentKHR, .p_vkGetDeviceProcAddr = win32u_vkGetDeviceProcAddr, .p_vkGetInstanceProcAddr = win32u_vkGetInstanceProcAddr, + .p_wine_get_host_surface = win32u_wine_get_host_surface, }; static VkResult nulldrv_vkCreateWin32SurfaceKHR( VkInstance instance, const VkWin32SurfaceCreateInfoKHR *info, @@ -165,11 +222,8 @@ static void vulkan_init(void) driver_funcs = &nulldrv_funcs; else { - vulkan_funcs.p_vkCreateWin32SurfaceKHR = driver_funcs->p_vkCreateWin32SurfaceKHR; - vulkan_funcs.p_vkDestroySurfaceKHR = driver_funcs->p_vkDestroySurfaceKHR; vulkan_funcs.p_vkGetPhysicalDeviceWin32PresentationSupportKHR = driver_funcs->p_vkGetPhysicalDeviceWin32PresentationSupportKHR; vulkan_funcs.p_get_host_surface_extension = driver_funcs->p_get_host_surface_extension; - vulkan_funcs.p_wine_get_host_surface = driver_funcs->p_wine_get_host_surface; } #define LOAD_FUNCPTR( f ) \

1 0

Rémi Bernon : winevulkan: Pass win32u surface wrappers for each vkQueuePresent swapchain.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 50584bcc02d1764ba9a8d8f4296f72bd91d050ef URL: https://gitlab.winehq.org/wine/wine/-/commit/50584bcc02d1764ba9a8d8f4296f72… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 24 12:42:59 2024 +0100 winevulkan: Pass win32u surface wrappers for each vkQueuePresent swapchain. --- dlls/win32u/vulkan.c | 11 +++++++---- dlls/winevulkan/vulkan.c | 4 ++-- include/wine/vulkan_driver.h | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 8d63e8bbd14..ecc6a532c83 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -52,6 +52,7 @@ struct surface { VkSurfaceKHR host_surface; VkSurfaceKHR driver_surface; + HWND hwnd; }; static inline struct surface *surface_from_handle( VkSurfaceKHR handle ) @@ -80,6 +81,7 @@ static VkResult win32u_vkCreateWin32SurfaceKHR( VkInstance instance, const VkWin return res; } + surface->hwnd = info->hwnd; surface->host_surface = driver_funcs->p_wine_get_host_surface( surface->driver_surface ); *handle = surface_to_handle( surface ); return VK_SUCCESS; @@ -96,20 +98,21 @@ static void win32u_vkDestroySurfaceKHR( VkInstance instance, VkSurfaceKHR handle free( surface ); } -static VkResult win32u_vkQueuePresentKHR( VkQueue queue, const VkPresentInfoKHR *present_info, HWND *surfaces ) +static VkResult win32u_vkQueuePresentKHR( VkQueue queue, const VkPresentInfoKHR *present_info, VkSurfaceKHR *surfaces ) { - VkPresentInfoKHR host_present_info = *present_info; VkResult res; UINT i; TRACE( "queue %p, present_info %p\n", queue, present_info ); - res = p_vkQueuePresentKHR( queue, &host_present_info ); + res = p_vkQueuePresentKHR( queue, present_info ); for (i = 0; i < present_info->swapchainCount; i++) { VkResult swapchain_res = present_info->pResults ? present_info->pResults[i] : res; - driver_funcs->p_vulkan_surface_presented( surfaces[i], swapchain_res ); + struct surface *surface = surface_from_handle( surfaces[i] ); + + driver_funcs->p_vulkan_surface_presented( surface->hwnd, swapchain_res ); } return res; diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 43ce65fc221..e7d00813a42 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1740,7 +1740,7 @@ void wine_vkDestroySwapchainKHR(VkDevice device_handle, VkSwapchainKHR swapchain VkResult wine_vkQueuePresentKHR(VkQueue queue_handle, const VkPresentInfoKHR *present_info) { VkSwapchainKHR swapchains_buffer[16], *swapchains = swapchains_buffer; - HWND surfaces_buffer[ARRAY_SIZE(swapchains_buffer)], *surfaces = surfaces_buffer; + VkSurfaceKHR surfaces_buffer[ARRAY_SIZE(swapchains_buffer)], *surfaces = surfaces_buffer; struct wine_queue *queue = wine_queue_from_handle(queue_handle); VkPresentInfoKHR present_info_host = *present_info; VkResult res; @@ -1759,7 +1759,7 @@ VkResult wine_vkQueuePresentKHR(VkQueue queue_handle, const VkPresentInfoKHR *pr struct wine_swapchain *swapchain = wine_swapchain_from_handle(present_info->pSwapchains[i]); struct wine_surface *surface = swapchain->surface; swapchains[i] = swapchain->host_swapchain; - surfaces[i] = surface->hwnd; + surfaces[i] = surface->driver_surface; } present_info_host.pSwapchains = swapchains; diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 8b24cd4978d..96f60cb067a 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -21,7 +21,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 28 +#define WINE_VULKAN_DRIVER_VERSION 29 struct vulkan_funcs { @@ -34,7 +34,7 @@ struct vulkan_funcs void * (*p_vkGetDeviceProcAddr)(VkDevice, const char *); void * (*p_vkGetInstanceProcAddr)(VkInstance, const char *); VkBool32 (*p_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice, uint32_t); - VkResult (*p_vkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *, HWND *surfaces); + VkResult (*p_vkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *, VkSurfaceKHR *surfaces); /* winevulkan specific functions */ const char *(*p_get_host_surface_extension)(void);

1 0