Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 66021: [NTOS]: Bring into evidence an existing hack in PnPMgr, in the hope it'll be fixed and not remain here again for years...
by hbelusca＠svn.reactos.org 09 Jan '15

09 Jan '15

Author: hbelusca Date: Fri Jan 9 19:58:19 2015 New Revision: 66021 URL: http://svn.reactos.org/svn/reactos?rev=66021&view=rev Log: [NTOS]: Bring into evidence an existing hack in PnPMgr, in the hope it'll be fixed and not remain here again for years... Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] Fri Jan 9 19:58:19 2015 @@ -59,6 +59,8 @@ /* ReactOS HACK for SETUPLDR */ if (KeLoaderBlock->SetupLdrBlock) { + DPRINT1("WARNING!! In PiInitCacheGroupInformation, using ReactOS HACK for SETUPLDR!!\n"); + /* Bogus data */ PiInitGroupOrderTableCount = 0; PiInitGroupOrderTable = (PVOID)0xBABEB00B;

1 0

[hbelusca] 66020: [RAMDISK] - Fix DeviceRelations allocation bug - Code style: Use sizeof(UNICODE_NULL) where needed; use sizeof(*ptr) for size of type pointed by ptr, when allocating space for ptr.
by hbelusca＠svn.reactos.org 09 Jan '15

09 Jan '15

Author: hbelusca Date: Fri Jan 9 18:26:17 2015 New Revision: 66020 URL: http://svn.reactos.org/svn/reactos?rev=66020&view=rev Log: [RAMDISK] - Fix DeviceRelations allocation bug - Code style: Use sizeof(UNICODE_NULL) where needed; use sizeof(*ptr) for size of type pointed by ptr, when allocating space for ptr. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Fri Jan 9 18:26:17 2015 @@ -380,7 +380,7 @@ /* Sanitize disk options */ Input->Options.Fixed = TRUE; Input->Options.Readonly = Input->Options.ExportAsCd | - Input->Options.Readonly; + Input->Options.Readonly; Input->Options.Hidden = FALSE; Input->Options.NoDosDevice = FALSE; Input->Options.NoDriveLetter = IsWinPEBoot ? TRUE : FALSE; @@ -1048,8 +1048,8 @@ IN PIRP Irp) { PRAMDISK_DRIVE_EXTENSION DeviceExtension; - //ULONG Length; - //LARGE_INTEGER ByteOffset; + // ULONG Length; + // LARGE_INTEGER ByteOffset; PIO_STACK_LOCATION IoStackLocation; NTSTATUS Status, ReturnStatus; @@ -1064,8 +1064,8 @@ /* Capture parameters */ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - //Length = IoStackLocation->Parameters.Read.Length; - //ByteOffset = IoStackLocation->Parameters.Read.ByteOffset; + // Length = IoStackLocation->Parameters.Read.Length; + // ByteOffset = IoStackLocation->Parameters.Read.ByteOffset; /* FIXME: Validate offset */ @@ -1345,7 +1345,7 @@ /* Allocate a buffer big enough to contain only one DO */ DeviceRelations = ExAllocatePoolWithTag(PagedPool, - sizeof(DeviceRelations), + sizeof(*DeviceRelations), 'dmaR'); if (DeviceRelations != NULL) { @@ -1795,7 +1795,7 @@ NTSTATUS Status = STATUS_SUCCESS; /* Allocate output memory */ - PnpBusInfo = ExAllocatePoolWithTag(PagedPool, sizeof(PNP_BUS_INFORMATION), 'dmaR'); + PnpBusInfo = ExAllocatePoolWithTag(PagedPool, sizeof(*PnpBusInfo), 'dmaR'); if (PnpBusInfo == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -2301,8 +2301,7 @@ { /* Initialize the bus FDO extension */ DeviceExtension = DeviceObject->DeviceExtension; - RtlZeroMemory(DeviceObject->DeviceExtension, - sizeof(RAMDISK_BUS_EXTENSION)); + RtlZeroMemory(DeviceExtension, sizeof(*DeviceExtension)); /* Set bus FDO flags */ DeviceObject->Flags |= DO_POWER_PAGABLE | DO_DIRECT_IO; @@ -2349,7 +2348,7 @@ /* Are we being booted from setup? Not yet supported */ if (KeLoaderBlock->SetupLdrBlock) DPRINT1("FIXME: RamdiskAddDevice is UNSUPPORTED when being started from SETUPLDR!\n"); - //ASSERT(!KeLoaderBlock->SetupLdrBlock); + // ASSERT(!KeLoaderBlock->SetupLdrBlock); } /* All done */ @@ -2378,7 +2377,7 @@ DriverRegistryPath = *RegistryPath; DriverRegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, RegistryPath->Length + - sizeof(WCHAR), + sizeof(UNICODE_NULL), 'dmaR'); if (!DriverRegistryPath.Buffer) return STATUS_INSUFFICIENT_RESOURCES; RtlCopyUnicodeString(&DriverRegistryPath, RegistryPath); @@ -2437,7 +2436,7 @@ /* Installing from Ramdisk isn't supported yet */ if (KeLoaderBlock->SetupLdrBlock) DPRINT1("FIXME: Installing from RamDisk is UNSUPPORTED!\n"); - //ASSERT(!KeLoaderBlock->SetupLdrBlock); + // ASSERT(!KeLoaderBlock->SetupLdrBlock); /* Are we reporting the device */ if (ReportDetectedDevice)

1 0

[dquintana] 66019: [EXPLORER] * Allow the result of the notify requests to return back to the caller. Fixes regressed shell32:systray winetests. CORE-8840 #resolve #comment Should be properly fixed...
by dquintana＠svn.reactos.org 09 Jan '15

09 Jan '15

Author: dquintana Date: Fri Jan 9 17:24:43 2015 New Revision: 66019 URL: http://svn.reactos.org/svn/reactos?rev=66019&view=rev Log: [EXPLORER] * Allow the result of the notify requests to return back to the caller. Fixes regressed shell32:systray winetests. CORE-8840 #resolve #comment Should be properly fixed in r66019. Modified: trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Fri Jan 9 17:24:43 2015 @@ -337,7 +337,7 @@ HWND CreateTrayNotifyWnd(IN OUT ITrayWindow *TrayWindow, IN BOOL bHideClock, CTrayNotifyWnd** ppTrayNotify); -VOID +BOOL TrayNotify_NotifyMsg(CTrayNotifyWnd* pTrayNotify, IN WPARAM wParam, IN LPARAM lParam); Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Fri Jan 9 17:24:43 2015 @@ -82,7 +82,7 @@ return -1; } - VOID AddButton(IN CONST NOTIFYICONDATA *iconData) + BOOL AddButton(IN CONST NOTIFYICONDATA *iconData) { TBBUTTON tbBtn; NOTIFYICONDATA * notifyItem; @@ -91,8 +91,7 @@ int index = FindItemByIconData(iconData, &notifyItem); if (index >= 0) { - UpdateButton(iconData); - return; + return UpdateButton(iconData); } notifyItem = new NOTIFYICONDATA(); @@ -138,9 +137,11 @@ CToolbar::AddButton(&tbBtn); SetButtonSize(ICON_SIZE, ICON_SIZE); - } - - VOID UpdateButton(IN CONST NOTIFYICONDATA *iconData) + + return TRUE; + } + + BOOL UpdateButton(IN CONST NOTIFYICONDATA *iconData) { NOTIFYICONDATA * notifyItem; TBBUTTONINFO tbbi = { 0 }; @@ -148,8 +149,7 @@ int index = FindItemByIconData(iconData, &notifyItem); if (index < 0) { - AddButton(iconData); - return; + return AddButton(iconData); } tbbi.cbSize = sizeof(tbbi); @@ -197,15 +197,17 @@ /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ SetButtonInfo(index, &tbbi); - } - - VOID RemoveButton(IN CONST NOTIFYICONDATA *iconData) + + return TRUE; + } + + BOOL RemoveButton(IN CONST NOTIFYICONDATA *iconData) { NOTIFYICONDATA * notifyItem; int index = FindItemByIconData(iconData, &notifyItem); if (index < 0) - return; + return FALSE; DeleteButton(index); @@ -215,6 +217,8 @@ } delete notifyItem; + + return TRUE; } VOID GetTooltipText(int index, LPTSTR szTip, DWORD cchTip) @@ -432,20 +436,11 @@ switch (data->notify_code) { case NIM_ADD: - { - Toolbar.AddButton(iconData); - break; - } + return Toolbar.AddButton(iconData); case NIM_MODIFY: - { - Toolbar.UpdateButton(iconData); - break; - } + return Toolbar.UpdateButton(iconData); case NIM_DELETE: - { - Toolbar.RemoveButton(iconData); - break; - } + return Toolbar.RemoveButton(iconData); default: TRACE("NotifyMessage received with unknown code %d.\n", data->notify_code); break; @@ -1458,7 +1453,7 @@ { if (m_pager) { - m_pager->NotifyMsg(uMsg, wParam, lParam, bHandled); + return m_pager->NotifyMsg(uMsg, wParam, lParam, bHandled); } return TRUE; @@ -1589,11 +1584,11 @@ return pTrayNotify->_Init(Tray, bHideClock); } -VOID +BOOL TrayNotify_NotifyMsg(CTrayNotifyWnd* pTrayNotify, WPARAM wParam, LPARAM lParam) { BOOL bDummy; - pTrayNotify->NotifyMsg(0, wParam, lParam, bDummy); + return pTrayNotify->NotifyMsg(0, wParam, lParam, bDummy); } BOOL Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Fri Jan 9 17:24:43 2015 @@ -2184,7 +2184,7 @@ { if (m_TrayNotify) { - TrayNotify_NotifyMsg(m_TrayNotifyInstance, wParam, lParam); + return TrayNotify_NotifyMsg(m_TrayNotifyInstance, wParam, lParam); } return TRUE; }

1 0

[akhaldi] 66018: [RAMDISK] Fix some comment typos. Convert comments to C style. No code changes.
by akhaldi＠svn.reactos.org 09 Jan '15

09 Jan '15

Author: akhaldi Date: Fri Jan 9 16:57:24 2015 New Revision: 66018 URL: http://svn.reactos.org/svn/reactos?rev=66018&view=rev Log: [RAMDISK] Fix some comment typos. Convert comments to C style. No code changes. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Fri Jan 9 16:57:24 2015 @@ -90,14 +90,10 @@ typedef struct _RAMDISK_DRIVE_EXTENSION { - // - // Inherited base class - // + /* Inherited base class */ RAMDISK_EXTENSION; - // - // Data we get from the creator - // + /* Data we get from the creator */ GUID DiskGuid; UNICODE_STRING GuidString; UNICODE_STRING SymbolicLinkName; @@ -108,9 +104,7 @@ WCHAR DriveLetter; ULONG BasePage; - // - // Data we get from the disk - // + /* Data we get from the disk */ ULONG BytesPerSector; ULONG SectorsPerTrack; ULONG NumberOfHeads; @@ -141,9 +135,7 @@ ULONG MinView, DefView, MinViewLength, DefViewLength, MaxViewLength; RTL_QUERY_REGISTRY_TABLE QueryTable[10]; - // - // Set defaults - // + /* Set defaults */ MaximumViewLength = 0x10000000u; MaximumPerDiskViewLength = 0x10000000u; ReportDetectedDevice = 0; @@ -154,9 +146,7 @@ MinimumViewLength = 0x10000u; DefaultViewLength = 0x100000u; - // - // Setup the query table and query the registry - // + /* Setup the query table and query the registry */ RtlZeroMemory(QueryTable, sizeof(QueryTable)); QueryTable[0].Flags = 1; QueryTable[0].Name = L"Parameters"; @@ -193,9 +183,7 @@ NULL, NULL); - // - // Parse minimum view count, cannot be bigger than 256 or smaller than 2 - // + /* Parse minimum view count, cannot be bigger than 256 or smaller than 2 */ MinView = MinimumViewCount; if (MinimumViewCount >= 2) { @@ -207,9 +195,7 @@ } MinimumViewCount = MinView; - // - // Parse default view count, cannot be bigger than 256 or smaller than minimum - // + /* Parse default view count, cannot be bigger than 256 or smaller than minimum */ DefView = DefaultViewCount; if (DefaultViewCount >= MinView) { @@ -221,9 +207,7 @@ } DefaultViewCount = DefView; - // - // Parse maximum view count, cannot be bigger than 256 or smaller than default - // + /* Parse maximum view count, cannot be bigger than 256 or smaller than default */ if (MaximumViewCount >= DefView) { if (MaximumViewCount > 256) MaximumViewCount = 256; @@ -233,9 +217,7 @@ MaximumViewCount = DefView; } - // - // Parse minimum view length, cannot be bigger than 1GB or smaller than 64KB - // + /* Parse minimum view length, cannot be bigger than 1GB or smaller than 64KB */ MinViewLength = MinimumViewLength; if (MinimumViewLength >= 0x10000) { @@ -247,9 +229,7 @@ } MinimumViewLength = MinViewLength; - // - // Parse default view length, cannot be bigger than 1GB or smaller than minimum - // + /* Parse default view length, cannot be bigger than 1GB or smaller than minimum */ DefViewLength = DefaultViewLength; if (DefaultViewLength >= MinViewLength) { @@ -261,9 +241,7 @@ } DefaultViewLength = DefViewLength; - // - // Parse maximum view length, cannot be bigger than 1GB or smaller than default - // + /* Parse maximum view length, cannot be bigger than 1GB or smaller than default */ MaxViewLength = MaximumViewLength; if (MaximumViewLength >= DefViewLength) { @@ -275,9 +253,7 @@ } MaximumViewLength = MaxViewLength; - // - // Parse maximum view length per disk, cannot be smaller than 16MB - // + /* Parse maximum view length per disk, cannot be smaller than 16MB */ if (MaximumPerDiskViewLength >= 0x1000000) { if (MaxViewLength > 0xFFFFFFFF) MaximumPerDiskViewLength = -1; @@ -302,54 +278,34 @@ LARGE_INTEGER ActualOffset; LARGE_INTEGER ActualPages; - // - // We only support boot disks for now - // + /* We only support boot disks for now */ ASSERT(DeviceExtension->DiskType == RAMDISK_BOOT_DISK); - // - // Calculate the actual offset in the drive - // + /* Calculate the actual offset in the drive */ ActualOffset.QuadPart = DeviceExtension->DiskOffset + Offset.QuadPart; - // - // Convert to pages - // + /* Convert to pages */ ActualPages.QuadPart = ActualOffset.QuadPart >> PAGE_SHIFT; - // - // Now add the base page - // + /* Now add the base page */ ActualPages.QuadPart = DeviceExtension->BasePage + ActualPages.QuadPart; - // - // Calculate final amount of bytes - // + /* Calculate final amount of bytes */ PhysicalAddress.QuadPart = ActualPages.QuadPart << PAGE_SHIFT; - // - // Calculate pages spanned for the mapping - // + /* Calculate pages spanned for the mapping */ ActualLength = ADDRESS_AND_SIZE_TO_SPAN_PAGES(ActualOffset.QuadPart, Length); - // - // And convert this back to bytes - // + /* And convert this back to bytes */ ActualLength <<= PAGE_SHIFT; - // - // Get the offset within the page - // + /* Get the offset within the page */ PageOffset = BYTE_OFFSET(ActualOffset.QuadPart); - // - // Map the I/O Space from the loader - // + /* Map the I/O Space from the loader */ MappedBase = MmMapIoSpace(PhysicalAddress, ActualLength, MmCached); - // - // Return actual offset within the page as well as the length - // + /* Return actual offset within the page as well as the length */ if (MappedBase) MappedBase = (PVOID)((ULONG_PTR)MappedBase + PageOffset); *OutputLength = Length; return MappedBase; @@ -366,39 +322,25 @@ SIZE_T ActualLength; ULONG PageOffset; - // - // We only support boot disks for now - // + /* We only support boot disks for now */ ASSERT(DeviceExtension->DiskType == RAMDISK_BOOT_DISK); - // - // Calculate the actual offset in the drive - // + /* Calculate the actual offset in the drive */ ActualOffset.QuadPart = DeviceExtension->DiskOffset + Offset.QuadPart; - // - // Calculate pages spanned for the mapping - // + /* Calculate pages spanned for the mapping */ ActualLength = ADDRESS_AND_SIZE_TO_SPAN_PAGES(ActualOffset.QuadPart, Length); - // - // And convert this back to bytes - // + /* And convert this back to bytes */ ActualLength <<= PAGE_SHIFT; - // - // Get the offset within the page - // + /* Get the offset within the page */ PageOffset = BYTE_OFFSET(ActualOffset.QuadPart); - // - // Calculate actual base address where we mapped this - // + /* Calculate actual base address where we mapped this */ BaseAddress = (PVOID)((ULONG_PTR)BaseAddress - PageOffset); - // - // Unmap the I/O space we got from the loader - // + /* Unmap the I/O space we got from the loader */ MmUnmapIoSpace(BaseAddress, ActualLength); } @@ -424,26 +366,18 @@ LARGE_INTEGER CurrentOffset, CylinderSize, DiskLength; ULONG CylinderCount, SizeByCylinders; - // - // Check if we're a boot RAM disk - // + /* Check if we're a boot RAM disk */ DiskType = Input->DiskType; if (DiskType >= RAMDISK_BOOT_DISK) { - // - // Check if we're an ISO - // + /* Check if we're an ISO */ if (DiskType == RAMDISK_BOOT_DISK) { - // - // NTLDR mounted us somewhere - // + /* NTLDR mounted us somewhere */ BasePage = Input->BasePage; if (!BasePage) return STATUS_INVALID_PARAMETER; - // - // Sanitize disk options - // + /* Sanitize disk options */ Input->Options.Fixed = TRUE; Input->Options.Readonly = Input->Options.ExportAsCd | Input->Options.Readonly; @@ -453,25 +387,17 @@ } else { - // - // The only other possibility is a WIM disk - // + /* The only other possibility is a WIM disk */ if (DiskType != RAMDISK_WIM_DISK) { - // - // Fail - // + /* Fail */ return STATUS_INVALID_PARAMETER; } - // - // Read the view count instead - // + /* Read the view count instead */ // ViewCount = Input->ViewCount; - // - // Sanitize disk options - // + /* Sanitize disk options */ Input->Options.Hidden = FALSE; Input->Options.NoDosDevice = FALSE; Input->Options.Readonly = FALSE; @@ -479,52 +405,36 @@ Input->Options.Fixed = TRUE; } - // - // Are we just validating and returning to the user? - // + /* Are we just validating and returning to the user? */ if (ValidateOnly) return STATUS_SUCCESS; - // - // Build the GUID string - // + /* Build the GUID string */ Status = RtlStringFromGUID(&Input->DiskGuid, &GuidString); if (!(NT_SUCCESS(Status)) || !(GuidString.Buffer)) { - // - // Fail - // + /* Fail */ Status = STATUS_INSUFFICIENT_RESOURCES; goto FailCreate; } - // - // Allocate our device name - // + /* Allocate our device name */ Length = GuidString.Length + 32; - Buffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - 'dmaR'); + Buffer = ExAllocatePoolWithTag(NonPagedPool, Length, 'dmaR'); if (!Buffer) { - // - // Fail - // + /* Fail */ Status = STATUS_INSUFFICIENT_RESOURCES; goto FailCreate; } - // - // Build the device name string - // + /* Build the device name string */ DeviceName.Buffer = Buffer; DeviceName.Length = Length - 2; DeviceName.MaximumLength = Length; wcsncpy(Buffer, L"\\Device\\Ramdisk", Length / sizeof(WCHAR)); wcsncat(Buffer, GuidString.Buffer, Length / sizeof(WCHAR)); - // - // Create the drive device - // + /* Create the drive device */ Status = IoCreateDevice(DeviceExtension->DeviceObject->DriverObject, sizeof(RAMDISK_DRIVE_EXTENSION), &DeviceName, @@ -535,19 +445,13 @@ &DeviceObject); if (!NT_SUCCESS(Status)) goto FailCreate; - // - // Grab the drive extension - // + /* Grab the drive extension */ DriveExtension = DeviceObject->DeviceExtension; - // - // Check if we need a DOS device - // + /* Check if we need a DOS device */ if (!Input->Options.NoDosDevice) { - // - // Build the symbolic link name - // + /* Build the symbolic link name */ SymbolicLinkName.MaximumLength = GuidString.Length + 36; SymbolicLinkName.Length = GuidString.Length + 34; Buffer = ExAllocatePoolWithTag(NonPagedPool, @@ -556,9 +460,7 @@ SymbolicLinkName.Buffer = Buffer; if (Buffer) { - // - // Create it - // + /* Create it */ wcsncpy(Buffer, L"\\GLOBAL??\\Ramdisk", SymbolicLinkName.MaximumLength / sizeof(WCHAR)); @@ -568,9 +470,7 @@ Status = IoCreateSymbolicLink(&SymbolicLinkName, &DeviceName); if (!NT_SUCCESS(Status)) { - // - // Nevermind... - // + /* Nevermind... */ Input->Options.NoDosDevice = TRUE; ExFreePool(Buffer); SymbolicLinkName.Buffer = NULL; @@ -578,25 +478,17 @@ } else { - // - // No DOS device - // + /* No DOS device */ Input->Options.NoDosDevice = TRUE; } - // - // It this an ISO boot ramdisk? - // + /* Is this an ISO boot ramdisk? */ if (Input->DiskType == RAMDISK_BOOT_DISK) { - // - // Does it need a drive letter? - // + /* Does it need a drive letter? */ if (!Input->Options.NoDriveLetter) { - // - // Build it and take over the existing symbolic link - // + /* Build it and take over the existing symbolic link */ _snwprintf(LocalBuffer, 30, L"\\DosDevices\\%wc:", @@ -605,32 +497,23 @@ IoDeleteSymbolicLink(&DriveString); IoCreateSymbolicLink(&DriveString, &DeviceName); - // - // Save the drive letter - // + /* Save the drive letter */ DriveExtension->DriveLetter = Input->DriveLetter; } } } - // - // Setup the device object flags - // + /* Setup the device object flags */ DeviceObject->Flags |= (DO_XIP | DO_POWER_PAGABLE | DO_DIRECT_IO); DeviceObject->AlignmentRequirement = 1; - // - // Build the drive FDO - // + /* Build the drive FDO */ *NewDriveExtension = DriveExtension; DriveExtension->Type = RamdiskDrive; DiskLength = Input->DiskLength; ExInitializeFastMutex(&DriveExtension->DiskListLock); - IoInitializeRemoveLock(&DriveExtension->RemoveLock, - 'dmaR', - 1, - 0); + IoInitializeRemoveLock(&DriveExtension->RemoveLock, 'dmaR', 1, 0); DriveExtension->DriveDeviceName = DeviceName; DriveExtension->SymbolicLinkName = SymbolicLinkName; DriveExtension->GuidString = GuidString; @@ -647,23 +530,17 @@ DriveExtension->SectorsPerTrack = 0; DriveExtension->NumberOfHeads = 0; - // - // Make sure we don't free it later - // + /* Make sure we don't free it later */ DeviceName.Buffer = NULL; SymbolicLinkName.Buffer = NULL; GuidString.Buffer = NULL; - // - // Check if this is an boot disk, or a registry ram drive - // + /* Check if this is a boot disk, or a registry ram drive */ if (!(Input->Options.ExportAsCd) && (Input->DiskType == RAMDISK_BOOT_DISK)) { - // - // Not an ISO boot, but it's a boot FS -- map it to figure out the - // drive settings - // + /* Not an ISO boot, but it's a boot FS -- map it to figure out the + * drive settings */ CurrentOffset.QuadPart = 0; BaseAddress = RamdiskMapPages(DriveExtension, CurrentOffset, @@ -671,25 +548,19 @@ &BytesRead); if (BaseAddress) { - // - // Get the data - // + /* Get the data */ BootSector = (PPACKED_BOOT_SECTOR)BaseAddress; FatUnpackBios(&BiosBlock, &BootSector->PackedBpb); BytesPerSector = BiosBlock.BytesPerSector; SectorsPerTrack = BiosBlock.SectorsPerTrack; Heads = BiosBlock.Heads; - // - // Save it - // + /* Save it */ DriveExtension->BytesPerSector = BytesPerSector; DriveExtension->SectorsPerTrack = SectorsPerTrack; DriveExtension->NumberOfHeads = Heads; - // - // Unmap now - // + /* Unmap now */ CurrentOffset.QuadPart = 0; RamdiskUnmapPages(DriveExtension, BaseAddress, @@ -698,47 +569,35 @@ } else { - // - // Fail - // + /* Fail */ Status = STATUS_INSUFFICIENT_RESOURCES; goto FailCreate; } } - // - // Check if the drive settings haven't been set yet - // + /* Check if the drive settings haven't been set yet */ if ((DriveExtension->BytesPerSector == 0) || (DriveExtension->SectorsPerTrack == 0) || (DriveExtension->NumberOfHeads == 0)) { - // - // Check if this is a CD - // + /* Check if this is a CD */ if (Input->Options.ExportAsCd) { - // - // Setup partition parameters default for ISO 9660 - // + /* Setup partition parameters default for ISO 9660 */ DriveExtension->BytesPerSector = 2048; DriveExtension->SectorsPerTrack = 32; DriveExtension->NumberOfHeads = 64; } else { - // - // Setup partition parameters default for FAT - // + /* Setup partition parameters default for FAT */ DriveExtension->BytesPerSector = 512; DriveExtension->SectorsPerTrack = 128; DriveExtension->NumberOfHeads = 16; } } - // - // Calculate the cylinder size - // + /* Calculate the cylinder size */ CylinderSize.QuadPart = DriveExtension->BytesPerSector * DriveExtension->SectorsPerTrack * DriveExtension->NumberOfHeads; @@ -747,32 +606,22 @@ DriveExtension->Cylinders = CylinderCount; if ((DiskLength.HighPart > 0) || (SizeByCylinders < DiskLength.LowPart)) { - // - // Align cylinder size up - // + /* Align cylinder size up */ DriveExtension->Cylinders++; } - // - // Acquire the disk lock - // + /* Acquire the disk lock */ KeEnterCriticalRegion(); ExAcquireFastMutex(&DeviceExtension->DiskListLock); - // - // Insert us - // + /* Insert us */ InsertTailList(&DeviceExtension->DiskList, &DriveExtension->DiskList); - // - // Release the lock - // + /* Release the lock */ ExReleaseFastMutex(&DeviceExtension->DiskListLock); KeLeaveCriticalRegion(); - // - // Clear init flag - // + /* Clear init flag */ DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; } @@ -797,92 +646,63 @@ NTSTATUS Status; PIO_STACK_LOCATION IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - // - // Get the device extension and our input data - // + /* Get the device extension and our input data */ DeviceExtension = DeviceObject->DeviceExtension; Length = IoStackLocation->Parameters.DeviceIoControl.InputBufferLength; Input = (PRAMDISK_CREATE_INPUT)Irp->AssociatedIrp.SystemBuffer; - // - // Validate input parameters - // + /* Validate input parameters */ if ((Length < sizeof(RAMDISK_CREATE_INPUT)) || (Input->Version != sizeof(RAMDISK_CREATE_INPUT))) { - // - // Invalid input - // return STATUS_INVALID_PARAMETER; } - // - // Validate the disk type - // + /* Validate the disk type */ DiskType = Input->DiskType; if (DiskType == RAMDISK_WIM_DISK) return STATUS_INVALID_PARAMETER; - // - // Look at the disk type - // + /* Look at the disk type */ if (DiskType == RAMDISK_BOOT_DISK) { - // - // We only allow this as an early-init boot - // + /* We only allow this as an early-init boot */ if (!KeLoaderBlock) return STATUS_INVALID_PARAMETER; - // - // Save command-line flags - // + /* Save command-line flags */ if (ExportBootDiskAsCd) Input->Options.ExportAsCd = TRUE; if (IsWinPEBoot) Input->Options.NoDriveLetter = TRUE; } - // - // Validate the disk type - // + /* Validate the disk type */ if ((Input->Options.ExportAsCd) && (DiskType != RAMDISK_BOOT_DISK)) { - // - // If the type isn't CDFS, it has to at least be raw CD - // + /* If the type isn't CDFS, it has to at least be raw CD */ if (DiskType != RAMDISK_MEMORY_MAPPED_DISK) return STATUS_INVALID_PARAMETER; } - // - // Check if this is an actual file - // + /* Check if this is an actual file */ if (DiskType <= RAMDISK_MEMORY_MAPPED_DISK) { - // - // Validate the file name - // + /* Validate the file name */ FileNameStart = (PWCHAR)((ULONG_PTR)Input + Length); FileNameEnd = Input->FileName + 1; while ((FileNameEnd < FileNameStart) && *(FileNameEnd)) FileNameEnd++; if (FileNameEnd == FileNameStart) return STATUS_INVALID_PARAMETER; } - // - // Create the actual device - // + /* Create the actual device */ Status = RamdiskCreateDiskDevice(DeviceExtension, Input, ValidateOnly, &DriveExtension); if (NT_SUCCESS(Status)) { - // - // Invalidate and set success - // + /* Invalidate and set success */ IoInvalidateDeviceRelations(DeviceExtension->PhysicalDeviceObject, 0); Irp->IoStatus.Information = STATUS_SUCCESS; } - // - // We're done - // + /* We're done */ return Status; } @@ -898,40 +718,30 @@ ULONG Length; PIO_STACK_LOCATION IoStackLocation; - // - // Validate the length - // + /* Validate the length */ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); if (IoStackLocation->Parameters.DeviceIoControl. OutputBufferLength < sizeof(PARTITION_INFORMATION)) { - // - // Invalid length - // + /* Invalid length */ Status = STATUS_BUFFER_TOO_SMALL; Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; return Status; } - // - // Map the partition table - // + /* Map the partition table */ BaseAddress = RamdiskMapPages(DeviceExtension, Zero, PAGE_SIZE, &Length); if (!BaseAddress) { - // - // No memory - // + /* No memory */ Status = STATUS_INSUFFICIENT_RESOURCES; Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; return Status; } - // - // Fill out the information - // + /* Fill out the information */ PartitionInfo = Irp->AssociatedIrp.SystemBuffer; PartitionInfo->StartingOffset.QuadPart = DeviceExtension->BytesPerSector; PartitionInfo->PartitionLength.QuadPart = DeviceExtension->BytesPerSector * @@ -947,14 +757,10 @@ PartitionType); PartitionInfo->RewritePartition = FALSE; - // - // Unmap the partition table - // + /* Unmap the partition table */ RamdiskUnmapPages(DeviceExtension, BaseAddress, Zero, Length); - // - // Done - // + /* Done */ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = sizeof(PARTITION_INFORMATION); return STATUS_SUCCESS; @@ -972,9 +778,7 @@ LARGE_INTEGER Zero = {{0, 0}}; PPARTITION_INFORMATION PartitionInfo; - // - // First validate input - // + /* First validate input */ Stack = IoGetCurrentIrpStackLocation(Irp); if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(PARTITION_INFORMATION)) { @@ -982,9 +786,7 @@ goto SetAndQuit; } - // - // Map to get MBR - // + /* Map to get MBR */ BaseAddress = RamdiskMapPages(DeviceExtension, Zero, PAGE_SIZE, &BytesRead); if (BaseAddress == NULL) { @@ -992,16 +794,11 @@ goto SetAndQuit; } - // - // Set the new partition type - // On partition 0, field system indicator - // + /* Set the new partition type on partition 0, field system indicator */ PartitionInfo = (PPARTITION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; *((PCHAR)BaseAddress + 450) = PartitionInfo->PartitionType; - // - // And unmap - // + /* And unmap */ RamdiskUnmapPages(DeviceExtension, BaseAddress, Zero, BytesRead); Status = STATUS_SUCCESS; @@ -1021,46 +818,30 @@ PIO_STACK_LOCATION IoStackLocation; PIRP Irp = Context; - // - // Get the stack location - // + /* Get the stack location */ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - // - // Free the work item - // + /* Free the work item */ IoFreeWorkItem(Irp->Tail.Overlay.DriverContext[0]); - // - // Grab the device extension and lock it - // + /* Grab the device extension and lock it */ DeviceExtension = DeviceObject->DeviceExtension; Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, Irp); if (NT_SUCCESS(Status)) { - // - // Discriminate by major code - // + /* Discriminate by major code */ switch (IoStackLocation->MajorFunction) { - // - // Device control - // + /* Device control */ case IRP_MJ_DEVICE_CONTROL: { - // - // Let's take a look at the IOCTL - // + /* Let's take a look at the IOCTL */ switch (IoStackLocation->Parameters.DeviceIoControl.IoControlCode) { - // - // Ramdisk create request - // + /* Ramdisk create request */ case FSCTL_CREATE_RAM_DISK: { - // - // This time we'll do it for real - // + /* This time we'll do it for real */ Status = RamdiskCreateRamdisk(DeviceObject, Irp, FALSE); break; } @@ -1086,45 +867,34 @@ break; } - // - // We're here - // + /* We're here */ break; } - // - // Read or write request - // + /* Read or write request */ case IRP_MJ_READ: case IRP_MJ_WRITE: UNIMPLEMENTED_DBGBREAK("Read/Write request\n"); break; - // - // Internal request (SCSI?) - // + /* Internal request (SCSI?) */ case IRP_MJ_INTERNAL_DEVICE_CONTROL: UNIMPLEMENTED_DBGBREAK("SCSI request\n"); break; - // - // Flush request - // + /* Flush request */ case IRP_MJ_FLUSH_BUFFERS: UNIMPLEMENTED_DBGBREAK("Flush request\n"); break; - // - // Anything else - // + /* Anything else */ default: - UNIMPLEMENTED_DBGBREAK("Invalid request: %lx\n", IoStackLocation->MajorFunction); + UNIMPLEMENTED_DBGBREAK("Invalid request: %lx\n", + IoStackLocation->MajorFunction); break; } - // - // Complete the I/O - // + /* Complete the I/O */ IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; @@ -1132,9 +902,7 @@ return; } - // - // Fail the I/O - // + /* Fail the I/O */ Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -1147,29 +915,21 @@ { PIO_WORKITEM WorkItem; - // - // Mark the IRP pending - // + /* Mark the IRP pending */ IoMarkIrpPending(Irp); - // - // Allocate a work item - // + /* Allocate a work item */ WorkItem = IoAllocateWorkItem(DeviceObject); if (WorkItem) { - // - // Queue it up - // + /* Queue it up */ Irp->Tail.Overlay.DriverContext[0] = WorkItem; IoQueueWorkItem(WorkItem, RamdiskWorkerThread, DelayedWorkQueue, Irp); return STATUS_PENDING; } else { - // - // Fail - // + /* Fail */ return STATUS_INSUFFICIENT_RESOURCES; } } @@ -1187,22 +947,16 @@ PVOID Source, Destination; NTSTATUS Status; - // - // Get the MDL and check if it's mapped - // + /* Get the MDL and check if it's mapped */ Mdl = Irp->MdlAddress; if (Mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | MDL_SOURCE_IS_NONPAGED_POOL)) { - // - // Use the mapped address - // + /* Use the mapped address */ SystemVa = Mdl->MappedSystemVa; } else { - // - // Map it ourselves - // + /* Map it ourselves */ SystemVa = MmMapLockedPagesSpecifyCache(Mdl, 0, MmCached, @@ -1211,98 +965,67 @@ NormalPagePriority); } - // - // Make sure we were able to map it - // + /* Make sure we were able to map it */ CurrentBase = SystemVa; if (!SystemVa) return STATUS_INSUFFICIENT_RESOURCES; - // - // Initialize default - // + /* Initialize default */ Irp->IoStatus.Information = 0; - // - // Get the I/O Stack Location and capture the data - // + /* Get the I/O Stack Location and capture the data */ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); CurrentOffset = IoStackLocation->Parameters.Read.ByteOffset; BytesLeft = IoStackLocation->Parameters.Read.Length; if (!BytesLeft) return STATUS_INVALID_PARAMETER; - // - // Do the copy loop - // + /* Do the copy loop */ while (TRUE) { - // - // Map the pages - // + /* Map the pages */ BaseAddress = RamdiskMapPages(DeviceExtension, CurrentOffset, BytesLeft, &BytesRead); if (!BaseAddress) return STATUS_INSUFFICIENT_RESOURCES; - // - // Update our lengths - // + /* Update our lengths */ Irp->IoStatus.Information += BytesRead; CopyLength = BytesRead; - // - // Check if this was a read or write - // + /* Check if this was a read or write */ Status = STATUS_SUCCESS; if (IoStackLocation->MajorFunction == IRP_MJ_READ) { - // - // Set our copy parameters - // + /* Set our copy parameters */ Destination = CurrentBase; Source = BaseAddress; goto DoCopy; } else if (IoStackLocation->MajorFunction == IRP_MJ_WRITE) { - // - // Set our copy parameters - // + /* Set our copy parameters */ Destination = BaseAddress; Source = CurrentBase; DoCopy: - // - // Copy the data - // + /* Copy the data */ RtlCopyMemory(Destination, Source, CopyLength); } else { - // - // Prepare us for failure - // + /* Prepare us for failure */ BytesLeft = CopyLength; Status = STATUS_INVALID_PARAMETER; } - // - // Unmap the pages - // - RamdiskUnmapPages(DeviceExtension, - BaseAddress, - CurrentOffset, - BytesRead); - - // - // Update offset and bytes left - // + /* Unmap the pages */ + RamdiskUnmapPages(DeviceExtension, BaseAddress, CurrentOffset, BytesRead); + + /* Update offset and bytes left */ BytesLeft -= BytesRead; CurrentOffset.QuadPart += BytesRead; CurrentBase = (PVOID)((ULONG_PTR)CurrentBase + BytesRead); - // - // Check if we're done - // + /* Check if we're done */ if (!BytesLeft) return Status; } } @@ -1312,9 +1035,7 @@ RamdiskOpenClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - // - // Complete the IRP - // + /* Complete the IRP */ Irp->IoStatus.Information = 1; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -1327,87 +1048,61 @@ IN PIRP Irp) { PRAMDISK_DRIVE_EXTENSION DeviceExtension; - // ULONG Length; - // LARGE_INTEGER ByteOffset; + //ULONG Length; + //LARGE_INTEGER ByteOffset; PIO_STACK_LOCATION IoStackLocation; NTSTATUS Status, ReturnStatus; - // - // Get the device extension and make sure this isn't a bus - // + /* Get the device extension and make sure this isn't a bus */ DeviceExtension = DeviceObject->DeviceExtension; if (DeviceExtension->Type == RamdiskBus) { - // - // Fail - // + /* Fail */ Status = STATUS_INVALID_DEVICE_REQUEST; goto Complete; } - // - // Capture parameters - // + /* Capture parameters */ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - // Length = IoStackLocation->Parameters.Read.Length; - // ByteOffset = IoStackLocation->Parameters.Read.ByteOffset; - - // - // FIXME: Validate offset - // - - // - // FIXME: Validate sector - // - - // - // Validate write - // + //Length = IoStackLocation->Parameters.Read.Length; + //ByteOffset = IoStackLocation->Parameters.Read.ByteOffset; + + /* FIXME: Validate offset */ + + /* FIXME: Validate sector */ + + /* Validate write */ if ((IoStackLocation->MajorFunction == IRP_MJ_WRITE) && (DeviceExtension->DiskOptions.Readonly)) { - // - // Fail, this is read-only - // + /* Fail, this is read-only */ Status = STATUS_MEDIA_WRITE_PROTECTED; goto Complete; } - // - // See if we want to do this sync or async - // + /* See if we want to do this sync or async */ if (DeviceExtension->DiskType > RAMDISK_MEMORY_MAPPED_DISK) { - // - // Do it sync - // + /* Do it sync */ Status = RamdiskReadWriteReal(Irp, DeviceExtension); goto Complete; } - // - // Queue it to the worker - // + /* Queue it to the worker */ Status = SendIrpToThread(DeviceObject, Irp); ReturnStatus = STATUS_PENDING; - // - // Check if we're pending or not - // + /* Check if we're pending or not */ if (Status != STATUS_PENDING) { Complete: - // - // Complete the IRP - // + /* Complete the IRP */ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_DISK_INCREMENT); ReturnStatus = Status; } - // - // Return to caller - // + /* Return to caller */ return ReturnStatus; } @@ -1424,45 +1119,31 @@ PCDROM_TOC Toc; PDISK_GEOMETRY DiskGeometry; - // - // Grab the remove lock - // + /* Grab the remove lock */ Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, Irp); if (!NT_SUCCESS(Status)) { - // - // Fail the IRP - // + /* Fail the IRP */ Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } - // - // Setup some defaults - // + /* Setup some defaults */ Status = STATUS_INVALID_DEVICE_REQUEST; Information = 0; - // - // Check if this is an bus device or the drive - // + /* Check if this is an bus device or the drive */ if (DeviceExtension->Type == RamdiskBus) { - // - // Check what the request is - // + /* Check what the request is */ switch (IoStackLocation->Parameters.DeviceIoControl.IoControlCode) { - // - // Request to create a ramdisk - // + /* Request to create a ramdisk */ case FSCTL_CREATE_RAM_DISK: { - // - // Do it - // + /* Do it */ Status = RamdiskCreateRamdisk(DeviceObject, Irp, TRUE); if (!NT_SUCCESS(Status)) goto CompleteRequest; break; @@ -1470,18 +1151,15 @@ default: { - // - // We don't handle anything else yet - // - UNIMPLEMENTED_DBGBREAK("FSCTL: 0x%lx is UNSUPPORTED!\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); + /* We don't handle anything else yet */ + UNIMPLEMENTED_DBGBREAK("FSCTL: 0x%lx is UNSUPPORTED!\n", + IoStackLocation->Parameters.DeviceIoControl.IoControlCode); } } } else { - // - // Check what the request is - // + /* Check what the request is */ switch (IoStackLocation->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_DISK_CHECK_VERIFY: @@ -1489,9 +1167,7 @@ case IOCTL_STORAGE_CHECK_VERIFY2: case IOCTL_CDROM_CHECK_VERIFY: { - // - // Just pretend it's OK, don't do more - // + /* Just pretend it's OK, don't do more */ Status = STATUS_SUCCESS; break; } @@ -1501,22 +1177,16 @@ case IOCTL_DISK_GET_DRIVE_GEOMETRY: case IOCTL_CDROM_GET_DRIVE_GEOMETRY: { - // - // Validate the length - // + /* Validate the length */ if (IoStackLocation->Parameters.DeviceIoControl. OutputBufferLength < sizeof(DISK_GEOMETRY)) { - // - // Invalid length - // + /* Invalid length */ Status = STATUS_BUFFER_TOO_SMALL; break; } - // - // Fill it out - // + /* Fill it out */ DiskGeometry = Irp->AssociatedIrp.SystemBuffer; DiskGeometry->Cylinders.QuadPart = DriveExtension->Cylinders; DiskGeometry->BytesPerSector = DriveExtension->BytesPerSector; @@ -1525,9 +1195,7 @@ DiskGeometry->MediaType = DriveExtension->DiskOptions.Fixed ? FixedMedia : RemovableMedia; - // - // We're done - // + /* We're done */ Status = STATUS_SUCCESS; Information = sizeof(DISK_GEOMETRY); break; @@ -1535,28 +1203,20 @@ case IOCTL_CDROM_READ_TOC: { - // - // Validate the length - // + /* Validate the length */ if (IoStackLocation->Parameters.DeviceIoControl. OutputBufferLength < sizeof(CDROM_TOC)) { - // - // Invalid length - // + /* Invalid length */ Status = STATUS_BUFFER_TOO_SMALL; break; } - // - // Clear the TOC - // + /* Clear the TOC */ Toc = Irp->AssociatedIrp.SystemBuffer; RtlZeroMemory(Toc, sizeof(CDROM_TOC)); - // - // Fill it out - // + /* Fill it out */ Toc->Length[0] = 0; Toc->Length[1] = RAMDISK_TOC_SIZE - sizeof(Toc->Length); Toc->FirstTrack = 1; @@ -1565,9 +1225,7 @@ Toc->TrackData[0].Control = TOC_DATA_TRACK; Toc->TrackData[0].TrackNumber = 1; - // - // We're done - // + /* We're done */ Status = STATUS_SUCCESS; Information = RAMDISK_TOC_SIZE; break; @@ -1581,40 +1239,28 @@ case IOCTL_DISK_GET_PARTITION_INFO: { - // - // Validate the length - // + /* Validate the length */ if (IoStackLocation->Parameters.DeviceIoControl. OutputBufferLength < sizeof(PARTITION_INFORMATION)) { - // - // Invalid length - // + /* Invalid length */ Status = STATUS_BUFFER_TOO_SMALL; break; } - // - // Check if we need to do this sync or async - // + /* Check if we need to do this sync or async */ if (DriveExtension->DiskType > RAMDISK_MEMORY_MAPPED_DISK) { - // - // Call the helper function - // + /* Call the helper function */ Status = RamdiskGetPartitionInfo(Irp, DriveExtension); } else { - // - // Do it asynchronously later - // + /* Do it asynchronously later */ goto CallWorker; } - // - // We're done - // + /* We're done */ Information = Irp->IoStatus.Information; break; } @@ -1631,50 +1277,40 @@ case IOCTL_VOLUME_GET_GPT_ATTRIBUTES: case IOCTL_VOLUME_OFFLINE: { - UNIMPLEMENTED_DBGBREAK("IOCTL: 0x%lx is UNIMPLEMENTED!\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); + UNIMPLEMENTED_DBGBREAK("IOCTL: 0x%lx is UNIMPLEMENTED!\n", + IoStackLocation->Parameters.DeviceIoControl.IoControlCode); break; } default: { - // - // Drive code not emulated - // - DPRINT1("IOCTL: 0x%lx is UNSUPPORTED!\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); + /* Drive code not emulated */ + DPRINT1("IOCTL: 0x%lx is UNSUPPORTED!\n", + IoStackLocation->Parameters.DeviceIoControl.IoControlCode); break; } } - // - // If requests drop down here, we just return them complete them - // + /* If requests drop down here, we just return them complete them */ goto CompleteRequest; } - // - // Queue the request to our worker thread - // + /* Queue the request to our worker thread */ CallWorker: Status = SendIrpToThread(DeviceObject, Irp); CompleteRequest: - // - // Release the lock - // + /* Release the lock */ IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); if (Status != STATUS_PENDING) { - // - // Complete the request - // + /* Complete the request */ Irp->IoStatus.Status = Status; Irp->IoStatus.Information = Information; IoCompleteRequest(Irp, IO_NO_INCREMENT); } - // - // Return status - // + /* Return status */ return Status; } @@ -1692,18 +1328,14 @@ PDEVICE_OBJECT* DriveDeviceObject; RAMDISK_DEVICE_STATE State; - // - // Get the device extension and check if this is a drive - // + /* Get the device extension and check if this is a drive */ DeviceExtension = DeviceObject->DeviceExtension; if (DeviceExtension->Type == RamdiskDrive) { NTSTATUS Status; PDEVICE_RELATIONS DeviceRelations; - // - // We're a child device, only handle target device relations - // + /* We're a child device, only handle target device relations */ if (Type != TargetDeviceRelation) { Status = Irp->IoStatus.Status; @@ -1711,15 +1343,13 @@ return Status; } - // - // Allocate a buffer big enough to contain only one DO - // - DeviceRelations = ExAllocatePoolWithTag(PagedPool, sizeof(DeviceRelations), 'dmaR'); + /* Allocate a buffer big enough to contain only one DO */ + DeviceRelations = ExAllocatePoolWithTag(PagedPool, + sizeof(DeviceRelations), + 'dmaR'); if (DeviceRelations != NULL) { - // - // Reference the DO and add it to the buffer - // + /* Reference the DO and add it to the buffer */ ObReferenceObject(DeviceObject); DeviceRelations->Objects[0] = DeviceObject; DeviceRelations->Count = 1; @@ -1730,75 +1360,53 @@ Status = STATUS_INSUFFICIENT_RESOURCES; } - // - // Return our processing & complete - // + /* Return our processing & complete */ Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } - // - // Anything but bus relations, we don't handle - // + /* We don't handle anything but bus relations */ if (Type != BusRelations) goto PassToNext; - // - // Acquire the disk list lock - // + /* Acquire the disk list lock */ KeEnterCriticalRegion(); ExAcquireFastMutex(&DeviceExtension->DiskListLock); - // - // Did a device already fill relations? - // + /* Did a device already fill relations? */ DeviceRelations = (PDEVICE_RELATIONS)Irp->IoStatus.Information; if (DeviceRelations) { - // - // Use the data - // + /* Use the data */ Count = DeviceRelations->Count; } else { - // - // We're the first - // + /* We're the first */ Count = 0; } - // - // Now loop our drives - // + /* Now loop our drives */ DiskCount = 0; ListHead = &DeviceExtension->DiskList; NextEntry = ListHead->Flink; while (NextEntry != ListHead) { - // - // As long as it wasn't removed, count it in - // + /* As long as it wasn't removed, count it in */ DriveExtension = CONTAINING_RECORD(NextEntry, RAMDISK_DRIVE_EXTENSION, DiskList); if (DriveExtension->State < RamdiskStateBusRemoved) DiskCount++; - // - // Move to the next one - // + /* Move to the next one */ NextEntry = NextEntry->Flink; } - // - // Now we know our final count - // + /* Now we know our final count */ FinalCount = Count + DiskCount; - // - // Allocate the structure - // + /* Allocate the structure */ OurDeviceRelations = ExAllocatePoolWithTag(PagedPool, FIELD_OFFSET(DEVICE_RELATIONS, Objects) + @@ -1807,9 +1415,7 @@ 'dmaR'); if (!OurDeviceRelations) { - // - // Fail - // + /* Fail */ ExReleaseFastMutex(&DeviceExtension->DiskListLock); KeLeaveCriticalRegion(); Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; @@ -1817,101 +1423,69 @@ return STATUS_INSUFFICIENT_RESOURCES; } - // - // Check if we already had some relations - // + /* Check if we already had some relations */ if (Count) { - // - // Copy them in - // + /* Copy them in */ RtlCopyMemory(OurDeviceRelations->Objects, DeviceRelations->Objects, Count * sizeof(PDEVICE_OBJECT)); } - // - // Save the count - // + /* Save the count */ OurDeviceRelations->Count = FinalCount; - // - // Now loop our drives again - // + /* Now loop our drives again */ ListHead = &DeviceExtension->DiskList; NextEntry = ListHead->Flink; while (NextEntry != ListHead) { - // - // Go to the end of the list - // + /* Go to the end of the list */ DriveDeviceObject = &OurDeviceRelations->Objects[Count]; - // - // Get the drive state - // + /* Get the drive state */ DriveExtension = CONTAINING_RECORD(NextEntry, RAMDISK_DRIVE_EXTENSION, DiskList); State = DriveExtension->State; - // - // If it was removed or enumerated, we don't touch the device object - // + /* If it was removed or enumerated, we don't touch the device object */ if (State >= RamdiskStateBusRemoved) { - // - // If it was removed, we still have to keep track of this though - // + /* If it was removed, we still have to keep track of this though */ if (State == RamdiskStateBusRemoved) { - // - // Mark it as enumerated now, but don't actually reference it - // + /* Mark it as enumerated now, but don't actually reference it */ DriveExtension->State = RamdiskStateEnumerated; } } else { - // - // First time it's enumerated, reference the device object - // + /* First time it's enumerated, reference the device object */ ObReferenceObject(DriveExtension->DeviceObject); - // - // Save the object pointer, and move on - // + /* Save the object pointer and move on */ *DriveDeviceObject++ = DriveExtension->PhysicalDeviceObject; } if (DriveExtension->State < RamdiskStateBusRemoved) DiskCount++; - // - // Move to the next one - // + /* Move to the next one */ NextEntry = NextEntry->Flink; } - // - // Release the lock - // + /* Release the lock */ ExReleaseFastMutex(&DeviceExtension->DiskListLock); KeLeaveCriticalRegion(); - // - // Cleanup old relations - // + /* Cleanup old relations */ if (DeviceRelations) ExFreePool(DeviceRelations); - // - // Complete our IRP - // + /* Complete our IRP */ Irp->IoStatus.Information = (ULONG_PTR)OurDeviceRelations; Irp->IoStatus.Status = STATUS_SUCCESS; - // - // Pass to the next driver - // + /* Pass to the next driver */ PassToNext: IoCopyCurrentIrpStackLocationToNext(Irp); return IoCallDriver(DeviceExtension->AttachedDevice, Irp); @@ -1938,15 +1512,11 @@ DeviceExtension = DeviceObject->DeviceExtension; - // - // Acquire disks list lock - // + /* Acquire disks list lock */ KeEnterCriticalRegion(); ExAcquireFastMutex(&DeviceExtension->DiskListLock); - // - // Loop over drives - // + /* Loop over drives */ ListHead = &DeviceExtension->DiskList; NextEntry = ListHead->Flink; while (NextEntry != ListHead) @@ -1955,78 +1525,50 @@ RAMDISK_DRIVE_EXTENSION, DiskList); - // - // Delete the disk - // + /* Delete the disk */ IoAcquireRemoveLock(&DriveExtension->RemoveLock, NULL); RamdiskDeleteDiskDevice(DriveExtension->PhysicalDeviceObject, NULL); - // - // RamdiskDeleteDiskDevice releases list lock, so reacquire it - // + /* RamdiskDeleteDiskDevice releases list lock, so reacquire it */ KeEnterCriticalRegion(); ExAcquireFastMutex(&DeviceExtension->DiskListLock); } - // - // Release disks list lock - // + /* Release disks list lock */ ExReleaseFastMutex(&DeviceExtension->DiskListLock); KeLeaveCriticalRegion(); - // - // Prepare to pass to the lower driver - // + /* Prepare to pass to the lower driver */ IoSkipCurrentIrpStackLocation(Irp); - // - // Here everything went fine - // + /* Here everything went fine */ Irp->IoStatus.Status = STATUS_SUCCESS; - // - // Call lower driver - // + /* Call lower driver */ Status = IoCallDriver(DeviceExtension->AttachedDevice, Irp); - // - // Update state - // + /* Update state */ DeviceExtension->State = RamdiskStateBusRemoved; - // - // Release the lock, and ensure that everyone - // has finished its job before we continue - // The lock has been acquired by the dispatcher - // + /* Release the lock and ensure that everyone has finished its job before + * we continue. The lock has been acquired by the dispatcher */ IoReleaseRemoveLockAndWait(&DeviceExtension->RemoveLock, Irp); - // - // If there's a drive name - // + /* If there's a drive name */ if (DeviceExtension->DriveDeviceName.Buffer) { - // - // Inform it's going to be disabled - // and free the drive name - // + /* Inform it's going to be disabled and free the drive name */ IoSetDeviceInterfaceState(&DeviceExtension->DriveDeviceName, FALSE); RtlFreeUnicodeString(&DeviceExtension->DriveDeviceName); } - // - // Part from the stack, detach from lower device - // + /* Part from the stack, detach from lower device */ IoDetachDevice(DeviceExtension->AttachedDevice); - // - // Finally, delete device - // + /* Finally, delete device */ RamdiskBusFdo = NULL; IoDeleteDevice(DeviceObject); - // - // Return status from lower driver - // + /* Return status from lower driver */ return Status; } @@ -2043,18 +1585,14 @@ Status = STATUS_SUCCESS; IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - // - // Get what is being queried - // + /* Get what is being queried */ switch (IoStackLocation->Parameters.QueryId.IdType) { case BusQueryDeviceID: { - // - // Allocate a buffer long enough to receive Ramdisk\RamDisk in any case - // In case we don't have RAMDISK_REGISTRY_DISK, we then need two more - // chars to store Ramdisk\RamVolume instead - // + /* Allocate a buffer long enough to receive Ramdisk\RamDisk in any case + * In case we don't have RAMDISK_REGISTRY_DISK, we then need two more + * chars to store Ramdisk\RamVolume instead */ StringLength = 4 * (DriveExtension->DiskType != RAMDISK_REGISTRY_DISK) + sizeof(L"Ramdisk\\RamDisk"); OutputString = ExAllocatePoolWithTag(PagedPool, StringLength, 'dmaR'); if (OutputString == NULL) @@ -2078,13 +1616,11 @@ case BusQueryHardwareIDs: { - // - // Allocate a buffer long enough to receive Ramdisk\RamDisk in any case - // In case we don't have RAMDISK_REGISTRY_DISK, we then need two more - // chars to store Ramdisk\RamVolume instead - // We also need an extra char, because it is required that the string - // is null-terminated twice - // + /* Allocate a buffer long enough to receive Ramdisk\RamDisk in any case + * In case we don't have RAMDISK_REGISTRY_DISK, we then need two more + * chars to store Ramdisk\RamVolume instead + * We also need an extra char, because it is required that the string + * is null-terminated twice */ StringLength = 4 * (DriveExtension->DiskType != RAMDISK_REGISTRY_DISK) + sizeof(UNICODE_NULL) + sizeof(L"Ramdisk\\RamDisk"); OutputString = ExAllocatePoolWithTag(PagedPool, StringLength, 'dmaR'); @@ -2132,23 +1668,25 @@ case BusQueryInstanceID: { - OutputString = ExAllocatePoolWithTag(PagedPool, DriveExtension->GuidString.MaximumLength, 'dmaR'); + OutputString = ExAllocatePoolWithTag(PagedPool, + DriveExtension->GuidString.MaximumLength, + 'dmaR'); if (OutputString == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; break; } - wcsncpy(OutputString, DriveExtension->GuidString.Buffer, DriveExtension->GuidString.MaximumLength / sizeof(WCHAR)); + wcsncpy(OutputString, + DriveExtension->GuidString.Buffer, + DriveExtension->GuidString.MaximumLength / sizeof(WCHAR)); break; } case BusQueryDeviceSerialNumber: { - // - // Nothing to do - // + /* Nothing to do */ break; } } @@ -2173,18 +1711,15 @@ DeviceCapabilities = IoStackLocation->Parameters.DeviceCapabilities.Capabilities; DriveExtension = DeviceObject->DeviceExtension; - // - // Validate our input buffer - // - if (DeviceCapabilities->Version != 1 || DeviceCapabilities->Size < sizeof(DEVICE_CAPABILITIES)) + /* Validate our input buffer */ + if (DeviceCapabilities->Version != 1 || + DeviceCapabilities->Size < sizeof(DEVICE_CAPABILITIES)) { Status = STATUS_UNSUCCESSFUL; } else { - // - // And set everything we know about our capabilities - // + /* And set everything we know about our capabilities */ DeviceCapabilities->Removable = MarkRamdisksAsRemovable; DeviceCapabilities->UniqueID = TRUE; DeviceCapabilities->SilentInstall = TRUE; @@ -2213,9 +1748,7 @@ DeviceTextType = IoStackLocation->Parameters.QueryDeviceText.DeviceTextType; Status = STATUS_SUCCESS; - // - // Just copy our constants, according to the input - // + /* Just copy our constants, according to the input */ switch (DeviceTextType) { case DeviceTextDescription: @@ -2261,9 +1794,7 @@ PPNP_BUS_INFORMATION PnpBusInfo; NTSTATUS Status = STATUS_SUCCESS; - // - // Allocate output memory - // + /* Allocate output memory */ PnpBusInfo = ExAllocatePoolWithTag(PagedPool, sizeof(PNP_BUS_INFORMATION), 'dmaR'); if (PnpBusInfo == NULL) { @@ -2271,9 +1802,7 @@ } else { - // - // Copy our bus GUID and set our legacy type - // + /* Copy our bus GUID and set our legacy type */ RtlCopyMemory(&PnpBusInfo->BusTypeGuid, &GUID_BUS_TYPE_RAMDISK, sizeof(GUID)); PnpBusInfo->LegacyBusType = PNPBus; PnpBusInfo->BusNumber = 0; @@ -2292,9 +1821,7 @@ IN PVOID Context) { - // - // Just set the event to unlock caller - // + /* Just set the event to unlock caller */ KeSetEvent((PKEVENT)Context, 0, FALSE); return STATUS_MORE_PROCESSING_REQUIRED; @@ -2311,26 +1838,18 @@ UCHAR Minor; KEVENT Event; - // - // Get the device extension and stack location - // + /* Get the device extension and stack location */ DeviceExtension = DeviceObject->DeviceExtension; IoStackLocation = IoGetCurrentIrpStackLocation(Irp); Minor = IoStackLocation->MinorFunction; - // - // Check if the bus is removed - // + /* Check if the bus is removed */ if (DeviceExtension->State == RamdiskStateBusRemoved) { - // - // Only remove-device and query-id are allowed - // + /* Only remove-device and query-id are allowed */ if ((Minor != IRP_MN_REMOVE_DEVICE) && (Minor != IRP_MN_QUERY_ID)) { - // - // Fail anything else - // + /* Fail anything else */ Status = STATUS_NO_SUCH_DEVICE; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -2338,24 +1857,18 @@ } } - // - // Acquire the remove lock - // + /* Acquire the remove lock */ Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, Irp); if (!NT_SUCCESS(Status)) { - // - // Fail the IRP - // + /* Fail the IRP */ Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } - // - // Query the IRP type - // + /* Query the IRP type */ switch (Minor) { case IRP_MN_START_DEVICE: @@ -2366,17 +1879,13 @@ DEVICE_INSTALL_STATE InstallState; PRAMDISK_DRIVE_EXTENSION DriveExtension = (PRAMDISK_DRIVE_EXTENSION)DeviceExtension; - // - // If we already have a drive name, free it - // + /* If we already have a drive name, free it */ if (DriveExtension->DriveDeviceName.Buffer) { ExFreePool(DriveExtension->DriveDeviceName.Buffer); } - // - // Register our device interface - // + /* Register our device interface */ if (DriveExtension->DiskType != RAMDISK_REGISTRY_DISK) { Status = IoRegisterDeviceInterface(DeviceObject, @@ -2392,11 +1901,8 @@ &DriveExtension->DriveDeviceName); } - // - // If we were asked not to assign a drive letter or - // if getting a name failed, just return saying - // we're now started - // + /* If we were asked not to assign a drive letter or if getting + * a name failed, just return saying we're now started */ if (DriveExtension->DiskOptions.NoDriveLetter || DriveExtension->DriveDeviceName.Buffer == NULL) { @@ -2405,49 +1911,38 @@ break; } - // - // Now get our installation state - // - Status = IoGetDeviceProperty(DeviceObject, DevicePropertyInstallState, - sizeof(InstallState), &InstallState, &ResultLength); - // - // If querying the information failed, assume success - // + /* Now get our installation state */ + Status = IoGetDeviceProperty(DeviceObject, + DevicePropertyInstallState, + sizeof(InstallState), + &InstallState, + &ResultLength); + /* If querying the information failed, assume success */ if (!NT_SUCCESS(Status)) { InstallState = InstallStateInstalled; } - // - // If we were properly installed, then, enable the interface - // + /* If we were properly installed, then, enable the interface */ if (InstallState == InstallStateInstalled) { Status = IoSetDeviceInterfaceState(&DriveExtension->DriveDeviceName, TRUE); } - // - // We're fine & up - // + /* We're fine & up */ DriveExtension->State = RamdiskStateStarted; Irp->IoStatus.Status = Status; break; } - // - // Prepare next stack to pass it down - // + /* Prepare next stack to pass it down */ IoCopyCurrentIrpStackLocationToNext(Irp); - // - // Initialize our notification event & our completion routine - // + /* Initialize our notification event & our completion routine */ KeInitializeEvent(&Event, NotificationEvent, FALSE); IoSetCompletionRoutine(Irp, RamdiskIoCompletionRoutine, &Event, TRUE, TRUE, TRUE); - // - // Call lower driver - // + /* Call lower driver */ Status = IoCallDriver(DeviceExtension->AttachedDevice, Irp); if (Status == STATUS_PENDING) { @@ -2455,9 +1950,7 @@ Status = Irp->IoStatus.Status; } - // - // If it succeed to start, then, enable ourselve and we're up! - // + /* If it succeed to start then enable ourselves and we're up! */ if (NT_SUCCESS(Status)) { Status = IoSetDeviceInterfaceState(&DeviceExtension->DriveDeviceName, TRUE); @@ -2480,28 +1973,22 @@ case IRP_MN_REMOVE_DEVICE: { - // - // Remove the proper device - // + /* Remove the proper device */ if (DeviceExtension->Type == RamdiskBus) { Status = RamdiskRemoveBusDevice(DeviceObject, Irp); - // - // Return here, lower device has already been called - // And remove lock released. This is needed by the function. - // + /* Return here, lower device has already been called + * And remove lock released. This is needed by the function. */ return Status; } else { Status = RamdiskDeleteDiskDevice(DeviceObject, Irp); - // - // Complete the IRP here and return - // Here again we don't have to release remove lock - // This has already been done by the function. - // + /* Complete the IRP here and return + * Here again we don't have to release remove lock + * This has already been done by the function. */ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -2514,9 +2001,7 @@ case IRP_MN_QUERY_ID: { - // - // Are we a drive? - // + /* Are we a drive? */ if (DeviceExtension->Type == RamdiskDrive) { Status = RamdiskQueryId((PRAMDISK_DRIVE_EXTENSION)DeviceExtension, Irp); @@ -2526,9 +2011,7 @@ case IRP_MN_QUERY_BUS_INFORMATION: { - // - // Are we a drive? - // + /* Are we a drive? */ if (DeviceExtension->Type == RamdiskDrive) { Status = RamdiskQueryBusInformation(DeviceObject, Irp); @@ -2542,9 +2025,7 @@ case IRP_MN_QUERY_DEVICE_TEXT: { - // - // Are we a drive? - // + /* Are we a drive? */ if (DeviceExtension->Type == RamdiskDrive) { Status = RamdiskQueryDeviceText((PRAMDISK_DRIVE_EXTENSION)DeviceExtension, Irp); @@ -2554,9 +2035,7 @@ case IRP_MN_QUERY_DEVICE_RELATIONS: { - // - // Call our main routine - // + /* Call our main routine */ Status = RamdiskQueryDeviceRelations(IoStackLocation-> Parameters. QueryDeviceRelations.Type, @@ -2567,9 +2046,7 @@ case IRP_MN_QUERY_CAPABILITIES: { - // - // Are we a drive? - // + /* Are we a drive? */ if (DeviceExtension->Type == RamdiskDrive) { Status = RamdiskQueryCapabilities(DeviceObject, Irp); @@ -2580,9 +2057,7 @@ case IRP_MN_QUERY_RESOURCES: case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: { - // - // Complete immediately without touching it - // + /* Complete immediately without touching it */ IoCompleteRequest(Irp, IO_NO_INCREMENT); goto ReleaseAndReturn; } @@ -2592,27 +2067,19 @@ break; } - // - // Are we the bus? - // + /* Are we the bus? */ if (DeviceExtension->Type == RamdiskBus) { - // - // Do we have an attached device? - // + /* Do we have an attached device? */ if (DeviceExtension->AttachedDevice) { - // - // Forward the IRP - // + /* Forward the IRP */ IoSkipCurrentIrpStackLocation(Irp); Status = IoCallDriver(DeviceExtension->AttachedDevice, Irp); } } - // - // Release the lock and return status - // + /* Release the lock and return status */ ReleaseAndReturn: IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); return Status; @@ -2629,27 +2096,18 @@ DeviceExtension = DeviceObject->DeviceExtension; - // - // If we have a device extension, take extra caution - // with the lower driver - // + /* If we have a device extension, take extra caution with the lower driver */ if (DeviceExtension != NULL) { PoStartNextPowerIrp(Irp); - // - // Device has not been removed yet, so - // pass to the attached/lower driver - // + /* Device has not been removed yet, so pass to the attached/lower driver */ if (DeviceExtension->State < RamdiskStateBusRemoved) { IoSkipCurrentIrpStackLocation(Irp); return PoCallDriver(DeviceExtension->AttachedDevice, Irp); } - // - // Otherwise, simply complete the IRP - // Notifying that deletion is pending - // + /* Otherwise, simply complete the IRP notifying that deletion is pending */ else { Irp->IoStatus.Status = STATUS_DELETE_PENDING; @@ -2658,26 +2116,19 @@ } } - // - // Get stack and deal with minor functions - // + /* Get stack and deal with minor functions */ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); switch (IoStackLocation->MinorFunction) { case IRP_MN_SET_POWER: { - // - // If setting device power state - // it's all fine and return success - // + /* If setting device power state it's all fine and return success */ if (DevicePowerState) { Irp->IoStatus.Status = STATUS_SUCCESS; } - // - // Get appropriate status for return - // + /* Get appropriate status for return */ Status = Irp->IoStatus.Status; PoStartNextPowerIrp(Irp); IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -2686,12 +2137,8 @@ case IRP_MN_QUERY_POWER: { - // - // We can obviously accept all states - // So just return success - // - Status = - Irp->IoStatus.Status = STATUS_SUCCESS; + /* We can obviously accept all states so just return success */ + Status = Irp->IoStatus.Status = STATUS_SUCCESS; PoStartNextPowerIrp(Irp); IoCompleteRequest(Irp, IO_NO_INCREMENT); break; @@ -2699,9 +2146,7 @@ default: { - // - // Just complete and save status for return - // + /* Just complete and save status for return */ Status = Irp->IoStatus.Status; PoStartNextPowerIrp(Irp); IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -2722,19 +2167,14 @@ DeviceExtension = DeviceObject->DeviceExtension; - // - // If we have a device extension, forward the IRP - // to the attached device - // + /* If we have a device extension, forward the IRP to the attached device */ if (DeviceExtension != NULL) { IoSkipCurrentIrpStackLocation(Irp); Status = IoCallDriver(DeviceExtension->AttachedDevice, Irp); } - // - // Otherwise just complete the request - // And return the status with which we complete it - // + /* Otherwise just complete the request + * And return the status with which we complete it */ else { Status = Irp->IoStatus.Status; @@ -2754,36 +2194,28 @@ DeviceExtension = DeviceObject->DeviceExtension; - // - // Having a proper device is mandatory - // + /* Having a proper device is mandatory */ if (DeviceExtension->State > RamdiskStateStopped) { Status = STATUS_DEVICE_DOES_NOT_EXIST; goto CompleteIRP; } - // - // Acquire the remove lock - // + /* Acquire the remove lock */ Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, Irp); if (!NT_SUCCESS(Status)) { goto CompleteIRP; } - // - // Queue the IRP for worker - // + /* Queue the IRP for worker */ Status = SendIrpToThread(DeviceObject, Irp); if (Status != STATUS_PENDING) { goto CompleteIRP; } - // - // Release the remove lock - // + /* Release the remove lock */ IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); goto Quit; @@ -2806,11 +2238,9 @@ DeviceExtension = DeviceObject->DeviceExtension; - // - // Ensure we have drive extension - // Only perform flush on disks that have been created - // from registry entries - // + /* Ensure we have drive extension + * Only perform flush on disks that have been created + * from registry entries */ if (DeviceExtension->Type != RamdiskDrive || DeviceExtension->DiskType > RAMDISK_MEMORY_MAPPED_DISK) { @@ -2820,16 +2250,11 @@ return STATUS_SUCCESS; } - // - // Queue the IRP for worker - // + /* Queue the IRP for worker */ Status = SendIrpToThread(DeviceObject, Irp); if (Status != STATUS_PENDING) { - // - // Queueing failed - complete the IRP - // and return failure - // + /* Queuing failed - complete the IRP and return failure */ Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -2842,9 +2267,7 @@ NTAPI RamdiskUnload(IN PDRIVER_OBJECT DriverObject) { - // - // Just release registry path if previously allocated - // + /* Just release registry path if previously allocated */ if (DriverRegistryPath.Buffer) { ExFreePoolWithTag(DriverRegistryPath.Buffer, 'dmaR'); @@ -2862,14 +2285,10 @@ UNICODE_STRING DeviceName; PDEVICE_OBJECT DeviceObject; - // - // Only create the bus FDO once - // + /* Only create the bus FDO once */ if (RamdiskBusFdo) return STATUS_DEVICE_ALREADY_ATTACHED; - // - // Create the bus FDO - // + /* Create the bus FDO */ RtlInitUnicodeString(&DeviceName, L"\\Device\\Ramdisk"); Status = IoCreateDevice(DriverObject, sizeof(RAMDISK_BUS_EXTENSION), @@ -2880,92 +2299,65 @@ &DeviceObject); if (NT_SUCCESS(Status)) { - // - // Initialize the bus FDO extension - // + /* Initialize the bus FDO extension */ DeviceExtension = DeviceObject->DeviceExtension; RtlZeroMemory(DeviceObject->DeviceExtension, sizeof(RAMDISK_BUS_EXTENSION)); - // - // Set bus FDO flags - // + /* Set bus FDO flags */ DeviceObject->Flags |= DO_POWER_PAGABLE | DO_DIRECT_IO; - // - // Setup the bus FDO extension - // + /* Setup the bus FDO extension */ DeviceExtension->Type = RamdiskBus; ExInitializeFastMutex(&DeviceExtension->DiskListLock); - IoInitializeRemoveLock(&DeviceExtension->RemoveLock, - 'dmaR', - 1, - 0); + IoInitializeRemoveLock(&DeviceExtension->RemoveLock, 'dmaR', 1, 0); InitializeListHead(&DeviceExtension->DiskList); DeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; DeviceExtension->DeviceObject = DeviceObject; - // - // Register the RAM disk device interface - // + /* Register the RAM disk device interface */ Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &RamdiskBusInterface, NULL, &DeviceExtension->BusDeviceName); if (!NT_SUCCESS(Status)) { - // - // Fail - // + /* Fail */ IoDeleteDevice(DeviceObject); return Status; } - // - // Attach us to the device stack - // + /* Attach us to the device stack */ AttachedDevice = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); DeviceExtension->AttachedDevice = AttachedDevice; if (!AttachedDevice) { - // - // Fail - // + /* Fail */ IoSetDeviceInterfaceState(&DeviceExtension->BusDeviceName, 0); RtlFreeUnicodeString(&DeviceExtension->BusDeviceName); IoDeleteDevice(DeviceObject); return STATUS_NO_SUCH_DEVICE; } - // - // Bus FDO is initialized - // + /* Bus FDO is initialized */ RamdiskBusFdo = DeviceObject; - // - // Loop for loader block - // + /* Loop for loader block */ if (KeLoaderBlock) { - // - // Are we being booted from setup? Not yet supported - // + /* Are we being booted from setup? Not yet supported */ if (KeLoaderBlock->SetupLdrBlock) DPRINT1("FIXME: RamdiskAddDevice is UNSUPPORTED when being started from SETUPLDR!\n"); - // ASSERT(!KeLoaderBlock->SetupLdrBlock); - } - - // - // All done - // + //ASSERT(!KeLoaderBlock->SetupLdrBlock); + } + + /* All done */ DeviceObject->Flags &= DO_DEVICE_INITIALIZING; Status = STATUS_SUCCESS; } - // - // Return status - // + /* Return status */ return Status; } @@ -2979,14 +2371,10 @@ NTSTATUS Status; DPRINT("RAM Disk Driver Initialized\n"); - // - // Query ramdisk parameters - // + /* Query ramdisk parameters */ QueryParameters(RegistryPath); - // - // Save the registry path - // + /* Save the registry path */ DriverRegistryPath = *RegistryPath; DriverRegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, RegistryPath->Length + @@ -2995,9 +2383,7 @@ if (!DriverRegistryPath.Buffer) return STATUS_INSUFFICIENT_RESOURCES; RtlCopyUnicodeString(&DriverRegistryPath, RegistryPath); - // - // Set device routines - // + /* Set device routines */ DriverObject->MajorFunction[IRP_MJ_CREATE] = RamdiskOpenClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = RamdiskOpenClose; DriverObject->MajorFunction[IRP_MJ_READ] = RamdiskReadWrite; @@ -3011,53 +2397,35 @@ DriverObject->DriverExtension->AddDevice = RamdiskAddDevice; DriverObject->DriverUnload = RamdiskUnload; - // - // Check for a loader block - // + /* Check for a loader block */ if (KeLoaderBlock) { - // - // Get the boot device name - // + /* Get the boot device name */ BootDeviceName = KeLoaderBlock->ArcBootDeviceName; if (BootDeviceName) { - // - // Check if we're booting from ramdisk - // + /* Check if we're booting from ramdisk */ if ((strlen(BootDeviceName) >= 10) && !(_strnicmp(BootDeviceName, "ramdisk(0)", 10))) { - // - // We'll have to tell the PnP Manager - // + /* We'll have to tell the PnP Manager */ ReportDetectedDevice = TRUE; - // - // Check for a command line - // + /* Check for a command line */ CommandLine = KeLoaderBlock->LoadOptions; if (CommandLine) { - // - // Check if this is an ISO boot - // + /* Check if this is an ISO boot */ if (strstr(CommandLine, "RDEXPORTASCD")) { - // - // Remember for later - // + /* Remember for later */ ExportBootDiskAsCd = TRUE; } - // - // Check if this is PE boot - // + /* Check if this is PE boot */ if (strstr(CommandLine, "MININT")) { - // - // Remember for later - // + /* Remember for later */ IsWinPEBoot = TRUE; } } @@ -3066,21 +2434,15 @@ } } - // - // Installing from Ramdisk isn't supported yet - // + /* Installing from Ramdisk isn't supported yet */ if (KeLoaderBlock->SetupLdrBlock) DPRINT1("FIXME: Installing from RamDisk is UNSUPPORTED!\n"); - // ASSERT(!KeLoaderBlock->SetupLdrBlock); - - // - // Are we reporting the device - // + //ASSERT(!KeLoaderBlock->SetupLdrBlock); + + /* Are we reporting the device */ if (ReportDetectedDevice) { - // - // Do it - // + /* Do it */ Status = IoReportDetectedDevice(DriverObject, InterfaceTypeUndefined, 0xFFFFFFFF, @@ -3091,15 +2453,11 @@ &PhysicalDeviceObject); if (NT_SUCCESS(Status)) { - // - // Create the device object - // + /* Create the device object */ Status = RamdiskAddDevice(DriverObject, PhysicalDeviceObject); if (NT_SUCCESS(Status)) { - // - // We're done - // + /* We're done */ PhysicalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; Status = STATUS_SUCCESS; } @@ -3107,14 +2465,10 @@ } else { - // - // Done - // + /* Done */ Status = STATUS_SUCCESS; } - // - // Done - // + /* Done */ return Status; }

1 0

[dquintana] 66017: Revert files that shouldn't have been included. I blame an ongoing headache for it.
by dquintana＠svn.reactos.org 09 Jan '15

09 Jan '15

Author: dquintana Date: Fri Jan 9 16:32:53 2015 New Revision: 66017 URL: http://svn.reactos.org/svn/reactos?rev=66017&view=rev Log: Revert files that shouldn't have been included. I blame an ongoing headache for it. Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Fri Jan 9 16:32:53 2015 @@ -82,7 +82,7 @@ return -1; } - BOOL AddButton(IN CONST NOTIFYICONDATA *iconData) + VOID AddButton(IN CONST NOTIFYICONDATA *iconData) { TBBUTTON tbBtn; NOTIFYICONDATA * notifyItem; @@ -91,7 +91,8 @@ int index = FindItemByIconData(iconData, &notifyItem); if (index >= 0) { - return UpdateButton(iconData); + UpdateButton(iconData); + return; } notifyItem = new NOTIFYICONDATA(); @@ -137,11 +138,9 @@ CToolbar::AddButton(&tbBtn); SetButtonSize(ICON_SIZE, ICON_SIZE); - - return TRUE; - } - - BOOL UpdateButton(IN CONST NOTIFYICONDATA *iconData) + } + + VOID UpdateButton(IN CONST NOTIFYICONDATA *iconData) { NOTIFYICONDATA * notifyItem; TBBUTTONINFO tbbi = { 0 }; @@ -149,7 +148,8 @@ int index = FindItemByIconData(iconData, &notifyItem); if (index < 0) { - return AddButton(iconData); + AddButton(iconData); + return; } tbbi.cbSize = sizeof(tbbi); @@ -197,17 +197,15 @@ /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ SetButtonInfo(index, &tbbi); - - return TRUE; - } - - BOOL RemoveButton(IN CONST NOTIFYICONDATA *iconData) + } + + VOID RemoveButton(IN CONST NOTIFYICONDATA *iconData) { NOTIFYICONDATA * notifyItem; int index = FindItemByIconData(iconData, &notifyItem); if (index < 0) - return FALSE; + return; DeleteButton(index); @@ -217,8 +215,6 @@ } delete notifyItem; - - return TRUE; } VOID GetTooltipText(int index, LPTSTR szTip, DWORD cchTip) @@ -436,11 +432,20 @@ switch (data->notify_code) { case NIM_ADD: - return Toolbar.AddButton(iconData); + { + Toolbar.AddButton(iconData); + break; + } case NIM_MODIFY: - return Toolbar.UpdateButton(iconData); + { + Toolbar.UpdateButton(iconData); + break; + } case NIM_DELETE: - return Toolbar.RemoveButton(iconData); + { + Toolbar.RemoveButton(iconData); + break; + } default: TRACE("NotifyMessage received with unknown code %d.\n", data->notify_code); break; Modified: trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuDes… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Fri Jan 9 16:32:53 2015 @@ -338,8 +338,6 @@ x = ppt->x + rc.left; y = ppt->y + rc.top; break; - case MPPF_TOP: - break; case MPPF_TOP | MPPF_ALIGN_LEFT: x = ppt->x - rc.right; y = ppt->y + rc.top;

1 0

[dquintana] 66016: [STOBJECT] * Disable compiling the resource dialog for ro-RO also.
by dquintana＠svn.reactos.org 09 Jan '15

09 Jan '15

Author: dquintana Date: Fri Jan 9 16:29:46 2015 New Revision: 66016 URL: http://svn.reactos.org/svn/reactos?rev=66016&view=rev Log: [STOBJECT] * Disable compiling the resource dialog for ro-RO also. Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Fri Jan 9 16:29:46 2015 @@ -82,7 +82,7 @@ return -1; } - VOID AddButton(IN CONST NOTIFYICONDATA *iconData) + BOOL AddButton(IN CONST NOTIFYICONDATA *iconData) { TBBUTTON tbBtn; NOTIFYICONDATA * notifyItem; @@ -91,8 +91,7 @@ int index = FindItemByIconData(iconData, &notifyItem); if (index >= 0) { - UpdateButton(iconData); - return; + return UpdateButton(iconData); } notifyItem = new NOTIFYICONDATA(); @@ -138,9 +137,11 @@ CToolbar::AddButton(&tbBtn); SetButtonSize(ICON_SIZE, ICON_SIZE); - } - - VOID UpdateButton(IN CONST NOTIFYICONDATA *iconData) + + return TRUE; + } + + BOOL UpdateButton(IN CONST NOTIFYICONDATA *iconData) { NOTIFYICONDATA * notifyItem; TBBUTTONINFO tbbi = { 0 }; @@ -148,8 +149,7 @@ int index = FindItemByIconData(iconData, &notifyItem); if (index < 0) { - AddButton(iconData); - return; + return AddButton(iconData); } tbbi.cbSize = sizeof(tbbi); @@ -197,15 +197,17 @@ /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ SetButtonInfo(index, &tbbi); - } - - VOID RemoveButton(IN CONST NOTIFYICONDATA *iconData) + + return TRUE; + } + + BOOL RemoveButton(IN CONST NOTIFYICONDATA *iconData) { NOTIFYICONDATA * notifyItem; int index = FindItemByIconData(iconData, &notifyItem); if (index < 0) - return; + return FALSE; DeleteButton(index); @@ -215,6 +217,8 @@ } delete notifyItem; + + return TRUE; } VOID GetTooltipText(int index, LPTSTR szTip, DWORD cchTip) @@ -432,20 +436,11 @@ switch (data->notify_code) { case NIM_ADD: - { - Toolbar.AddButton(iconData); - break; - } + return Toolbar.AddButton(iconData); case NIM_MODIFY: - { - Toolbar.UpdateButton(iconData); - break; - } + return Toolbar.UpdateButton(iconData); case NIM_DELETE: - { - Toolbar.RemoveButton(iconData); - break; - } + return Toolbar.RemoveButton(iconData); default: TRACE("NotifyMessage received with unknown code %d.\n", data->notify_code); break; Modified: trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuDes… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Fri Jan 9 16:29:46 2015 @@ -338,6 +338,8 @@ x = ppt->x + rc.left; y = ppt->y + rc.top; break; + case MPPF_TOP: + break; case MPPF_TOP | MPPF_ALIGN_LEFT: x = ppt->x - rc.right; y = ppt->y + rc.top; Modified: trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc [iso-8859-1] Fri Jan 9 16:29:46 2015 @@ -1,6 +1,7 @@ /* Ètefan Fulea (stefan dot fulea at mail dot md) */ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT +#if 0 IDD_POWER_METER DIALOGEX 0, 0, 252, 218 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP @@ -12,6 +13,7 @@ CONTROL "AfiÈeazÄ detalii pentru fiecare &baterie.", 1003, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 CONTROL "", 1000, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 END +#endif STRINGTABLE BEGIN

1 0

[dquintana] 66015: [STOBJECT] * Fix resource strings so they compile correctly. * Make use of the resource strings for the tooltip. * Implement a context menu for the volume icon, using resource st...
by dquintana＠svn.reactos.org 09 Jan '15

09 Jan '15

Author: dquintana Date: Fri Jan 9 16:25:49 2015 New Revision: 66015 URL: http://svn.reactos.org/svn/reactos?rev=66015&view=rev Log: [STOBJECT] * Fix resource strings so they compile correctly. * Make use of the resource strings for the tooltip. * Implement a context menu for the volume icon, using resource strings. NOTE: I have a strange issue where the cursor disappears while the popup is open. No idea if it's my fault or win32k. Modified: trunk/reactos/dll/shellext/stobject/lang/de-DE.rc trunk/reactos/dll/shellext/stobject/lang/en-US.rc trunk/reactos/dll/shellext/stobject/lang/es-ES.rc trunk/reactos/dll/shellext/stobject/lang/tr-TR.rc trunk/reactos/dll/shellext/stobject/stobject.rc trunk/reactos/dll/shellext/stobject/volume.cpp Modified: trunk/reactos/dll/shellext/stobject/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/de-DE.rc [iso-8859-1] Fri Jan 9 16:25:49 2015 @@ -1,5 +1,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +#if 0 IDD_POWER_METER DIALOGEX 0, 0, 252, 218 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP @@ -11,6 +12,7 @@ CONTROL "&Details fÃ¼r jede Batterie anzeigen", 1002, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 129, 6, 123, 10 CONTROL "", 1000, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 END +#endif STRINGTABLE BEGIN @@ -34,7 +36,7 @@ IDS_HOTPLUG_DRIVE " - Laufwerk (%s)" IDS_HOTPLUG_DRIVES " - Laufwerke (%s)" IDS_HOTPLUG_A "A:" - IDS_HOTPLUG_REQUIERES "Diese Hardware erfordert \"Sicheres Entfernen\"" + IDS_HOTPLUG_REQUIERES "Diese Hardware erfordert ""Sicheres Entfernen""" IDS_HOTPLUG_CLICK "Klicken Sie auf dieses Symbol, und wÃ¤hlen Sie die zu entfernende Hardware, bevor Sie diese Hardware entfernen." //Volume related strings @@ -48,4 +50,4 @@ IDS_KEYS_STICKY "Einrastfunktion" IDS_KEYS_MOUSE "Tastaturmaus" IDS_KEYS_FILTER "AnschlagverzÃ¶gerung" -END +END Modified: trunk/reactos/dll/shellext/stobject/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/en-US.rc [iso-8859-1] Fri Jan 9 16:25:49 2015 @@ -1,5 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#if 0 IDD_POWER_METER DIALOGEX 0, 0, 252, 218 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP @@ -11,6 +12,7 @@ CONTROL "Show details for each &battery.", 1003, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 CONTROL "", 1000, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 END +#endif STRINGTABLE BEGIN @@ -34,7 +36,7 @@ IDS_HOTPLUG_DRIVE " - Drive(%s)" IDS_HOTPLUG_DRIVES " - Drives(%s)" IDS_HOTPLUG_A "A:" - IDS_HOTPLUG_REQUIERES "This hardware requires \"Safe Removal\"" + IDS_HOTPLUG_REQUIERES "This hardware requires ""Safe Removal""" IDS_HOTPLUG_CLICK "Before removing this hardware, click on this icon and select the hardware you want to remove." //Volume related strings @@ -49,4 +51,3 @@ IDS_KEYS_MOUSE "MouseKeys" IDS_KEYS_FILTER "FilterKeys" END - Modified: trunk/reactos/dll/shellext/stobject/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/es-ES.rc [iso-8859-1] Fri Jan 9 16:25:49 2015 @@ -1,6 +1,7 @@ /* Spanish translation created by Ismael Ferreras Morezuelas (2014-12-30) */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +#if 0 IDD_POWER_METER DIALOGEX 0, 0, 252, 218 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP @@ -12,6 +13,7 @@ CONTROL "Mostrar un estado detallado para cada &baterÃa.", 1003, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 CONTROL "", 1000, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 END +#endif STRINGTABLE BEGIN @@ -35,7 +37,7 @@ IDS_HOTPLUG_DRIVE " - Unidad(%s)" IDS_HOTPLUG_DRIVES " - Unidades(%s)" IDS_HOTPLUG_A "A:" - IDS_HOTPLUG_REQUIERES "Este dispositivo necesita una \"desconexiÃ³n segura\"" + IDS_HOTPLUG_REQUIERES "Este dispositivo necesita una ""desconexiÃ³n segura""" IDS_HOTPLUG_CLICK "Antes de desconectar el dispositivo, haga clic en este icono y eliga el dispositivo a desconectar." //Volume related strings @@ -50,4 +52,3 @@ IDS_KEYS_MOUSE "MouseKeys" IDS_KEYS_FILTER "FilterKeys" END - Modified: trunk/reactos/dll/shellext/stobject/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/tr-TR.rc [iso-8859-1] Fri Jan 9 16:25:49 2015 @@ -2,6 +2,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +#if 0 IDD_POWER_METER DIALOGEX 0, 0, 252, 218 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP @@ -13,6 +14,7 @@ CONTROL "&TÃ¼m Piller Ä°Ã§in AyrÄ±ntÄ±larÄ± GÃ¶ster", 1003, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 CONTROL "", 1000, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 END +#endif STRINGTABLE BEGIN @@ -51,4 +53,3 @@ IDS_KEYS_MOUSE "FÃ¢re DÃ¼Ämeleri" IDS_KEYS_FILTER "SÃ¼zgeÃ§ DÃ¼Ämeleri" END - Modified: trunk/reactos/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stob… ============================================================================== --- trunk/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] Fri Jan 9 16:25:49 2015 @@ -16,7 +16,6 @@ /* UTF-8 */ #pragma code_page(65001) -#if 0 #ifdef LANGUAGE_DE_DE #include "lang/de-DE.rc" #endif @@ -32,4 +31,3 @@ #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif -#endif Modified: trunk/reactos/dll/shellext/stobject/volume.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/volu… ============================================================================== --- trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] Fri Jan 9 16:25:49 2015 @@ -11,6 +11,9 @@ #include <mmsystem.h> #include <mmddk.h> +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) + WINE_DEFAULT_DEBUG_CHANNEL(stobject); HICON g_hIconVolume; @@ -28,13 +31,13 @@ static HRESULT __stdcall Volume_FindMixerControl(CSysTray * pSysTray) { MMRESULT result; - UINT mixerId = 0; + UINT mixerId = 0; DWORD waveOutId = 0; - DWORD param2 = 0; + DWORD param2 = 0; TRACE("Volume_FindDefaultMixerID\n"); - result = waveOutMessage((HWAVEOUT) WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR) &waveOutId, (DWORD_PTR) &param2); + result = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&waveOutId, (DWORD_PTR)&param2); if (result) return E_FAIL; @@ -48,7 +51,7 @@ { TRACE("waveOut default device is %d\n", waveOutId); - result = mixerGetID((HMIXEROBJ) waveOutId, &mixerId, MIXER_OBJECTF_WAVEOUT); + result = mixerGetID((HMIXEROBJ)waveOutId, &mixerId, MIXER_OBJECTF_WAVEOUT); if (result) return E_FAIL; @@ -79,7 +82,7 @@ { mixerLine.cbStruct = sizeof(mixerLine); mixerLine.dwDestination = idx; - if (!mixerGetLineInfoW((HMIXEROBJ) g_mixerId, &mixerLine, 0)) + if (!mixerGetLineInfoW((HMIXEROBJ)g_mixerId, &mixerLine, 0)) { if (mixerLine.dwComponentType >= MIXERLINE_COMPONENTTYPE_DST_SPEAKERS && mixerLine.dwComponentType <= MIXERLINE_COMPONENTTYPE_DST_HEADPHONES) @@ -102,11 +105,11 @@ mixerLineControls.pamxctrl = &mixerControl; mixerLineControls.cbmxctrl = sizeof(mixerControl); - if (mixerGetLineControlsW((HMIXEROBJ) g_mixerId, &mixerLineControls, MIXER_GETLINECONTROLSF_ONEBYTYPE)) + if (mixerGetLineControlsW((HMIXEROBJ)g_mixerId, &mixerLineControls, MIXER_GETLINECONTROLSF_ONEBYTYPE)) return E_FAIL; TRACE("Found control id %d for mute: %d\n", mixerControl.dwControlID); - + g_muteControlID = mixerControl.dwControlID; return S_OK; @@ -172,13 +175,18 @@ Volume_IsMute(); + WCHAR strTooltip[128]; HICON icon; - if (g_IsMute) + if (g_IsMute) { icon = g_hIconMute; - else + LoadStringW(g_hInstance, IDS_VOL_MUTED, strTooltip, _countof(strTooltip)); + } + else { icon = g_hIconVolume; - - return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_VOLUME, icon, L"Placeholder"); + LoadStringW(g_hInstance, IDS_VOL_VOLUME, strTooltip, _countof(strTooltip)); + } + + return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_VOLUME, icon, strTooltip); } HRESULT STDMETHODCALLTYPE Volume_Shutdown(_In_ CSysTray * pSysTray) @@ -191,6 +199,49 @@ HRESULT Volume_OnDeviceChange(_In_ CSysTray * pSysTray, WPARAM wParam, LPARAM lParam) { return Volume_FindMixerControl(pSysTray); +} + +static void _RunVolume() +{ + // FIXME: ensure we are loading the right one + ShellExecuteW(NULL, NULL, L"sndvol32.exe", NULL, NULL, SW_SHOWNORMAL); +} + +static void _RunMMCpl() +{ + ShellExecuteW(NULL, NULL, L"mmsys.cpl", NULL, NULL, SW_NORMAL); +} + +static void _ShowContextMenu(CSysTray * pSysTray) +{ + WCHAR strAdjust[128]; + WCHAR strOpen[128]; + LoadStringW(g_hInstance, IDS_VOL_ADJUST, strAdjust, _countof(strAdjust)); + LoadStringW(g_hInstance, IDS_VOL_OPEN, strOpen, _countof(strOpen)); + + HMENU hPopup = CreatePopupMenu(); + AppendMenuW(hPopup, MF_STRING, IDS_VOL_ADJUST, strAdjust); + AppendMenuW(hPopup, MF_STRING, IDS_VOL_OPEN, strOpen); + + DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN; + DWORD msgPos = GetMessagePos(); + + SetForegroundWindow(pSysTray->GetHWnd()); + DWORD id = TrackPopupMenuEx(hPopup, flags, + GET_X_LPARAM(msgPos), GET_Y_LPARAM(msgPos), + pSysTray->GetHWnd(), NULL); + + DestroyMenu(hPopup); + + switch (id) + { + case IDS_VOL_OPEN: + _RunVolume(); + break; + case IDS_VOL_ADJUST: + _RunMMCpl(); + break; + } } HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -216,13 +267,12 @@ TRACE("TODO: display volume slider\n"); break; case WM_LBUTTONDBLCLK: - // FIXME: ensure we are loading the right one - ShellExecute(NULL, NULL, L"sndvol32.exe", NULL, NULL, SW_SHOWNORMAL); + _RunVolume(); break; case WM_RBUTTONDOWN: break; case WM_RBUTTONUP: - break; + _ShowContextMenu(pSysTray); case WM_RBUTTONDBLCLK: break; case WM_MOUSEMOVE:

1 0

[hbelusca] 66014: [ramdisk]: improve again the dprints.
by hbelusca＠svn.reactos.org 09 Jan '15

09 Jan '15

Author: hbelusca Date: Fri Jan 9 14:17:39 2015 New Revision: 66014 URL: http://svn.reactos.org/svn/reactos?rev=66014&view=rev Log: [ramdisk]: improve again the dprints. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Fri Jan 9 14:17:39 2015 @@ -1473,7 +1473,7 @@ // // We don't handle anything else yet // - UNIMPLEMENTED_DBGBREAK("IOCTL: %lx\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); + UNIMPLEMENTED_DBGBREAK("FSCTL: 0x%lx is UNSUPPORTED!\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); } } } @@ -1631,7 +1631,7 @@ case IOCTL_VOLUME_GET_GPT_ATTRIBUTES: case IOCTL_VOLUME_OFFLINE: { - UNIMPLEMENTED_DBGBREAK("IOCTL: %lx\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); + UNIMPLEMENTED_DBGBREAK("IOCTL: 0x%lx is UNIMPLEMENTED!\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); break; } @@ -1640,7 +1640,7 @@ // // Drive code not emulated // - DPRINT1("IOCTL: %lx\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); + DPRINT1("IOCTL: 0x%lx is UNSUPPORTED!\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); break; } } @@ -2952,7 +2952,7 @@ // Are we being booted from setup? Not yet supported // if (KeLoaderBlock->SetupLdrBlock) - DPRINT1("FIXME: RamdiskAddDevice unsupported when being started from SETUPLDR!\n"); + DPRINT1("FIXME: RamdiskAddDevice is UNSUPPORTED when being started from SETUPLDR!\n"); // ASSERT(!KeLoaderBlock->SetupLdrBlock); }

1 0

[hbelusca] 66013: [RAMDISK] - Whitespace fixes, - Add braces for long "case blah: ..." code blocks, - Add more informational messages when a feature is unimplemented (some control codes and cases h...
by hbelusca＠svn.reactos.org 09 Jan '15

09 Jan '15

Author: hbelusca Date: Fri Jan 9 14:09:34 2015 New Revision: 66013 URL: http://svn.reactos.org/svn/reactos?rev=66013&view=rev Log: [RAMDISK] - Whitespace fixes, - Add braces for long "case blah: ..." code blocks, - Add more informational messages when a feature is unimplemented (some control codes and cases happening when using ramdisk with bootcd). Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Fri Jan 9 14:09:34 2015 @@ -34,10 +34,10 @@ #define RAMDISK_SESSION_SIZE \ FIELD_OFFSET(CDROM_TOC, TrackData) + sizeof(TRACK_DATA) - + #define RAMDISK_TOC_SIZE \ FIELD_OFFSET(CDROM_TOC, TrackData) + 2 * sizeof(TRACK_DATA) - + #define TOC_DATA_TRACK (0x04) typedef enum _RAMDISK_DEVICE_TYPE @@ -58,16 +58,16 @@ } RAMDISK_DEVICE_STATE; DEFINE_GUID(RamdiskBusInterface, - 0x5DC52DF0, - 0x2F8A, - 0x410F, - 0x80, 0xE4, 0x05, 0xF8, 0x10, 0xE7, 0xA8, 0x8A); + 0x5DC52DF0, + 0x2F8A, + 0x410F, + 0x80, 0xE4, 0x05, 0xF8, 0x10, 0xE7, 0xA8, 0x8A); DEFINE_GUID(RamdiskDiskInterface, - 0x31D909F0, - 0x2CDF, - 0x4A20, - 0x9E, 0xD4, 0x7D, 0x65, 0x47, 0x6C, 0xA7, 0x68); + 0x31D909F0, + 0x2CDF, + 0x4A20, + 0x9E, 0xD4, 0x7D, 0x65, 0x47, 0x6C, 0xA7, 0x68); typedef struct _RAMDISK_EXTENSION { @@ -94,7 +94,7 @@ // Inherited base class // RAMDISK_EXTENSION; - + // // Data we get from the creator // @@ -107,7 +107,7 @@ LONG DiskOffset; WCHAR DriveLetter; ULONG BasePage; - + // // Data we get from the disk // @@ -140,7 +140,7 @@ { ULONG MinView, DefView, MinViewLength, DefViewLength, MaxViewLength; RTL_QUERY_REGISTRY_TABLE QueryTable[10]; - + // // Set defaults // @@ -153,7 +153,7 @@ MaximumViewCount = 64; MinimumViewLength = 0x10000u; DefaultViewLength = 0x100000u; - + // // Setup the query table and query the registry // @@ -192,7 +192,7 @@ QueryTable, NULL, NULL); - + // // Parse minimum view count, cannot be bigger than 256 or smaller than 2 // @@ -220,7 +220,7 @@ DefView = MinView; } DefaultViewCount = DefView; - + // // Parse maximum view count, cannot be bigger than 256 or smaller than default // @@ -232,7 +232,7 @@ { MaximumViewCount = DefView; } - + // // Parse minimum view length, cannot be bigger than 1GB or smaller than 64KB // @@ -301,52 +301,52 @@ SIZE_T ActualLength; LARGE_INTEGER ActualOffset; LARGE_INTEGER ActualPages; - + // // We only support boot disks for now // ASSERT(DeviceExtension->DiskType == RAMDISK_BOOT_DISK); - + // // Calculate the actual offset in the drive // ActualOffset.QuadPart = DeviceExtension->DiskOffset + Offset.QuadPart; - + // // Convert to pages // ActualPages.QuadPart = ActualOffset.QuadPart >> PAGE_SHIFT; - + // // Now add the base page // ActualPages.QuadPart = DeviceExtension->BasePage + ActualPages.QuadPart; - + // // Calculate final amount of bytes // PhysicalAddress.QuadPart = ActualPages.QuadPart << PAGE_SHIFT; - + // // Calculate pages spanned for the mapping // ActualLength = ADDRESS_AND_SIZE_TO_SPAN_PAGES(ActualOffset.QuadPart, Length); - + // // And convert this back to bytes // ActualLength <<= PAGE_SHIFT; - + // // Get the offset within the page // PageOffset = BYTE_OFFSET(ActualOffset.QuadPart); - + // // Map the I/O Space from the loader // MappedBase = MmMapIoSpace(PhysicalAddress, ActualLength, MmCached); - + // // Return actual offset within the page as well as the length // @@ -365,37 +365,37 @@ LARGE_INTEGER ActualOffset; SIZE_T ActualLength; ULONG PageOffset; - + // // We only support boot disks for now // ASSERT(DeviceExtension->DiskType == RAMDISK_BOOT_DISK); - + // // Calculate the actual offset in the drive // ActualOffset.QuadPart = DeviceExtension->DiskOffset + Offset.QuadPart; - + // // Calculate pages spanned for the mapping // ActualLength = ADDRESS_AND_SIZE_TO_SPAN_PAGES(ActualOffset.QuadPart, Length); - + // // And convert this back to bytes // ActualLength <<= PAGE_SHIFT; - + // // Get the offset within the page // PageOffset = BYTE_OFFSET(ActualOffset.QuadPart); - + // // Calculate actual base address where we mapped this // BaseAddress = (PVOID)((ULONG_PTR)BaseAddress - PageOffset); - + // // Unmap the I/O space we got from the loader // @@ -432,7 +432,7 @@ { // // Check if we're an ISO - // + // if (DiskType == RAMDISK_BOOT_DISK) { // @@ -440,7 +440,7 @@ // BasePage = Input->BasePage; if (!BasePage) return STATUS_INVALID_PARAMETER; - + // // Sanitize disk options // @@ -467,8 +467,8 @@ // // Read the view count instead // - //ViewCount = Input->ViewCount; - + // ViewCount = Input->ViewCount; + // // Sanitize disk options // @@ -512,8 +512,8 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto FailCreate; } - - // + + // // Build the device name string // DeviceName.Buffer = Buffer; @@ -521,7 +521,7 @@ DeviceName.MaximumLength = Length; wcsncpy(Buffer, L"\\Device\\Ramdisk", Length / sizeof(WCHAR)); wcsncat(Buffer, GuidString.Buffer, Length / sizeof(WCHAR)); - + // // Create the drive device // @@ -534,12 +534,12 @@ 0, &DeviceObject); if (!NT_SUCCESS(Status)) goto FailCreate; - + // // Grab the drive extension // DriveExtension = DeviceObject->DeviceExtension; - + // // Check if we need a DOS device // @@ -583,7 +583,7 @@ // Input->Options.NoDosDevice = TRUE; } - + // // It this an ISO boot ramdisk? // @@ -604,14 +604,14 @@ RtlInitUnicodeString(&DriveString, LocalBuffer); IoDeleteSymbolicLink(&DriveString); IoCreateSymbolicLink(&DriveString, &DeviceName); - + // // Save the drive letter // DriveExtension->DriveLetter = Input->DriveLetter; } } - + } // @@ -619,7 +619,7 @@ // DeviceObject->Flags |= (DO_XIP | DO_POWER_PAGABLE | DO_DIRECT_IO); DeviceObject->AlignmentRequirement = 1; - + // // Build the drive FDO // @@ -628,9 +628,9 @@ DiskLength = Input->DiskLength; ExInitializeFastMutex(&DriveExtension->DiskListLock); IoInitializeRemoveLock(&DriveExtension->RemoveLock, - 'dmaR', - 1, - 0); + 'dmaR', + 1, + 0); DriveExtension->DriveDeviceName = DeviceName; DriveExtension->SymbolicLinkName = SymbolicLinkName; DriveExtension->GuidString = GuidString; @@ -646,14 +646,14 @@ DriveExtension->BytesPerSector = 0; DriveExtension->SectorsPerTrack = 0; DriveExtension->NumberOfHeads = 0; - + // // Make sure we don't free it later // DeviceName.Buffer = NULL; SymbolicLinkName.Buffer = NULL; GuidString.Buffer = NULL; - + // // Check if this is an boot disk, or a registry ram drive // @@ -679,14 +679,14 @@ BytesPerSector = BiosBlock.BytesPerSector; SectorsPerTrack = BiosBlock.SectorsPerTrack; Heads = BiosBlock.Heads; - + // // Save it // DriveExtension->BytesPerSector = BytesPerSector; DriveExtension->SectorsPerTrack = SectorsPerTrack; DriveExtension->NumberOfHeads = Heads; - + // // Unmap now // @@ -705,7 +705,7 @@ goto FailCreate; } } - + // // Check if the drive settings haven't been set yet // @@ -735,7 +735,7 @@ DriveExtension->NumberOfHeads = 16; } } - + // // Calculate the cylinder size // @@ -752,31 +752,31 @@ // DriveExtension->Cylinders++; } - + // // Acquire the disk lock // KeEnterCriticalRegion(); ExAcquireFastMutex(&DeviceExtension->DiskListLock); - + // // Insert us // InsertTailList(&DeviceExtension->DiskList, &DriveExtension->DiskList); - + // // Release the lock // ExReleaseFastMutex(&DeviceExtension->DiskListLock); KeLeaveCriticalRegion(); - + // // Clear init flag // DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; } - + FailCreate: UNIMPLEMENTED_DBGBREAK(); return STATUS_SUCCESS; @@ -791,95 +791,95 @@ PRAMDISK_CREATE_INPUT Input; ULONG Length; PRAMDISK_BUS_EXTENSION DeviceExtension; - PRAMDISK_DRIVE_EXTENSION DriveExtension; + PRAMDISK_DRIVE_EXTENSION DriveExtension; ULONG DiskType; PWCHAR FileNameStart, FileNameEnd; NTSTATUS Status; PIO_STACK_LOCATION IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + // // Get the device extension and our input data // DeviceExtension = DeviceObject->DeviceExtension; Length = IoStackLocation->Parameters.DeviceIoControl.InputBufferLength; Input = (PRAMDISK_CREATE_INPUT)Irp->AssociatedIrp.SystemBuffer; - + // // Validate input parameters // if ((Length < sizeof(RAMDISK_CREATE_INPUT)) || - (Input->Version != sizeof(RAMDISK_CREATE_INPUT))) - { - // - // Invalid input - // - return STATUS_INVALID_PARAMETER; - } - + (Input->Version != sizeof(RAMDISK_CREATE_INPUT))) + { + // + // Invalid input + // + return STATUS_INVALID_PARAMETER; + } + // // Validate the disk type // DiskType = Input->DiskType; if (DiskType == RAMDISK_WIM_DISK) return STATUS_INVALID_PARAMETER; - + // // Look at the disk type // if (DiskType == RAMDISK_BOOT_DISK) { - // - // We only allow this as an early-init boot - // - if (!KeLoaderBlock) return STATUS_INVALID_PARAMETER; - - // - // Save command-line flags - // - if (ExportBootDiskAsCd) Input->Options.ExportAsCd = TRUE; - if (IsWinPEBoot) Input->Options.NoDriveLetter = TRUE; - } - + // + // We only allow this as an early-init boot + // + if (!KeLoaderBlock) return STATUS_INVALID_PARAMETER; + + // + // Save command-line flags + // + if (ExportBootDiskAsCd) Input->Options.ExportAsCd = TRUE; + if (IsWinPEBoot) Input->Options.NoDriveLetter = TRUE; + } + // // Validate the disk type // if ((Input->Options.ExportAsCd) && (DiskType != RAMDISK_BOOT_DISK)) { - // - // If the type isn't CDFS, it has to at least be raw CD - // - if (DiskType != RAMDISK_MEMORY_MAPPED_DISK) return STATUS_INVALID_PARAMETER; - } - + // + // If the type isn't CDFS, it has to at least be raw CD + // + if (DiskType != RAMDISK_MEMORY_MAPPED_DISK) return STATUS_INVALID_PARAMETER; + } + // // Check if this is an actual file // if (DiskType <= RAMDISK_MEMORY_MAPPED_DISK) { - // - // Validate the file name - // - FileNameStart = (PWCHAR)((ULONG_PTR)Input + Length); - FileNameEnd = Input->FileName + 1; - while ((FileNameEnd < FileNameStart) && *(FileNameEnd)) FileNameEnd++; - if (FileNameEnd == FileNameStart) return STATUS_INVALID_PARAMETER; - } - + // + // Validate the file name + // + FileNameStart = (PWCHAR)((ULONG_PTR)Input + Length); + FileNameEnd = Input->FileName + 1; + while ((FileNameEnd < FileNameStart) && *(FileNameEnd)) FileNameEnd++; + if (FileNameEnd == FileNameStart) return STATUS_INVALID_PARAMETER; + } + // // Create the actual device // Status = RamdiskCreateDiskDevice(DeviceExtension, - Input, + Input, ValidateOnly, &DriveExtension); if (NT_SUCCESS(Status)) { - // - // Invalidate and set success - // - IoInvalidateDeviceRelations(DeviceExtension->PhysicalDeviceObject, 0); - Irp->IoStatus.Information = STATUS_SUCCESS; - } - + // + // Invalidate and set success + // + IoInvalidateDeviceRelations(DeviceExtension->PhysicalDeviceObject, 0); + Irp->IoStatus.Information = STATUS_SUCCESS; + } + // // We're done // @@ -897,7 +897,7 @@ LARGE_INTEGER Zero = {{0, 0}}; ULONG Length; PIO_STACK_LOCATION IoStackLocation; - + // // Validate the length // @@ -913,7 +913,7 @@ Irp->IoStatus.Information = 0; return Status; } - + // // Map the partition table // @@ -928,7 +928,7 @@ Irp->IoStatus.Information = 0; return Status; } - + // // Fill out the information // @@ -951,7 +951,7 @@ // Unmap the partition table // RamdiskUnmapPages(DeviceExtension, BaseAddress, Zero, Length); - + // // Done // @@ -1020,17 +1020,17 @@ NTSTATUS Status; PIO_STACK_LOCATION IoStackLocation; PIRP Irp = Context; - + // // Get the stack location // IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + // // Free the work item // IoFreeWorkItem(Irp->Tail.Overlay.DriverContext[0]); - + // // Grab the device extension and lock it // @@ -1047,7 +1047,7 @@ // Device control // case IRP_MJ_DEVICE_CONTROL: - + { // // Let's take a look at the IOCTL // @@ -1057,61 +1057,60 @@ // Ramdisk create request // case FSCTL_CREATE_RAM_DISK: - + { // // This time we'll do it for real // Status = RamdiskCreateRamdisk(DeviceObject, Irp, FALSE); break; - + } + case IOCTL_DISK_SET_PARTITION_INFO: - + { Status = RamdiskSetPartitionInfo(Irp, (PRAMDISK_DRIVE_EXTENSION)DeviceExtension); break; + } case IOCTL_DISK_GET_DRIVE_LAYOUT: - UNIMPLEMENTED_DBGBREAK("Get drive layout request\n"); break; - + case IOCTL_DISK_GET_PARTITION_INFO: - + { Status = RamdiskGetPartitionInfo(Irp, (PRAMDISK_DRIVE_EXTENSION)DeviceExtension); break; + } default: - UNIMPLEMENTED_DBGBREAK("Invalid request\n"); break; } - + // // We're here // break; - + } + // // Read or write request // case IRP_MJ_READ: case IRP_MJ_WRITE: - UNIMPLEMENTED_DBGBREAK("Read/Write request\n"); break; - + // // Internal request (SCSI?) // case IRP_MJ_INTERNAL_DEVICE_CONTROL: - UNIMPLEMENTED_DBGBREAK("SCSI request\n"); break; - + // // Flush request // case IRP_MJ_FLUSH_BUFFERS: - UNIMPLEMENTED_DBGBREAK("Flush request\n"); break; @@ -1119,11 +1118,10 @@ // Anything else // default: - UNIMPLEMENTED_DBGBREAK("Invalid request: %lx\n", IoStackLocation->MajorFunction); break; } - + // // Complete the I/O // @@ -1133,7 +1131,7 @@ IoCompleteRequest(Irp, IO_DISK_INCREMENT); return; } - + // // Fail the I/O // @@ -1148,12 +1146,12 @@ IN PIRP Irp) { PIO_WORKITEM WorkItem; - + // // Mark the IRP pending // IoMarkIrpPending(Irp); - + // // Allocate a work item // @@ -1188,7 +1186,7 @@ ULONG BytesRead, BytesLeft, CopyLength; PVOID Source, Destination; NTSTATUS Status; - + // // Get the MDL and check if it's mapped // @@ -1209,21 +1207,21 @@ 0, MmCached, NULL, - 0, + 0, NormalPagePriority); } - + // // Make sure we were able to map it // CurrentBase = SystemVa; if (!SystemVa) return STATUS_INSUFFICIENT_RESOURCES; - + // // Initialize default // Irp->IoStatus.Information = 0; - + // // Get the I/O Stack Location and capture the data // @@ -1231,7 +1229,7 @@ CurrentOffset = IoStackLocation->Parameters.Read.ByteOffset; BytesLeft = IoStackLocation->Parameters.Read.Length; if (!BytesLeft) return STATUS_INVALID_PARAMETER; - + // // Do the copy loop // @@ -1245,13 +1243,13 @@ BytesLeft, &BytesRead); if (!BaseAddress) return STATUS_INSUFFICIENT_RESOURCES; - + // // Update our lengths // Irp->IoStatus.Information += BytesRead; CopyLength = BytesRead; - + // // Check if this was a read or write // @@ -1286,7 +1284,7 @@ BytesLeft = CopyLength; Status = STATUS_INVALID_PARAMETER; } - + // // Unmap the pages // @@ -1294,14 +1292,14 @@ BaseAddress, CurrentOffset, BytesRead); - + // // Update offset and bytes left // BytesLeft -= BytesRead; CurrentOffset.QuadPart += BytesRead; CurrentBase = (PVOID)((ULONG_PTR)CurrentBase + BytesRead); - + // // Check if we're done // @@ -1329,8 +1327,8 @@ IN PIRP Irp) { PRAMDISK_DRIVE_EXTENSION DeviceExtension; - //ULONG Length; - //LARGE_INTEGER ByteOffset; + // ULONG Length; + // LARGE_INTEGER ByteOffset; PIO_STACK_LOCATION IoStackLocation; NTSTATUS Status, ReturnStatus; @@ -1346,22 +1344,22 @@ Status = STATUS_INVALID_DEVICE_REQUEST; goto Complete; } - + // // Capture parameters // IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - //Length = IoStackLocation->Parameters.Read.Length; - //ByteOffset = IoStackLocation->Parameters.Read.ByteOffset; - + // Length = IoStackLocation->Parameters.Read.Length; + // ByteOffset = IoStackLocation->Parameters.Read.ByteOffset; + // // FIXME: Validate offset // - + // // FIXME: Validate sector // - + // // Validate write // @@ -1374,7 +1372,7 @@ Status = STATUS_MEDIA_WRITE_PROTECTED; goto Complete; } - + // // See if we want to do this sync or async // @@ -1386,13 +1384,13 @@ Status = RamdiskReadWriteReal(Irp, DeviceExtension); goto Complete; } - + // // Queue it to the worker // Status = SendIrpToThread(DeviceObject, Irp); ReturnStatus = STATUS_PENDING; - + // // Check if we're pending or not // @@ -1406,7 +1404,7 @@ IoCompleteRequest(Irp, IO_DISK_INCREMENT); ReturnStatus = Status; } - + // // Return to caller // @@ -1425,7 +1423,7 @@ ULONG Information; PCDROM_TOC Toc; PDISK_GEOMETRY DiskGeometry; - + // // Grab the remove lock // @@ -1440,13 +1438,13 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } - + // // Setup some defaults // Status = STATUS_INVALID_DEVICE_REQUEST; Information = 0; - + // // Check if this is an bus device or the drive // @@ -1461,20 +1459,22 @@ // Request to create a ramdisk // case FSCTL_CREATE_RAM_DISK: - + { // // Do it // Status = RamdiskCreateRamdisk(DeviceObject, Irp, TRUE); if (!NT_SUCCESS(Status)) goto CompleteRequest; break; - + } + default: - + { // // We don't handle anything else yet // - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED_DBGBREAK("IOCTL: %lx\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); + } } } else @@ -1488,18 +1488,19 @@ case IOCTL_STORAGE_CHECK_VERIFY: case IOCTL_STORAGE_CHECK_VERIFY2: case IOCTL_CDROM_CHECK_VERIFY: - + { // // Just pretend it's OK, don't do more // Status = STATUS_SUCCESS; break; + } case IOCTL_STORAGE_GET_MEDIA_TYPES: case IOCTL_DISK_GET_MEDIA_TYPES: case IOCTL_DISK_GET_DRIVE_GEOMETRY: case IOCTL_CDROM_GET_DRIVE_GEOMETRY: - + { // // Validate the length // @@ -1512,7 +1513,7 @@ Status = STATUS_BUFFER_TOO_SMALL; break; } - + // // Fill it out // @@ -1523,16 +1524,17 @@ DiskGeometry->TracksPerCylinder = DriveExtension->NumberOfHeads; DiskGeometry->MediaType = DriveExtension->DiskOptions.Fixed ? FixedMedia : RemovableMedia; - + // // We're done // Status = STATUS_SUCCESS; Information = sizeof(DISK_GEOMETRY); break; - + } + case IOCTL_CDROM_READ_TOC: - + { // // Validate the length // @@ -1545,13 +1547,13 @@ Status = STATUS_BUFFER_TOO_SMALL; break; } - + // // Clear the TOC // Toc = Irp->AssociatedIrp.SystemBuffer; RtlZeroMemory(Toc, sizeof(CDROM_TOC)); - + // // Fill it out // @@ -1562,21 +1564,23 @@ Toc->TrackData[0].Adr = 1; Toc->TrackData[0].Control = TOC_DATA_TRACK; Toc->TrackData[0].TrackNumber = 1; - + // // We're done // Status = STATUS_SUCCESS; Information = RAMDISK_TOC_SIZE; break; - + } + case IOCTL_DISK_SET_PARTITION_INFO: - + { Status = RamdiskSetPartitionInfo(Irp, DriveExtension); break; - + } + case IOCTL_DISK_GET_PARTITION_INFO: - + { // // Validate the length // @@ -1589,7 +1593,7 @@ Status = STATUS_BUFFER_TOO_SMALL; break; } - + // // Check if we need to do this sync or async // @@ -1607,75 +1611,38 @@ // goto CallWorker; } - + // // We're done // Information = Irp->IoStatus.Information; break; - + } + case IOCTL_DISK_GET_DRIVE_LAYOUT: - - UNIMPLEMENTED_DBGBREAK(); + case IOCTL_DISK_GET_LENGTH_INFO: + case IOCTL_DISK_IS_WRITABLE: + case IOCTL_SCSI_MINIPORT: + case IOCTL_STORAGE_QUERY_PROPERTY: + case IOCTL_MOUNTDEV_QUERY_UNIQUE_ID: + case IOCTL_MOUNTDEV_QUERY_STABLE_GUID: + case IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS: + case IOCTL_VOLUME_SET_GPT_ATTRIBUTES: + case IOCTL_VOLUME_GET_GPT_ATTRIBUTES: + case IOCTL_VOLUME_OFFLINE: + { + UNIMPLEMENTED_DBGBREAK("IOCTL: %lx\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); break; - - case IOCTL_DISK_GET_LENGTH_INFO: - - UNIMPLEMENTED_DBGBREAK(); + } + + default: + { + // + // Drive code not emulated + // + DPRINT1("IOCTL: %lx\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); break; - - case IOCTL_DISK_IS_WRITABLE: - - UNIMPLEMENTED_DBGBREAK(); - break; - - case IOCTL_SCSI_MINIPORT: - - UNIMPLEMENTED_DBGBREAK(); - break; - - case IOCTL_STORAGE_QUERY_PROPERTY: - - UNIMPLEMENTED_DBGBREAK(); - break; - - case IOCTL_MOUNTDEV_QUERY_UNIQUE_ID: - - UNIMPLEMENTED_DBGBREAK(); - break; - - case IOCTL_MOUNTDEV_QUERY_STABLE_GUID: - - UNIMPLEMENTED_DBGBREAK(); - break; - - case IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS: - - UNIMPLEMENTED_DBGBREAK(); - break; - - case IOCTL_VOLUME_SET_GPT_ATTRIBUTES: - - UNIMPLEMENTED_DBGBREAK(); - break; - - case IOCTL_VOLUME_GET_GPT_ATTRIBUTES: - - UNIMPLEMENTED_DBGBREAK(); - break; - - case IOCTL_VOLUME_OFFLINE: - - UNIMPLEMENTED_DBGBREAK(); - break; - - default: - - // - // Drive code not emulated - // - DPRINT1("IOCTL: %lx\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); - break; + } } // @@ -1683,13 +1650,13 @@ // goto CompleteRequest; } - + // // Queue the request to our worker thread // CallWorker: Status = SendIrpToThread(DeviceObject, Irp); - + CompleteRequest: // // Release the lock @@ -1704,7 +1671,7 @@ Irp->IoStatus.Information = Information; IoCompleteRequest(Irp, IO_NO_INCREMENT); } - + // // Return status // @@ -1724,7 +1691,7 @@ PLIST_ENTRY ListHead, NextEntry; PDEVICE_OBJECT* DriveDeviceObject; RAMDISK_DEVICE_STATE State; - + // // Get the device extension and check if this is a drive // @@ -1771,18 +1738,18 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } - + // // Anything but bus relations, we don't handle // if (Type != BusRelations) goto PassToNext; - + // // Acquire the disk list lock // KeEnterCriticalRegion(); ExAcquireFastMutex(&DeviceExtension->DiskListLock); - + // // Did a device already fill relations? // @@ -1801,7 +1768,7 @@ // Count = 0; } - + // // Now loop our drives // @@ -1817,18 +1784,18 @@ RAMDISK_DRIVE_EXTENSION, DiskList); if (DriveExtension->State < RamdiskStateBusRemoved) DiskCount++; - + // // Move to the next one // NextEntry = NextEntry->Flink; } - + // // Now we know our final count // FinalCount = Count + DiskCount; - + // // Allocate the structure // @@ -1849,7 +1816,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INSUFFICIENT_RESOURCES; } - + // // Check if we already had some relations // @@ -1862,12 +1829,12 @@ DeviceRelations->Objects, Count * sizeof(PDEVICE_OBJECT)); } - + // // Save the count // OurDeviceRelations->Count = FinalCount; - + // // Now loop our drives again // @@ -1879,7 +1846,7 @@ // Go to the end of the list // DriveDeviceObject = &OurDeviceRelations->Objects[Count]; - + // // Get the drive state // @@ -1887,7 +1854,7 @@ RAMDISK_DRIVE_EXTENSION, DiskList); State = DriveExtension->State; - + // // If it was removed or enumerated, we don't touch the device object // @@ -1910,15 +1877,15 @@ // First time it's enumerated, reference the device object // ObReferenceObject(DriveExtension->DeviceObject); - + // // Save the object pointer, and move on // *DriveDeviceObject++ = DriveExtension->PhysicalDeviceObject; } - + if (DriveExtension->State < RamdiskStateBusRemoved) DiskCount++; - + // // Move to the next one // @@ -1930,24 +1897,24 @@ // ExReleaseFastMutex(&DeviceExtension->DiskListLock); KeLeaveCriticalRegion(); - + // // Cleanup old relations // if (DeviceRelations) ExFreePool(DeviceRelations); - + // // Complete our IRP // Irp->IoStatus.Information = (ULONG_PTR)OurDeviceRelations; Irp->IoStatus.Status = STATUS_SUCCESS; - + // // Pass to the next driver // PassToNext: IoCopyCurrentIrpStackLocationToNext(Irp); - return IoCallDriver(DeviceExtension->AttachedDevice, Irp); + return IoCallDriver(DeviceExtension->AttachedDevice, Irp); } NTSTATUS @@ -2082,7 +2049,7 @@ switch (IoStackLocation->Parameters.QueryId.IdType) { case BusQueryDeviceID: - + { // // Allocate a buffer long enough to receive Ramdisk\RamDisk in any case // In case we don't have RAMDISK_REGISTRY_DISK, we then need two more @@ -2107,9 +2074,10 @@ } break; + } case BusQueryHardwareIDs: - + { // // Allocate a buffer long enough to receive Ramdisk\RamDisk in any case // In case we don't have RAMDISK_REGISTRY_DISK, we then need two more @@ -2138,9 +2106,10 @@ OutputString[(StringLength / sizeof(WCHAR)) - 1] = UNICODE_NULL; break; + } case BusQueryCompatibleIDs: - + { if (DriveExtension->DiskType != RAMDISK_REGISTRY_DISK) { Status = STATUS_INVALID_DEVICE_REQUEST; @@ -2159,9 +2128,10 @@ OutputString[(StringLength / sizeof(WCHAR)) - 1] = UNICODE_NULL; break; + } case BusQueryInstanceID: - + { OutputString = ExAllocatePoolWithTag(PagedPool, DriveExtension->GuidString.MaximumLength, 'dmaR'); if (OutputString == NULL) { @@ -2172,14 +2142,15 @@ wcsncpy(OutputString, DriveExtension->GuidString.Buffer, DriveExtension->GuidString.MaximumLength / sizeof(WCHAR)); break; + } case BusQueryDeviceSerialNumber: - + { // // Nothing to do // - break; + } } Irp->IoStatus.Status = Status; @@ -2248,7 +2219,7 @@ switch (DeviceTextType) { case DeviceTextDescription: - + { OutputString = ExAllocatePoolWithTag(PagedPool, sizeof(L"RamDisk"), 'dmaR'); if (OutputString == NULL) { @@ -2259,9 +2230,10 @@ wcsncpy(OutputString, L"RamDisk", sizeof(L"RamDisk") / sizeof(WCHAR)); break; + } case DeviceTextLocationInformation: - + { OutputString = ExAllocatePoolWithTag(PagedPool, sizeof(L"RamDisk\\0"), 'dmaR'); if (OutputString == NULL) { @@ -2272,6 +2244,7 @@ wcsncpy(OutputString, L"RamDisk\\0", sizeof(L"RamDisk\\0") / sizeof(WCHAR)); break; + } } Irp->IoStatus.Status = Status; @@ -2344,7 +2317,7 @@ DeviceExtension = DeviceObject->DeviceExtension; IoStackLocation = IoGetCurrentIrpStackLocation(Irp); Minor = IoStackLocation->MinorFunction; - + // // Check if the bus is removed // @@ -2364,7 +2337,7 @@ return Status; } } - + // // Acquire the remove lock // @@ -2379,14 +2352,14 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } - + // // Query the IRP type // switch (Minor) { case IRP_MN_START_DEVICE: - + { if (DeviceExtension->Type == RamdiskDrive) { ULONG ResultLength; @@ -2493,34 +2466,20 @@ Irp->IoStatus.Status = Status; break; - + } + case IRP_MN_QUERY_STOP_DEVICE: - + case IRP_MN_CANCEL_STOP_DEVICE: + case IRP_MN_STOP_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + { UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor); break; - - case IRP_MN_CANCEL_STOP_DEVICE: - - UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor); - break; - - case IRP_MN_STOP_DEVICE: - - UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor); - break; - - case IRP_MN_QUERY_REMOVE_DEVICE: - - UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor); - break; - - case IRP_MN_CANCEL_REMOVE_DEVICE: - - UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor); - break; - + } + case IRP_MN_REMOVE_DEVICE: - + { // // Remove the proper device // @@ -2547,14 +2506,14 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } + } case IRP_MN_SURPRISE_REMOVAL: - UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor); break; - + case IRP_MN_QUERY_ID: - + { // // Are we a drive? // @@ -2563,9 +2522,10 @@ Status = RamdiskQueryId((PRAMDISK_DRIVE_EXTENSION)DeviceExtension, Irp); } break; - + } + case IRP_MN_QUERY_BUS_INFORMATION: - + { // // Are we a drive? // @@ -2574,14 +2534,14 @@ Status = RamdiskQueryBusInformation(DeviceObject, Irp); } break; - + } + case IRP_MN_EJECT: - UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor); break; - + case IRP_MN_QUERY_DEVICE_TEXT: - + { // // Are we a drive? // @@ -2590,9 +2550,10 @@ Status = RamdiskQueryDeviceText((PRAMDISK_DRIVE_EXTENSION)DeviceExtension, Irp); } break; - + } + case IRP_MN_QUERY_DEVICE_RELATIONS: - + { // // Call our main routine // @@ -2602,9 +2563,10 @@ DeviceObject, Irp); goto ReleaseAndReturn; - + } + case IRP_MN_QUERY_CAPABILITIES: - + { // // Are we a drive? // @@ -2613,22 +2575,23 @@ Status = RamdiskQueryCapabilities(DeviceObject, Irp); } break; - + } + case IRP_MN_QUERY_RESOURCES: case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: - + { // // Complete immediately without touching it // IoCompleteRequest(Irp, IO_NO_INCREMENT); goto ReleaseAndReturn; - + } + default: - DPRINT1("Illegal IRP: %lx\n", Minor); break; } - + // // Are we the bus? // @@ -2646,7 +2609,7 @@ Status = IoCallDriver(DeviceExtension->AttachedDevice, Irp); } } - + // // Release the lock and return status // @@ -2702,6 +2665,7 @@ switch (IoStackLocation->MinorFunction) { case IRP_MN_SET_POWER: + { // // If setting device power state // it's all fine and return success @@ -2718,8 +2682,10 @@ PoStartNextPowerIrp(Irp); IoCompleteRequest(Irp, IO_NO_INCREMENT); break; + } case IRP_MN_QUERY_POWER: + { // // We can obviously accept all states // So just return success @@ -2729,8 +2695,10 @@ PoStartNextPowerIrp(Irp); IoCompleteRequest(Irp, IO_NO_INCREMENT); break; + } default: + { // // Just complete and save status for return // @@ -2738,6 +2706,7 @@ PoStartNextPowerIrp(Irp); IoCompleteRequest(Irp, IO_NO_INCREMENT); break; + } } return Status; @@ -2884,20 +2853,20 @@ NTSTATUS NTAPI -RamdiskAddDevice(IN PDRIVER_OBJECT DriverObject, +RamdiskAddDevice(IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) { PRAMDISK_BUS_EXTENSION DeviceExtension; PDEVICE_OBJECT AttachedDevice; - NTSTATUS Status; + NTSTATUS Status; UNICODE_STRING DeviceName; PDEVICE_OBJECT DeviceObject; - + // // Only create the bus FDO once // if (RamdiskBusFdo) return STATUS_DEVICE_ALREADY_ATTACHED; - + // // Create the bus FDO // @@ -2911,34 +2880,34 @@ &DeviceObject); if (NT_SUCCESS(Status)) { - // - // Initialize the bus FDO extension - // + // + // Initialize the bus FDO extension + // DeviceExtension = DeviceObject->DeviceExtension; RtlZeroMemory(DeviceObject->DeviceExtension, sizeof(RAMDISK_BUS_EXTENSION)); - - // - // Set bus FDO flags - // + + // + // Set bus FDO flags + // DeviceObject->Flags |= DO_POWER_PAGABLE | DO_DIRECT_IO; - - // - // Setup the bus FDO extension - // + + // + // Setup the bus FDO extension + // DeviceExtension->Type = RamdiskBus; - ExInitializeFastMutex(&DeviceExtension->DiskListLock); + ExInitializeFastMutex(&DeviceExtension->DiskListLock); IoInitializeRemoveLock(&DeviceExtension->RemoveLock, 'dmaR', 1, 0); - InitializeListHead(&DeviceExtension->DiskList); + InitializeListHead(&DeviceExtension->DiskList); DeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; DeviceExtension->DeviceObject = DeviceObject; - - // - // Register the RAM disk device interface - // + + // + // Register the RAM disk device interface + // Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &RamdiskBusInterface, NULL, @@ -2951,47 +2920,49 @@ IoDeleteDevice(DeviceObject); return Status; } - - // - // Attach us to the device stack - // + + // + // Attach us to the device stack + // AttachedDevice = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); DeviceExtension->AttachedDevice = AttachedDevice; if (!AttachedDevice) { - // - // Fail - // - IoSetDeviceInterfaceState(&DeviceExtension->BusDeviceName, 0); - RtlFreeUnicodeString(&DeviceExtension->BusDeviceName); - IoDeleteDevice(DeviceObject); - return STATUS_NO_SUCH_DEVICE; - } - - // - // Bus FDO is initialized - // + // + // Fail + // + IoSetDeviceInterfaceState(&DeviceExtension->BusDeviceName, 0); + RtlFreeUnicodeString(&DeviceExtension->BusDeviceName); + IoDeleteDevice(DeviceObject); + return STATUS_NO_SUCH_DEVICE; + } + + // + // Bus FDO is initialized + // RamdiskBusFdo = DeviceObject; - - // - // Loop for loader block - // + + // + // Loop for loader block + // if (KeLoaderBlock) { - // - // Are we being booted from setup? Not yet supported - // - //ASSERT(!KeLoaderBlock->SetupLdrBlock); - } - - // - // All done - // + // + // Are we being booted from setup? Not yet supported + // + if (KeLoaderBlock->SetupLdrBlock) + DPRINT1("FIXME: RamdiskAddDevice unsupported when being started from SETUPLDR!\n"); + // ASSERT(!KeLoaderBlock->SetupLdrBlock); + } + + // + // All done + // DeviceObject->Flags &= DO_DEVICE_INITIALIZING; Status = STATUS_SUCCESS; } - + // // Return status // @@ -3007,12 +2978,12 @@ PDEVICE_OBJECT PhysicalDeviceObject = NULL; NTSTATUS Status; DPRINT("RAM Disk Driver Initialized\n"); - + // // Query ramdisk parameters // QueryParameters(RegistryPath); - + // // Save the registry path // @@ -3023,7 +2994,7 @@ 'dmaR'); if (!DriverRegistryPath.Buffer) return STATUS_INSUFFICIENT_RESOURCES; RtlCopyUnicodeString(&DriverRegistryPath, RegistryPath); - + // // Set device routines // @@ -3039,7 +3010,7 @@ DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = RamdiskFlushBuffers; DriverObject->DriverExtension->AddDevice = RamdiskAddDevice; DriverObject->DriverUnload = RamdiskUnload; - + // // Check for a loader block // @@ -3061,7 +3032,7 @@ // We'll have to tell the PnP Manager // ReportDetectedDevice = TRUE; - + // // Check for a command line // @@ -3078,7 +3049,7 @@ // ExportBootDiskAsCd = TRUE; } - + // // Check if this is PE boot // @@ -3091,15 +3062,17 @@ } } } - - } - } - + + } + } + // // Installing from Ramdisk isn't supported yet // - //ASSERT(!KeLoaderBlock->SetupLdrBlock); - + if (KeLoaderBlock->SetupLdrBlock) + DPRINT1("FIXME: Installing from RamDisk is UNSUPPORTED!\n"); + // ASSERT(!KeLoaderBlock->SetupLdrBlock); + // // Are we reporting the device // @@ -3117,7 +3090,7 @@ 0, &PhysicalDeviceObject); if (NT_SUCCESS(Status)) - { + { // // Create the device object //

1 0

[hbelusca] 66012: [INSTALL_FREELDR] Instead of keeping binary C arrays for FAT bootsectors (that by the way were completely out of date and were broken) in header files, just generate them out of o...
by hbelusca＠svn.reactos.org 09 Jan '15

09 Jan '15

Author: hbelusca Date: Fri Jan 9 00:12:51 2015 New Revision: 66012 URL: http://svn.reactos.org/svn/reactos?rev=66012&view=rev Log: [INSTALL_FREELDR] Instead of keeping binary C arrays for FAT bootsectors (that by the way were completely out of date and were broken) in header files, just generate them out of our ASM-compiled bootsectors, with bin2c (as we do for PCI data for the HAL) and use them instead! So now we can use installfreeldr.exe to install e.g. a correct bootsector on a USB key that will work for loading freeldr! (and thus get rid of the Syslinux hack I presented in my video). Removed: trunk/reactos/boot/freeldr/bootsect/fat.h trunk/reactos/boot/freeldr/bootsect/fat32.h Modified: trunk/reactos/boot/freeldr/install/CMakeLists.txt trunk/reactos/boot/freeldr/install/install.c Removed: trunk/reactos/boot/freeldr/bootsect/fat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat.h (removed) @@ -1,35 +0,0 @@ -unsigned char fat_data[] = { - -0xeb, 0x3c, 0x90, 0x46, 0x72, 0x4c, 0x64, 0x72, 0x31, 0x2e, 0x30, 0x00, 0x02, 0x01, 0x01, 0x00, -0x02, 0xe0, 0x00, 0x40, 0x0b, 0xf0, 0x09, 0x00, 0x12, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x4f, 0x20, 0x4e, 0x41, -0x4d, 0x45, 0x20, 0x20, 0x20, 0x20, 0x46, 0x41, 0x54, 0x31, 0x32, 0x20, 0x20, 0x20, 0x31, 0xc0, -0x8e, 0xd0, 0xbd, 0x00, 0x7c, 0xbc, 0xf2, 0x7b, 0x8e, 0xd8, 0x8e, 0xc0, 0x80, 0x7e, 0x24, 0xff, -0x75, 0x03, 0x88, 0x56, 0x24, 0xb4, 0x08, 0x8a, 0x56, 0x24, 0xcd, 0x13, 0x73, 0x05, 0xb9, 0xff, -0xff, 0x88, 0xce, 0x88, 0xeb, 0x88, 0xcf, 0xc0, 0xef, 0x06, 0x80, 0xe1, 0x3f, 0x66, 0x0f, 0xb6, -0xc6, 0x66, 0x0f, 0xb7, 0xdb, 0x66, 0x0f, 0xb6, 0xc9, 0x66, 0x40, 0x66, 0x43, 0x66, 0xf7, 0xe1, -0x66, 0xf7, 0xe3, 0x66, 0x89, 0x46, 0xf8, 0x31, 0xc0, 0x31, 0xc9, 0x8a, 0x46, 0x10, 0xf7, 0x66, -0x16, 0x03, 0x46, 0x1c, 0x13, 0x56, 0x1e, 0x03, 0x46, 0x0e, 0x11, 0xca, 0x89, 0x46, 0xfc, 0x89, -0x56, 0xfe, 0x8b, 0x76, 0x11, 0x60, 0x31, 0xd2, 0xb8, 0x20, 0x00, 0xf7, 0xe6, 0x8b, 0x5e, 0x0b, -0x01, 0xd8, 0x48, 0xf7, 0xf3, 0x01, 0x46, 0xfc, 0x11, 0x4e, 0xfe, 0x61, 0xbb, 0xe0, 0x07, 0x8e, -0xc3, 0x31, 0xdb, 0x31, 0xc9, 0x41, 0x31, 0xff, 0x06, 0xe8, 0x78, 0x00, 0x07, 0x26, 0x38, 0x2d, -0x74, 0x38, 0x60, 0xb1, 0x0b, 0xbe, 0xef, 0x7d, 0xf3, 0xa6, 0x61, 0x74, 0x0e, 0x4e, 0x74, 0x2a, -0x83, 0xc7, 0x20, 0x81, 0xff, 0x00, 0x02, 0x72, 0xe4, 0xeb, 0xd1, 0x26, 0x8b, 0x45, 0x1a, 0x50, -0x68, 0x00, 0x08, 0x07, 0xe8, 0x3c, 0x00, 0x58, 0xc7, 0x46, 0xf6, 0x44, 0x7d, 0xc7, 0x46, 0xf4, -0x33, 0x7d, 0xc7, 0x46, 0xf2, 0x1c, 0x7d, 0xe9, 0xf9, 0x02, 0xbe, 0xc7, 0x7d, 0xe8, 0x0c, 0x00, -0xbe, 0xdf, 0x7d, 0xe8, 0x06, 0x00, 0x31, 0xc0, 0xcd, 0x16, 0xcd, 0x19, 0xac, 0x08, 0xc0, 0x74, -0x09, 0xb4, 0x0e, 0xbb, 0x07, 0x00, 0xcd, 0x10, 0xeb, 0xf2, 0xc3, 0xbe, 0xba, 0x7d, 0xe8, 0xeb, -0xff, 0xeb, 0xdd, 0x48, 0x48, 0x30, 0xed, 0x8a, 0x4e, 0x0d, 0xf7, 0xe1, 0x03, 0x46, 0xfc, 0x13, -0x56, 0xfe, 0x31, 0xdb, 0x60, 0x49, 0x01, 0xc8, 0x83, 0xd2, 0x00, 0x3b, 0x56, 0xfa, 0x77, 0x07, -0x72, 0x31, 0x3b, 0x46, 0xf8, 0x76, 0x2c, 0x61, 0x60, 0x66, 0x6a, 0x00, 0x52, 0x50, 0x06, 0x53, -0x6a, 0x01, 0x6a, 0x10, 0x89, 0xe6, 0x8a, 0x56, 0x24, 0xb4, 0x42, 0xcd, 0x13, 0x72, 0xbc, 0x83, -0xc4, 0x10, 0x61, 0x40, 0x83, 0xd2, 0x00, 0x53, 0x8c, 0xc3, 0x83, 0xc3, 0x20, 0x8e, 0xc3, 0x5b, -0xe2, 0xd6, 0xc3, 0x61, 0x60, 0x91, 0x92, 0x31, 0xd2, 0xf7, 0x76, 0x18, 0x91, 0xf7, 0x76, 0x18, -0x42, 0x87, 0xca, 0xf7, 0x76, 0x1a, 0x88, 0xd6, 0x8a, 0x56, 0x24, 0x88, 0xc5, 0xc0, 0xcc, 0x02, -0x08, 0xe1, 0xb8, 0x01, 0x02, 0xcd, 0x13, 0x72, 0x82, 0x61, 0x40, 0x75, 0x01, 0x42, 0x53, 0x8c, -0xc3, 0x83, 0xc3, 0x20, 0x8e, 0xc3, 0x5b, 0xe2, 0xcb, 0xc3, 0x44, 0x69, 0x73, 0x6b, 0x20, 0x65, -0x72, 0x72, 0x6f, 0x72, 0x0d, 0x0a, 0x00, 0x66, 0x72, 0x65, 0x65, 0x6c, 0x64, 0x72, 0x2e, 0x73, -0x79, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x0d, 0x0a, 0x00, 0x50, -0x72, 0x65, 0x73, 0x73, 0x20, 0x61, 0x6e, 0x79, 0x20, 0x6b, 0x65, 0x79, 0x0d, 0x0a, 0x00, 0x46, -0x52, 0x45, 0x45, 0x4c, 0x44, 0x52, 0x20, 0x53, 0x59, 0x53, 0x00, 0x00, 0x00, 0x00, 0x55, 0xaa -}; Removed: trunk/reactos/boot/freeldr/bootsect/fat32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.h (removed) @@ -1,67 +0,0 @@ -unsigned char fat32_data[] = { - -0xeb, 0x58, 0x90, 0x46, 0x72, 0x4c, 0x64, 0x72, 0x31, 0x2e, 0x30, 0x00, 0x02, 0x00, 0x20, 0x00, -0x02, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x4f, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x20, -0x20, 0x20, 0x46, 0x41, 0x54, 0x33, 0x32, 0x20, 0x20, 0x20, 0x31, 0xc0, 0x8e, 0xd8, 0x8e, 0xc0, -0x8e, 0xd0, 0xbd, 0x00, 0x7c, 0xbc, 0x00, 0x7c, 0x80, 0x7e, 0x40, 0xff, 0x75, 0x03, 0x88, 0x56, -0x40, 0x83, 0x7e, 0x16, 0x00, 0x75, 0x0d, 0x66, 0x83, 0x7e, 0x11, 0x00, 0x75, 0x06, 0x83, 0x7e, -0x2a, 0x00, 0x76, 0x03, 0xe9, 0xff, 0x00, 0xb8, 0x00, 0x08, 0x8a, 0x56, 0x40, 0xcd, 0x13, 0x73, -0x05, 0xb9, 0xff, 0xff, 0x88, 0xce, 0x88, 0xeb, 0x88, 0xcf, 0xc0, 0xef, 0x06, 0x80, 0xe1, 0x3f, -0x66, 0x0f, 0xb6, 0xc6, 0x66, 0x0f, 0xb7, 0xdb, 0x66, 0x0f, 0xb6, 0xc9, 0x66, 0x40, 0x66, 0x43, -0x66, 0xf7, 0xe1, 0x66, 0xf7, 0xe3, 0x66, 0xa3, 0xa7, 0x7d, 0x66, 0xb8, 0x0e, 0x00, 0x00, 0x00, -0x66, 0x03, 0x46, 0x1c, 0xb9, 0x01, 0x00, 0x31, 0xdb, 0x8e, 0xc3, 0xbb, 0x00, 0x7e, 0xe8, 0x03, -0x00, 0xe9, 0x2c, 0x01, 0x66, 0x3b, 0x06, 0xa7, 0x7d, 0x73, 0x1b, 0x66, 0x60, 0xb4, 0x41, 0xbb, -0xaa, 0x55, 0x8a, 0x56, 0x40, 0xcd, 0x13, 0x72, 0x55, 0x81, 0xfb, 0x55, 0xaa, 0x75, 0x4f, 0xf6, -0xc1, 0x01, 0x74, 0x4a, 0x66, 0x61, 0x66, 0x60, 0x81, 0xf9, 0x40, 0x00, 0x76, 0x03, 0xb9, 0x40, -0x00, 0x89, 0x0e, 0x3a, 0x7d, 0x66, 0x6a, 0x00, 0x66, 0x50, 0x06, 0x53, 0x51, 0x6a, 0x10, 0x89, -0xe6, 0x8a, 0x56, 0x40, 0xb4, 0x42, 0xcd, 0x13, 0x72, 0x63, 0x83, 0xc4, 0x10, 0x66, 0x61, 0x53, -0x66, 0x8b, 0x1e, 0x3a, 0x7d, 0x66, 0x01, 0xd8, 0x66, 0xc1, 0xe3, 0x05, 0x8c, 0xc2, 0x01, 0xda, -0x8e, 0xc2, 0x5b, 0x2b, 0x0e, 0x3a, 0x7d, 0x75, 0xbd, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x66, 0x61, -0x66, 0x60, 0x66, 0x31, 0xd2, 0x66, 0x0f, 0xb7, 0x4e, 0x18, 0x66, 0xf7, 0xf1, 0xfe, 0xc2, 0x88, -0xd1, 0x66, 0x89, 0xc2, 0x66, 0xc1, 0xea, 0x10, 0xf7, 0x76, 0x1a, 0x88, 0xd6, 0x8a, 0x56, 0x40, -0x88, 0xc5, 0xd0, 0xcc, 0xd0, 0xcc, 0x08, 0xe1, 0xb8, 0x01, 0x02, 0xcd, 0x13, 0x72, 0x0e, 0x66, -0x61, 0x66, 0x40, 0x8c, 0xc2, 0x83, 0xc2, 0x20, 0x8e, 0xc2, 0xe2, 0xc4, 0xc3, 0xbe, 0xab, 0x7d, -0xe8, 0x15, 0x00, 0xe9, 0x06, 0x00, 0xbe, 0xb8, 0x7d, 0xe8, 0x0c, 0x00, 0xbe, 0xcc, 0x7d, 0xe8, -0x06, 0x00, 0x31, 0xc0, 0xcd, 0x16, 0xcd, 0x19, 0xac, 0x08, 0xc0, 0x74, 0x09, 0xb4, 0x0e, 0xbb, -0x07, 0x00, 0xcd, 0x10, 0xeb, 0xf2, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x44, 0x69, 0x73, 0x6b, 0x20, -0x65, 0x72, 0x72, 0x6f, 0x72, 0x0d, 0x0a, 0x00, 0x46, 0x69, 0x6c, 0x65, 0x20, 0x73, 0x79, 0x73, -0x74, 0x65, 0x6d, 0x20, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x0d, 0x0a, 0x00, 0x50, 0x72, 0x65, 0x73, -0x73, 0x20, 0x61, 0x6e, 0x79, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x74, 0x6f, 0x20, 0x72, 0x65, 0x73, -0x74, 0x61, 0x72, 0x74, 0x0d, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0xaa, -0x66, 0x8b, 0x46, 0x2c, 0x66, 0x3d, 0xf8, 0xff, 0xff, 0x0f, 0x72, 0x03, 0xe9, 0x67, 0x01, 0xbb, -0x00, 0x20, 0x8e, 0xc3, 0xe8, 0x27, 0x01, 0x31, 0xdb, 0x8a, 0x5e, 0x0d, 0xc1, 0xe3, 0x04, 0xb8, -0x00, 0x20, 0x8e, 0xc0, 0x31, 0xff, 0xbe, 0x9d, 0x7f, 0xb9, 0x0b, 0x00, 0xf3, 0xa6, 0x74, 0x2a, -0x4b, 0x75, 0x03, 0xe9, 0x40, 0x01, 0x8c, 0xc0, 0x05, 0x02, 0x00, 0x8e, 0xc0, 0x31, 0xff, 0xbe, -0x9d, 0x7f, 0xb9, 0x0b, 0x00, 0xf3, 0xa6, 0x74, 0x11, 0x4b, 0x75, 0xea, 0x66, 0x8b, 0x46, 0x2c, -0xe8, 0x6f, 0x00, 0x66, 0x89, 0x46, 0x2c, 0xe9, 0xa6, 0xff, 0xbe, 0xa8, 0x7f, 0xe8, 0x38, 0xff, -0x31, 0xff, 0x31, 0xd2, 0x26, 0x8b, 0x45, 0x14, 0x66, 0xc1, 0xe0, 0x10, 0x26, 0x8b, 0x45, 0x1a, -0x66, 0x3d, 0x02, 0x00, 0x00, 0x00, 0x73, 0x03, 0xe9, 0x0b, 0xff, 0x66, 0x3d, 0xf8, 0xff, 0xff, -0x0f, 0x72, 0x03, 0xe9, 0x00, 0xff, 0xbb, 0x00, 0x08, 0x8e, 0xc3, 0x66, 0x3d, 0xf8, 0xff, 0xff, -0x0f, 0x73, 0x21, 0x66, 0x50, 0x31, 0xdb, 0x06, 0xe8, 0xa3, 0x00, 0x07, 0x31, 0xdb, 0x8a, 0x5e, -0x0d, 0xc1, 0xe3, 0x05, 0x8c, 0xc0, 0x01, 0xd8, 0x8e, 0xc0, 0x66, 0x58, 0x06, 0xe8, 0x12, 0x00, -0x07, 0xe9, 0xd7, 0xff, 0x8a, 0x56, 0x40, 0x8a, 0x36, 0xfd, 0x7d, 0x31, 0xc0, 0x50, 0x68, 0x00, -0x80, 0xcb, 0x66, 0xc1, 0xe0, 0x02, 0x66, 0x89, 0xc1, 0x66, 0x31, 0xd2, 0x66, 0x0f, 0xb7, 0x5e, -0x0b, 0x66, 0x53, 0x66, 0xf7, 0xf3, 0x66, 0x0f, 0xb7, 0x5e, 0x0e, 0x66, 0x01, 0xd8, 0x66, 0x8b, -0x5e, 0x1c, 0x66, 0x01, 0xd8, 0x66, 0x5b, 0x66, 0x4b, 0x66, 0x21, 0xd9, 0x66, 0x0f, 0xb7, 0x5e, -0x28, 0x81, 0xe3, 0x0f, 0x00, 0x74, 0x16, 0x3a, 0x5e, 0x10, 0x72, 0x03, 0xe9, 0x87, 0xfe, 0x66, -0x50, 0x66, 0x8b, 0x46, 0x24, 0x66, 0xf7, 0xe3, 0x66, 0x5a, 0x66, 0x01, 0xd0, 0x66, 0x51, 0x66, -0x3b, 0x06, 0x3a, 0x7f, 0x74, 0x11, 0x66, 0xa3, 0x3a, 0x7f, 0xbb, 0x00, 0x70, 0x8e, 0xc3, 0x31, -0xdb, 0xb9, 0x01, 0x00, 0xe8, 0xad, 0xfd, 0xbb, 0x00, 0x70, 0x8e, 0xc3, 0x66, 0x59, 0x26, 0x66, -0x67, 0x8b, 0x01, 0x66, 0x25, 0xff, 0xff, 0xff, 0x0f, 0xc3, 0xff, 0xff, 0xff, 0xff, 0x66, 0x48, -0x66, 0x48, 0x66, 0x31, 0xd2, 0x66, 0x0f, 0xb6, 0x5e, 0x0d, 0x66, 0xf7, 0xe3, 0x66, 0x50, 0x66, -0x31, 0xd2, 0x66, 0x0f, 0xb6, 0x46, 0x10, 0x66, 0xf7, 0x66, 0x24, 0x66, 0x0f, 0xb7, 0x5e, 0x0e, -0x66, 0x01, 0xd8, 0x66, 0x03, 0x46, 0x1c, 0x66, 0x5b, 0x66, 0x01, 0xd8, 0x31, 0xdb, 0x0f, 0xb6, -0x4e, 0x0d, 0xe8, 0x5f, 0xfd, 0xc3, 0xbe, 0x85, 0x7f, 0xe8, 0x1c, 0xfe, 0xbe, 0xcc, 0x7d, 0xe8, -0x16, 0xfe, 0xe9, 0x07, 0xfe, 0x66, 0x72, 0x65, 0x65, 0x6c, 0x64, 0x72, 0x2e, 0x73, 0x79, 0x73, -0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x0d, 0x0a, 0x00, 0x46, 0x52, 0x45, -0x45, 0x4c, 0x44, 0x52, 0x20, 0x53, 0x59, 0x53, 0x4c, 0x6f, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x20, -0x46, 0x72, 0x65, 0x65, 0x4c, 0x6f, 0x61, 0x64, 0x65, 0x72, 0x2e, 0x2e, 0x2e, 0x0d, 0x0a, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0xaa -}; Modified: trunk/reactos/boot/freeldr/install/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/install/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/install/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/install/CMakeLists.txt [iso-8859-1] Fri Jan 9 00:12:51 2015 @@ -1,7 +1,23 @@ + +##################################### +# Generate the FAT bootsector source files +# +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/fat.c ${CMAKE_CURRENT_BINARY_DIR}/fat.h + COMMAND native-bin2c ${CMAKE_CURRENT_BINARY_DIR}/../bootsect/fat.bin ${CMAKE_CURRENT_BINARY_DIR}/fat.c ${CMAKE_CURRENT_BINARY_DIR}/fat.h fat_data + DEPENDS native-bin2c fat) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/fat32.c ${CMAKE_CURRENT_BINARY_DIR}/fat32.h + COMMAND native-bin2c ${CMAKE_CURRENT_BINARY_DIR}/../bootsect/fat32.bin ${CMAKE_CURRENT_BINARY_DIR}/fat32.c ${CMAKE_CURRENT_BINARY_DIR}/fat32.h fat32_data + DEPENDS native-bin2c fat32) +##################################### add_executable(installfreeldr EXCLUDE_FROM_ALL install.c - volume.c) + volume.c + ${CMAKE_CURRENT_BINARY_DIR}/fat.c + ${CMAKE_CURRENT_BINARY_DIR}/fat32.c) set_module_type(installfreeldr win32cui) add_importlibs(installfreeldr msvcrt kernel32) Modified: trunk/reactos/boot/freeldr/install/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/install/insta… ============================================================================== --- trunk/reactos/boot/freeldr/install/install.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/install/install.c [iso-8859-1] Fri Jan 9 00:12:51 2015 @@ -23,8 +23,13 @@ #include <stdio.h> #include "install.h" #include "volume.h" -#include "../bootsect/fat.h" -#include "../bootsect/fat32.h" + +/* + * These includes are required to define + * the fat_data and fat32_data arrays. + */ +#include "fat.h" +#include "fat32.h" BOOL BackupBootSector(LPCTSTR lpszVolumeName); BOOL InstallBootSector(LPCTSTR lpszVolumeType);

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