[ros-diffs] [pschweitzer] 69291: [MOUNTMGR] Our ReconcileThisDatabaseWithMasterWorker() routine will expect two parameters: the device extension + the device to which reconcile remote database. So, fix our cod...

Author: pschweitzer
Date: Sat Sep 19 14:50:04 2015
New Revision: 69291

URL: http://svn.reactos.org/svn/reactos?rev=69291&view=rev
Log:
[MOUNTMGR]
Our ReconcileThisDatabaseWithMasterWorker() routine will expect two parameters: the device
extension + the device to which reconcile remote database.
So, fix our code accordingly

Modified:
    trunk/reactos/drivers/filters/mountmgr/device.c
    trunk/reactos/drivers/filters/mountmgr/mntmgr.h

Modified: trunk/reactos/drivers/filters/mountmgr/device.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d…
==============================================================================
--- trunk/reactos/drivers/filters/mountmgr/device.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/filters/mountmgr/device.c	[iso-8859-1] Sat Sep 19 14:50:04 2015
@@ -1467,6 +1467,7 @@
     ULONG Attempts, OutputLength;
     PMOUNTMGR_TARGET_NAME Target;
     PMOUNTMGR_VOLUME_PATHS Paths, Output;
+    RECONCILE_WORK_ITEM_CONTEXT ReconcileContext;
     PDEVICE_INFORMATION DeviceInformation, ListDeviceInfo, FailedDevice;
 
     Stack = IoGetCurrentIrpStackLocation(Irp);
@@ -1535,8 +1536,10 @@
         }
 
         /* Reconcile database */
+        ReconcileContext.DeviceExtension = DeviceExtension;
+        ReconcileContext.DeviceInformation = FailedDevice;
         KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1,
FALSE);
-        ReconcileThisDatabaseWithMasterWorker(&DeviceExtension);
+        ReconcileThisDatabaseWithMasterWorker(&ReconcileContext);
         KeWaitForSingleObject(&DeviceExtension->DeviceLock, Executive, KernelMode,
FALSE, NULL);
 
         /* Look for our device, to check it's online */

Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m…
==============================================================================
--- trunk/reactos/drivers/filters/mountmgr/mntmgr.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h	[iso-8859-1] Sat Sep 19 14:50:04 2015
@@ -128,14 +128,19 @@
     UNICODE_STRING SymbolicName;                                  // 0x14
 } ONLINE_NOTIFICATION_WORK_ITEM, *PONLINE_NOTIFICATION_WORK_ITEM; // 0x1C
 
+typedef struct _RECONCILE_WORK_ITEM_CONTEXT
+{
+    PDEVICE_EXTENSION DeviceExtension;
+    PDEVICE_INFORMATION DeviceInformation;
+} RECONCILE_WORK_ITEM_CONTEXT, *PRECONCILE_WORK_ITEM_CONTEXT;
+
 typedef struct _RECONCILE_WORK_ITEM
 {
     LIST_ENTRY WorkerQueueListEntry;            // 0x00
     PIO_WORKITEM WorkItem;                      // 0x08
     PWORKER_THREAD_ROUTINE WorkerRoutine;       // 0x0C
     PVOID Context;                              // 0x10
-    PDEVICE_EXTENSION DeviceExtension;          // 0x14
-    PDEVICE_INFORMATION DeviceInformation;      // 0x18
+    RECONCILE_WORK_ITEM_CONTEXT;                // 0x14
 } RECONCILE_WORK_ITEM, *PRECONCILE_WORK_ITEM;   // 0x1C
 
 typedef struct _MIGRATE_WORK_ITEM