[PATCH v4 4/6] ntoskrnl: Use the new plugplay definitions to send PnP events.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/ntoskrnl.exe/pnp.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c
index 7444b81823c..57e3dcebce5 100644
--- a/dlls/ntoskrnl.exe/pnp.c
+++ b/dlls/ntoskrnl.exe/pnp.c
@@ -695,11 +695,11 @@ static LONG WINAPI rpc_filter( EXCEPTION_POINTERS *eptr )
     return I_RpcExceptionFilter( eptr->ExceptionRecord->ExceptionCode );
 }

-static void send_devicechange( DWORD code, void *data, unsigned int size )
+static void send_devicechange( DWORD code, DEVICE_BROADCAST *data )
 {
     __TRY
     {
-        plugplay_send_event( code, data, size );
+        plugplay_send_event( code, data );
     }
     __EXCEPT(rpc_filter)
     {
@@ -722,7 +722,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable
     static const WCHAR hashW[] = {'#',0};

size_t namelen = name->Length / sizeof(WCHAR);
-    DEV_BROADCAST_DEVICEINTERFACE_W *broadcast;
+    DEVICE_BROADCAST broadcast = {0};
     struct device_interface *iface;
     HANDLE iface_key, control_key;
     OBJECT_ATTRIBUTES attr = {0};
@@ -805,18 +805,16 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable

iface->enabled = enable;

-    len = offsetof(DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name[namelen + 1]);
-
-    if ((broadcast = heap_alloc( len )))
+    broadcast.devicetype = DBT_DEVTYP_DEVICEINTERFACE;
+    broadcast.event.device_interface.name = heap_alloc( name->Length + 1 );
+    if ( broadcast.event.device_interface.name )
     {
-        broadcast->dbcc_size       = len;
-        broadcast->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
-        broadcast->dbcc_reserved   = 0;
-        broadcast->dbcc_classguid  = iface->interface_class;
-        lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 );
-        if (namelen > 1) broadcast->dbcc_name[1] = '\';
-        send_devicechange( enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, broadcast, len );
-        heap_free( broadcast );
+        broadcast.event.device_interface.class_guid = iface->interface_class;
+        lstrcpyW( broadcast.event.device_interface.name, name->Buffer );
+        if ( namelen > 1 ) broadcast.event.device_interface.name[1] = '\';
+        send_devicechange( enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE,
+                         &broadcast );
+       heap_free( broadcast.event.device_interface.name );
     }
     return ret;
 }