[ros-diffs] [pschweitzer] 75780: [FSUTIL] Fix a cppcheck warning
Author: pschweitzer Date: Thu Sep 7 12:49:13 2017 New Revision: 75780 URL: http://svn.reactos.org/svn/reactos?rev=75780&view=rev Log: [FSUTIL] Fix a cppcheck warning Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/fsutil/dirty.c?rev=75780&r1=75779&r2=75780&view=diff == --- trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] Thu Sep 7 12:49:13 2017 @@ -52,7 +52,7 @@ CloseHandle(Volume); /* Print the status */ -_ftprintf(stdout, _T("The %s volume is %s\n"), argv[1], (VolumeStatus & VOLUME_IS_DIRTY ? _T("dirty") : _T("clean"))); +_ftprintf(stdout, _T("The %s volume is %s\n"), argv[1], ((VolumeStatus & VOLUME_IS_DIRTY) ? _T("dirty") : _T("clean"))); return 0; }
[ros-diffs] [mjansen] 75781: [SDK] Allow version lie shims to be applied to msi.dll
Author: mjansen Date: Thu Sep 7 16:46:33 2017 New Revision: 75781 URL: http://svn.reactos.org/svn/reactos?rev=75781&view=rev Log: [SDK] Allow version lie shims to be applied to msi.dll Modified: trunk/reactos/media/sdb/sysmain.xml Modified: trunk/reactos/media/sdb/sysmain.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/sdb/sysmain.xml?rev=75781&r1=75780&r2=75781&view=diff == --- trunk/reactos/media/sdb/sysmain.xml [iso-8859-1] (original) +++ trunk/reactos/media/sdb/sysmain.xml [iso-8859-1] Thu Sep 7 16:46:33 2017 @@ -13,6 +13,7 @@ + @@ -21,6 +22,7 @@ + @@ -29,6 +31,7 @@ + @@ -37,6 +40,7 @@ + @@ -45,6 +49,7 @@ + @@ -53,6 +58,7 @@ + @@ -61,6 +67,7 @@ + @@ -69,6 +76,7 @@ + @@ -77,6 +85,7 @@ + @@ -85,6 +94,7 @@ + @@ -93,6 +103,7 @@ + @@ -101,6 +112,7 @@ + @@ -109,6 +121,7 @@ + @@ -117,6 +130,7 @@ + @@ -125,6 +139,7 @@ + @@ -133,6 +148,7 @@ + @@ -141,6 +157,7 @@ + @@ -149,6 +166,7 @@ +
[ros-diffs] [pschweitzer] 75782: [NTOSKRNL] In IoReportDetectedDevice(), don't attempt to guess service name, use the one provided in DriverObject. This fixes BtrFS file system driver initialization.
Author: pschweitzer Date: Thu Sep 7 21:23:19 2017 New Revision: 75782 URL: http://svn.reactos.org/svn/reactos?rev=75782&view=rev Log: [NTOSKRNL] In IoReportDetectedDevice(), don't attempt to guess service name, use the one provided in DriverObject. This fixes BtrFS file system driver initialization. Patch by Thomas Faber. CORE-13763 Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c?rev=75782&r1=75781&r2=75782&view=diff == --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c[iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c[iso-8859-1] Thu Sep 7 21:23:19 2017 @@ -181,12 +181,7 @@ DPRINT("IoReportDetectedDevice (DeviceObject %p, *DeviceObject %p)\n", DeviceObject, DeviceObject ? *DeviceObject : NULL); -/* Create the service name (eg. ACPI_HAL) */ -ServiceName.Buffer = DriverObject->DriverName.Buffer + - sizeof(DRIVER_ROOT_NAME) / sizeof(WCHAR) - 1; -ServiceName.Length = DriverObject->DriverName.Length - - sizeof(DRIVER_ROOT_NAME) + sizeof(WCHAR); -ServiceName.MaximumLength = ServiceName.Length; +ServiceName = DriverObject->DriverExtension->ServiceKeyName; /* If the interface type is unknown, treat it as internal */ if (LegacyBusType == InterfaceTypeUndefined)