- Wine-Commits - list.winehq.org

Alexandre Julliard : plugplay: Use fully interpreted IDL stubs.
by Alexandre Julliard April 26, 2024

April 26, 2024

Module: wine Branch: master Commit: e26ed6bc9976ebd9ed50959c25272ae31feab790 URL: https://gitlab.winehq.org/wine/wine/-/commit/e26ed6bc9976ebd9ed50959c25272a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:20:05 2024 +0200 plugplay: Use fully interpreted IDL stubs. --- programs/plugplay/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in index ce595a6d759..e39c39bf1aa 100644 --- a/programs/plugplay/Makefile.in +++ b/programs/plugplay/Makefile.in @@ -2,6 +2,7 @@ MODULE = plugplay.exe IMPORTS = advapi32 rpcrt4 user32 EXTRADLLFLAGS = -mconsole -municode +EXTRAIDLFLAGS = -Oicf SOURCES = \ main.c \

1 0

Alexandre Julliard : rpcss: Use fully interpreted IDL stubs.
by Alexandre Julliard April 26, 2024

April 26, 2024

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

Alistair Leslie-Hughes : include: Add atldef.h.
by Alexandre Julliard April 25, 2024

April 25, 2024

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

Akihiro Sagawa : winegstreamer: Implement input media type enumeration in MPEG splitter.
by Alexandre Julliard April 25, 2024

April 25, 2024

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

Akihiro Sagawa : winegstreamer: Reject unexpected formats on init.
by Alexandre Julliard April 25, 2024

April 25, 2024

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 : quartz/tests: Add tests to reject unsupported contents for MPEG splitter.
by Alexandre Julliard April 25, 2024

April 25, 2024

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

Etaash Mathamsetty : user32: Fake success from RegisterTouchWindow.
by Alexandre Julliard April 25, 2024

April 25, 2024

Module: wine Branch: master Commit: 6236c508074fc8aeea6584ba3fe0f7609b695610 URL: https://gitlab.winehq.org/wine/wine/-/commit/6236c508074fc8aeea6584ba3fe0f7… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Tue Apr 23 18:54:41 2024 -0400 user32: Fake success from RegisterTouchWindow. --- dlls/user32/input.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 00337aa72b7..c1c20ad8a84 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -723,8 +723,7 @@ BOOL WINAPI IsTouchWindow( HWND hwnd, ULONG *flags ) BOOL WINAPI RegisterTouchWindow( HWND hwnd, ULONG flags ) { FIXME( "hwnd %p, flags %#lx stub!\n", hwnd, flags ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + return TRUE; } /*****************************************************************************

1 0

Etaash Mathamsetty : user32: Fake success from UnregisterTouchWindow.
by Alexandre Julliard April 25, 2024

April 25, 2024

Module: wine Branch: master Commit: c7375748016049c7312d53617e22b72e940e18bb URL: https://gitlab.winehq.org/wine/wine/-/commit/c7375748016049c7312d53617e22b7… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Tue Apr 23 18:55:23 2024 -0400 user32: Fake success from UnregisterTouchWindow. --- dlls/user32/input.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index c1c20ad8a84..108592f018f 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -732,8 +732,7 @@ BOOL WINAPI RegisterTouchWindow( HWND hwnd, ULONG flags ) BOOL WINAPI UnregisterTouchWindow( HWND hwnd ) { FIXME( "hwnd %p stub!\n", hwnd ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + return TRUE; } /*****************************************************************************

1 0

Tuomas Räsänen : setupapi: Use INF parser to read class GUID and class name.
by Alexandre Julliard April 25, 2024

April 25, 2024

Module: wine Branch: master Commit: 987695a427868e77704bb19c3e2cf9d6069364d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/987695a427868e77704bb19c3e2cf9… Author: Tuomas Räsänen <tuomas.rasanen(a)opinsys.fi> Date: Fri Apr 19 14:50:32 2024 +0300 setupapi: Use INF parser to read class GUID and class name. Previously, SetupDiGetINFClassW read INF files with GetPrivateProfileString, which does not substitute %strkey% tokens. This caused device installation to fail for devices which had driver INF files using %strkey% tokens in Version section. An example of such device is Vernier LabQuest Mini (08f7:0008) for which Vernier's LoggerPro application includes a driver. The INF file in question adds a new device setup class and has following entries in Version section: Class = %ClassName% ClassGuid = %DeviceClassGUID% Strings section includes following entries: DeviceClassGUID = "{6B8429BF-10AD-4b66-9FBA-2FE72B891721}" ClassName = "VST_WinUSB" Previously, when LoggerPro was installed and LabQuest Mini was hotplugged, device installation failed with the following error: fixme:setupapi:SetupDiGetINFClassW failed to convert "L"%DeviceClassGUID"" into a guid This caused GUID_NULL to be used and Class was not set to the registry for the device. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56579 --- dlls/setupapi/devinst.c | 67 ++++++++++++++++++++++++++++++++++--------- dlls/setupapi/tests/devinst.c | 3 +- 2 files changed, 54 insertions(+), 16 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7e2d683daa6..019505b01ec 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4280,8 +4280,11 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, DWORD size, PDWORD required_size) { BOOL have_guid, have_name; - DWORD dret; + DWORD class_name_len; WCHAR buffer[MAX_PATH]; + INFCONTEXT inf_ctx; + HINF hinf; + BOOL retval = FALSE; if (!inf) { @@ -4302,30 +4305,63 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, return FALSE; } - if (!GetPrivateProfileStringW(Version, Signature, NULL, buffer, MAX_PATH, inf)) + if ((hinf = SetupOpenInfFileW(inf, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + { + ERR("failed to open INF file %s\n", debugstr_w(inf)); return FALSE; + } + + if (!SetupFindFirstLineW(hinf, Version, Signature, &inf_ctx)) + { + ERR("INF file %s does not have mandatory [Version].Signature\n", debugstr_w(inf)); + goto out; + } + + if (!SetupGetStringFieldW(&inf_ctx, 1, buffer, ARRAY_SIZE(buffer), NULL)) + { + ERR("failed to get [Version].Signature string from %s\n", debugstr_w(inf)); + goto out; + } if (lstrcmpiW(buffer, Chicago) && lstrcmpiW(buffer, WindowsNT)) - return FALSE; + { + ERR("INF file %s has invalid [Version].Signature: %s\n", debugstr_w(inf), debugstr_w(buffer)); + goto out; + } + + have_guid = SetupFindFirstLineW(hinf, Version, ClassGUID, &inf_ctx); - buffer[0] = '\0'; - have_guid = 0 < GetPrivateProfileStringW(Version, ClassGUID, NULL, buffer, MAX_PATH, inf); if (have_guid) { + if (!SetupGetStringFieldW(&inf_ctx, 1, buffer, ARRAY_SIZE(buffer), NULL)) + { + ERR("failed to get [Version].ClassGUID as a string from '%s'\n", debugstr_w(inf)); + goto out; + } + buffer[lstrlenW(buffer)-1] = 0; if (RPC_S_OK != UuidFromStringW(buffer + 1, class_guid)) { - FIXME("failed to convert \"%s\" into a guid\n", debugstr_w(buffer)); + ERR("INF file %s has invalid [Version].ClassGUID: %s\n", debugstr_w(inf), debugstr_w(buffer)); SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + goto out; } } - buffer[0] = '\0'; - dret = GetPrivateProfileStringW(Version, Class, NULL, buffer, MAX_PATH, inf); - have_name = 0 < dret; + have_name = SetupFindFirstLineW(hinf, Version, Class, &inf_ctx); + + class_name_len = 0; + if (have_name) + { + if (!SetupGetStringFieldW(&inf_ctx, 1, buffer, ARRAY_SIZE(buffer), NULL)) + { + ERR("failed to get [Version].Class as a string from '%s'\n", debugstr_w(inf)); + goto out; + } + + class_name_len = lstrlenW(buffer); + } - if (dret >= MAX_PATH -1) FIXME("buffer might be too small\n"); if (have_guid && !have_name) { class_name[0] = '\0'; @@ -4334,7 +4370,7 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, if (have_name) { - if (dret < size) lstrcpyW(class_name, buffer); + if (class_name_len < size) lstrcpyW(class_name, buffer); else { SetLastError(ERROR_INSUFFICIENT_BUFFER); @@ -4342,9 +4378,12 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, } } - if (required_size) *required_size = dret + ((dret) ? 1 : 0); + if (required_size) *required_size = class_name_len + ((class_name_len) ? 1 : 0); - return (have_guid || have_name); + retval = (have_guid || have_name); +out: + SetupCloseInfFile(hinf); + return retval; } static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index bc830aebc19..e54605d6987 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2031,12 +2031,11 @@ static void test_get_inf_class(void) WritePrivateProfileStringA("Strings", "ClassGuid", "{deadbeef-dead-beef-dead-beefdeadbeef}", filename); count = 0xdeadbeef; retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); -todo_wine { ok(retval, "expected SetupDiGetINFClassA to succeed! error %lu\n", GetLastError()); ok(count == lstrlenA(deadbeef_class_name) + 1, "expected count=%d, got %lu\n", lstrlenA(deadbeef_class_name) + 1, count); ok(!lstrcmpA(deadbeef_class_name, cn), "expected class_name='%s', got '%s'\n", deadbeef_class_name, cn); ok(IsEqualGUID(&deadbeef_class_guid, &guid), "expected ClassGUID to be deadbeef-dead-beef-dead-beefdeadbeef\n"); -} + DeleteFileA(filename); } }

1 0

Alex Henrie : setupapi: Don't set RequiredSize when SetupDiGetClassDescription* fails.
by Alexandre Julliard April 25, 2024

April 25, 2024

Module: wine Branch: master Commit: 6e0b07e8ecef393e964e831f6fb687a1ec5d7a40 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e0b07e8ecef393e964e831f6fb687… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 24 22:35:12 2024 -0600 setupapi: Don't set RequiredSize when SetupDiGetClassDescription* fails. Discovered while investigating Bug 56551. --- dlls/setupapi/devinst.c | 20 ++++++++++---------- dlls/setupapi/tests/devinst.c | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 019505b01ec..9bbc1afb3ac 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2119,7 +2119,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExA( { HKEY hKey; DWORD dwLength; - BOOL ret; + LSTATUS ls; hKey = SetupDiOpenClassRegKeyExA(ClassGuid, KEY_ALL_ACCESS, @@ -2133,11 +2133,11 @@ BOOL WINAPI SetupDiGetClassDescriptionExA( } dwLength = ClassDescriptionSize; - ret = !RegQueryValueExA( hKey, NULL, NULL, NULL, - (LPBYTE)ClassDescription, &dwLength ); - if (RequiredSize) *RequiredSize = dwLength; + ls = RegQueryValueExA(hKey, NULL, NULL, NULL, (BYTE *)ClassDescription, &dwLength); RegCloseKey(hKey); - return ret; + if ((!ls || ls == ERROR_MORE_DATA) && RequiredSize) + *RequiredSize = dwLength; + return !ls; } /*********************************************************************** @@ -2153,7 +2153,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExW( { HKEY hKey; DWORD dwLength; - BOOL ret; + LSTATUS ls; hKey = SetupDiOpenClassRegKeyExW(ClassGuid, KEY_ALL_ACCESS, @@ -2167,11 +2167,11 @@ BOOL WINAPI SetupDiGetClassDescriptionExW( } dwLength = ClassDescriptionSize * sizeof(WCHAR); - ret = !RegQueryValueExW( hKey, NULL, NULL, NULL, - (LPBYTE)ClassDescription, &dwLength ); - if (RequiredSize) *RequiredSize = dwLength / sizeof(WCHAR); + ls = RegQueryValueExW(hKey, NULL, NULL, NULL, (BYTE *)ClassDescription, &dwLength); RegCloseKey(hKey); - return ret; + if ((!ls || ls == ERROR_MORE_DATA) && RequiredSize) + *RequiredSize = dwLength / sizeof(WCHAR); + return !ls; } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index e54605d6987..1d8df5faea1 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -162,6 +162,8 @@ static void test_install_class(void) '1','1','d','b','-','b','7','0','4','-', '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; char tmpfile[MAX_PATH]; + char buf[32]; + DWORD size; BOOL ret; static const char inf_data[] = @@ -195,12 +197,28 @@ static void test_install_class(void) ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Got unexpected error %#lx.\n", GetLastError()); + size = 123; + SetLastError(0xdeadbeef); + ret = SetupDiGetClassDescriptionA(&guid, buf, sizeof(buf), &size); + ok(!ret, "Expected failure.\n"); + ok(size == 123, "Expected 123, got %ld.\n", size); + todo_wine + ok(GetLastError() == ERROR_NOT_FOUND /* win7 */ || GetLastError() == ERROR_INVALID_CLASS /* win10 */, + "Got unexpected error %#lx.\n", GetLastError()); + /* The next call will succeed. Information is put into the registry but the * location(s) is/are depending on the Windows version. */ ret = SetupDiInstallClassA(NULL, tmpfile, 0, NULL); ok(ret, "Failed to install class, error %#lx.\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupDiGetClassDescriptionA(&guid, buf, sizeof(buf), &size); + ok(ret == TRUE, "Failed to get class description.\n"); + ok(size == sizeof("Wine test devices"), "Expected %Iu, got %lu.\n", sizeof("Wine test devices"), size); + ok(!strcmp(buf, "Wine test devices"), "Got unexpected class description %s.\n", debugstr_a(buf)); + todo_wine ok(!GetLastError(), "Got unexpected error %#lx.\n", GetLastError()); + ret = RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey); ok(!ret, "Failed to delete class key, error %lu.\n", GetLastError()); DeleteFileA(tmpfile);

1 0