Ros-diffs January 2016

ros-diffs@reactos.org

13 participants
192 discussions

[pschweitzer] 70499: [ROSVBOXMGMT] When displaying active shares, also display their names

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Jan 5 21:42:54 2016 New Revision: 70499 URL: http://svn.reactos.org/svn/reactos?rev=70499&view=rev Log: [ROSVBOXMGMT] When displaying active shares, also display their names Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/rosv… ============================================================================== --- trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] Tue Jan 5 21:42:54 2016 @@ -12,6 +12,8 @@ /* DON'T CHANGE ORDER!!!! */ PCWSTR devices[3] = { L"\\\\.\\VBoxMiniRdrDN", L"\\??\\VBoxMiniRdrDN", L"\\Device\\VBoxMiniRdr" }; + +#define MAX_LEN 255 /* Taken from VBox header */ #define _MRX_MAX_DRIVE_LETTERS 26 @@ -21,6 +23,7 @@ #define IOCTL_MRX_VBOX_ADDCONN _MRX_VBOX_CONTROL_CODE(100, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_MRX_VBOX_GETLIST _MRX_VBOX_CONTROL_CODE(103, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_MRX_VBOX_GETGLOBALLIST _MRX_VBOX_CONTROL_CODE(104, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MRX_VBOX_GETGLOBALCONN _MRX_VBOX_CONTROL_CODE(105, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_MRX_VBOX_START _MRX_VBOX_CONTROL_CODE(106, METHOD_BUFFERED, FILE_ANY_ACCESS) BOOL performDevIoCtl(DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize) @@ -120,6 +123,21 @@ return 0; } +PWSTR getGlobalConn(CHAR id) +{ + BOOL ret; + static WCHAR name[MAX_LEN]; + + ret = performDevIoCtl(IOCTL_MRX_VBOX_GETGLOBALCONN, &id, sizeof(id), name, sizeof(name)); + if (ret == FALSE) + { + return NULL; + } + + name[MAX_LEN - 1] = 0; + return name; +} + int getGlobalList(void) { short i; @@ -135,10 +153,22 @@ return 1; } - for (i = 0; i < _MRX_MAX_DRIVE_LETTERS; i += 2) - { - wprintf(L"%c: %s\t%c: %s\n", 'A' + i, (outputBuffer[i] & 0x80 ? L"Active" : L"Inactive"), - 'A' + (i + 1), (outputBuffer[i + 1] & 0x80 ? L"Active" : L"Inactive")); + for (i = 0; i < _MRX_MAX_DRIVE_LETTERS; ++i) + { + CHAR id = outputBuffer[i]; + BOOL active = ((id & 0x80) == 0x80); + PWSTR name = NULL; + + if (active) + { + name = getGlobalConn(id); + } + if (name == NULL) + { + name = L"None"; + } + + wprintf(L"%c: %s (%s)%c", 'A' + i, (active ? L"Active" : L"Inactive"), name, (i & 1 ? '\n' : '\t')); } return 0;

8 years, 8 months

[hbelusca] 70498: [NTOS:MM]: Don't hardcode Mm tags since we have a #define

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jan 5 19:53:07 2016 New Revision: 70498 URL: http://svn.reactos.org/svn/reactos?rev=70498&view=rev Log: [NTOS:MM]: Don't hardcode Mm tags since we have a #define Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/session.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Tue Jan 5 19:53:07 2016 @@ -1901,7 +1901,7 @@ // MmPagedPoolInfo.PagedPoolAllocationMap = ExAllocatePoolWithTag(NonPagedPool, Size, - ' mM'); + TAG_MM); ASSERT(MmPagedPoolInfo.PagedPoolAllocationMap); // @@ -1922,7 +1922,7 @@ // MmPagedPoolInfo.EndOfPagedPoolBitmap = ExAllocatePoolWithTag(NonPagedPool, Size, - ' mM'); + TAG_MM); ASSERT(MmPagedPoolInfo.EndOfPagedPoolBitmap); RtlInitializeBitMap(MmPagedPoolInfo.EndOfPagedPoolBitmap, (PULONG)(MmPagedPoolInfo.EndOfPagedPoolBitmap + 1), @@ -2306,7 +2306,7 @@ // Bitmap = ExAllocatePoolWithTag(NonPagedPool, (((MmHighestPhysicalPage + 1) + 31) / 32) * 4, - ' mM'); + TAG_MM); if (!Bitmap) { // Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Tue Jan 5 19:53:07 2016 @@ -1353,7 +1353,7 @@ /* Allocate and initialize the bitmap to track allocations */ PagedPoolInfo->PagedPoolAllocationMap = ExAllocatePoolWithTag(NonPagedPool, BitmapSize, - ' mM'); + TAG_MM); ASSERT(PagedPoolInfo->PagedPoolAllocationMap != NULL); RtlInitializeBitMap(PagedPoolInfo->PagedPoolAllocationMap, (PULONG)(PagedPoolInfo->PagedPoolAllocationMap + 1), @@ -1366,7 +1366,7 @@ /* Allocate and initialize the bitmap to track free space */ PagedPoolInfo->EndOfPagedPoolBitmap = ExAllocatePoolWithTag(NonPagedPool, BitmapSize, - ' mM'); + TAG_MM); ASSERT(PagedPoolInfo->EndOfPagedPoolBitmap != NULL); RtlInitializeBitMap(PagedPoolInfo->EndOfPagedPoolBitmap, (PULONG)(PagedPoolInfo->EndOfPagedPoolBitmap + 1), Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/session.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] Tue Jan 5 19:53:07 2016 @@ -143,7 +143,7 @@ BitmapSize = ((Size + 31) / 32) * sizeof(ULONG); MiSessionIdBitmap = ExAllocatePoolWithTag(PagedPool, sizeof(RTL_BITMAP) + BitmapSize, - ' mM'); + TAG_MM); if (MiSessionIdBitmap) { /* Free all the bits */ Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Tue Jan 5 19:53:07 2016 @@ -48,7 +48,7 @@ /* Allocate enough buffer for the PFN bitmap and align it on 32-bits */ Bitmap = ExAllocatePoolWithTag(NonPagedPool, (((MmHighestPhysicalPage + 1) + 31) / 32) * 4, - ' mM'); + TAG_MM); ASSERT(Bitmap); /* Initialize it and clear all the bits to begin with */ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Jan 5 19:53:07 2016 @@ -305,7 +305,7 @@ // MmSharedUserDataPte = ExAllocatePoolWithTag(PagedPool, sizeof(MMPTE), - ' mM'); + TAG_MM); if (!MmSharedUserDataPte) return FALSE; //

8 years, 8 months

[hbelusca] 70497: [REACTOS] Update the README files for 0.4.x releases.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jan 5 19:52:35 2016 New Revision: 70497 URL: http://svn.reactos.org/svn/reactos?rev=70497&view=rev Log: [REACTOS] Update the README files for 0.4.x releases. Modified: trunk/reactos/INSTALL trunk/reactos/README trunk/reactos/boot/bootdata/readme.txt Modified: trunk/reactos/INSTALL URL: http://svn.reactos.org/svn/reactos/trunk/reactos/INSTALL?rev=70497&r1=70496… ============================================================================== --- trunk/reactos/INSTALL [iso-8859-1] (original) +++ trunk/reactos/INSTALL [iso-8859-1] Tue Jan 5 19:52:35 2016 @@ -1,28 +1,41 @@ 1. Build environment +-------------------- -To build the system you need either mingw32 installed on Windows or a mingw32 -cross compiler running on unix. You may obtain MinGW binaries that build -ReactOS from http://www.reactos.org/. +To build the system it is strongly advised to use the ReactOS Build Environment +(RosBE). Up-to-date versions for Windows and for Unix/GNU-Linux are available +from our download page at: http://www.reactos.org/wiki/Build_Environment/ + +Alternatively one can use Microsoft Visual C++ (MSVC) version 2010+, together +with separate installations of CMake and the Ninja build utility. 2. Building ReactOS +------------------- + +A throughout guide for how to build ReactOS can be found at: + http://www.reactos.org/wiki/Building_ReactOS + +In the following we only make a quick overview. + 2.1 Building the binaries -To build ReactOS run 'make' (without the quotes) if you are building on Linux -or 'mingw32-make' if you are building on Windows (or ReactOS) from the top -directory. If you are using RosBE, follow on-screen instructions. +To build ReactOS run 'ninja' (without the quotes), or alternatively run +'make' if you are using the Make utility, from the top directory. +NOTE: In the other examples listed in the following, similar modification +holds if you are using the Make utility instead of Ninja. +If you are using RosBE, follow on-screen instructions. 2.2 Building a bootable CD image -To build a bootable CD image run 'make bootcd' (without the quotes) if you are -building on Linux or 'mingw32-make bootcd' if you are building on Windows (or -ReactOS) from the top directory. This will create a CD image with a filename, -ReactOS.iso, in the top directory. +To build a bootable CD image run 'ninja bootcd' (without the quotes) from the +top directory. This will create a CD image with a filename, ReactOS.iso, in +the top directory. 3. Installation +--------------- ReactOS can only be installed on a machine that has a FAT16 or FAT32 partition as the active (bootable) partition. The partition on which ReactOS is to be @@ -41,13 +54,13 @@ follow the instructions to install ReactOS. If you have an existing ReactOS installation you want to upgrade, then to -install ReactOS after building it, type 'make install' or -'mingw32-make install'. This will create the directory 'reactos' in the top -directory. Copy the contents of this directory over the existing installation. +install ReactOS after building it, type 'ninja install'. This will create +the directory 'reactos' in the top directory. Copy the contents of this +directory over the existing installation. If you don't want to copy the files manually every time you run a -'make install' or 'mingw32-make install', then you can specify the directory -where the files are to be copied to during installation. +'ninja install', then you can specify the directory where the files are +to be copied to during installation. Set the ROS_INSTALL environment variable. If you are on Windows this could be done by: @@ -58,8 +71,7 @@ export ROS_INSTALL=/mnt/windows/reactos -Now run 'make install' or 'mingw32-make install' to install the files to the -new location. +Now run 'ninja install' to install the files to the new location. 3.2 Installation from bootable CD distribution @@ -68,12 +80,13 @@ contents. Then burn the CD image, boot from it, and follow instructions. -5. Help +4. Help +------- If you run into problems or have suggestions for making ReactOS better, please visit the address below. Mailing lists are available for a variety of topics, bugs should be submitted to JIRA and general chat takes place in the forums, -or #reactos on freenode +or #reactos on freenode. http://www.reactos.org/ Modified: trunk/reactos/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/README?rev=70497&r1=70496&… ============================================================================== --- trunk/reactos/README [iso-8859-1] (original) +++ trunk/reactos/README [iso-8859-1] Tue Jan 5 19:52:35 2016 @@ -1,29 +1,32 @@ ======================== -ReactOS Version 0.3.x -Updated Dec 16, 2006 +ReactOS Version 0.4.x +Updated January 5, 2016 ======================== 1. What is ReactOS? +------------------- - ReactOS is an Open Source effort to develop a quality operating system -that is compatible with Windows NT applications and drivers. +ReactOS is an Open Source effort to develop a quality operating system that is +compatible with applications and drivers written for the Microsoft® Windows NT +family of operating systems (NT4, 2000, XP, 2003, Vista, Seven). - The ReactOS project, although currently focused on Windows XP/2003 -drivers compatibility, is always keeping an eye toward compatibility with -older version of Windows NT family ( NT 4.0, 2000 (NT 5.0)) and new -Windows NT releases (Vista, etc). Applications (Win32 API) compatibility -focus is Windows XP. +The ReactOS project, although currently focused on Windows Server 2003 +compatibility, is always keeping an eye toward compatibility with +Windows Vista and future Windows NT releases. -More information is available at http://www.reactos.org/. +More information is available at: http://www.reactos.org 2. Building ReactOS +------------------- See the INSTALL file for more details. 3. More information +------------------- See the media\doc subdirectory for some sparse notes. 4. Who is responsible +--------------------- See the CREDITS file. Modified: trunk/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/readme.txt?r… ============================================================================== --- trunk/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/readme.txt [iso-8859-1] Tue Jan 5 19:52:35 2016 @@ -1,6 +1,6 @@ ======================== -ReactOS Version 0.3.x -Updated March 3, 2013 +ReactOS Version 0.4.x +Updated January 5, 2016 ======================== 1. What is ReactOS? @@ -10,7 +10,7 @@ compatible with applications and drivers written for the Microsoft® Windows NT family of operating systems (NT4, 2000, XP, 2003, Vista, Seven). -Website: http://www.reactos.org +More information is available at: http://www.reactos.org 2. Relationship with the WINE project

8 years, 8 months

[gedmurphy] 70496: [NTOSKRNL] - Use the LockQueueIoDatabaseLock spinlock to guard the device list instead of blindly raising the IRQL - Add missing lock to IopEditDeviceList

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jan 5 18:58:32 2016 New Revision: 70496 URL: http://svn.reactos.org/svn/reactos?rev=70496&view=rev Log: [NTOSKRNL] - Use the LockQueueIoDatabaseLock spinlock to guard the device list instead of blindly raising the IRQL - Add missing lock to IopEditDeviceList Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Tue Jan 5 18:58:32 2016 @@ -333,6 +333,10 @@ IN IOP_DEVICE_LIST_OPERATION Type) { PDEVICE_OBJECT Previous; + KIRQL OldIrql; + + /* Lock the Device list while we edit it */ + OldIrql = KeAcquireQueuedSpinLock(LockQueueIoDatabaseLock); /* Check the type of operation */ if (Type == IopRemove) @@ -353,7 +357,12 @@ /* Not this one, keep moving */ if (!Previous->NextDevice) { - DPRINT1("Failed to remove PDO %p on driver %wZ (not found)\n", DeviceObject, &DeviceObject->DriverObject->DriverName); + DPRINT1("Failed to remove PDO %p on driver %wZ (not found)\n", + DeviceObject, + &DeviceObject->DriverObject->DriverName); + + ASSERT(FALSE); + KeReleaseQueuedSpinLock(LockQueueIoDatabaseLock, OldIrql); return; } Previous = Previous->NextDevice; @@ -369,6 +378,9 @@ DeviceObject->NextDevice = DriverObject->DeviceObject; DriverObject->DeviceObject = DeviceObject; } + + /* Release the device list lock */ + KeReleaseQueuedSpinLock(LockQueueIoDatabaseLock, OldIrql); } VOID @@ -1090,8 +1102,8 @@ PDEVICE_OBJECT CurrentDevice = DriverObject->DeviceObject; KIRQL OldIrql; - /* Raise to dispatch level */ - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + /* Lock the Device list while we enumerate it */ + OldIrql = KeAcquireQueuedSpinLock(LockQueueIoDatabaseLock); /* Find out how many devices we'll enumerate */ while ((CurrentDevice = CurrentDevice->NextDevice)) ActualDevices++; @@ -1106,7 +1118,7 @@ if ((ActualDevices * sizeof(PDEVICE_OBJECT)) > DeviceObjectListSize) { /* Fail because the buffer was too small */ - KeLowerIrql(OldIrql); + KeReleaseQueuedSpinLock(LockQueueIoDatabaseLock, OldIrql); return STATUS_BUFFER_TOO_SMALL; } @@ -1129,8 +1141,8 @@ } } - /* Return back to previous IRQL */ - KeLowerIrql(OldIrql); + /* Release the device list lock */ + KeReleaseQueuedSpinLock(LockQueueIoDatabaseLock, OldIrql); /* Return the status */ return STATUS_SUCCESS;

8 years, 8 months

[gedmurphy] 70495: [FLTMGR] - Fix a bug in FltpDetachFromFileSystemDevice so it correctly bails when we've walked the attached device list. - FltpDispatch can come in at high IRQL. Thanks to Thomas...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jan 5 18:43:26 2016 New Revision: 70495 URL: http://svn.reactos.org/svn/reactos?rev=70495&view=rev Log: [FLTMGR] - Fix a bug in FltpDetachFromFileSystemDevice so it correctly bails when we've walked the attached device list. - FltpDispatch can come in at high IRQL. Thanks to Thomas for noticing that err. - Add newlines to the end of DPRINTS (it's been a while...) - The filter now loads and runs in the reactos FS stack. Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] Tue Jan 5 18:43:26 2016 @@ -342,7 +342,6 @@ #pragma alloc_text(PAGE, FltpAttachToFileSystemDevice) #pragma alloc_text(PAGE, FltpDetachFromFileSystemDevice) #pragma alloc_text(PAGE, FltpFsNotification) -#pragma alloc_text(PAGE, FltpDispatch) #pragma alloc_text(PAGE, FltpCreate) #pragma alloc_text(PAGE, FltpFsControl) #pragma alloc_text(PAGE, FltpFastIoRead) @@ -427,8 +426,6 @@ { PFLTMGR_DEVICE_EXTENSION DeviceExtension; - PAGED_CODE(); - DeviceExtension = DeviceObject->DeviceExtension; __debugbreak(); FLT_ASSERT(DeviceExtension && @@ -1807,7 +1804,7 @@ Status = FltpGetObjectName(DeviceObject->DriverObject, &FileSystemDeviceName); if (!NT_SUCCESS(Status)) return Status; - DPRINT("Found device %wZ, checking if we need to attach...", &FileSystemDeviceName); + DPRINT("Found device %wZ, checking if we need to attach...\n", &FileSystemDeviceName); /* Build up the name of the file system recognizer device */ RtlInitUnicodeString(&FsRecDeviceName, L"\\FileSystem\\Fs_Rec"); @@ -1828,7 +1825,7 @@ &NewDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to create a DO for attatching to a FS : 0x%X", Status); + DPRINT1("Failed to create a DO for attatching to a FS : 0x%X\n", Status); return Status; } @@ -1841,11 +1838,11 @@ &DeviceExtension->AttachedToDeviceObject); if (NT_SUCCESS(Status)) { - DPRINT("Attached to %wZ", &FileSystemDeviceName); + DPRINT("Attached to %wZ\n", &FileSystemDeviceName); } else { - DPRINT1("Failed to attach to the driver stack : 0x%X", Status); + DPRINT1("Failed to attach to the driver stack : 0x%X\n", Status); goto Cleanup; } @@ -1862,7 +1859,7 @@ Status = FltpEnumerateFileSystemVolumes(DeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to enumerate file system volumes for this file system : 0x%X", Status); + DPRINT1("Failed to enumerate file system volumes for this file system : 0x%X\n", Status); IoDetachDevice(DeviceExtension->AttachedToDeviceObject); } @@ -1880,28 +1877,32 @@ LONG_PTR FltpDetachFromFileSystemDevice(_In_ PDEVICE_OBJECT DeviceObject) { - PDEVICE_OBJECT AttachedDevice, LowestDevice; + PDEVICE_OBJECT AttachedDevice, NextDevice; PFLTMGR_DEVICE_EXTENSION DeviceExtension; LONG_PTR Count; PAGED_CODE(); - - /* Get the attached device and increment the ref count on it */ + __debugbreak(); + + /* Get the top device in the chain and increment the ref count on it */ AttachedDevice = IoGetAttachedDeviceReference(DeviceObject); - /* Loop through all attached devices until we reach the bottom (file system driver) */ - while (AttachedDevice == NULL || - AttachedDevice->DriverObject != DriverData.DriverObject) - { - /* Get the attached device */ - LowestDevice = IoGetLowerDeviceObject(AttachedDevice); - - /* Remove the reference we added. If it's zero then we're already clean */ + /* Loop all attached devices looking for our file system driver */ + while (AttachedDevice->DriverObject != DriverData.DriverObject) + { + FLT_ASSERT(AttachedDevice != NULL); + + /* Get the next lower device object. This adds a ref on NextDevice */ + NextDevice = IoGetLowerDeviceObject(AttachedDevice); + + /* Remove the reference we added */ Count = ObfDereferenceObject(AttachedDevice); - if (Count == 0) return Count; + + /* Bail if this is the last one */ + if (NextDevice == NULL) return Count; /* Try the next one */ - AttachedDevice = LowestDevice; + AttachedDevice = NextDevice; } @@ -1929,7 +1930,7 @@ { UNICODE_STRING DeviceName; NTSTATUS Status; - __debugbreak(); + PAGED_CODE(); /* Set an empty string */ @@ -1939,7 +1940,7 @@ Status = FltpGetBaseDeviceObjectName(DeviceObject, &DeviceName); if (NT_SUCCESS(Status)) { - /* Check if it's attaching or detaching*/ + /* Check if it's attaching or detaching */ if (FsActive) { /* Run the attach routine */ @@ -1970,7 +1971,7 @@ UNICODE_STRING SymLink; NTSTATUS Status; - __debugbreak(); + RtlZeroMemory(&DriverData, sizeof(DRIVER_DATA)); DriverData.DriverObject = DriverObject; @@ -1996,7 +1997,7 @@ &DeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT1("fltmgr IoCreateDevice failed. Status = %X", Status); + DPRINT1("fltmgr IoCreateDevice failed. Status = %X\n", Status); goto Cleanup; }

8 years, 8 months

[ion] 70494: [DDK]: Add IMAGE_RESOURCE_DIRECTORY_ENTRY to NTIMAGE.H. I shudder to think how our current code currently parses resource directories without this.

by ion＠svn.reactos.org

Author: ion Date: Tue Jan 5 17:12:14 2016 New Revision: 70494 URL: http://svn.reactos.org/svn/reactos?rev=70494&view=rev Log: [DDK]: Add IMAGE_RESOURCE_DIRECTORY_ENTRY to NTIMAGE.H. I shudder to think how our current code currently parses resource directories without this. Modified: trunk/reactos/include/ddk/ntimage.h Modified: trunk/reactos/include/ddk/ntimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntimage.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntimage.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntimage.h [iso-8859-1] Tue Jan 5 17:12:14 2016 @@ -175,6 +175,27 @@ USHORT NumberOfNamedEntries; USHORT NumberOfIdEntries; } IMAGE_RESOURCE_DIRECTORY, *PIMAGE_RESOURCE_DIRECTORY; + +#define IMAGE_RESOURCE_NAME_IS_STRING 0x80000000 +#define IMAGE_RESOURCE_DATA_IS_DIRECTORY 0x80000000 + +typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY { + _ANONYMOUS_UNION union { + _ANONYMOUS_STRUCT struct { + ULONG NameOffset:31; + ULONG NameIsString:1; + } DUMMYSTRUCTNAME; + ULONG Name; + USHORT Id; + } DUMMYUNIONNAME; + _ANONYMOUS_UNION union { + ULONG OffsetToData; + _ANONYMOUS_STRUCT struct { + ULONG OffsetToDirectory:31; + ULONG DataIsDirectory:1; + } DUMMYSTRUCTNAME2; + } DUMMYUNIONNAME2; +} IMAGE_RESOURCE_DIRECTORY_ENTRY, *PIMAGE_RESOURCE_DIRECTORY_ENTRY; typedef struct _IMAGE_RESOURCE_DIRECTORY_STRING { USHORT Length;

8 years, 8 months

[gedmurphy] 70493: [FLTMGR] - Mark the Dispatch / FastIo functions as paged code - Fix declarations and remove casts

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jan 5 13:04:52 2016 New Revision: 70493 URL: http://svn.reactos.org/svn/reactos?rev=70493&view=rev Log: [FLTMGR] - Mark the Dispatch / FastIo functions as paged code - Fix declarations and remove casts Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] Tue Jan 5 13:04:52 2016 @@ -77,6 +77,260 @@ _In_ PDEVICE_OBJECT DeviceObject, _In_ BOOLEAN FsActive ); + +NTSTATUS +NTAPI +FltpDispatch( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp +); + +NTSTATUS +NTAPI +FltpCreate( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp +); + +NTSTATUS +NTAPI +FltpFsControl( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp +); + +BOOLEAN +NTAPI +FltpFastIoCheckIfPossible( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _In_ BOOLEAN CheckForReadOperation, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject +); + + +BOOLEAN +NTAPI +FltpFastIoRead( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _Out_ PVOID Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoWrite( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _In_ PVOID Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoQueryBasicInfo( + _In_ PFILE_OBJECT FileObject, + _In_ BOOLEAN Wait, + _Out_ PFILE_BASIC_INFORMATION Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoQueryStandardInfo( + _In_ PFILE_OBJECT FileObject, + _In_ BOOLEAN Wait, + _Out_ PFILE_STANDARD_INFORMATION Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoLock( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ PLARGE_INTEGER Length, + _In_ PEPROCESS ProcessId, + _In_ ULONG Key, + _In_ BOOLEAN FailImmediately, + _In_ BOOLEAN ExclusiveLock, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoUnlockSingle( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ PLARGE_INTEGER Length, + _In_ PEPROCESS ProcessId, + _In_ ULONG Key, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoUnlockAll( + _In_ PFILE_OBJECT FileObject, + _In_ PEPROCESS ProcessId, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoUnlockAllByKey( + _In_ PFILE_OBJECT FileObject, + _In_ PVOID ProcessId, + _In_ ULONG Key, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoDeviceControl( + _In_ PFILE_OBJECT FileObject, + _In_ BOOLEAN Wait, + _In_opt_ PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_opt_ PVOID OutputBuffer, + _In_ ULONG OutputBufferLength, + _In_ ULONG IoControlCode, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject +); + +VOID +NTAPI +FltpFastIoDetachDevice( + _In_ PDEVICE_OBJECT SourceDevice, + _In_ PDEVICE_OBJECT TargetDevice +); + +BOOLEAN +NTAPI +FltpFastIoQueryNetworkOpenInfo( + _In_ PFILE_OBJECT FileObject, + _In_ BOOLEAN Wait, + _Out_ PFILE_NETWORK_OPEN_INFORMATION Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoMdlRead( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ ULONG LockKey, + _Out_ PMDL *MdlChain, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoMdlReadComplete( + _In_ PFILE_OBJECT FileObject, + _In_ PMDL MdlChain, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoPrepareMdlWrite( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ ULONG LockKey, + _Out_ PMDL *MdlChain, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoMdlWriteComplete( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ PMDL MdlChain, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoReadCompressed( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ ULONG LockKey, + _Out_ PVOID Buffer, + _Out_ PMDL *MdlChain, + _Out_ PIO_STATUS_BLOCK IoStatus, + _Out_ PCOMPRESSED_DATA_INFO CompressedDataInfo, + _In_ ULONG CompressedDataInfoLength, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoWriteCompressed( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ ULONG LockKey, + _In_ PVOID Buffer, + _Out_ PMDL *MdlChain, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PCOMPRESSED_DATA_INFO CompressedDataInfo, + _In_ ULONG CompressedDataInfoLength, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoMdlReadCompleteCompressed( + _In_ PFILE_OBJECT FileObject, + _In_ PMDL MdlChain, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoMdlWriteCompleteCompressed( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ PMDL MdlChain, + _In_ PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +NTAPI +FltpFastIoQueryOpen( + _Inout_ PIRP Irp, + _Out_ PFILE_NETWORK_OPEN_INFORMATION NetworkInformation, + _In_ PDEVICE_OBJECT DeviceObject +); + #ifdef ALLOC_PRAGMA @@ -88,7 +342,29 @@ #pragma alloc_text(PAGE, FltpAttachToFileSystemDevice) #pragma alloc_text(PAGE, FltpDetachFromFileSystemDevice) #pragma alloc_text(PAGE, FltpFsNotification) -//#pragma alloc_text(PAGE, ) +#pragma alloc_text(PAGE, FltpDispatch) +#pragma alloc_text(PAGE, FltpCreate) +#pragma alloc_text(PAGE, FltpFsControl) +#pragma alloc_text(PAGE, FltpFastIoRead) +#pragma alloc_text(PAGE, FltpFastIoWrite) +#pragma alloc_text(PAGE, FltpFastIoQueryBasicInfo) +#pragma alloc_text(PAGE, FltpFastIoQueryStandardInfo) +#pragma alloc_text(PAGE, FltpFastIoLock) +#pragma alloc_text(PAGE, FltpFastIoUnlockSingle) +#pragma alloc_text(PAGE, FltpFastIoUnlockAll) +#pragma alloc_text(PAGE, FltpFastIoUnlockAllByKey) +#pragma alloc_text(PAGE, FltpFastIoDeviceControl) +#pragma alloc_text(PAGE, FltpFastIoDetachDevice) +#pragma alloc_text(PAGE, FltpFastIoQueryNetworkOpenInfo) +#pragma alloc_text(PAGE, FltpFastIoMdlRead) +#pragma alloc_text(PAGE, FltpFastIoMdlReadComplete) +#pragma alloc_text(PAGE, FltpFastIoPrepareMdlWrite) +#pragma alloc_text(PAGE, FltpFastIoMdlWriteComplete) +#pragma alloc_text(PAGE, FltpFastIoReadCompressed) +#pragma alloc_text(PAGE, FltpFastIoWriteCompressed) +#pragma alloc_text(PAGE, FltpFastIoMdlReadCompleteCompressed) +#pragma alloc_text(PAGE, FltpFastIoMdlWriteCompleteCompressed) +#pragma alloc_text(PAGE, FltpFastIoQueryOpen) #endif #define MAX_DEVNAME_LENGTH 64 @@ -150,6 +426,9 @@ _Inout_ PIRP Irp) { PFLTMGR_DEVICE_EXTENSION DeviceExtension; + + PAGED_CODE(); + DeviceExtension = DeviceObject->DeviceExtension; __debugbreak(); FLT_ASSERT(DeviceExtension && @@ -166,6 +445,9 @@ _Inout_ PIRP Irp) { PFLTMGR_DEVICE_EXTENSION DeviceExtension; + + PAGED_CODE(); + DeviceExtension = DeviceObject->DeviceExtension; __debugbreak(); FLT_ASSERT(DeviceExtension && @@ -182,6 +464,9 @@ _Inout_ PIRP Irp) { PFLTMGR_DEVICE_EXTENSION DeviceExtension; + + PAGED_CODE(); + DeviceExtension = DeviceObject->DeviceExtension; __debugbreak(); FLT_ASSERT(DeviceExtension && @@ -196,6 +481,7 @@ /* FASTIO ROUTINES ************************************************/ BOOLEAN +NTAPI FltpFastIoCheckIfPossible(_In_ PFILE_OBJECT FileObject, _In_ PLARGE_INTEGER FileOffset, _In_ ULONG Length, @@ -248,6 +534,7 @@ } BOOLEAN +NTAPI FltpFastIoRead(_In_ PFILE_OBJECT FileObject, _In_ PLARGE_INTEGER FileOffset, _In_ ULONG Length, @@ -299,6 +586,7 @@ } BOOLEAN +NTAPI FltpFastIoWrite(_In_ PFILE_OBJECT FileObject, _In_ PLARGE_INTEGER FileOffset, _In_ ULONG Length, @@ -350,6 +638,7 @@ } BOOLEAN +NTAPI FltpFastIoQueryBasicInfo(_In_ PFILE_OBJECT FileObject, _In_ BOOLEAN Wait, _Out_ PFILE_BASIC_INFORMATION Buffer, @@ -395,6 +684,7 @@ } BOOLEAN +NTAPI FltpFastIoQueryStandardInfo(_In_ PFILE_OBJECT FileObject, _In_ BOOLEAN Wait, _Out_ PFILE_STANDARD_INFORMATION Buffer, @@ -440,6 +730,7 @@ } BOOLEAN +NTAPI FltpFastIoLock(_In_ PFILE_OBJECT FileObject, _In_ PLARGE_INTEGER FileOffset, _In_ PLARGE_INTEGER Length, @@ -493,6 +784,7 @@ } BOOLEAN +NTAPI FltpFastIoUnlockSingle(_In_ PFILE_OBJECT FileObject, _In_ PLARGE_INTEGER FileOffset, _In_ PLARGE_INTEGER Length, @@ -542,6 +834,7 @@ } BOOLEAN +NTAPI FltpFastIoUnlockAll(_In_ PFILE_OBJECT FileObject, _In_ PEPROCESS ProcessId, _Out_ PIO_STATUS_BLOCK IoStatus, @@ -586,6 +879,7 @@ } BOOLEAN +NTAPI FltpFastIoUnlockAllByKey(_In_ PFILE_OBJECT FileObject, _In_ PVOID ProcessId, _In_ ULONG Key, @@ -631,6 +925,7 @@ } BOOLEAN +NTAPI FltpFastIoDeviceControl(_In_ PFILE_OBJECT FileObject, _In_ BOOLEAN Wait, _In_opt_ PVOID InputBuffer, @@ -701,6 +996,7 @@ } VOID +NTAPI FltpFastIoDetachDevice(_In_ PDEVICE_OBJECT SourceDevice, _In_ PDEVICE_OBJECT TargetDevice) { @@ -740,6 +1036,7 @@ } BOOLEAN +NTAPI FltpFastIoQueryNetworkOpenInfo(_In_ PFILE_OBJECT FileObject, _In_ BOOLEAN Wait, _Out_ PFILE_NETWORK_OPEN_INFORMATION Buffer, @@ -785,6 +1082,7 @@ } BOOLEAN +NTAPI FltpFastIoMdlRead(_In_ PFILE_OBJECT FileObject, _In_ PLARGE_INTEGER FileOffset, _In_ ULONG Length, @@ -834,6 +1132,7 @@ } BOOLEAN +NTAPI FltpFastIoMdlReadComplete(_In_ PFILE_OBJECT FileObject, _In_ PMDL MdlChain, _In_ PDEVICE_OBJECT DeviceObject) @@ -874,6 +1173,7 @@ } BOOLEAN +NTAPI FltpFastIoPrepareMdlWrite(_In_ PFILE_OBJECT FileObject, _In_ PLARGE_INTEGER FileOffset, _In_ ULONG Length, @@ -923,6 +1223,7 @@ } BOOLEAN +NTAPI FltpFastIoMdlWriteComplete(_In_ PFILE_OBJECT FileObject, _In_ PLARGE_INTEGER FileOffset, _In_ PMDL MdlChain, @@ -964,6 +1265,7 @@ } BOOLEAN +NTAPI FltpFastIoReadCompressed(_In_ PFILE_OBJECT FileObject, _In_ PLARGE_INTEGER FileOffset, _In_ ULONG Length, @@ -1017,6 +1319,7 @@ } BOOLEAN +NTAPI FltpFastIoWriteCompressed(_In_ PFILE_OBJECT FileObject, _In_ PLARGE_INTEGER FileOffset, _In_ ULONG Length, @@ -1070,6 +1373,7 @@ } BOOLEAN +NTAPI FltpFastIoMdlReadCompleteCompressed(_In_ PFILE_OBJECT FileObject, _In_ PMDL MdlChain, _In_ PDEVICE_OBJECT DeviceObject) @@ -1108,6 +1412,7 @@ } BOOLEAN +NTAPI FltpFastIoMdlWriteCompleteCompressed(_In_ PFILE_OBJECT FileObject, _In_ PLARGE_INTEGER FileOffset, _In_ PMDL MdlChain, @@ -1148,6 +1453,7 @@ } BOOLEAN +NTAPI FltpFastIoQueryOpen(_Inout_ PIRP Irp, _Out_ PFILE_NETWORK_OPEN_INFORMATION NetworkInformation, _In_ PDEVICE_OBJECT DeviceObject) @@ -1792,27 +2098,27 @@ /* Fill out the FastIo table */ RtlZeroMemory(FastIoDispatch, sizeof(FAST_IO_DISPATCH)); FastIoDispatch->SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); - FastIoDispatch->FastIoCheckIfPossible = (PFAST_IO_CHECK_IF_POSSIBLE)FltpFastIoCheckIfPossible; - FastIoDispatch->FastIoRead = (PFAST_IO_READ)FltpFastIoRead; - FastIoDispatch->FastIoWrite = (PFAST_IO_WRITE)FltpFastIoWrite; - FastIoDispatch->FastIoQueryBasicInfo = (PFAST_IO_QUERY_BASIC_INFO)FltpFastIoQueryBasicInfo; - FastIoDispatch->FastIoQueryStandardInfo = (PFAST_IO_QUERY_STANDARD_INFO)FltpFastIoQueryStandardInfo; - FastIoDispatch->FastIoLock = (PFAST_IO_LOCK)FltpFastIoLock; - FastIoDispatch->FastIoUnlockSingle = (PFAST_IO_UNLOCK_SINGLE)FltpFastIoUnlockSingle; - FastIoDispatch->FastIoUnlockAll = (PFAST_IO_UNLOCK_ALL)FltpFastIoUnlockAll; - FastIoDispatch->FastIoUnlockAllByKey = (PFAST_IO_UNLOCK_ALL_BY_KEY)FltpFastIoUnlockAllByKey; - FastIoDispatch->FastIoDeviceControl = (PFAST_IO_DEVICE_CONTROL)FltpFastIoDeviceControl; - FastIoDispatch->FastIoDetachDevice = (PFAST_IO_DETACH_DEVICE)FltpFastIoDetachDevice; - FastIoDispatch->FastIoQueryNetworkOpenInfo = (PFAST_IO_QUERY_NETWORK_OPEN_INFO)FltpFastIoQueryNetworkOpenInfo; - FastIoDispatch->MdlRead = (PFAST_IO_MDL_READ)FltpFastIoMdlRead; - FastIoDispatch->MdlReadComplete = (PFAST_IO_MDL_READ_COMPLETE)FltpFastIoMdlReadComplete; - FastIoDispatch->PrepareMdlWrite = (PFAST_IO_PREPARE_MDL_WRITE)FltpFastIoPrepareMdlWrite; - FastIoDispatch->MdlWriteComplete = (PFAST_IO_MDL_WRITE_COMPLETE)FltpFastIoMdlWriteComplete; - FastIoDispatch->FastIoReadCompressed = (PFAST_IO_READ_COMPRESSED)FltpFastIoReadCompressed; - FastIoDispatch->FastIoWriteCompressed = (PFAST_IO_WRITE_COMPRESSED)FltpFastIoWriteCompressed; - FastIoDispatch->MdlReadCompleteCompressed = (PFAST_IO_MDL_READ_COMPLETE_COMPRESSED)FltpFastIoMdlReadCompleteCompressed; - FastIoDispatch->MdlWriteCompleteCompressed = (PFAST_IO_MDL_WRITE_COMPLETE_COMPRESSED)FltpFastIoMdlWriteCompleteCompressed; - FastIoDispatch->FastIoQueryOpen = (PFAST_IO_QUERY_OPEN)FltpFastIoQueryOpen; + FastIoDispatch->FastIoCheckIfPossible = FltpFastIoCheckIfPossible; + FastIoDispatch->FastIoRead = FltpFastIoRead; + FastIoDispatch->FastIoWrite = FltpFastIoWrite; + FastIoDispatch->FastIoQueryBasicInfo = FltpFastIoQueryBasicInfo; + FastIoDispatch->FastIoQueryStandardInfo = FltpFastIoQueryStandardInfo; + FastIoDispatch->FastIoLock = FltpFastIoLock; + FastIoDispatch->FastIoUnlockSingle = FltpFastIoUnlockSingle; + FastIoDispatch->FastIoUnlockAll = FltpFastIoUnlockAll; + FastIoDispatch->FastIoUnlockAllByKey = FltpFastIoUnlockAllByKey; + FastIoDispatch->FastIoDeviceControl = FltpFastIoDeviceControl; + FastIoDispatch->FastIoDetachDevice = FltpFastIoDetachDevice; + FastIoDispatch->FastIoQueryNetworkOpenInfo = FltpFastIoQueryNetworkOpenInfo; + FastIoDispatch->MdlRead = FltpFastIoMdlRead; + FastIoDispatch->MdlReadComplete = FltpFastIoMdlReadComplete; + FastIoDispatch->PrepareMdlWrite = FltpFastIoPrepareMdlWrite; + FastIoDispatch->MdlWriteComplete = FltpFastIoMdlWriteComplete; + FastIoDispatch->FastIoReadCompressed = FltpFastIoReadCompressed; + FastIoDispatch->FastIoWriteCompressed = FltpFastIoWriteCompressed; + FastIoDispatch->MdlReadCompleteCompressed = FltpFastIoMdlReadCompleteCompressed; + FastIoDispatch->MdlWriteCompleteCompressed = FltpFastIoMdlWriteCompleteCompressed; + FastIoDispatch->FastIoQueryOpen = FltpFastIoQueryOpen; /* Store the FastIo table for internal and our access */ DriverObject->FastIoDispatch = FastIoDispatch;

8 years, 8 months

[ion] 70492: [BOOTLIB]: Separate out bcd.c into bcdopt.c, bootreg.c and bcd.c [BOOTLIB]: Implement routines to enumerate subkeys and to read a key value. [BOOTLIB]: Implement routines to parse, enu...

by ion＠svn.reactos.org

Author: ion Date: Tue Jan 5 06:09:22 2016 New Revision: 70492 URL: http://svn.reactos.org/svn/reactos?rev=70492&view=rev Log: [BOOTLIB]: Separate out bcd.c into bcdopt.c, bootreg.c and bcd.c [BOOTLIB]: Implement routines to enumerate subkeys and to read a key value. [BOOTLIB]: Implement routines to parse, enumerate, and convert registry data into BCD elements, and to convert BCD elements into boot library BCD options. [BOOTLIB/BOOTMGFW]: Lots of cleanups, mainly around the fact we now use ntintsafe.h instead of the manually self-inlined code from before, and from documenting additional flag values, and from using our newfound BCD powers. [BOOTMGFW]: Implement BmGetOptionList, BmpUpdateApplicationOptions. [BOOTMGFW]: Prepare for post-BCD library reinitialization. We correctly read the 3 BCD options so far in the hive. Added: trunk/reactos/boot/environ/lib/misc/bcdopt.c (with props) trunk/reactos/boot/environ/lib/misc/bootreg.c (with props) Modified: trunk/reactos/boot/environ/CMakeLists.txt trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/app/bootmgr/bootmgr.h trunk/reactos/boot/environ/include/bcd.h trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/bootlib.c trunk/reactos/boot/environ/lib/io/display/display.c trunk/reactos/boot/environ/lib/misc/bcd.c trunk/reactos/boot/environ/lib/mm/mm.c trunk/reactos/boot/environ/lib/mm/pagealloc.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/environ/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/CMakeLists.tx… Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… Modified: trunk/reactos/boot/environ/include/bcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bcd.h… Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… Modified: trunk/reactos/boot/environ/lib/bootlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/bootlib.c… Modified: trunk/reactos/boot/environ/lib/io/display/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… Modified: trunk/reactos/boot/environ/lib/misc/bcd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcd.… Added: trunk/reactos/boot/environ/lib/misc/bcdopt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcdo… Added: trunk/reactos/boot/environ/lib/misc/bootreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/boot… Modified: trunk/reactos/boot/environ/lib/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/mm.c?r… Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal…

8 years, 8 months

[ion] 70491: [BOOTMGFW]: Implement the rtlcompat functions, so that Rtl string functions will actually work. [HIVEBCD]: Start filling out a minimalistic BCD Hive layout to try out the BCD parsing/c...

by ion＠svn.reactos.org

Author: ion Date: Tue Jan 5 05:12:01 2016 New Revision: 70491 URL: http://svn.reactos.org/svn/reactos?rev=70491&view=rev Log: [BOOTMGFW]: Implement the rtlcompat functions, so that Rtl string functions will actually work. [HIVEBCD]: Start filling out a minimalistic BCD Hive layout to try out the BCD parsing/conversion code in my WC. Modified: trunk/reactos/boot/bootdata/hivebcd.inf trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c Modified: trunk/reactos/boot/bootdata/hivebcd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivebcd.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivebcd.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivebcd.inf [iso-8859-1] Tue Jan 5 05:12:01 2016 @@ -6,6 +6,11 @@ BCD,"BCD00000000\Description\Control","System",0x00010003,1 BCD,"BCD00000000\Description\Control","TreatAtSystem",0x00010003,1 BCD,"BCD00000000\Description\Control","KeyName",2,"BCD00000000" -BCD,"BCD00000000\Objects",,0x00000012 + +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Description","Type",0x00010003,0x10100002 + +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\12000002","Element",2,"\EFI\BOOT\BOOTIA32.EFI" +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\12000004","Element",2,"ReactOS Boot Manager" +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\12000005","Element",2,"en-US" ; EOF Modified: trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/r… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c [iso-8859-1] Tue Jan 5 05:12:01 2016 @@ -30,7 +30,8 @@ _In_ ULONG Tag ) { - return NULL; + UNREFERENCED_PARAMETER(Tag); + return BlMmAllocateHeap(Bytes); } VOID @@ -40,7 +41,8 @@ _In_ ULONG Tag ) { - return; + UNREFERENCED_PARAMETER(Tag); + BlMmFreeHeap(Mem); } NTSTATUS @@ -64,7 +66,11 @@ IN PCHAR Message OPTIONAL ) { - + EfiPrintf(L"*** ASSERTION %s FAILED AT %d in %s (%s) ***\r \n", + FailedAssertion, + LineNumber, + FileName, + Message); } ULONG @@ -73,6 +79,7 @@ ... ) { + EfiPrintf(L"%s\r\n", Format); return 0; }

8 years, 8 months

[ion] 70490: [CMLIB]: Attempt fix for Linux hosts.

by ion＠svn.reactos.org

Author: ion Date: Tue Jan 5 01:55:40 2016 New Revision: 70490 URL: http://svn.reactos.org/svn/reactos?rev=70490&view=rev Log: [CMLIB]: Attempt fix for Linux hosts. Modified: trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7049… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Tue Jan 5 01:55:40 2016 @@ -101,6 +101,7 @@ #define CMLTRACE(x, ...) #undef PAGED_CODE #define PAGED_CODE() + #define REGISTRY_ERROR ((ULONG)0x00000051L) #else // // Debug/Tracing support @@ -118,6 +119,7 @@ #include <ntdef.h> #include <ntddk.h> + #include <bugcodes.h> #undef PAGED_CODE #define PAGED_CODE() @@ -160,7 +162,6 @@ #include <wchar.h> #include "hivedata.h" #include "cmdata.h" -#include "bugcodes.h" #if defined(_TYPEDEFS_HOST_H) || defined(__FREELDR_H)

8 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2016