September 2022 - Wine-Commits

Julian Klemann : windows.devices.enumeration: Add IDeviceInformationStatics2 stub.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: 606cb45e738c2e012f41d98ff5789ccaf6bdda0a URL: https://gitlab.winehq.org/wine/wine/-/commit/606cb45e738c2e012f41d98ff5789c… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Wed Sep 14 14:59:36 2022 +0200 windows.devices.enumeration: Add IDeviceInformationStatics2 stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53328 --- dlls/windows.devices.enumeration/main.c | 158 +++++++++++++++++++---------- dlls/windows.devices.enumeration/private.h | 42 ++++++++ 2 files changed, 148 insertions(+), 52 deletions(-)

1 0

Julian Klemann : windows.devices.enumeration: Implement Stopped handler for DeviceWatcher.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: ead2528b42edf5c7043f9600751698a9ff6a50a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ead2528b42edf5c7043f9600751698… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Wed Sep 14 15:00:10 2022 +0200 windows.devices.enumeration: Implement Stopped handler for DeviceWatcher. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53328 --- dlls/windows.devices.enumeration/Makefile.in | 1 + dlls/windows.devices.enumeration/event_handlers.c | 109 ++++++++++++++++++++++ dlls/windows.devices.enumeration/main.c | 36 +++++-- dlls/windows.devices.enumeration/private.h | 7 ++ 4 files changed, 144 insertions(+), 9 deletions(-) diff --git a/dlls/windows.devices.enumeration/Makefile.in b/dlls/windows.devices.enumeration/Makefile.in index a2058b3d002..77aa007c0dc 100644 --- a/dlls/windows.devices.enumeration/Makefile.in +++ b/dlls/windows.devices.enumeration/Makefile.in @@ -2,6 +2,7 @@ MODULE = windows.devices.enumeration.dll IMPORTS = combase uuid C_SRCS = \ + event_handlers.c \ main.c IDL_SRCS = classes.idl diff --git a/dlls/windows.devices.enumeration/event_handlers.c b/dlls/windows.devices.enumeration/event_handlers.c new file mode 100644 index 00000000000..4989a983e55 --- /dev/null +++ b/dlls/windows.devices.enumeration/event_handlers.c @@ -0,0 +1,109 @@ +/* WinRT Windows.Devices.Enumeration implementation + * + * Copyright 2022 Bernhard Kölbl + * + * 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 + */ + +#include "private.h" + +static CRITICAL_SECTION handlers_cs; +static CRITICAL_SECTION_DEBUG handlers_cs_debug = +{ + 0, 0, &handlers_cs, + { &handlers_cs_debug.ProcessLocksList, &handlers_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": handlers_cs") } +}; +static CRITICAL_SECTION handlers_cs = { &handlers_cs_debug, -1, 0, 0, 0, 0 }; +static EventRegistrationToken next_token = {.value = 1}; + +struct typed_event_handler_entry +{ + struct list entry; + EventRegistrationToken token; + ITypedEventHandler_IInspectable_IInspectable *handler; +}; + +HRESULT typed_event_handlers_append( struct list *list, ITypedEventHandler_IInspectable_IInspectable *handler, EventRegistrationToken *token ) +{ + struct typed_event_handler_entry *entry; + + if (!(entry = calloc( 1, sizeof(*entry) ))) return E_OUTOFMEMORY; + ITypedEventHandler_IInspectable_IInspectable_AddRef( (entry->handler = handler) ); + + EnterCriticalSection( &handlers_cs ); + + *token = entry->token = next_token; + next_token.value++; + list_add_tail( list, &entry->entry ); + + LeaveCriticalSection( &handlers_cs ); + + return S_OK; +} + +HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken *token ) +{ + struct typed_event_handler_entry *entry; + BOOL found = FALSE; + + EnterCriticalSection( &handlers_cs ); + + LIST_FOR_EACH_ENTRY( entry, list, struct typed_event_handler_entry, entry ) + if ((found = !memcmp( &entry->token, token, sizeof(*token) ))) break; + if (found) list_remove( &entry->entry ); + + LeaveCriticalSection( &handlers_cs ); + + if (found) + { + ITypedEventHandler_IInspectable_IInspectable_Release( entry->handler ); + free( entry ); + } + + return S_OK; +} + +HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ) +{ + struct typed_event_handler_entry *entry; + + EnterCriticalSection( &handlers_cs ); + + LIST_FOR_EACH_ENTRY( entry, list, struct typed_event_handler_entry, entry ) + ITypedEventHandler_IInspectable_IInspectable_Invoke( entry->handler, sender, args ); + + LeaveCriticalSection( &handlers_cs ); + + return S_OK; +} + +HRESULT typed_event_handlers_clear( struct list *list ) +{ + struct typed_event_handler_entry *entry, *entry_cursor2; + + EnterCriticalSection( &handlers_cs ); + + LIST_FOR_EACH_ENTRY_SAFE( entry, entry_cursor2, list, struct typed_event_handler_entry, entry ) + { + list_remove( &entry->entry ); + ITypedEventHandler_IInspectable_IInspectable_Release( entry->handler ); + free( entry ); + } + + LeaveCriticalSection( &handlers_cs ); + + return S_OK; +} diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c index e9a56d51b8d..603b27fe356 100644 --- a/dlls/windows.devices.enumeration/main.c +++ b/dlls/windows.devices.enumeration/main.c @@ -38,6 +38,8 @@ struct device_watcher { IDeviceWatcher IDeviceWatcher_iface; LONG ref; + + struct list stopped_handlers; }; static inline struct device_watcher *impl_from_IDeviceWatcher( IDeviceWatcher *iface ) @@ -80,7 +82,10 @@ static ULONG WINAPI device_watcher_Release( IDeviceWatcher *iface ) TRACE( "iface %p, ref %lu.\n", iface, ref ); if (!ref) + { + typed_event_handlers_clear( &impl->stopped_handlers ); free( impl ); + } return ref; } @@ -107,7 +112,7 @@ static HRESULT WINAPI device_watcher_add_Added( IDeviceWatcher *iface, ITypedEve EventRegistrationToken *token ) { FIXME( "iface %p, handler %p, token %p stub!\n", iface, handler, token ); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI device_watcher_remove_Added( IDeviceWatcher *iface, EventRegistrationToken token ) @@ -120,7 +125,7 @@ static HRESULT WINAPI device_watcher_add_Updated( IDeviceWatcher *iface, ITypedE EventRegistrationToken *token ) { FIXME( "iface %p, handler %p, token %p stub!\n", iface, handler, token ); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI device_watcher_remove_Updated( IDeviceWatcher *iface, EventRegistrationToken token ) @@ -157,14 +162,18 @@ static HRESULT WINAPI device_watcher_remove_EnumerationCompleted( IDeviceWatcher static HRESULT WINAPI device_watcher_add_Stopped( IDeviceWatcher *iface, ITypedEventHandler_DeviceWatcher_IInspectable *handler, EventRegistrationToken *token ) { - FIXME( "iface %p, handler %p, token %p stub!\n", iface, handler, token ); - return E_NOTIMPL; + struct device_watcher *impl = impl_from_IDeviceWatcher( iface ); + + TRACE( "iface %p, handler %p, token %p.\n", iface, handler, token ); + return typed_event_handlers_append( &impl->stopped_handlers, (ITypedEventHandler_IInspectable_IInspectable *)handler, token ); } static HRESULT WINAPI device_watcher_remove_Stopped( IDeviceWatcher *iface, EventRegistrationToken token ) { - FIXME( "iface %p, token %#I64x stub!\n", iface, token.value ); - return E_NOTIMPL; + struct device_watcher *impl = impl_from_IDeviceWatcher( iface ); + + TRACE( "iface %p, token %#I64x.\n", iface, token.value ); + return typed_event_handlers_remove( &impl->stopped_handlers, &token ); } static HRESULT WINAPI device_watcher_Status( IDeviceWatcher *iface, DeviceWatcherStatus *status ) @@ -176,13 +185,20 @@ static HRESULT WINAPI device_watcher_Status( IDeviceWatcher *iface, DeviceWatche static HRESULT WINAPI device_watcher_Start( IDeviceWatcher *iface ) { FIXME( "iface %p stub!\n", iface ); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI device_watcher_Stop( IDeviceWatcher *iface ) { - FIXME( "iface %p stub!\n", iface ); - return E_NOTIMPL; + struct device_watcher *impl = impl_from_IDeviceWatcher( iface ); + HRESULT hr; + + FIXME( "iface %p semi-stub!\n", iface ); + + IDeviceWatcher_AddRef( &impl->IDeviceWatcher_iface ); + hr = typed_event_handlers_notify( &impl->stopped_handlers, (IInspectable *)iface, NULL ); + IDeviceWatcher_Release( &impl->IDeviceWatcher_iface ); + return hr; } static const struct IDeviceWatcherVtbl device_watcher_vtbl = @@ -342,6 +358,8 @@ static HRESULT WINAPI device_statics2_CreateWatcher( IDeviceInformationStatics2 this->IDeviceWatcher_iface.lpVtbl = &device_watcher_vtbl; this->ref = 1; + list_init( &this->stopped_handlers ); + *watcher = &this->IDeviceWatcher_iface; return S_OK; } diff --git a/dlls/windows.devices.enumeration/private.h b/dlls/windows.devices.enumeration/private.h index 3c433766f1f..7ce7d11bc46 100644 --- a/dlls/windows.devices.enumeration/private.h +++ b/dlls/windows.devices.enumeration/private.h @@ -37,6 +37,13 @@ #define WIDL_using_Windows_Devices_Enumeration #include "windows.devices.enumeration.h" +#include "wine/list.h" + +HRESULT typed_event_handlers_append( struct list *list, ITypedEventHandler_IInspectable_IInspectable *handler, EventRegistrationToken *token ); +HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken *token ); +HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); +HRESULT typed_event_handlers_clear( struct list *list ); + #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ { \

1 0

Jacek Caban : wininet/tests: Collect persistent connection before running tests in test_async_HttpSendRequestEx.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: e970c4c386bb7981eafb92f751f6a0cbd1e9d8da URL: https://gitlab.winehq.org/wine/wine/-/commit/e970c4c386bb7981eafb92f751f6a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 14:32:14 2022 +0200 wininet/tests: Collect persistent connection before running tests in test_async_HttpSendRequestEx. --- dlls/wininet/tests/http.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6a5a18fe282..aadedd27f24 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -7400,8 +7400,8 @@ static const struct notification async_send_request_ex_test2[] = { http_send_request_ex, INTERNET_STATUS_COOKIE_SENT, TRUE, FALSE, TRUE }, { http_send_request_ex, INTERNET_STATUS_RESOLVING_NAME, TRUE, FALSE, TRUE }, { http_send_request_ex, INTERNET_STATUS_NAME_RESOLVED, TRUE, FALSE, TRUE }, - { http_send_request_ex, INTERNET_STATUS_CONNECTING_TO_SERVER, TRUE, TRUE }, - { http_send_request_ex, INTERNET_STATUS_CONNECTED_TO_SERVER, TRUE, TRUE }, + { http_send_request_ex, INTERNET_STATUS_CONNECTING_TO_SERVER, TRUE }, + { http_send_request_ex, INTERNET_STATUS_CONNECTED_TO_SERVER, TRUE }, { http_send_request_ex, INTERNET_STATUS_SENDING_REQUEST, TRUE }, { http_send_request_ex, INTERNET_STATUS_REQUEST_SENT, TRUE }, { http_send_request_ex, INTERNET_STATUS_REQUEST_COMPLETE, TRUE }, @@ -7445,8 +7445,8 @@ static const struct notification async_send_request_ex_chunked_test[] = { http_end_request, INTERNET_STATUS_RECEIVING_RESPONSE, TRUE }, { http_end_request, INTERNET_STATUS_RESPONSE_RECEIVED, TRUE }, { http_end_request, INTERNET_STATUS_REQUEST_COMPLETE, TRUE }, - { internet_close_handle, INTERNET_STATUS_CLOSING_CONNECTION }, - { internet_close_handle, INTERNET_STATUS_CONNECTION_CLOSED }, + { internet_close_handle, INTERNET_STATUS_CLOSING_CONNECTION, FALSE, FALSE, TRUE }, + { internet_close_handle, INTERNET_STATUS_CONNECTION_CLOSED, FALSE, FALSE, TRUE }, { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING }, { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING } }; @@ -7497,6 +7497,10 @@ static void test_async_HttpSendRequestEx(const struct notification_data *nd) trace("Async HttpSendRequestEx test (%s %s)\n", nd->method, nd->host); + /* Collect all existing persistent connections */ + ret = InternetSetOptionA(NULL, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); + ok(ret, "InternetSetOption(INTERNET_OPTION_END_BROWSER_SESSION) failed: %lu\n", GetLastError()); + InitializeCriticalSection( &notification_cs ); info.test = nd->test;

1 0

Julian Klemann : windows.devices.enumeration: Replace STDMETHODCALLTYPE with WINAPI.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: 20846c258ee719d97647560d63ca4eeccb5a4a49 URL: https://gitlab.winehq.org/wine/wine/-/commit/20846c258ee719d97647560d63ca4e… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Mon Aug 8 18:05:24 2022 -0500 windows.devices.enumeration: Replace STDMETHODCALLTYPE with WINAPI. --- dlls/windows.devices.enumeration/main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c index 0e44251de08..b5cc5b63e14 100644 --- a/dlls/windows.devices.enumeration/main.c +++ b/dlls/windows.devices.enumeration/main.c @@ -57,7 +57,7 @@ static inline struct windows_devices_enumeration *impl_from_IActivationFactory(I return CONTAINING_RECORD(iface, struct windows_devices_enumeration, IActivationFactory_iface); } -static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_QueryInterface( +static HRESULT WINAPI windows_devices_enumeration_QueryInterface( IActivationFactory *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); @@ -77,7 +77,7 @@ static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_QueryInterface( return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE windows_devices_enumeration_AddRef( +static ULONG WINAPI windows_devices_enumeration_AddRef( IActivationFactory *iface) { struct windows_devices_enumeration *impl = impl_from_IActivationFactory(iface); @@ -86,7 +86,7 @@ static ULONG STDMETHODCALLTYPE windows_devices_enumeration_AddRef( return ref; } -static ULONG STDMETHODCALLTYPE windows_devices_enumeration_Release( +static ULONG WINAPI windows_devices_enumeration_Release( IActivationFactory *iface) { struct windows_devices_enumeration *impl = impl_from_IActivationFactory(iface); @@ -95,28 +95,28 @@ static ULONG STDMETHODCALLTYPE windows_devices_enumeration_Release( return ref; } -static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_GetIids( +static HRESULT WINAPI windows_devices_enumeration_GetIids( IActivationFactory *iface, ULONG *iid_count, IID **iids) { FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_GetRuntimeClassName( +static HRESULT WINAPI windows_devices_enumeration_GetRuntimeClassName( IActivationFactory *iface, HSTRING *class_name) { FIXME("iface %p, class_name %p stub!\n", iface, class_name); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_GetTrustLevel( +static HRESULT WINAPI windows_devices_enumeration_GetTrustLevel( IActivationFactory *iface, TrustLevel *trust_level) { FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_ActivateInstance( +static HRESULT WINAPI windows_devices_enumeration_ActivateInstance( IActivationFactory *iface, IInspectable **instance) { FIXME("iface %p, instance %p stub!\n", iface, instance);

1 0

Julian Klemann : windows.devices.enumeration: Create private header file.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: 310225a2455cf94046abdc93f8d92e2f9a037f3d URL: https://gitlab.winehq.org/wine/wine/-/commit/310225a2455cf94046abdc93f8d92e… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Wed Aug 17 14:23:05 2022 -0500 windows.devices.enumeration: Create private header file. --- dlls/windows.devices.enumeration/main.c | 17 ++----------- dlls/windows.devices.enumeration/private.h | 40 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 15 deletions(-) diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c index b5cc5b63e14..c035531ff90 100644 --- a/dlls/windows.devices.enumeration/main.c +++ b/dlls/windows.devices.enumeration/main.c @@ -17,23 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winstring.h" -#include "wine/debug.h" -#include "objbase.h" - #include "initguid.h" -#include "activation.h" +#include "private.h" -#define WIDL_using_Windows_Foundation -#define WIDL_using_Windows_Foundation_Collections -#include "windows.foundation.h" -#define WIDL_using_Windows_Devices_Enumeration -#include "windows.devices.enumeration.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(enumeration); diff --git a/dlls/windows.devices.enumeration/private.h b/dlls/windows.devices.enumeration/private.h new file mode 100644 index 00000000000..e8500a742c0 --- /dev/null +++ b/dlls/windows.devices.enumeration/private.h @@ -0,0 +1,40 @@ +/* WinRT Windows.Devices.Enumeration implementation + * + * Copyright 2021 Gijs Vermeulen + * Copyright 2022 Julian Klemann for CodeWeavers + * + * 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 __WINE_WINDOWS_DEVICES_ENUMERATION_PRIVATE_H +#define __WINE_WINDOWS_DEVICES_ENUMERATION_PRIVATE_H + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "objbase.h" + +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Devices_Enumeration +#include "windows.devices.enumeration.h" + +#endif

1 0

Julian Klemann : include/windows.devices.enumeration: Update file to newer formatting.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: 1f030a753464e0dfa2dcfb8ee6152cb5500a528c URL: https://gitlab.winehq.org/wine/wine/-/commit/1f030a753464e0dfa2dcfb8ee6152c… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Mon Aug 15 15:53:25 2022 -0500 include/windows.devices.enumeration: Update file to newer formatting. Remove nested namespaces and forward declares, add comma to last entry of enums. --- include/windows.devices.enumeration.idl | 344 +++++++++++++++----------------- 1 file changed, 156 insertions(+), 188 deletions(-)

1 0

Julian Klemann : include/windows.devices.enumeration: Define IDeviceInformationStatics2.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: 5bc764d9d55996473008f08604b6cd807a77c756 URL: https://gitlab.winehq.org/wine/wine/-/commit/5bc764d9d55996473008f08604b6cd… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Thu Aug 18 13:22:20 2022 -0500 include/windows.devices.enumeration: Define IDeviceInformationStatics2. This includes any remaining dependencies. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53328 --- include/windows.devices.enumeration.idl | 72 +++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/include/windows.devices.enumeration.idl b/include/windows.devices.enumeration.idl index e3338db0f98..3b3ed383531 100644 --- a/include/windows.devices.enumeration.idl +++ b/include/windows.devices.enumeration.idl @@ -28,6 +28,8 @@ import "windows.storage.streams.idl"; import "windows.foundation.idl"; namespace Windows.Devices.Enumeration { + typedef enum DeviceClass DeviceClass; + typedef enum DeviceInformationKind DeviceInformationKind; typedef enum DeviceWatcherStatus DeviceWatcherStatus; typedef enum Panel Panel; @@ -38,6 +40,7 @@ namespace Windows.Devices.Enumeration { interface IEnclosureLocation; runtimeclass DeviceInformation; + runtimeclass DeviceInformationCollection; runtimeclass DeviceInformationUpdate; runtimeclass DeviceThumbnail; runtimeclass DeviceWatcher; @@ -45,10 +48,15 @@ namespace Windows.Devices.Enumeration { declare { + interface Windows.Foundation.Collections.IVectorView<Windows.Devices.Enumeration.DeviceInformation *>; + interface Windows.Foundation.Collections.IIterable<Windows.Devices.Enumeration.DeviceInformation *>; + interface Windows.Foundation.Collections.IIterator<Windows.Devices.Enumeration.DeviceInformation *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Enumeration.DeviceInformation *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Enumeration.DeviceInformationCollection *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Enumeration.DeviceThumbnail *>; interface Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *>; interface Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformation *>; + interface Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformationCollection *>; interface Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceThumbnail *>; interface Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, IInspectable *>; interface Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, Windows.Devices.Enumeration.DeviceInformation *>; @@ -57,6 +65,35 @@ namespace Windows.Devices.Enumeration { } namespace Windows.Devices.Enumeration { + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum DeviceClass + { + All = 0, + AudioCapture = 1, + AudioRender = 2, + PortableStorageDevice = 3, + VideoCapture = 4, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + ImageScanner = 5, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Location = 6, + }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum DeviceInformationKind + { + Unknown = 0, + DeviceInterface = 1, + DeviceContainer = 2, + Device = 3, + DeviceInterfaceClass = 4, + AssociationEndpoint = 5, + AssociationEndpointContainer = 6, + AssociationEndpointService = 7, + [contract(Windows.Foundation.UniversalApiContract, 7.0)] + DevicePanel = 8, + }; + enum DeviceWatcherStatus { Created = 0, @@ -142,6 +179,31 @@ namespace Windows.Devices.Enumeration { [propget] HRESULT Panel([out, retval] Windows.Devices.Enumeration.Panel *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Devices.Enumeration.DeviceInformation), + uuid(493b4f34-a84f-45fd-9167-15d1cb1bd1f9) + ] + interface IDeviceInformationStatics2 : IInspectable + { + HRESULT GetAqsFilterFromDeviceClass([in] Windows.Devices.Enumeration.DeviceClass device_class, [out, retval] HSTRING *filter); + [overload("CreateFromIdAsync")] + HRESULT CreateFromIdAsyncWithKindAndAdditionalProperties([in] HSTRING device_id, + [in] Windows.Foundation.Collections.IIterable<HSTRING> *additional_properties, + [in] Windows.Devices.Enumeration.DeviceInformationKind kind, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformation *> **async_operation); + [overload("FindAllAsync")] + HRESULT FindAllAsyncWithKindAqsFilterAndAdditionalProperties([in] HSTRING filter, + [in] Windows.Foundation.Collections.IIterable<HSTRING> *additional_properties, + [in] Windows.Devices.Enumeration.DeviceInformationKind kind, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformationCollection *> **async_operation); + [overload("CreateWatcher")] + HRESULT CreateWatcherWithKindAqsFilterAndAdditionalProperties([in] HSTRING filter, + [in] Windows.Foundation.Collections.IIterable<HSTRING> *additional_properties, + [in] Windows.Devices.Enumeration.DeviceInformationKind kind, + [out, retval] Windows.Devices.Enumeration.DeviceWatcher **watcher); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -155,6 +217,16 @@ namespace Windows.Devices.Enumeration { [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Devices.Enumeration.IDeviceInformation2; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + ] + runtimeclass DeviceInformationCollection + { + [default] interface Windows.Foundation.Collections.IVectorView<Windows.Devices.Enumeration.DeviceInformation *>; + interface Windows.Foundation.Collections.IIterable<Windows.Devices.Enumeration.DeviceInformation *>; + } + [ marshaling_behavior(agile), ]

1 0

Julian Klemann : widl: Use "cinterface(IInspectable)" for IInspectable signature.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: c8c7ff640a90aeef2dc72f66dfa2b84663c918ed URL: https://gitlab.winehq.org/wine/wine/-/commit/c8c7ff640a90aeef2dc72f66dfa2b8… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Tue Aug 16 16:10:04 2022 -0500 widl: Use "cinterface(IInspectable)" for IInspectable signature. Fixes the UUID of ITypedEventHandler<DeviceWatcher*, IInspectable*> to match MIDL. --- tools/widl/typetree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index fef9d2e5c03..ee71a7a2899 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -168,7 +168,8 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t switch (type->type_type) { case TYPE_INTERFACE: - if (type->signature) n += strappend(buf, len, pos + n, "%s", type->signature); + if (!strcmp(type->name, "IInspectable")) n += strappend(buf, len, pos + n, "cinterface(IInspectable)"); + else if (type->signature) n += strappend(buf, len, pos + n, "%s", type->signature); else { if (!(uuid = get_attrp(type->attrs, ATTR_UUID)))

1 0

Jacob Czekalla : notepad: Track and display line number and column.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: 799c24aa81506c38458c78e0c0af164d3c9491ed URL: https://gitlab.winehq.org/wine/wine/-/commit/799c24aa81506c38458c78e0c0af16… Author: Jacob Czekalla <jacobczekalla(a)gmail.com> Date: Tue Sep 13 20:43:33 2022 -0400 notepad: Track and display line number and column. --- po/ar.po | 58 ++++++++++++++++++++++-------------------- po/ast.po | 58 ++++++++++++++++++++++-------------------- po/bg.po | 58 ++++++++++++++++++++++-------------------- po/ca.po | 58 ++++++++++++++++++++++-------------------- po/cs.po | 58 ++++++++++++++++++++++-------------------- po/da.po | 58 ++++++++++++++++++++++-------------------- po/de.po | 58 ++++++++++++++++++++++-------------------- po/el.po | 58 ++++++++++++++++++++++-------------------- po/en.po | 58 ++++++++++++++++++++++-------------------- po/en_US.po | 58 ++++++++++++++++++++++-------------------- po/eo.po | 58 ++++++++++++++++++++++-------------------- po/es.po | 58 ++++++++++++++++++++++-------------------- po/fa.po | 58 ++++++++++++++++++++++-------------------- po/fi.po | 58 ++++++++++++++++++++++-------------------- po/fr.po | 58 ++++++++++++++++++++++-------------------- po/he.po | 58 ++++++++++++++++++++++-------------------- po/hi.po | 58 ++++++++++++++++++++++-------------------- po/hr.po | 58 ++++++++++++++++++++++-------------------- po/hu.po | 58 ++++++++++++++++++++++-------------------- po/it.po | 58 ++++++++++++++++++++++-------------------- po/ja.po | 58 ++++++++++++++++++++++-------------------- po/ko.po | 58 ++++++++++++++++++++++-------------------- po/lt.po | 58 ++++++++++++++++++++++-------------------- po/ml.po | 58 ++++++++++++++++++++++-------------------- po/nb_NO.po | 58 ++++++++++++++++++++++-------------------- po/nl.po | 58 ++++++++++++++++++++++-------------------- po/or.po | 58 ++++++++++++++++++++++-------------------- po/pa.po | 58 ++++++++++++++++++++++-------------------- po/pl.po | 58 ++++++++++++++++++++++-------------------- po/pt_BR.po | 58 ++++++++++++++++++++++-------------------- po/pt_PT.po | 58 ++++++++++++++++++++++-------------------- po/rm.po | 58 ++++++++++++++++++++++-------------------- po/ro.po | 58 ++++++++++++++++++++++-------------------- po/ru.po | 58 ++++++++++++++++++++++-------------------- po/si.po | 58 ++++++++++++++++++++++-------------------- po/sk.po | 58 ++++++++++++++++++++++-------------------- po/sl.po | 58 ++++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 58 ++++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 58 ++++++++++++++++++++++-------------------- po/sv.po | 58 ++++++++++++++++++++++-------------------- po/ta.po | 58 ++++++++++++++++++++++-------------------- po/te.po | 58 ++++++++++++++++++++++-------------------- po/th.po | 58 ++++++++++++++++++++++-------------------- po/tr.po | 58 ++++++++++++++++++++++-------------------- po/uk.po | 58 ++++++++++++++++++++++-------------------- po/wa.po | 58 ++++++++++++++++++++++-------------------- po/wine.pot | 58 ++++++++++++++++++++++-------------------- po/zh_CN.po | 58 ++++++++++++++++++++++-------------------- po/zh_TW.po | 58 ++++++++++++++++++++++-------------------- programs/notepad/dialog.c | 2 ++ programs/notepad/main.c | 58 ++++++++++++++++++++++++++++++++++++++++++ programs/notepad/main.h | 4 +++ programs/notepad/notepad.rc | 2 ++ programs/notepad/notepad_res.h | 2 ++ 54 files changed, 1587 insertions(+), 1323 deletions(-)

1 0

Jacek Caban : urlmon/tests: Make BINDSTATUS_DOWNLOADINGDATA optional in test_URLDownloadToFile_abort.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: d0056f6e55b4d012a5fed4bae542b110868745c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0056f6e55b4d012a5fed4bae542b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 10:46:13 2022 +0200 urlmon/tests: Make BINDSTATUS_DOWNLOADINGDATA optional in test_URLDownloadToFile_abort. --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 7ec5bf144db..9e1a6edcdfd 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3747,7 +3747,7 @@ static void test_URLDownloadToFile_abort(void) CHECK_CALLED(OnProgress_SENDINGREQUEST); CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA); - CHECK_CALLED(OnProgress_DOWNLOADINGDATA); + CLEAR_CALLED(OnProgress_DOWNLOADINGDATA); CHECK_CALLED(OnProgress_ENDDOWNLOADDATA); CHECK_CALLED(OnStopBinding);

1 0