Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 70412: [WIN32K] Pass cjMaxBits parameter from GreCreateDIBitmapInternal to IntCreateDIBitmap and check the image size before creating the bitmap. Should fix crash when hitting about tab ...
by tkreuzer＠svn.reactos.org 23 Dec '15

23 Dec '15

Author: tkreuzer Date: Wed Dec 23 14:55:34 2015 New Revision: 70412 URL: http://svn.reactos.org/svn/reactos?rev=70412&view=rev Log: [WIN32K] Pass cjMaxBits parameter from GreCreateDIBitmapInternal to IntCreateDIBitmap and check the image size before creating the bitmap. Should fix crash when hitting about tab in Office2000 WinWord. CORE-10583 #comment please retest Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Wed Dec 23 14:55:34 2015 @@ -248,6 +248,7 @@ UINT StartScan, UINT ScanLines, CONST VOID *Bits, + ULONG cjMaxBits, CONST BITMAPINFO *bmi, UINT ColorUse) { @@ -260,6 +261,11 @@ PPALETTE ppalDIB = 0; if (!bmi) return 0; + + if (bmi->bmiHeader.biSizeImage > cjMaxBits) + { + return 0; + } SourceBitmap = GreCreateBitmapEx(bmi->bmiHeader.biWidth, ScanLines, @@ -1316,6 +1322,7 @@ ULONG compression, DWORD init, LPBYTE bits, + ULONG cjMaxBits, PBITMAPINFO data, DWORD coloruse) { @@ -1390,7 +1397,7 @@ if ((NULL != handle) && (CBM_INIT & init)) { - IntSetDIBits(Dc, handle, 0, height, bits, data, coloruse); + IntSetDIBits(Dc, handle, 0, height, bits, cjMaxBits, data, coloruse); } return handle; @@ -1529,7 +1536,7 @@ planes = 0; compression = 0; } - Bmp = IntCreateDIBitmap(Dc, cx, cy, planes, bpp, compression, fInit, pjInit, pbmi, iUsage); + Bmp = IntCreateDIBitmap(Dc, cx, cy, planes, bpp, compression, fInit, pjInit, cjMaxBits, pbmi, iUsage); DC_UnlockDc(Dc); if(!hDc)

1 0

[gedmurphy] 70411: [FLTMGR] - Add the service key
by gedmurphy＠svn.reactos.org 23 Dec '15

23 Dec '15

Author: gedmurphy Date: Wed Dec 23 14:55:17 2015 New Revision: 70411 URL: http://svn.reactos.org/svn/reactos?rev=70411&view=rev Log: [FLTMGR] - Add the service key Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Wed Dec 23 14:55:17 2015 @@ -1943,6 +1943,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","Ext3ForceWriting",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","AutoMount",0x00010001,0x00000001 +; Filesystem Filter Manager driver +HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ErrorControl",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ImagePath",0x00020000,"system32\drivers\rosfltmgr.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Type",0x00010001,0x00000002 + ; ControlSet selection settings HKLM,"SYSTEM\Select","Current",0x00010001,0x00000001 HKLM,"SYSTEM\Select","Default",0x00010001,0x00000001

1 0

[gedmurphy] 70410: [XDK] - hackfix just DRIVER_FS_NOTIFICATION until we decide how we want to declare them - Should fix build
by gedmurphy＠svn.reactos.org 23 Dec '15

23 Dec '15

Author: gedmurphy Date: Wed Dec 23 14:45:15 2015 New Revision: 70410 URL: http://svn.reactos.org/svn/reactos?rev=70410&view=rev Log: [XDK] - hackfix just DRIVER_FS_NOTIFICATION until we decide how we want to declare them - Should fix build Modified: trunk/reactos/include/xdk/iotypes.h Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Wed Dec 23 14:45:15 2015 @@ -6939,10 +6939,18 @@ #define IO_STOP_ON_SYMLINK 0x0008 #define IO_MM_PAGING_FILE 0x0010 -typedef VOID -(NTAPI *PDRIVER_FS_NOTIFICATION) ( - _In_ PDEVICE_OBJECT DeviceObject, - _In_ BOOLEAN FsActive); +//typedef VOID +//( *PDRIVER_FS_NOTIFICATION) ( +// _In_ PDEVICE_OBJECT DeviceObject, +// _In_ BOOLEAN FsActive); + +typedef +VOID +DRIVER_FS_NOTIFICATION( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ BOOLEAN FsActive +); +typedef DRIVER_FS_NOTIFICATION *PDRIVER_FS_NOTIFICATION; typedef enum _FS_FILTER_SECTION_SYNC_TYPE { SyncTypeOther = 0,

1 0

[gedmurphy] 70409: [FLTMGR] - Add the beginning of the fltmgr. It's called rosfltmgr for now so I can test in Windows. - It's currently just base code which registers for file systems appearing (or...
by gedmurphy＠svn.reactos.org 23 Dec '15

23 Dec '15

Author: gedmurphy Date: Wed Dec 23 14:41:05 2015 New Revision: 70409 URL: http://svn.reactos.org/svn/reactos?rev=70409&view=rev Log: [FLTMGR] - Add the beginning of the fltmgr. It's called rosfltmgr for now so I can test in Windows. - It's currently just base code which registers for file systems appearing (or disappearing), and attaches itself to them and all other mounted devices in their chain. - Although it builds (touch wood), don't add it to a running system. The IRPs aren't plugged in yet and it'll just bugcheck lower down the stack. Added: trunk/reactos/drivers/fs_minifilter/ trunk/reactos/drivers/fs_minifilter/CMakeLists.txt (with props) trunk/reactos/drivers/fs_minifilter/fltmgr/ trunk/reactos/drivers/fs_minifilter/fltmgr/CMakeLists.txt (with props) trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c (with props) trunk/reactos/drivers/fs_minifilter/fltmgr/Lib.c (with props) trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.h (with props) trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.rc (with props) Modified: trunk/reactos/drivers/CMakeLists.txt Modified: trunk/reactos/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] Wed Dec 23 14:41:05 2015 @@ -8,6 +8,7 @@ add_subdirectory(crypto) add_subdirectory(filesystems) add_subdirectory(filters) +add_subdirectory(fs_minifilter) add_subdirectory(hid) add_subdirectory(input) add_subdirectory(ksfilter) Added: trunk/reactos/drivers/fs_minifilter/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/CMak… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/CMakeLists.txt (added) +++ trunk/reactos/drivers/fs_minifilter/CMakeLists.txt [iso-8859-1] Wed Dec 23 14:41:05 2015 @@ -0,0 +1,2 @@ + +add_subdirectory(fltmgr) Propchange: trunk/reactos/drivers/fs_minifilter/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/fs_minifilter/fltmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/CMakeLists.txt (added) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/CMakeLists.txt [iso-8859-1] Wed Dec 23 14:41:05 2015 @@ -0,0 +1,12 @@ + +list(APPEND SOURCE + Interface.c + Lib.c + fltmgr.h) + +add_library(rosfltmgr SHARED ${SOURCE} fltmgr.rc) +set_module_type(rosfltmgr kernelmodedriver) +target_link_libraries(rosfltmgr ${PSEH_LIB}) +add_importlibs(rosfltmgr ntoskrnl hal) +add_pch(rosfltmgr fltmgr.h SOURCE) +add_cd_file(TARGET rosfltmgr DESTINATION reactos/system32/drivers NO_CAB FOR all) Propchange: trunk/reactos/drivers/fs_minifilter/fltmgr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] Wed Dec 23 14:41:05 2015 @@ -0,0 +1,805 @@ +/* +* PROJECT: Filesystem Filter Manager +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/fs_minifilter/fltmgr/interface.c +* PURPOSE: Implements the driver interface +* PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) +*/ + +/* INCLUDES ******************************************************************/ + +#include "fltmgr.h" + +//#define NDEBUG +#include <debug.h> + + +/* DATA *********************************************************************/ + +DRIVER_INITIALIZE DriverEntry; +NTSTATUS +NTAPI +DriverEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath +); + +static +NTSTATUS +SetupDispatchAndCallbacksTables( + _In_ PDRIVER_OBJECT DriverObject +); + +static +NTSTATUS +FltpAttachDeviceObject( + _In_ PDEVICE_OBJECT SourceDevice, + _In_ PDEVICE_OBJECT Targetevice, + _Out_ PDEVICE_OBJECT *AttachedToDeviceObject +); + +static +BOOLEAN +FltpIsAttachedToDevice( + _In_ PDEVICE_OBJECT DeviceObject, + _In_opt_ PDEVICE_OBJECT *AttachedDeviceObject +); + +static +NTSTATUS +FltpEnumerateFileSystemVolumes( + _In_ PDEVICE_OBJECT DeviceObject +); + +static +NTSTATUS +FltpAttachToFileSystemDevice( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PUNICODE_STRING DeviceName +); + +static +LONG_PTR +FltpDetachFromFileSystemDevice( + _In_ PDEVICE_OBJECT DeviceObject +); + +DRIVER_FS_NOTIFICATION FltpFsNotification; +VOID +FltpFsNotification( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ BOOLEAN FsActive +); + + +#ifdef ALLOC_PRAGMA +#pragma alloc_text(INIT, DriverEntry) +#pragma alloc_text(INIT, SetupDispatchAndCallbacksTables) +#pragma alloc_text(PAGE, FltpAttachDeviceObject) +#pragma alloc_text(PAGE, FltpIsAttachedToDevice) +#pragma alloc_text(PAGE, FltpEnumerateFileSystemVolumes) +#pragma alloc_text(PAGE, FltpAttachToFileSystemDevice) +#pragma alloc_text(PAGE, FltpDetachFromFileSystemDevice) +#pragma alloc_text(PAGE, FltpFsNotification) +//#pragma alloc_text(PAGE, ) +#endif + +#define MAX_DEVNAME_LENGTH 64 + +DRIVER_DATA DriverData; + +typedef struct _FLTMGR_DEVICE_EXTENSION +{ + /* The file system we're attached to */ + PDEVICE_OBJECT AttachedToDeviceObject; + + // Pointer to the real (disk) device object that is associated with + // the file system device object we are attached to + /* The storage stack(disk) accociated with the file system device object we're attached to */ + PDEVICE_OBJECT StorageStackDeviceObject; + + /* Either physical drive for volume device objects otherwise + * it's the name of the control device we're attached to */ + UNICODE_STRING DeviceName; + WCHAR DeviceNameBuffer[MAX_DEVNAME_LENGTH]; + +} FLTMGR_DEVICE_EXTENSION, *PFLTMGR_DEVICE_EXTENSION; + + + + +/* DISPATCH ROUTINES **********************************************/ + +NTSTATUS +NTAPI +FltpPreFsFilterOperation(_In_ PFS_FILTER_CALLBACK_DATA Data, + _Out_ PVOID *CompletionContext) +{ + UNREFERENCED_PARAMETER(Data); + UNREFERENCED_PARAMETER(CompletionContext); + __debugbreak(); + return STATUS_SUCCESS; +} + +VOID +NTAPI +FltpPostFsFilterOperation(_In_ PFS_FILTER_CALLBACK_DATA Data, + _In_ NTSTATUS OperationStatus, + _In_ PVOID CompletionContext) +{ + UNREFERENCED_PARAMETER(Data); + UNREFERENCED_PARAMETER(OperationStatus); + UNREFERENCED_PARAMETER(CompletionContext); + __debugbreak(); +} + +NTSTATUS +NTAPI +FltpDispatch(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(Irp); + __debugbreak(); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +FltpCreate(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(Irp); + __debugbreak(); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +FltpFsControl(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(Irp); + __debugbreak(); + return STATUS_SUCCESS; +} + + + +/* FUNCTIONS **********************************************/ + +VOID +FltpCleanupDeviceObject(_In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + if (DeviceExtension) + { + // cleanup device extension + } +} + +static +NTSTATUS +FltpAttachDeviceObject(_In_ PDEVICE_OBJECT SourceDevice, + _In_ PDEVICE_OBJECT TargetDevice, + _Out_ PDEVICE_OBJECT *AttachedToDeviceObject) +{ + NTSTATUS Status; + + PAGED_CODE(); + + /* Before attaching, copy the flags from the device we're going to attach to */ + if (FlagOn(SourceDevice->Flags, DO_BUFFERED_IO)) + { + SetFlag(TargetDevice->Flags, DO_BUFFERED_IO); + } + if (FlagOn(SourceDevice->Flags, DO_DIRECT_IO)) + { + SetFlag(TargetDevice->Flags, DO_DIRECT_IO); + } + if (FlagOn(SourceDevice->Flags, DO_SYSTEM_BOOT_PARTITION)) + { + SetFlag(TargetDevice->Characteristics, FILE_DEVICE_SECURE_OPEN); + } + + /* Attach this device to the top of the driver stack */ + Status = IoAttachDeviceToDeviceStackSafe(SourceDevice, + TargetDevice, + AttachedToDeviceObject); + + return Status; +} + +static +BOOLEAN +FltpIsAttachedToDevice(_In_ PDEVICE_OBJECT DeviceObject, + _In_opt_ PDEVICE_OBJECT *AttachedDeviceObject) +{ + PDEVICE_OBJECT CurrentDeviceObject; + PDEVICE_OBJECT NextDeviceObject; + + PAGED_CODE(); + + /* Initialize the return pointer */ + if (AttachedDeviceObject) *AttachedDeviceObject = NULL; + + /* Start by getting the top level device in the chain */ + CurrentDeviceObject = IoGetAttachedDeviceReference(DeviceObject); + + /* Loop while there are attached devices */ + while (CurrentDeviceObject) + { + /* Check if this device driver matches ours */ + if (CurrentDeviceObject->DriverObject == DriverData.DriverObject) + { + FLT_ASSERT(CurrentDeviceObject->DeviceExtension != NULL); + + /* We're attached, return the device object if the caller asked for it */ + if (AttachedDeviceObject) + { + *AttachedDeviceObject = CurrentDeviceObject; + } + else + { + /* We aren't returning the reference, so decrement the count */ + ObDereferenceObject(CurrentDeviceObject); + } + + return TRUE; + } + + /* Get the next device in the chain */ + NextDeviceObject = IoGetLowerDeviceObject(CurrentDeviceObject); + + /* Decrement the count on the last device before we update the pointer */ + ObDereferenceObject(CurrentDeviceObject); + CurrentDeviceObject = NextDeviceObject; + } + + return FALSE; +} + +static +NTSTATUS +FltpEnumerateFileSystemVolumes(_In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION NewDeviceExtension; + PDEVICE_OBJECT BaseDeviceObject; + PDEVICE_OBJECT NewDeviceObject; + PDEVICE_OBJECT *DeviceList; + PDEVICE_OBJECT StorageStackDeviceObject; + UNICODE_STRING DeviceName; + ULONG NumDevices; + ULONG i; + NTSTATUS Status; + + PAGED_CODE(); + + /* Get the base device */ + BaseDeviceObject = IoGetDeviceAttachmentBaseRef(DeviceObject); + + /* get the number of device object linked to the base file system */ + Status = IoEnumerateDeviceObjectList(BaseDeviceObject->DriverObject, + NULL, + 0, + &NumDevices); + if (Status != STATUS_BUFFER_TOO_SMALL) return Status; + + /* Add a few more slots in case the size changed between calls and allocate some memory to hold the pointers */ + NumDevices += 4; + DeviceList = ExAllocatePoolWithTag(NonPagedPool, + (NumDevices * sizeof(PDEVICE_OBJECT)), + FM_TAG_DEV_OBJ_PTRS); + if (DeviceList == NULL) return STATUS_INSUFFICIENT_RESOURCES; + + /* Now get all the device objects that this base driver has created */ + Status = IoEnumerateDeviceObjectList(BaseDeviceObject->DriverObject, + DeviceList, + (NumDevices * sizeof(PDEVICE_OBJECT)), + &NumDevices); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(DeviceList, FM_TAG_DEV_OBJ_PTRS); + return Status; + } + + /* Loop through all the devices looking for ones to attach to */ + for (i = 0; i < NumDevices; i++) + { + RtlInitUnicodeString(&DeviceName, NULL); + StorageStackDeviceObject = NULL; + NewDeviceObject = NULL; + + /* Ignore the device we passed in, and devices of the wrong type */ + if ((DeviceList[i] == BaseDeviceObject) || + (DeviceList[i]->DeviceType != BaseDeviceObject->DeviceType)) + { + goto CleanupAndNext; + } + + /* Ignore this device if we're already attached to it */ + if (FltpIsAttachedToDevice(DeviceList[i], NULL) == FALSE) + { + goto CleanupAndNext; + } + + + /* + * If the device has a name, it must be a control device. + * This handles drivers with more then one control device (like FastFat) + */ + FltpGetBaseDeviceObjectName(DeviceList[i], &DeviceName); + if (NT_SUCCESS(Status) && DeviceName.Length > 0) + { + goto CleanupAndNext; + } + + /* + * Try to get the storage stack (disk) device object accociated with + * this file system device object. Ignore the device if we don't have one + */ + Status = IoGetDiskDeviceObject(DeviceList[i], + &StorageStackDeviceObject); + if (!NT_SUCCESS(Status)) + { + goto CleanupAndNext; + } + + + /* + * TODO: Don't attach to shadow copy volumes, + * ros doesn't have any so it's not an issues yet + */ + + /* + * We're far enough to be ready to attach, create a device + * object which we'll use to do so + */ + Status = IoCreateDevice(DriverData.DriverObject, + sizeof(FLTMGR_DEVICE_EXTENSION), + NULL, + DeviceList[i]->DeviceType, + 0, + FALSE, + &NewDeviceObject); + if (!NT_SUCCESS(Status)) + { + goto CleanupAndNext; + } + + /* Get the device extension for this new object and store our disk object there */ + NewDeviceExtension = NewDeviceObject->DeviceExtension; + NewDeviceExtension->StorageStackDeviceObject = StorageStackDeviceObject; + + /* Lookup and store the device name for the storage stack */ + RtlInitEmptyUnicodeString(&NewDeviceExtension->DeviceName, + NewDeviceExtension->DeviceNameBuffer, + sizeof(NewDeviceExtension->DeviceNameBuffer)); + FltpGetObjectName(StorageStackDeviceObject, + &NewDeviceExtension->DeviceName); + + + /* Grab the attach lock before we attempt to attach */ + ExAcquireFastMutex(&DriverData.FilterAttachLock); + + /* Check again that we aren't already attached. It may have changed since our last check */ + if (FltpIsAttachedToDevice(DeviceList[i], NULL) == FALSE) + { + FLT_ASSERT(NewDeviceObject->DriverObject == DriverData.DriverObject); + + /* Finally, attach to the volume */ + Status = FltpAttachDeviceObject(DeviceList[i], + NewDeviceObject, + &NewDeviceExtension->AttachedToDeviceObject); + if (NT_SUCCESS(Status)) + { + /* Clean the initializing flag so other filters can attach to our device object */ + ClearFlag(NewDeviceObject->Flags, DO_DEVICE_INITIALIZING); + } + } + else + { + /* We're already attached. Just cleanup */ + Status = STATUS_DEVICE_ALREADY_ATTACHED; + } + + ExReleaseFastMutex(&DriverData.FilterAttachLock); + +CleanupAndNext: + + if (!NT_SUCCESS(Status)) + { + if (NewDeviceObject) + { + FltpCleanupDeviceObject(NewDeviceObject); + IoDeleteDevice(NewDeviceObject); + } + } + + if (StorageStackDeviceObject) + { + /* A ref was added for us when we attached, so we can deref ours now */ + ObDereferenceObject(StorageStackDeviceObject); + } + + /* Remove the ref which was added by IoEnumerateDeviceObjectList */ + ObDereferenceObject(DeviceList[i]); + + /* Free the buffer that FltpGetBaseDeviceObjectName added */ + FltpFreeUnicodeString(&DeviceName); + + } + + /* Free the memory we allocated for the list */ + ExFreePoolWithTag(DeviceList, FM_TAG_DEV_OBJ_PTRS); + + return STATUS_SUCCESS; +} + +static +NTSTATUS +FltpAttachToFileSystemDevice(_In_ PDEVICE_OBJECT DeviceObject, + _In_ PUNICODE_STRING DeviceName) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT NewDeviceObject; + WCHAR Buffer[MAX_DEVNAME_LENGTH]; + UNICODE_STRING FileSystemDeviceName; + UNICODE_STRING FsRecDeviceName; + NTSTATUS Status; + + PAGED_CODE(); + + /* Only handle device types we're interested in */ + if (DeviceObject->DeviceType != FILE_DEVICE_DISK_FILE_SYSTEM && + DeviceObject->DeviceType != FILE_DEVICE_CD_ROM_FILE_SYSTEM && + DeviceObject->DeviceType != FILE_DEVICE_NETWORK_FILE_SYSTEM) + { + return STATUS_SUCCESS; + } + + /* Setup the buffer to hold the device name */ + RtlInitEmptyUnicodeString(&FileSystemDeviceName, + Buffer, + MAX_DEVNAME_LENGTH * sizeof(WCHAR)); + + /* Get the the name of the file system device */ + Status = FltpGetObjectName(DeviceObject->DriverObject, &FileSystemDeviceName); + if (!NT_SUCCESS(Status)) return Status; + + DPRINT("Found device %wZ, checking if we need to attach...", &FileSystemDeviceName); + + /* Build up the name of the file system recognizer device */ + RtlInitUnicodeString(&FsRecDeviceName, L"\\FileSystem\\Fs_Rec"); + + /* We don't attach to recognizer devices, so bail if this is one */ + if (RtlCompareUnicodeString(&FileSystemDeviceName, &FsRecDeviceName, TRUE) == 0) + { + return STATUS_SUCCESS; + } + + /* Create a device object which we can attach to this file system */ + Status = IoCreateDevice(DriverData.DriverObject, + sizeof(FLTMGR_DEVICE_EXTENSION), + NULL, + DeviceObject->DeviceType, + 0, + FALSE, + &NewDeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create a DO for attatching to a FS : 0x%X", Status); + return Status; + } + + /* Cast the device extension to something we understand */ + DeviceExtension = NewDeviceObject->DeviceExtension; + + /* Attach this device to the top of the driver stack and store the DO we attached to in the DE */ + Status = FltpAttachDeviceObject(NewDeviceObject, + DeviceObject, + &DeviceExtension->AttachedToDeviceObject); + if (NT_SUCCESS(Status)) + { + DPRINT("Attached to %wZ", &FileSystemDeviceName); + } + else + { + DPRINT1("Failed to attach to the driver stack : 0x%X", Status); + goto Cleanup; + } + + /* Setup the unicode string buffer and copy the device name to the device extension */ + RtlInitEmptyUnicodeString(&DeviceExtension->DeviceName, + DeviceExtension->DeviceNameBuffer, + MAX_DEVNAME_LENGTH * sizeof(WCHAR)); + RtlCopyUnicodeString(&DeviceExtension->DeviceName, DeviceName); + + /* We're done, remove the initializing flag */ + ClearFlag(NewDeviceObject->Flags, DO_DEVICE_INITIALIZING); + + /* Look for existing mounted devices for this file system */ + Status = FltpEnumerateFileSystemVolumes(DeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to enumerate file system volumes for this file system : 0x%X", Status); + IoDetachDevice(DeviceExtension->AttachedToDeviceObject); + } + +Cleanup: + + if (!NT_SUCCESS(Status)) + { + IoDeleteDevice(NewDeviceObject); + } + + return Status; +} + +static +LONG_PTR +FltpDetachFromFileSystemDevice(_In_ PDEVICE_OBJECT DeviceObject) +{ + PDEVICE_OBJECT AttachedDevice, LowestDevice; + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + LONG_PTR Count; + + PAGED_CODE(); + + /* Get the attached device 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->DriverObject != DriverData.DriverObject) + { + /* Get the attached device */ + LowestDevice = IoGetLowerDeviceObject(AttachedDevice); + + /* Remove the reference we added. If it's zero then we're already clean */ + Count = ObfDereferenceObject(AttachedDevice); + if (Count == 0) return Count; + + /* Try the next one */ + AttachedDevice = LowestDevice; + } + + + DeviceExtension = AttachedDevice->DeviceExtension; + if (DeviceExtension) + { + // + // FIXME: Put any device extension cleanup code here + // + } + + /* Detach the device from the chain and delete the object */ + IoDetachDevice(DeviceObject); + IoDeleteDevice(AttachedDevice); + + /* Remove the reference we added so the delete can complete */ + return ObfDereferenceObject(AttachedDevice); +} + +DRIVER_FS_NOTIFICATION FltpFsNotification; +VOID +FltpFsNotification(_In_ PDEVICE_OBJECT DeviceObject, + _In_ BOOLEAN FsActive) +{ + UNICODE_STRING DeviceName; + NTSTATUS Status; + __debugbreak(); + PAGED_CODE(); + + /* Set an empty string */ + RtlInitUnicodeString(&DeviceName, NULL); + + /* Get the name of the lowest device object on the stack */ + Status = FltpGetBaseDeviceObjectName(DeviceObject, &DeviceName); + if (NT_SUCCESS(Status)) + { + /* Check if it's attaching or detaching*/ + if (FsActive) + { + /* Run the attach routine */ + FltpAttachToFileSystemDevice(DeviceObject, &DeviceName); + } + else + { + /* Run the detatch routine */ + FltpDetachFromFileSystemDevice(DeviceObject); + } + + /* Free the buffer which FltpGetBaseDeviceObjectName allocated */ + FltpFreeUnicodeString(&DeviceName); + } +} + +DRIVER_INITIALIZE DriverEntry; +NTSTATUS +NTAPI +DriverEntry(_In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath) +{ + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\FileSystem\\Filters\\"DRIVER_NAME); + PDEVICE_OBJECT RawDeviceObject; + PDEVICE_OBJECT DeviceObject; + PFILE_OBJECT RawFileObject; + UNICODE_STRING ObjectName; + UNICODE_STRING SymLink; + + NTSTATUS Status; + __debugbreak(); + RtlZeroMemory(&DriverData, sizeof(DRIVER_DATA)); + DriverData.DriverObject = DriverObject; + + /* Save the registry key for this driver */ + DriverData.ServiceKey.Length = RegistryPath->Length; + DriverData.ServiceKey.MaximumLength = RegistryPath->MaximumLength; + DriverData.ServiceKey.Buffer = (PWCHAR)ExAllocatePoolWithTag(NonPagedPool, + RegistryPath->MaximumLength, + FM_TAG_REGISTRY_DATA); + if (!DriverData.ServiceKey.Buffer) return STATUS_INSUFFICIENT_RESOURCES; + RtlCopyUnicodeString(&DriverData.ServiceKey, RegistryPath); + + /* Do some initialization */ + ExInitializeFastMutex(&DriverData.FilterAttachLock); + + /* Create the main filter manager device object */ + Status = IoCreateDevice(DriverObject, + 0, + &DeviceName, + FILE_DEVICE_DISK_FILE_SYSTEM, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("fltmgr IoCreateDevice failed. Status = %X", Status); + goto Cleanup; + } + + /* Store a global reference so we can access from callbacks */ + DriverData.DeviceObject = DeviceObject; + + /* Generate the symbolic link name */ + RtlInitUnicodeString(&SymLink, L"\\??\\"DRIVER_NAME); + Status = IoCreateSymbolicLink(&SymLink, &DeviceName); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Create the callbacks for the dispatch table, FastIo and FS callbacks */ + Status = SetupDispatchAndCallbacksTables(DriverObject); + if (!NT_SUCCESS(Status)) goto Cleanup; + + // + // TODO: Create fltmgr message device + // + + /* Register for notifications when a new file system is loaded. This also enumerates any existing file systems */ + Status = IoRegisterFsRegistrationChange(DriverObject, FltpFsNotification); + FLT_ASSERT(Status != STATUS_DEVICE_ALREADY_ATTACHED); // Windows checks for this, but I'm not sure how that can happen?? + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* IoRegisterFsRegistrationChange isn't notified about the raw file systems, so we attach to them manually */ + RtlInitUnicodeString(&ObjectName, L"\\Device\\RawDisk"); + Status = IoGetDeviceObjectPointer(&ObjectName, + FILE_READ_ATTRIBUTES, + &RawFileObject, + &RawDeviceObject); + if (NT_SUCCESS(Status)) + { + FltpFsNotification(RawDeviceObject, TRUE); + ObfDereferenceObject(RawFileObject); + } + + RtlInitUnicodeString(&ObjectName, L"\\Device\\RawCdRom"); + Status = IoGetDeviceObjectPointer(&ObjectName, + FILE_READ_ATTRIBUTES, + &RawFileObject, + &RawDeviceObject); + if (NT_SUCCESS(Status)) + { + FltpFsNotification(RawDeviceObject, TRUE); + ObfDereferenceObject(RawFileObject); + } + + /* We're done, clear the initializing flag */ + ClearFlag(DeviceObject->Flags, DO_DEVICE_INITIALIZING); + Status = STATUS_SUCCESS; + +Cleanup: + + if (!NT_SUCCESS(Status)) + { + if (DriverData.FastIoDispatch) + { + DriverObject->FastIoDispatch = NULL; + ExFreePoolWithTag(DriverData.FastIoDispatch, FM_TAG_DISPATCH_TABLE); + } + + IoDeleteSymbolicLink(&SymLink); + + if (DeviceObject) + IoDeleteDevice(DeviceObject); + + if (DriverData.ServiceKey.Buffer) + ExFreePoolWithTag(DriverData.ServiceKey.Buffer, FM_TAG_REGISTRY_DATA); + } + + return Status; +} + + +static +NTSTATUS +SetupDispatchAndCallbacksTables(_In_ PDRIVER_OBJECT DriverObject) +{ + PFAST_IO_DISPATCH FastIoDispatch; + FS_FILTER_CALLBACKS Callbacks; + ULONG i; + + /* Plug all the IRPs */ + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + { + DriverObject->MajorFunction[i] = FltpDispatch; + } + + /* Override the ones we're interested in */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = FltpCreate; + DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = FltpCreate; + DriverObject->MajorFunction[IRP_MJ_CREATE_MAILSLOT] = FltpCreate; + DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = FltpFsControl; + + /* The FastIo diapatch table is stored in the pool along with a tag */ + FastIoDispatch = ExAllocatePoolWithTag(NonPagedPool, sizeof(FAST_IO_DISPATCH), FM_TAG_DISPATCH_TABLE); + if (FastIoDispatch == NULL) return STATUS_INSUFFICIENT_RESOURCES; + + /* Fill out the FastIo table */ + RtlZeroMemory(FastIoDispatch, sizeof(FAST_IO_DISPATCH)); + FastIoDispatch->SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); + FastIoDispatch->FastIoCheckIfPossible = (PFAST_IO_CHECK_IF_POSSIBLE)NULL; + FastIoDispatch->FastIoRead = (PFAST_IO_READ)NULL; + FastIoDispatch->FastIoWrite = (PFAST_IO_WRITE)NULL; + FastIoDispatch->FastIoQueryBasicInfo = (PFAST_IO_QUERY_BASIC_INFO)NULL; + FastIoDispatch->FastIoQueryStandardInfo = (PFAST_IO_QUERY_STANDARD_INFO)NULL; + FastIoDispatch->FastIoLock = (PFAST_IO_LOCK)NULL; + FastIoDispatch->FastIoUnlockSingle = (PFAST_IO_UNLOCK_SINGLE)NULL; + FastIoDispatch->FastIoUnlockAll = (PFAST_IO_UNLOCK_ALL)NULL; + FastIoDispatch->FastIoUnlockAllByKey = (PFAST_IO_UNLOCK_ALL_BY_KEY)NULL; + FastIoDispatch->FastIoDeviceControl = (PFAST_IO_DEVICE_CONTROL)NULL; + FastIoDispatch->FastIoDetachDevice = (PFAST_IO_DETACH_DEVICE)NULL; + FastIoDispatch->FastIoQueryNetworkOpenInfo = (PFAST_IO_QUERY_NETWORK_OPEN_INFO)NULL; + FastIoDispatch->MdlRead = (PFAST_IO_MDL_READ)NULL; + FastIoDispatch->MdlReadComplete = (PFAST_IO_MDL_READ_COMPLETE)NULL; + FastIoDispatch->PrepareMdlWrite = (PFAST_IO_PREPARE_MDL_WRITE)NULL; + FastIoDispatch->MdlWriteComplete = (PFAST_IO_MDL_WRITE_COMPLETE)NULL; + FastIoDispatch->FastIoReadCompressed = (PFAST_IO_READ_COMPRESSED)NULL; + FastIoDispatch->FastIoWriteCompressed = (PFAST_IO_WRITE_COMPRESSED)NULL; + FastIoDispatch->MdlReadCompleteCompressed = (PFAST_IO_MDL_READ_COMPLETE_COMPRESSED)NULL; + FastIoDispatch->MdlWriteCompleteCompressed = (PFAST_IO_MDL_WRITE_COMPLETE_COMPRESSED)NULL; + FastIoDispatch->FastIoQueryOpen = (PFAST_IO_QUERY_OPEN)NULL; + + /* Store the FastIo table address for easy reference */ + DriverData.FastIoDispatch = FastIoDispatch; + + /* Initialize the callback table */ + Callbacks.SizeOfFsFilterCallbacks = sizeof(FS_FILTER_CALLBACKS); + Callbacks.PreAcquireForSectionSynchronization = FltpPreFsFilterOperation; + Callbacks.PostAcquireForSectionSynchronization = FltpPostFsFilterOperation; + Callbacks.PreReleaseForSectionSynchronization = FltpPreFsFilterOperation; + Callbacks.PostReleaseForSectionSynchronization = FltpPostFsFilterOperation; + Callbacks.PreAcquireForCcFlush = FltpPreFsFilterOperation; + Callbacks.PostAcquireForCcFlush = FltpPostFsFilterOperation; + Callbacks.PreReleaseForCcFlush = FltpPreFsFilterOperation; + Callbacks.PostReleaseForCcFlush = FltpPostFsFilterOperation; + Callbacks.PreAcquireForModifiedPageWriter = FltpPreFsFilterOperation; + Callbacks.PostAcquireForModifiedPageWriter = FltpPostFsFilterOperation; + Callbacks.PreReleaseForModifiedPageWriter = FltpPreFsFilterOperation; + Callbacks.PostReleaseForModifiedPageWriter = FltpPostFsFilterOperation; + + /* Register our callbacks */ + return FsRtlRegisterFileSystemFilterCallbacks(DriverObject, &Callbacks); +} Propchange: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/fs_minifilter/fltmgr/Lib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/Lib.c (added) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Lib.c [iso-8859-1] Wed Dec 23 14:41:05 2015 @@ -0,0 +1,160 @@ +/* +* PROJECT: Filesystem Filter Manager +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/fs_minifilter/fltmgr/Lib.c +* PURPOSE: Miscellaneous library functions +* PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) +*/ + +/* INCLUDES ******************************************************************/ + +#include "fltmgr.h" + +#define NDEBUG +#include <debug.h> + + +/* DATA *********************************************************************/ + + + +/* FUNCTIONS **********************************************/ + +NTSTATUS +FltpGetBaseDeviceObjectName(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PUNICODE_STRING ObjectName) +{ + PDEVICE_OBJECT BaseDeviceObject; + NTSTATUS Status; + + /* + * Get the lowest device object on the stack, which may be the + * object we were passed, and lookup the name for that object + */ + BaseDeviceObject = IoGetDeviceAttachmentBaseRef(DeviceObject); + Status = FltpGetObjectName(BaseDeviceObject, ObjectName); + ObDereferenceObject(BaseDeviceObject); + + return Status; +} + +NTSTATUS +FltpGetObjectName(_In_ PVOID Object, + _Inout_ PUNICODE_STRING ObjectName) +{ + POBJECT_NAME_INFORMATION ObjectNameInfo = NULL; + OBJECT_NAME_INFORMATION LocalNameInfo; + ULONG ReturnLength; + NTSTATUS Status; + + if (ObjectName == NULL) + return STATUS_INVALID_PARAMETER; + + /* Get the size of the buffer required to hold the nameinfo */ + Status = ObQueryNameString(Object, + &LocalNameInfo, + sizeof(LocalNameInfo), + &ReturnLength); + if (Status == STATUS_INFO_LENGTH_MISMATCH) + { + ObjectNameInfo = ExAllocatePoolWithTag(PagedPool, + ReturnLength, + FM_TAG_UNICODE_STRING); + if (ObjectNameInfo == NULL) return STATUS_INSUFFICIENT_RESOURCES; + + /* Get the actual name info now we have the buffer to hold it */ + Status = ObQueryNameString(Object, + ObjectNameInfo, + ReturnLength, + &ReturnLength); + } + + + if (NT_SUCCESS(Status)) + { + /* Make sure the buffer we were passed is large enough to hold the string */ + if (ObjectName->MaximumLength < ObjectNameInfo->Name.Length) + { + /* It wasn't, let's enlarge the buffer */ + Status = FltpReallocateUnicodeString(ObjectName, + ObjectNameInfo->Name.Length, + FALSE); + + } + + if (NT_SUCCESS(Status)) + { + /* Copy the object name into the callers buffer */ + RtlCopyUnicodeString(ObjectName, &ObjectNameInfo->Name); + } + } + + if (ObjectNameInfo) + { + ExFreePoolWithTag(ObjectNameInfo, FM_TAG_UNICODE_STRING); + } + + return Status; +} + +VOID +FltpFreeUnicodeString(_In_ PUNICODE_STRING String) +{ + /* Free up any existing buffer */ + if (String->Buffer) + { + ExFreePoolWithTag(String->Buffer, FM_TAG_UNICODE_STRING); + } + + /* Empty the string */ + String->Buffer = NULL; + String->Length = 0; + String->MaximumLength = 0; +} + +NTSTATUS +FltpReallocateUnicodeString(_In_ PUNICODE_STRING String, + _In_ SIZE_T NewLength, + _In_ BOOLEAN CopyExisting) +{ + PWCH NewBuffer; + + /* Don't bother reallocating if the buffer is smaller */ + if (NewLength <= String->MaximumLength) + { + String->Length = 0; + return STATUS_SUCCESS; + } + + /* Allocate a new buffer at the size requested */ + NewBuffer = ExAllocatePoolWithTag(PagedPool, NewLength, FM_TAG_UNICODE_STRING); + if (NewBuffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; + + if (CopyExisting) + { + /* Copy the old data across */ + RtlCopyMemory(NewBuffer, String->Buffer, String->Length); + } + else + { + /* Reset the length */ + String->Length = 0; + } + + /* Free any old buffer */ + if (String->Buffer) + ExFreePoolWithTag(String->Buffer, FM_TAG_UNICODE_STRING); + + /* Update the lengths */ + String->Buffer = NewBuffer; + String->MaximumLength = NewLength; + + return STATUS_SUCCESS; +} + +NTSTATUS +FltpCopyUnicodeString(_In_ PUNICODE_STRING StringOne, + _In_ PUNICODE_STRING StringTwo) +{ + return 0; +} Propchange: trunk/reactos/drivers/fs_minifilter/fltmgr/Lib.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.h (added) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.h [iso-8859-1] Wed Dec 23 14:41:05 2015 @@ -0,0 +1,264 @@ +#ifndef _FLTMGR_H +#define _FLTMGR_H + +#include <ntifs.h> +//#include <fltkernel.h> +#include <pseh/pseh2.h> + +#define DRIVER_NAME L"RosFltMgr" + +#define FM_TAG_DISPATCH_TABLE 'ifMF' +#define FM_TAG_REGISTRY_DATA 'rtMF' +#define FM_TAG_DEV_OBJ_PTRS 'ldMF' +#define FM_TAG_UNICODE_STRING 'suMF' + +typedef struct _DRIVER_DATA +{ + PDRIVER_OBJECT DriverObject; + PDEVICE_OBJECT DeviceObject; + UNICODE_STRING ServiceKey; + + PFAST_IO_DISPATCH FastIoDispatch; + + FAST_MUTEX FilterAttachLock; + +} DRIVER_DATA, *PDRIVER_DATA; + + +#define FLT_ASSERT(_e) NT_ASSERT(_e) //FIXME + + +//FM ? ? -fltmgr.sys - Unrecognized FltMgr tag(update pooltag.w) +//FMac - fltmgr.sys - ASCII String buffers +//FMas - fltmgr.sys - ASYNC_IO_COMPLETION_CONTEXT structure +//FMcb - fltmgr.sys - FLT_CCB structure +//FMcr - fltmgr.sys - Context registration structures +//FMct - fltmgr.sys - TRACK_COMPLETION_NODES structure +//FMdl - fltmgr.sys - Array of DEVICE_OBJECT pointers +//FMea - fltmgr.sys - EA buffer for create +//FMfc - fltmgr.sys - FLTMGR_FILE_OBJECT_CONTEXT structure +//FMfi - fltmgr.sys - Fast IO dispatch table +//FMfk - fltmgr.sys - Byte Range Lock structure +//FMfl - fltmgr.sys - FLT_FILTER structure +//FMfn - fltmgr.sys - NAME_CACHE_NODE structure +//FMfr - fltmgr.sys - FLT_FRAME structure +//FMfz - fltmgr.sys - FILE_LIST_CTRL structure +//FMib - fltmgr.sys - Irp SYSTEM buffers +//FMic - fltmgr.sys - IRP_CTRL structure +//FMin - fltmgr.sys - FLT_INSTANCE name +//FMil - fltmgr.sys - IRP_CTRL completion node stack +//FMis - fltmgr.sys - FLT_INSTANCE structure +//FMla - fltmgr.sys - Per - processor IRPCTRL lookaside lists +//FMnc - fltmgr.sys - NAME_CACHE_CREATE_CTRL structure +//FMng - fltmgr.sys - NAME_GENERATION_CONTEXT structure +//FMol - fltmgr.sys - OPLOCK_CONTEXT structure +//FMos - fltmgr.sys - Operation status ctrl structure +//FMpl - fltmgr.sys - Cache aware pushLock +//FMpr - fltmgr.sys - FLT_PRCB structure +//FMrl - fltmgr.sys - FLT_OBJECT rundown logs +//FMrp - fltmgr.sys - Reparse point data buffer +//FMrr - fltmgr.sys - Per - processor Cache - aware rundown ref structure +//FMsd - fltmgr.sys - Security descriptors +//FMsl - fltmgr.sys - STREAM_LIST_CTRL structure +//FMtn - fltmgr.sys - Temporary file names +//FMtr - fltmgr.sys - Temporary Registry information +//FMts - fltmgr.sys - Tree Stack +//FMus - fltmgr.sys - Unicode string +//FMvf - fltmgr.sys - FLT_VERIFIER_EXTENSION structure +//FMvj - fltmgr.sys - FLT_VERIFIER_OBJECT structure +//FMvo - fltmgr.sys - FLT_VOLUME structure +//FMwi - fltmgr.sys - Work item structures +//FMcn - fltmgr.sys - Non paged context extension structures. +//FMtp - fltmgr.sys - Non Paged tx vol context structures. +//FMlp - fltmgr.sys - Paged stream list control entry structures. + + + + +/* +FltAcquirePushLockExclusive +FltAcquirePushLockShared +FltAcquireResourceExclusive +FltAcquireResourceShared +FltAllocateCallbackData +FltAllocateContext +FltAllocateDeferredIoWorkItem +FltAllocateFileLock +FltAllocateGenericWorkItem +FltAllocatePoolAlignedWithTag +FltAttachVolume +FltAttachVolumeAtAltitude +FltBuildDefaultSecurityDescriptor +FltCancelFileOpen +FltCancelIo +FltCbdqDisable +FltCbdqEnable +FltCbdqInitialize +FltCbdqInsertIo +FltCbdqRemoveIo +FltCbdqRemoveNextIo +FltCheckAndGrowNameControl +FltCheckLockForReadAccess +FltCheckLockForWriteAccess +FltCheckOplock +FltClearCallbackDataDirty +FltClearCancelCompletion +FltClose +FltCloseClientPort +FltCloseCommunicationPort +FltCompareInstanceAltitudes +FltCompletePendedPostOperation +FltCompletePendedPreOperation +FltCreateCommunicationPort +FltCreateFile +FltCreateFileEx +FltCreateSystemVolumeInformationFolder +FltCurrentBatchOplock +FltDecodeParameters +FltDeleteContext +FltDeleteFileContext +FltDeleteInstanceContext +FltDeletePushLock +FltDeleteStreamContext +FltDeleteStreamHandleContext +FltDeleteVolumeContext +FltDetachVolume +FltDeviceIoControlFile +FltDoCompletionProcessingWhenSafe +FltEnumerateFilterInformation +FltEnumerateFilters +FltEnumerateInstanceInformationByFilter +FltEnumerateInstanceInformationByVolume +FltEnumerateInstances +FltEnumerateVolumeInformation +FltEnumerateVolumes +FltFlushBuffers +FltFreeCallbackData +FltFreeDeferredIoWorkItem +FltFreeFileLock +FltFreeGenericWorkItem +FltFreePoolAlignedWithTag +FltFreeSecurityDescriptor +FltFsControlFile +FltGetBottomInstance +FltGetContexts +FltGetDestinationFileNameInformation +FltGetDeviceObject +FltGetDiskDeviceObject +FltGetFileContext +FltGetFileNameInformation +FltGetFileNameInformationUnsafe +FltGetFilterFromInstance +FltGetFilterFromName +FltGetFilterInformation +FltGetInstanceContext +FltGetInstanceInformation +FltGetIrpName +FltGetLowerInstance +FltGetRequestorProcess +FltGetRequestorProcessId +FltGetRoutineAddress +FltGetStreamContext +FltGetStreamHandleContext +FltGetSwappedBufferMdlAddress +FltGetTopInstance +FltGetTunneledName +FltGetUpperInstance +FltGetVolumeContext +FltGetVolumeFromDeviceObject +FltGetVolumeFromFileObject +FltGetVolumeFromInstance +FltGetVolumeFromName +FltGetVolumeGuidName +FltGetVolumeInstanceFromName +FltGetVolumeName +FltGetVolumeProperties +FltInitializeFileLock +FltInitializeOplock +FltInitializePushLock +FltIs32bitProcess +FltIsCallbackDataDirty +FltIsDirectory +FltIsIoCanceled +FltIsOperationSynchronous +FltIsVolumeWritable +FltLoadFilter +FltLockUserBuffer +FltNotifyFilterChangeDirectory +FltObjectDereference +FltObjectReference +FltOpenVolume +FltOplockFsctrl +FltOplockIsFastIoPossible +FltParseFileName +FltParseFileNameInformation +FltPerformAsynchronousIo +FltPerformSynchronousIo +FltProcessFileLock +FltPurgeFileNameInformationCache +FltQueryEaFile +FltQueryInformationFile +FltQuerySecurityObject +FltQueryVolumeInformation +FltQueryVolumeInformationFile +FltQueueDeferredIoWorkItem +FltQueueGenericWorkItem +FltReadFile +FltReferenceContext +FltReferenceFileNameInformation +FltRegisterFilter +FltReissueSynchronousIo +FltReleaseContext +FltReleaseContexts +FltReleaseFileNameInformation +FltReleasePushLock +FltReleaseResource +FltRequestOperationStatusCallback +FltRetainSwappedBufferMdlAddress +FltReuseCallbackData +FltSendMessage +FltSetCallbackDataDirty +FltSetCancelCompletion +FltSetEaFile +FltSetFileContext +FltSetInformationFile +FltSetInstanceContext +FltSetSecurityObject +FltSetStreamContext +FltSetStreamHandleContext +FltSetVolumeContext +FltSetVolumeInformation +FltStartFiltering +FltSupportsFileContexts +FltSupportsStreamContexts +FltSupportsStreamHandleContexts +FltTagFile +FltUninitializeFileLock +FltUninitializeOplock +FltUnloadFilter +FltUnregisterFilter +FltUntagFile +FltWriteFile +*/ + + + +/////////// FIXME: put these into the correct header +NTSTATUS +FltpGetBaseDeviceObjectName(_In_ PDEVICE_OBJECT DeviceObject, +_Inout_ PUNICODE_STRING ObjectName); + +NTSTATUS +FltpGetObjectName(_In_ PVOID Object, +_Inout_ PUNICODE_STRING ObjectName); + +NTSTATUS +FltpReallocateUnicodeString(_In_ PUNICODE_STRING String, +_In_ SIZE_T NewLength, +_In_ BOOLEAN CopyExisting); + +VOID +FltpFreeUnicodeString(_In_ PUNICODE_STRING String); +//////////////////////////////////////////////// + +#endif /* _FLTMGR_H */ Propchange: trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.rc (added) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.rc [iso-8859-1] Wed Dec 23 14:41:05 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Filesystem Filter Manager" +#define REACTOS_STR_INTERNAL_NAME "fltmgr" +#define REACTOS_STR_ORIGINAL_FILENAME "fltmgr.sys" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 70408: [NTOSKRNL] - Raise the IRQL when enumerating device lists so it doesn't get edited mid-listing - Don't hardcode the pointer size when checking the buffer size
by gedmurphy＠svn.reactos.org 23 Dec '15

23 Dec '15

Author: gedmurphy Date: Wed Dec 23 11:26:28 2015 New Revision: 70408 URL: http://svn.reactos.org/svn/reactos?rev=70408&view=rev Log: [NTOSKRNL] - Raise the IRQL when enumerating device lists so it doesn't get edited mid-listing - Don't hardcode the pointer size when checking the buffer size 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] Wed Dec 23 11:26:28 2015 @@ -1088,6 +1088,10 @@ { ULONG ActualDevices = 1; PDEVICE_OBJECT CurrentDevice = DriverObject->DeviceObject; + KIRQL OldIrql; + + /* Raise to dispatch level */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); /* Find out how many devices we'll enumerate */ while ((CurrentDevice = CurrentDevice->NextDevice)) ActualDevices++; @@ -1099,13 +1103,14 @@ *ActualNumberDeviceObjects = ActualDevices; /* Check if we can support so many */ - if ((ActualDevices * 4) > DeviceObjectListSize) + if ((ActualDevices * sizeof(PDEVICE_OBJECT)) > DeviceObjectListSize) { /* Fail because the buffer was too small */ + KeLowerIrql(OldIrql); return STATUS_BUFFER_TOO_SMALL; } - /* Check if the caller only wanted the size */ + /* Check if the caller wanted the device list */ if (DeviceObjectList) { /* Loop through all the devices */ @@ -1123,6 +1128,9 @@ DeviceObjectList++; } } + + /* Return back to previous IRQL */ + KeLowerIrql(OldIrql); /* Return the status */ return STATUS_SUCCESS;

1 0

[tkreuzer] 70407: [FREELDR/AMD64] Save parameter registers (rcx, rdx) before calling CallRealMode. Patch by andy-123, applied to a secondary location by me. CORE-10511 #resolve #comment Thanks. I a...
by tkreuzer＠svn.reactos.org 21 Dec '15

21 Dec '15

Author: tkreuzer Date: Mon Dec 21 19:36:10 2015 New Revision: 70407 URL: http://svn.reactos.org/svn/reactos?rev=70407&view=rev Log: [FREELDR/AMD64] Save parameter registers (rcx, rdx) before calling CallRealMode. Patch by andy-123, applied to a secondary location by me. CORE-10511 #resolve #comment Thanks. I added the same fix to PnpBiosGet below. Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/pnpbios.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/pnpbios.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/pnpbios.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/pnpbios.S [iso-8859-1] Mon Dec 21 19:36:10 2015 @@ -104,9 +104,17 @@ PUBLIC PnpBiosGetDeviceNodeCount PnpBiosGetDeviceNodeCount: + /* Save param-regs */ + push rcx + push rdx + /* Call the real mode function */ mov bx, FNID_PnpBiosGetDeviceNodeCount call CallRealMode + + /* Restore param-regs */ + pop rdx + pop rcx xor eax, eax mov ax, [BSS_PnpNodeSize] @@ -140,9 +148,15 @@ and eax, HEX(0f) mov word ptr [BSS_PnpBiosBufferOffset], ax + /* Save rcx */ + push rcx + /* Call the real mode function */ mov bx, FNID_PnpBiosGetDeviceNode call CallRealMode + + /* Restore rcx */ + pop rcx /* update node number */ mov al, byte ptr [BSS_PnpNodeNumber]

1 0

[ekohl] 70406: [USERENV] Hack, that fixes the "Volatile Environment" bug by deleting the "Volatile Environment" key before the user hive is unloaded. CORE-10705
by ekohl＠svn.reactos.org 20 Dec '15

20 Dec '15

Author: ekohl Date: Sun Dec 20 22:30:51 2015 New Revision: 70406 URL: http://svn.reactos.org/svn/reactos?rev=70406&view=rev Log: [USERENV] Hack, that fixes the "Volatile Environment" bug by deleting the "Volatile Environment" key before the user hive is unloaded. CORE-10705 Modified: trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Sun Dec 20 22:30:51 2015 @@ -539,8 +539,8 @@ return FALSE; } - wcscpy(lpProfileDir, szProfilePath); - } + wcscpy(lpProfileDir, szProfilePath); + } *lpcchSize = dwLength; @@ -667,8 +667,8 @@ return FALSE; } - wcscpy(lpProfileDir, szProfilePath); - } + wcscpy(lpProfileDir, szProfilePath); + } *lpcchSize = dwLength; @@ -1309,6 +1309,25 @@ return FALSE; } + /* HACK */ + { + HKEY hUserKey; + + Error = RegOpenKeyExW(HKEY_USERS, + SidString.Buffer, + 0, + KEY_WRITE, + &hUserKey); + if (Error == ERROR_SUCCESS) + { + RegDeleteKeyW(hUserKey, + L"Volatile Environment"); + + RegCloseKey(hUserKey); + } + } + /* End of HACK */ + /* Unload the hive */ Error = RegUnLoadKeyW(HKEY_USERS, SidString.Buffer);

1 0

[hbelusca] 70405: [KDCOM] Do not use the "LoaderBlock->u.I386.CommonDataArea; " hack to use FreeLdr's DbgPrint function inside KDCOM, for the simple reason that while it works when KDCOM just initia...
by hbelusca＠svn.reactos.org 20 Dec '15

20 Dec '15

Author: hbelusca Date: Sun Dec 20 16:21:59 2015 New Revision: 70405 URL: http://svn.reactos.org/svn/reactos?rev=70405&view=rev Log: [KDCOM] Do not use the "LoaderBlock->u.I386.CommonDataArea;" hack to use FreeLdr's DbgPrint function inside KDCOM, for the simple reason that while it works when KDCOM just initializes, the memory area where FreeLdr's DbgPrint function is, gets erased when ReactOS is running. As a result, all attempts to call the DbgPrint function when tracing something in KDCOM at the end of life of ReactOS, just fails lamentably (it hangs). We therefore cannot rely on external code to provide us with DbgPrint. Instead, implement a very simple DbgPrint function inside KDCOM, as done by KDGDB. The KD serial port serving for debugging KDCOM is chosen dynamically amongst the other free COM ports. This needs to be also fixed in KDVM. [KDGDB] Instead of hardcoding the KD serial port number serving for debugging KDGDB, determine it dynamically amongst the other free COM ports. Modified: trunk/reactos/drivers/base/kdcom/kdcom.c trunk/reactos/drivers/base/kdcom/kddll.c trunk/reactos/drivers/base/kdcom/kddll.h trunk/reactos/drivers/base/kdcom/kdserial.c trunk/reactos/drivers/base/kdgdb/kdcom.c Modified: trunk/reactos/drivers/base/kdcom/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.c [iso-8859-1] Sun Dec 20 16:21:59 2015 @@ -10,11 +10,9 @@ #include <cportlib/cportlib.h> #include <arc/arc.h> +#include <stdio.h> #include <stdlib.h> #include <ndk/halfuncs.h> - -#define NDEBUG -#include <debug.h> /* Serial debug connection */ #define DEFAULT_DEBUG_PORT 2 /* COM2 */ @@ -36,11 +34,52 @@ #error Unknown architecture #endif +#define MAX_COM_PORTS (sizeof(BaseArray) / sizeof(BaseArray[0]) - 1) + /* GLOBALS ********************************************************************/ +CPPORT KdComPort; +ULONG KdComPortIrq = 0; // Not used at the moment. +#ifdef KDDEBUG CPPORT KdDebugComPort; -ULONG KdDebugComPortIrq = 0; // Not used at the moment. - +#endif + +/* DEBUGGING ******************************************************************/ + +#ifdef KDDEBUG +ULONG KdpDbgPrint(const char *Format, ...) +{ + va_list ap; + int Length; + char* ptr; + CHAR Buffer[512]; + + va_start(ap, Format); + Length = _vsnprintf(Buffer, sizeof(Buffer), Format, ap); + va_end(ap); + + /* Check if we went past the buffer */ + if (Length == -1) + { + /* Terminate it if we went over-board */ + Buffer[sizeof(Buffer) - 1] = '\n'; + + /* Put maximum */ + Length = sizeof(Buffer); + } + + ptr = Buffer; + while (Length--) + { + if (*ptr == '\n') + CpPutByte(&KdDebugComPort, '\r'); + + CpPutByte(&KdDebugComPort, *ptr++); + } + + return 0; +} +#endif /* FUNCTIONS ******************************************************************/ @@ -83,7 +122,7 @@ KDDBGPRINT("KdpPortInitialize, Port = COM%ld\n", ComPortNumber); - Status = CpInitialize(&KdDebugComPort, + Status = CpInitialize(&KdComPort, UlongToPtr(BaseArray[ComPortNumber]), ComPortBaudRate); if (!NT_SUCCESS(Status)) @@ -92,7 +131,7 @@ } else { - KdComPortInUse = KdDebugComPort.Address; + KdComPortInUse = KdComPort.Address; return STATUS_SUCCESS; } } @@ -113,13 +152,9 @@ PCHAR CommandLine, PortString, BaudString, IrqString; ULONG Value; - /* Check if e have a LoaderBlock */ + /* Check if we have a LoaderBlock */ if (LoaderBlock) { - /* HACK */ - KdpDbgPrint = LoaderBlock->u.I386.CommonDataArea; - KDDBGPRINT("KdDebuggerInitialize0\n"); - /* Get the Command Line */ CommandLine = LoaderBlock->LoadOptions; @@ -191,10 +226,36 @@ { /* Read and set it */ Value = atol(IrqString + 1); - if (Value) KdDebugComPortIrq = Value; + if (Value) KdComPortIrq = Value; } } } + +#ifdef KDDEBUG + /* + * Try to find a free COM port and use it as the KD debugging port. + * NOTE: Inspired by reactos/boot/freeldr/freeldr/comm/rs232.c, Rs232PortInitialize(...) + */ + { + /* + * Start enumerating COM ports from the last one to the first one, + * and break when we find a valid port. + * If we reach the first element of the list, the invalid COM port, + * then it means that no valid port was found. + */ + ULONG ComPort; + for (ComPort = MAX_COM_PORTS; ComPort > 0; ComPort--) + { + /* Check if the port exist; skip the KD port */ + if ((ComPort != ComPortNumber) && CpDoesPortExist(UlongToPtr(BaseArray[ComPort]))) + break; + } + if (ComPort != 0) + CpInitialize(&KdDebugComPort, UlongToPtr(BaseArray[ComPort]), DEFAULT_BAUD_RATE); + } +#endif + + KDDBGPRINT("KdDebuggerInitialize0\n"); /* Initialize the port */ return KdpPortInitialize(ComPortNumber, ComPortBaudRate); @@ -219,21 +280,28 @@ KdpSendByte(IN UCHAR Byte) { /* Send the byte */ - CpPutByte(&KdDebugComPort, Byte); + CpPutByte(&KdComPort, Byte); } KDP_STATUS NTAPI KdpPollByte(OUT PUCHAR OutByte) { + USHORT Status; + /* Poll the byte */ - if (CpGetByte(&KdDebugComPort, OutByte, FALSE, FALSE) == CP_GET_SUCCESS) - { - return KDP_PACKET_RECEIVED; - } - else - { - return KDP_PACKET_TIMEOUT; + Status = CpGetByte(&KdComPort, OutByte, FALSE, FALSE); + switch (Status) + { + case CP_GET_SUCCESS: + return KDP_PACKET_RECEIVED; + + case CP_GET_NODATA: + return KDP_PACKET_TIMEOUT; + + case CP_GET_ERROR: + default: + return KDP_PACKET_RESEND; } } @@ -241,14 +309,21 @@ NTAPI KdpReceiveByte(OUT PUCHAR OutByte) { + USHORT Status; + /* Get the byte */ - if (CpGetByte(&KdDebugComPort, OutByte, TRUE, FALSE) == CP_GET_SUCCESS) - { - return KDP_PACKET_RECEIVED; - } - else - { - return KDP_PACKET_TIMEOUT; + Status = CpGetByte(&KdComPort, OutByte, TRUE, FALSE); + switch (Status) + { + case CP_GET_SUCCESS: + return KDP_PACKET_RECEIVED; + + case CP_GET_NODATA: + return KDP_PACKET_TIMEOUT; + + case CP_GET_ERROR: + default: + return KDP_PACKET_RESEND; } } Modified: trunk/reactos/drivers/base/kdcom/kddll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kddll.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] Sun Dec 20 16:21:59 2015 @@ -8,12 +8,8 @@ #include "kddll.h" -#define NDEBUG -#include <debug.h> - /* GLOBALS ********************************************************************/ -PFNDBGPRNT KdpDbgPrint = NULL; ULONG CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; ULONG RemotePacketId = INITIAL_PACKET_ID; Modified: trunk/reactos/drivers/base/kdcom/kddll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kddll.h… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kddll.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kddll.h [iso-8859-1] Sun Dec 20 16:21:59 2015 @@ -13,22 +13,20 @@ #include <ntifs.h> #include <windbgkd.h> -//#define KDDEBUG /* uncomment to enable debugging this dll */ - -typedef ULONG (*PFNDBGPRNT)(const char *Format, ...); -extern PFNDBGPRNT KdpDbgPrint; +// #define KDDEBUG /* uncomment to enable debugging this dll */ #ifndef KDDEBUG #define KDDBGPRINT(...) #else +extern ULONG KdpDbgPrint(const char* Format, ...); #define KDDBGPRINT KdpDbgPrint #endif typedef enum { KDP_PACKET_RECEIVED = 0, - KDP_PACKET_TIMEOUT = 1, - KDP_PACKET_RESEND = 2 + KDP_PACKET_TIMEOUT = 1, + KDP_PACKET_RESEND = 2 } KDP_STATUS; VOID Modified: trunk/reactos/drivers/base/kdcom/kdserial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdseria… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdserial.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdserial.c [iso-8859-1] Sun Dec 20 16:21:59 2015 @@ -7,9 +7,6 @@ */ #include "kddll.h" - -#define NDEBUG -#include <debug.h> /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/drivers/base/kdgdb/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdcom.c [iso-8859-1] Sun Dec 20 16:21:59 2015 @@ -32,6 +32,8 @@ #error Unknown architecture #endif +#define MAX_COM_PORTS (sizeof(BaseArray) / sizeof(BaseArray[0]) - 1) + /* GLOBALS ********************************************************************/ CPPORT KdComPort; @@ -40,6 +42,42 @@ CPPORT KdDebugComPort; #endif +/* DEBUGGING ******************************************************************/ + +#ifdef KDDEBUG +ULONG KdpDbgPrint(const char *Format, ...) +{ + va_list ap; + int Length; + char* ptr; + CHAR Buffer[512]; + + va_start(ap, Format); + Length = _vsnprintf(Buffer, sizeof(Buffer), Format, ap); + va_end(ap); + + /* Check if we went past the buffer */ + if (Length == -1) + { + /* Terminate it if we went over-board */ + Buffer[sizeof(Buffer) - 1] = '\n'; + + /* Put maximum */ + Length = sizeof(Buffer); + } + + ptr = Buffer; + while (Length--) + { + if (*ptr == '\n') + CpPutByte(&KdDebugComPort, '\r'); + + CpPutByte(&KdDebugComPort, *ptr++); + } + + return 0; +} +#endif /* FUNCTIONS ******************************************************************/ @@ -190,8 +228,27 @@ } #ifdef KDDEBUG - /* Use DEBUGPORT=COM1 if you want to debug KDGDB, as we use COM2 for debugging it */ - CpInitialize(&KdDebugComPort, UlongToPtr(BaseArray[2]), DEFAULT_BAUD_RATE); + /* + * Try to find a free COM port and use it as the KD debugging port. + * NOTE: Inspired by reactos/boot/freeldr/freeldr/comm/rs232.c, Rs232PortInitialize(...) + */ + { + /* + * Start enumerating COM ports from the last one to the first one, + * and break when we find a valid port. + * If we reach the first element of the list, the invalid COM port, + * then it means that no valid port was found. + */ + ULONG ComPort; + for (ComPort = MAX_COM_PORTS; ComPort > 0; ComPort--) + { + /* Check if the port exist; skip the KD port */ + if ((ComPort != ComPortNumber) && CpDoesPortExist(UlongToPtr(BaseArray[ComPort]))) + break; + } + if (ComPort != 0) + CpInitialize(&KdDebugComPort, UlongToPtr(BaseArray[ComPort]), DEFAULT_BAUD_RATE); + } #endif /* Initialize the port */ @@ -273,34 +330,4 @@ return KdPacketTimedOut; } -#ifdef KDDEBUG -ULONG KdpDbgPrint(const char* Format, ...) -{ - va_list ap; - static CHAR Buffer[512]; - char* ptr; - int Length; - - va_start(ap, Format); - Length = _vsnprintf(Buffer, sizeof(Buffer), Format, ap); - va_end(ap); - - /* Check if we went past the buffer */ - if (Length == -1) - { - /* Terminate it if we went over-board */ - Buffer[sizeof(Buffer) - 1] = '\n'; - - /* Put maximum */ - Length = sizeof(Buffer); - } - - ptr = Buffer; - while (Length--) - CpPutByte(&KdDebugComPort, *ptr++); - - return 0; -} -#endif - /* EOF */

1 0

[hbelusca] 70404: [NTOS:KDBG]: Sync back the code that I copied in FreeLdr (r70403) for COM port selection.
by hbelusca＠svn.reactos.org 20 Dec '15

20 Dec '15

Author: hbelusca Date: Sun Dec 20 02:53:30 2015 New Revision: 70404 URL: http://svn.reactos.org/svn/reactos?rev=70404&view=rev Log: [NTOS:KDBG]: Sync back the code that I copied in FreeLdr (r70403) for COM port selection. Modified: trunk/reactos/ntoskrnl/kd/i386/kdbg.c Modified: trunk/reactos/ntoskrnl/kd/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/i386/kdbg.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd/i386/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/i386/kdbg.c [iso-8859-1] Sun Dec 20 02:53:30 2015 @@ -28,13 +28,14 @@ #error Unknown architecture #endif +#define MAX_COM_PORTS (sizeof(BaseArray) / sizeof(BaseArray[0]) - 1) + /* STATIC VARIABLES ***********************************************************/ // static CPPORT DefaultPort = {0, 0, 0}; /* The COM port must only be initialized once! */ // static BOOLEAN PortInitialized = FALSE; - /* REACTOS FUNCTIONS **********************************************************/ @@ -58,7 +59,6 @@ /* * Find the port if needed */ - SIZE_T i; if (!PortInitialized) { @@ -72,12 +72,11 @@ * If we reach the first element of the list, the invalid COM port, * then it means that no valid port was found. */ - for (i = sizeof(BaseArray) / sizeof(BaseArray[0]) - 1; i > 0; i--) + for (ComPortNumber = MAX_COM_PORTS; ComPortNumber > 0; ComPortNumber--) { - if (CpDoesPortExist(UlongToPtr(BaseArray[i]))) + if (CpDoesPortExist(UlongToPtr(BaseArray[ComPortNumber]))) { - PortInformation->Address = DefaultPort.Address = BaseArray[i]; - ComPortNumber = (ULONG)i; + PortInformation->Address = DefaultPort.Address = BaseArray[ComPortNumber]; break; } }

1 0

[hbelusca] 70403: [FREELDR] - Allow to specify in freeldr.ini the debugging port parameters, similarly to what NTLDR allows to do: http://naesten.blogspot.fr/2010/07/undocumented-debug-section-in-b...
by hbelusca＠svn.reactos.org 20 Dec '15

20 Dec '15

Author: hbelusca Date: Sun Dec 20 02:06:40 2015 New Revision: 70403 URL: http://svn.reactos.org/svn/reactos?rev=70403&view=rev Log: [FREELDR] - Allow to specify in freeldr.ini the debugging port parameters, similarly to what NTLDR allows to do: http://naesten.blogspot.fr/2010/07/undocumented-debug-section-in-bootini.ht… - Update the FREELDR.INI example file to reflect these changes. - Because some FreeLdr components, that need to be initialized before the debugging port parameters can be read from freeldr.ini, use debugging features, we still need to choose some default parameters. For serial ports, we select the possible port starting from COM4 down to COM1. CORE-9023 #comment Revision 70403: Allow to specify a debugging port in freeldr.ini . Modified: trunk/reactos/boot/freeldr/FREELDR.INI trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/cmdline.c trunk/reactos/boot/freeldr/freeldr/comm/rs232.c trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/include/cmdline.h trunk/reactos/boot/freeldr/freeldr/include/debug.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/FREELDR.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/FREELDR.INI?r… ============================================================================== --- trunk/reactos/boot/freeldr/FREELDR.INI [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/FREELDR.INI [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -29,6 +29,7 @@ ; [FREELOADER] Section Commands: ; +; Debug - FreeLoader debugging port parameters, e.g. /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 ; MessageBox - displays the specified text in a message box upon bootup ; MessageLine - adds a new line of text to a message box (must come before MessageBox command) ; TitleText - text that is displayed in the title box @@ -50,15 +51,15 @@ ; [OS-General] Section Commands: ; -; BootType - sets the boot type: ReactOS, Linux, BootSector, Partition, Drive -; BootPath - ARC path e.g. multi(0)disk(0)rdisk(x)partition(y) +; BootType - sets the boot type: Windows, WindowsNT40, Windows2003, Linux, BootSector, Partition, Drive, ReactOSSetup +; BootPath - ARC path, e.g. multi(0)disk(0)rdisk(x)partition(y) ; DriveMap - maps a BIOS drive number to another (i.e. DriveMap=hd1,hd0 maps harddisk1 to harddisk0 or DriveMap=fd1,fd0) ; [BootSector OSType] Section Commands: ; ; BootSector - sets the filename of the bootsector to be loaded -; [ReactOS OSType] Section Commands: +; [Windows(NT40|2003) OSType] Section Commands: ; ; SystemPath - sets the system root path (must be a valid ARC - Path): ; multi(0)disk(0)rdisk(0)partition(1)\reactos @@ -110,7 +111,7 @@ ; Load ReactOS from harddisk (drive C:) [ReactOSHD] -BootType=ReactOS +BootType=Windows2003 SystemPath=multi(0)disk(0)rdisk(0)partition(1)\reactos Options=/DEBUGPORT=SCREEN Kernel=\REACTOS\SYSTEM32\NTOSKRNL.EXE @@ -118,14 +119,14 @@ ; Load ReactOS from floppy (drive A:) [ReactOSFloppy] -BootType=ReactOS +BootType=Windows2003 SystemPath=multi(0)disk(0)fdisk(0) Options=/DEBUGPORT=SCREEN Kernel=\reactos\NTOSKRNL.EXE Hal=\reactos\HAL.DLL ;[ReactOS (Debug)] -;BootType=ReactOS +;BootType=Windows2003 ;SystemPath=multi(0)disk(0)rdisk(0)partition(1)\reactos ;Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=19200 ;Kernel=\NTOSKRNL.EXE Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -20,6 +20,7 @@ /* INCLUDES *******************************************************************/ #include <freeldr.h> +#include <debug.h> /* GLOBALS ********************************************************************/ @@ -131,7 +132,7 @@ if (DefaultOSName != NULL) { - for (Idx = 0; Idx<OperatingSystemCount; Idx++) + for (Idx = 0; Idx < OperatingSystemCount; Idx++) { if (_stricmp(DefaultOSName, OperatingSystemList[Idx].SystemPartition) == 0) { @@ -208,6 +209,9 @@ return; } + /* Debugger main initialization */ + DebugInit(TRUE); + if (!IniOpenSection("FreeLoader", &SectionId)) { UiMessageBoxCritical("Section [FreeLoader] not found in freeldr.ini."); @@ -216,6 +220,7 @@ TimeOut = GetTimeOut(); + /* UI main initialization */ if (!UiInitialize(TRUE)) { UiMessageBoxCritical("Unable to initialize UI."); Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cmdli… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cmdline.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/cmdline.c [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -14,24 +14,60 @@ typedef struct tagCMDLINEINFO { - const char *DefaultOperatingSystem; + PCCH DebugString; + PCCH DefaultOperatingSystem; LONG TimeOut; } CMDLINEINFO, *PCMDLINEINFO; +CCHAR DebugString[256]; CCHAR DefaultOs[256]; CMDLINEINFO CmdLineInfo; /* FUNCTIONS ******************************************************************/ VOID -CmdLineParse(IN PCHAR CmdLine) +CmdLineParse(IN PCCH CmdLine) { PCHAR End, Setting; ULONG_PTR Length, Offset = 0; /* Set defaults */ + CmdLineInfo.DebugString = NULL; CmdLineInfo.DefaultOperatingSystem = NULL; CmdLineInfo.TimeOut = -1; + + /* + * Get debug string, in the following format: + * "debug=option1=XXX;option2=YYY;..." + * and translate it into the format: + * "OPTION1=XXX OPTION2=YYY ..." + */ + Setting = strstr(CmdLine, "debug="); + if (Setting) + { + /* Check if there are more command-line parameters following */ + Setting += sizeof("debug=") + sizeof(ANSI_NULL); + End = strstr(Setting, " "); + if (End) + Length = End - Setting; + else + Length = sizeof(DebugString); + + /* Copy the debug string and upcase it */ + strncpy(DebugString, Setting, Length); + DebugString[Length - 1] = ANSI_NULL; + _strupr(DebugString); + + /* Replace all separators ';' by spaces */ + Setting = DebugString; + while (*Setting) + { + if (*Setting == ';') *Setting = ' '; + Setting++; + } + + CmdLineInfo.DebugString = DebugString; + } /* Get timeout */ Setting = strstr(CmdLine, "timeout="); @@ -43,7 +79,7 @@ Setting = strstr(CmdLine, "defaultos="); if (Setting) { - /* Check if there's more command-line parameters following */ + /* Check if there are more command-line parameters following */ Setting += sizeof("defaultos=") + sizeof(ANSI_NULL); End = strstr(Setting, " "); if (End) @@ -53,6 +89,7 @@ /* Copy the default OS */ strncpy(DefaultOs, Setting, Length); + DefaultOs[Length - 1] = ANSI_NULL; CmdLineInfo.DefaultOperatingSystem = DefaultOs; } @@ -85,6 +122,12 @@ } PCCH +CmdLineGetDebugString(VOID) +{ + return CmdLineInfo.DebugString; +} + +PCCH CmdLineGetDefaultOS(VOID) { return CmdLineInfo.DefaultOperatingSystem; Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -21,26 +21,36 @@ #ifndef _M_ARM +/* INCLUDES *******************************************************************/ + #include <freeldr.h> #include <cportlib/cportlib.h> -/* MACROS *******************************************************************/ +#if DBG -#if DBG +/* STATIC VARIABLES ***********************************************************/ #define DEFAULT_BAUD_RATE 19200 +#if defined(_M_IX86) || defined(_M_AMD64) +static const ULONG BaseArray[] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; +#elif defined(_M_PPC) +static const ULONG BaseArray[] = {0, 0x800003F8}; +#elif defined(_M_MIPS) +static const ULONG BaseArray[] = {0, 0x80006000, 0x80007000}; +#elif defined(_M_ARM) +static const ULONG BaseArray[] = {0, 0xF1012000}; +#else +#error Unknown architecture +#endif -/* STATIC VARIABLES *********************************************************/ - -static ULONG BaseArray[] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; +#define MAX_COM_PORTS (sizeof(BaseArray) / sizeof(BaseArray[0]) - 1) /* The COM port must only be initialized once! */ -static CPPORT Rs232ComPort; -static BOOLEAN PortInitialized = FALSE; +static ULONG Rs232ComPort = 0; +static CPPORT Rs232ComPortInfo; - -/* FUNCTIONS *********************************************************/ +/* FUNCTIONS ******************************************************************/ BOOLEAN Rs232PortInitialize(IN ULONG ComPort, IN ULONG BaudRate) @@ -48,77 +58,73 @@ NTSTATUS Status; PUCHAR Address; - if (PortInitialized == FALSE) + /* + * Check whether it's the first time we initialize a COM port. + * If not, check whether the specified one was already initialized. + */ + if ((Rs232ComPort != 0) && (Rs232ComPort == ComPort)) + return TRUE; + + if (BaudRate == 0) + BaudRate = DEFAULT_BAUD_RATE; + + if (ComPort == 0) { - if (BaudRate == 0) - { - BaudRate = DEFAULT_BAUD_RATE; - } - - if (ComPort == 0) - { - if (CpDoesPortExist(UlongToPtr(BaseArray[2]))) - { - Address = UlongToPtr(BaseArray[2]); - } - else if (CpDoesPortExist(UlongToPtr(BaseArray[1]))) - { - Address = UlongToPtr(BaseArray[1]); - } - else - { - return FALSE; - } - } - else if (ComPort <= 4) // 4 == MAX_COM_PORTS + /* + * Start enumerating COM ports from the last one to the first one, + * and break when we find a valid port. + * If we reach the first element of the list, the invalid COM port, + * then it means that no valid port was found. + */ + for (ComPort = MAX_COM_PORTS; ComPort > 0; ComPort--) { if (CpDoesPortExist(UlongToPtr(BaseArray[ComPort]))) { Address = UlongToPtr(BaseArray[ComPort]); - } - else - { - return FALSE; + break; } } + if (ComPort == 0) + return FALSE; + } + else if (ComPort <= MAX_COM_PORTS) + { + if (CpDoesPortExist(UlongToPtr(BaseArray[ComPort]))) + Address = UlongToPtr(BaseArray[ComPort]); else - { return FALSE; - } + } + else + { + return FALSE; + } - Status = CpInitialize(&Rs232ComPort, Address, BaudRate); - if (!NT_SUCCESS(Status)) return FALSE; + Status = CpInitialize(&Rs232ComPortInfo, Address, BaudRate); + if (!NT_SUCCESS(Status)) return FALSE; - PortInitialized = TRUE; - } + Rs232ComPort = ComPort; return TRUE; } BOOLEAN Rs232PortGetByte(PUCHAR ByteReceived) { - if (PortInitialized == FALSE) - return FALSE; - - return (CpGetByte(&Rs232ComPort, ByteReceived, TRUE, FALSE) == CP_GET_SUCCESS); + if (Rs232ComPort == 0) return FALSE; + return (CpGetByte(&Rs232ComPortInfo, ByteReceived, TRUE, FALSE) == CP_GET_SUCCESS); } /* BOOLEAN Rs232PortPollByte(PUCHAR ByteReceived) { - if (PortInitialized == FALSE) - return FALSE; - - return (CpGetByte(&Rs232ComPort, ByteReceived, FALSE, FALSE) == CP_GET_SUCCESS); + if (Rs232ComPort == 0) return FALSE; + return (CpGetByte(&Rs232ComPortInfo, ByteReceived, FALSE, FALSE) == CP_GET_SUCCESS); } */ VOID Rs232PortPutByte(UCHAR ByteToSend) { - if (PortInitialized == FALSE) - return; - - CpPutByte(&Rs232ComPort, ByteToSend); + if (Rs232ComPort == 0) return; + CpPutByte(&Rs232ComPortInfo, ByteToSend); } #endif /* DBG */ @@ -126,7 +132,7 @@ BOOLEAN Rs232PortInUse(PUCHAR Base) { #if DBG - return ( (PortInitialized && (Rs232ComPort.Address == Base)) ? TRUE : FALSE ); + return ( ((Rs232ComPort != 0) && (Rs232ComPortInfo.Address == Base)) ? TRUE : FALSE ); #else return FALSE; #endif Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -18,7 +18,6 @@ */ #include <freeldr.h> - #include <debug.h> #if DBG && !defined(_M_ARM) @@ -33,36 +32,31 @@ #define DBG_DEFAULT_LEVELS (ERR_LEVEL|FIXME_LEVEL) +static UCHAR DbgChannels[DBG_CHANNELS_COUNT]; + #define SCREEN 1 #define RS232 2 #define BOCHS 4 -#define COM1 1 -#define COM2 2 -#define COM3 3 -#define COM4 4 - -#define BOCHS_OUTPUT_PORT 0xe9 - -static UCHAR DbgChannels[DBG_CHANNELS_COUNT]; +#define BOCHS_OUTPUT_PORT 0xE9 ULONG DebugPort = RS232; -// ULONG DebugPort = SCREEN; -// ULONG DebugPort = BOCHS; -// ULONG DebugPort = SCREEN|BOCHS; -#ifdef _WINKD_ -/* COM1 is the WinDbg port */ -ULONG ComPort = COM2; -#else -ULONG ComPort = COM1; -#endif -// ULONG BaudRate = 19200; + +/* Serial debug connection */ +ULONG ComPort = 0; // The COM port initializer chooses the first available port starting from COM4 down to COM1. ULONG BaudRate = 115200; +ULONG PortIrq = 0; // Not used at the moment. BOOLEAN DebugStartOfLine = TRUE; -VOID DebugInit(VOID) -{ +VOID DebugInit(BOOLEAN MainInit) +{ + PCHAR CommandLine, PortString, BaudString, IrqString; + ULONG Value; + CHAR DebugString[256]; + + /* Always reset the debugging channels */ + #if defined (DEBUG_ALL) memset(DbgChannels, MAX_LEVEL, DBG_CHANNELS_COUNT); #elif defined (DEBUG_WARN) @@ -83,9 +77,121 @@ DbgChannels[DPRINT_WINDOWS] = MAX_LEVEL; #endif + /* Check for pre- or main initialization phase */ + if (!MainInit) + { + /* Pre-initialization phase: use the FreeLdr command-line debugging string */ + CommandLine = (PCHAR)CmdLineGetDebugString(); + + /* If no command-line is provided, initialize the debug port with default settings */ + if (CommandLine == NULL) + goto Done; + + strcpy(DebugString, CommandLine); + } + else + { + /* Main initialization phase: use the FreeLdr INI debugging string */ + + ULONG_PTR SectionId; + + if (!IniOpenSection("FreeLoader", &SectionId)) + return; + + if (!IniReadSettingByName(SectionId, "Debug", DebugString, sizeof(DebugString))) + return; + } + + /* Get the Command Line */ + CommandLine = DebugString; + + /* Upcase it */ + _strupr(CommandLine); + + /* Get the port and baud rate */ + PortString = strstr(CommandLine, "DEBUGPORT"); + BaudString = strstr(CommandLine, "BAUDRATE"); + IrqString = strstr(CommandLine, "IRQ"); + + /* + * Check if we got /DEBUGPORT parameters. + * NOTE: Inspired by reactos/ntoskrnl/kd/kdinit.c, KdInitSystem(...) + */ + while (PortString) + { + /* Move past the actual string, to reach the port*/ + PortString += strlen("DEBUGPORT"); + + /* Now get past any spaces and skip the equal sign */ + while (*PortString == ' ') PortString++; + PortString++; + + /* Check for possible ports and set the port to use */ + if (strncmp(PortString, "SCREEN", 6) == 0) + { + PortString += 6; + DebugPort |= SCREEN; + } + else if (strncmp(PortString, "BOCHS", 5) == 0) + { + PortString += 5; + DebugPort |= BOCHS; + } + else if (strncmp(PortString, "COM", 3) == 0) + { + PortString += 3; + DebugPort |= RS232; + + /* Set the port to use */ + Value = atol(PortString); + if (Value) ComPort = Value; + } + + PortString = strstr(PortString, "DEBUGPORT"); + } + + /* Check if we got a baud rate */ + if (BaudString) + { + /* Move past the actual string, to reach the rate */ + BaudString += strlen("BAUDRATE"); + + /* Now get past any spaces */ + while (*BaudString == ' ') BaudString++; + + /* And make sure we have a rate */ + if (*BaudString) + { + /* Read and set it */ + Value = atol(BaudString + 1); + if (Value) BaudRate = Value; + } + } + + /* Check Serial Port Settings [IRQ] */ + if (IrqString) + { + /* Move past the actual string, to reach the rate */ + IrqString += strlen("IRQ"); + + /* Now get past any spaces */ + while (*IrqString == ' ') IrqString++; + + /* And make sure we have an IRQ */ + if (*IrqString) + { + /* Read and set it */ + Value = atol(IrqString + 1); + if (Value) PortIrq = Value; + } + } + +Done: + /* Try to initialize the port; if it fails, remove the corresponding flag */ if (DebugPort & RS232) { - Rs232PortInitialize(ComPort, BaudRate); + if (!Rs232PortInitialize(ComPort, BaudRate)) + DebugPort &= ~RS232; } } @@ -114,9 +220,9 @@ ULONG DbgPrint(const char *Format, ...) { - int i; + va_list ap; int Length; - va_list ap; + char* ptr; CHAR Buffer[512]; va_start(ap, Format); @@ -133,10 +239,9 @@ Length = sizeof(Buffer); } - for (i = 0; i < Length; i++) - { - DebugPrintChar(Buffer[i]); - } + ptr = Buffer; + while (Length--) + DebugPrintChar(*ptr++); return 0; } @@ -149,7 +254,7 @@ char *ptr = Buffer; /* Mask out unwanted debug messages */ - if (!(DbgChannels[Mask] & Level) && !(Level & DBG_DEFAULT_LEVELS )) + if (!(DbgChannels[Mask] & Level) && !(Level & DBG_DEFAULT_LEVELS)) { return; } @@ -191,9 +296,8 @@ VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length) { - PUCHAR BufPtr = (PUCHAR)Buffer; - ULONG Idx; - ULONG Idx2; + PUCHAR BufPtr = (PUCHAR)Buffer; + ULONG Idx, Idx2; /* Mask out unwanted debug messages */ if (!(DbgChannels[Mask] & TRACE_LEVEL)) @@ -202,7 +306,7 @@ DebugStartOfLine = FALSE; // We don't want line headers DbgPrint("Dumping buffer at %p with length of %lu bytes:\n", Buffer, Length); - for (Idx=0; Idx<Length; ) + for (Idx = 0; Idx < Length; ) { DebugStartOfLine = FALSE; // We don't want line headers @@ -215,7 +319,7 @@ else DbgPrint("%x:\t", Idx); - for (Idx2=0; Idx2<16; Idx2++,Idx++) + for (Idx2 = 0; Idx2 < 16; Idx2++, Idx++) { if (BufPtr[Idx] < 0x10) { @@ -236,7 +340,7 @@ Idx -= 16; DbgPrint(" "); - for (Idx2=0; Idx2<16; Idx2++,Idx++) + for (Idx2 = 0; Idx2 < 16; Idx2++, Idx++) { if ((BufPtr[Idx] > 20) && (BufPtr[Idx] < 0x80)) { @@ -257,10 +361,10 @@ { int iLevel, iChannel; - if (channel == NULL || *channel == L'\0' || strlen(channel) == 0 ) + if (channel == NULL || *channel == '\0' || strlen(channel) == 0) return FALSE; - if (level == NULL || *level == L'\0' || strlen(level) == 0 ) + if (level == NULL || *level == '\0' || strlen(level) == 0) iLevel = MAX_LEVEL; else if (strcmp(level, "err") == 0) iLevel = ERR_LEVEL; @@ -290,9 +394,9 @@ { int i; - for(i= 0 ; i < DBG_CHANNELS_COUNT; i++) - { - if(op==L'+') + for (i = 0; i < DBG_CHANNELS_COUNT; i++) + { + if (op == '+') DbgChannels[i] |= iLevel; else DbgChannels[i] &= ~iLevel; @@ -302,7 +406,7 @@ } else return FALSE; - if (op == L'+') + if (op == '+') DbgChannels[iChannel] |= iLevel; else DbgChannels[iChannel] &= ~iLevel; Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -26,19 +26,21 @@ /* FUNCTIONS ******************************************************************/ -VOID __cdecl BootMain(LPSTR CmdLine) +VOID __cdecl BootMain(IN PCCH CmdLine) { CmdLineParse(CmdLine); MachInit(CmdLine); FsInit(); - DebugInit(); + /* Debugger pre-initialization */ + DebugInit(FALSE); TRACE("BootMain() called.\n"); /* Check if the CPU is new enough */ FrLdrCheckCpuCompatiblity(); + /* UI pre-initialization */ if (!UiInitialize(FALSE)) { UiMessageBoxCritical("Unable to initialize UI."); Modified: trunk/reactos/boot/freeldr/freeldr/include/cmdline.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/cmdline.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/cmdline.h [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -19,8 +19,9 @@ #pragma once -VOID CmdLineParse(IN PCHAR CmdLine); +VOID CmdLineParse(IN PCCH CmdLine); +PCCH CmdLineGetDebugString(VOID); PCCH CmdLineGetDefaultOS(VOID); LONG CmdLineGetTimeOut(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -40,7 +40,7 @@ #if DBG && !defined(_M_ARM) - VOID DebugInit(VOID); + VOID DebugInit(BOOLEAN MainInit); ULONG DbgPrint(const char *Format, ...); VOID DbgPrint2(ULONG Mask, ULONG Level, const char *File, ULONG Line, char *Format, ...); VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length); @@ -113,7 +113,7 @@ #define UNIMPLEMENTED - #define DebugInit() + #define DebugInit(init) #define BugCheck(fmt, ...) #define DbgDumpBuffer(mask, buf, len) #define DbgParseDebugChannels(val) Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -119,7 +119,7 @@ #include <arch/mips/arcbios.h> #endif -VOID __cdecl BootMain(LPSTR CmdLine); +VOID __cdecl BootMain(IN PCCH CmdLine); VOID LoadOperatingSystem(IN OperatingSystemItem* OperatingSystem); VOID RunLoader(VOID); VOID FrLdrCheckCpuCompatiblity(VOID);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs