[PATCH v3 2/5] windows.devices.enumeration: Implement Added handler for DeviceWatcher.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/windows.devices.enumeration/main.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c
index ba7edaa5199..b1890235c6a 100644
--- a/dlls/windows.devices.enumeration/main.c
+++ b/dlls/windows.devices.enumeration/main.c
@@ -31,6 +31,7 @@ struct device_watcher
     IDeviceWatcher IDeviceWatcher_iface;
     LONG ref;

+    struct list added_handlers;
     struct list stopped_handlers;
     HSTRING filter;
 };
@@ -76,6 +77,7 @@ static ULONG WINAPI device_watcher_Release( IDeviceWatcher *iface )

if (!ref)
     {
+        typed_event_handlers_clear( &impl->added_handlers );
         typed_event_handlers_clear( &impl->stopped_handlers );
         WindowsDeleteString( impl->filter );
         free( impl );
@@ -105,14 +107,18 @@ static HRESULT WINAPI device_watcher_GetTrustLevel( IDeviceWatcher *iface, Trust
 static HRESULT WINAPI device_watcher_add_Added( IDeviceWatcher *iface, ITypedEventHandler_DeviceWatcher_DeviceInformation *handler,
                                                 EventRegistrationToken *token )
 {
-    FIXME( "iface %p, handler %p, token %p stub!\n", iface, handler, token );
-    return S_OK;
+    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->added_handlers, (ITypedEventHandler_IInspectable_IInspectable *)handler, token );
 }

static HRESULT WINAPI device_watcher_remove_Added( 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->added_handlers, &token );
 }

static HRESULT WINAPI device_watcher_add_Updated( IDeviceWatcher *iface, ITypedEventHandler_DeviceWatcher_DeviceInformationUpdate *handler,
@@ -465,6 +471,7 @@ static HRESULT WINAPI device_statics_CreateWatcherAqsFilter( IDeviceInformationS
         return hr;
     }

+    list_init( &this->added_handlers );
     list_init( &this->stopped_handlers );

*watcher = &this->IDeviceWatcher_iface;
@@ -548,6 +555,7 @@ static HRESULT WINAPI device_statics2_CreateWatcher( IDeviceInformationStatics2
         return hr;
     }

+    list_init( &this->added_handlers );
     list_init( &this->stopped_handlers );

*watcher = &this->IDeviceWatcher_iface;