Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 65909: [FREELDR] Simplify the stack management in PxeCallApi(), we don't need that much
by pschweitzer＠svn.reactos.org 30 Dec '14

30 Dec '14

Author: pschweitzer Date: Tue Dec 30 13:51:41 2014 New Revision: 65909 URL: http://svn.reactos.org/svn/reactos?rev=65909&view=rev Log: [FREELDR] Simplify the stack management in PxeCallApi(), we don't need that much Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Tue Dec 30 13:51:41 2014 @@ -158,40 +158,32 @@ */ PUBLIC _PxeCallApi _PxeCallApi: - push ebp - mov ebp, esp - - pusha - push es - /* copy entry point */ - mov eax, [ebp + 8] + mov eax, [esp + 4] shl eax, 16 - mov ax, [ebp + 12] + mov ax, [esp + 8] mov dword ptr ds:[BSS_PxeEntryPoint], eax /* copy function */ - mov ax, [ebp + 16] + mov ax, [esp + 12] mov word ptr ds:[BSS_PxeFunction], ax /* convert pointer to data buffer to segment/offset */ - mov eax, [ebp + 20] + mov eax, [esp + 16] shr eax, 4 and eax, HEX(0f000) mov word ptr ds:[BSS_PxeBufferSegment], ax - mov eax, [ebp + 20] + mov eax, [esp + 16] and eax, HEX(0ffff) mov word ptr ds:[BSS_PxeBufferOffset], ax + + pusha /* Set the function ID and call realmode */ mov bx, FNID_PxeCallApi call i386CallRealMode - pop es popa - - mov esp, ebp - pop ebp mov ax, word ptr [BSS_PxeResult]

1 0

[tkreuzer] 65908: [GDI32] Remove some breakpoints and add some DPRINTs.
by tkreuzer＠svn.reactos.org 30 Dec '14

30 Dec '14

Author: tkreuzer Date: Tue Dec 30 13:21:48 2014 New Revision: 65908 URL: http://svn.reactos.org/svn/reactos?rev=65908&view=rev Log: [GDI32] Remove some breakpoints and add some DPRINTs. Modified: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c Modified: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/ros… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] Tue Dec 30 13:21:48 2014 @@ -233,7 +233,6 @@ if (eObjType == GDILoObjType_LO_ALTDC_TYPE) { /* Object is stored as LDC */ - __debugbreak(); return GdiGetLDC(hobj); } @@ -847,7 +846,8 @@ _va_arg_n(argptr, const POINT*, 0), _va_arg_n(argptr, DWORD, 1)); case DCFUNC_PolyDraw: - __debugbreak(); // not implemented + DPRINT1("DCFUNC_PolyDraw not implemented\n");; + return FALSE; return physdev->funcs->pPolyDraw(physdev, _va_arg_n(argptr, const POINT*, 1), _va_arg_n(argptr, const BYTE*, 1), @@ -861,7 +861,8 @@ _va_arg_n(argptr, const POINT*, 0), _va_arg_n(argptr, INT, 1)); case DCFUNC_PolylineTo: - __debugbreak(); // not implemented + DPRINT1("DCFUNC_PolylineTo not implemented\n");; + return FALSE; return physdev->funcs->pPolylineTo(physdev, _va_arg_n(argptr, const POINT*, 0), _va_arg_n(argptr, INT, 1)); @@ -1175,11 +1176,10 @@ METADC_DeleteDC( _In_ HDC hdc) { - __debugbreak(); - /* Only ALTDCs are supported */ if (GDI_HANDLE_GET_TYPE(hdc) != GDILoObjType_LO_ALTDC_TYPE) { + DPRINT1("Trying to delete METADC %p\n", hdc); return FALSE; } // FIXME call the driver?

1 0

[pschweitzer] 65907: [FREELDR] Tab -> spaces
by pschweitzer＠svn.reactos.org 30 Dec '14

30 Dec '14

Author: pschweitzer Date: Tue Dec 30 13:14:33 2014 New Revision: 65907 URL: http://svn.reactos.org/svn/reactos?rev=65907&view=rev Log: [FREELDR] Tab -> spaces Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Tue Dec 30 13:14:33 2014 @@ -31,22 +31,22 @@ PUBLIC _RealEntryPoint _RealEntryPoint: - /* Setup segment selectors */ - mov ax, PMODE_DS - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax + /* Setup segment selectors */ + mov ax, PMODE_DS + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax /* Setup protected mode stack */ - mov esp, dword ptr ds:[stack32] - - /* Load the IDT */ + mov esp, dword ptr ds:[stack32] + + /* Load the IDT */ #ifdef _USE_ML lidt fword ptr ds:[i386idtptr] #else - lidt i386idtptr + lidt i386idtptr #endif /* Continue execution */ @@ -59,10 +59,10 @@ _FrldrStartup: /* Store BootDrive and BootPartition */ - mov byte ptr ds:[_FrldrBootDrive], dl - xor eax, eax + mov byte ptr ds:[_FrldrBootDrive], dl + xor eax, eax mov al, dh - mov dword ptr ds:[_FrldrBootPartition], eax + mov dword ptr ds:[_FrldrBootPartition], eax /* Patch long jump with real mode entry point */ mov eax, dword ptr ds:[BSS_RealModeEntry] @@ -86,20 +86,20 @@ xor eax, eax #endif - /* GO! */ - push eax - call _BootMain - - /* We should never get here */ + /* GO! */ + push eax + call _BootMain + + /* We should never get here */ stop: - jmp stop - nop - nop + jmp stop + nop + nop Int386_regsin: - .long 0 + .long 0 Int386_regsout: - .long 0 + .long 0 /* * int Int386(int ivec, REGS* in, REGS* out); @@ -107,20 +107,20 @@ PUBLIC _Int386 _Int386: - /* Get the function parameters */ - mov eax, dword ptr [esp + 4] + /* Get the function parameters */ + mov eax, dword ptr [esp + 4] mov dword ptr ds:[BSS_IntVector], eax - mov eax, dword ptr [esp + 8] - mov dword ptr [Int386_regsin], eax - mov eax, dword ptr [esp + 12] - mov dword ptr [Int386_regsout], eax - - /* Save all registers + segment registers */ - push ds - push es - push fs - push gs - pusha + mov eax, dword ptr [esp + 8] + mov dword ptr [Int386_regsin], eax + mov eax, dword ptr [esp + 12] + mov dword ptr [Int386_regsout], eax + + /* Save all registers + segment registers */ + push ds + push es + push fs + push gs + pusha /* Copy input registers */ mov esi, dword ptr [Int386_regsin] @@ -233,17 +233,17 @@ * bx must be set to the ID of the realmode function to call. */ SwitchToReal: /* Set sane segments */ - mov ax, PMODE_DS - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax - - /* Save 32-bit stack pointer */ - mov dword ptr [stack32], esp - - /* jmp to 16-bit segment to set the limit correctly */ + mov ax, PMODE_DS + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax + + /* Save 32-bit stack pointer */ + mov dword ptr [stack32], esp + + /* jmp to 16-bit segment to set the limit correctly */ .byte HEX(0ea) // jmp far RMODE_CS:switch_to_real16 SwitchToReal16Address: .long 0 // receives address of switch_to_real16 @@ -251,55 +251,55 @@ nop - /* 16-bit stack pointer */ + /* 16-bit stack pointer */ stack16: - .word STACK16ADDR - - /* 32-bit stack pointer */ + .word STACK16ADDR + + /* 32-bit stack pointer */ stack32: - .long STACKADDR + .long STACKADDR .align 4 /* force 4-byte alignment */ gdt: - /* NULL Descriptor */ - .word HEX(0000) - .word HEX(0000) - .word HEX(0000) - .word HEX(0000) - - /* 32-bit flat CS */ - .word HEX(FFFF) - .word HEX(0000) - .word HEX(9A00) - .word HEX(00CF) - - /* 32-bit flat DS */ - .word HEX(FFFF) - .word HEX(0000) - .word HEX(9200) - .word HEX(00CF) - - /* 16-bit real mode CS */ - .word HEX(FFFF) - .word HEX(0000) - .word HEX(9E00) - .word HEX(0000) - - /* 16-bit real mode DS */ - .word HEX(FFFF) - .word HEX(0000) - .word HEX(9200) - .word HEX(0000) + /* NULL Descriptor */ + .word HEX(0000) + .word HEX(0000) + .word HEX(0000) + .word HEX(0000) + + /* 32-bit flat CS */ + .word HEX(FFFF) + .word HEX(0000) + .word HEX(9A00) + .word HEX(00CF) + + /* 32-bit flat DS */ + .word HEX(FFFF) + .word HEX(0000) + .word HEX(9200) + .word HEX(00CF) + + /* 16-bit real mode CS */ + .word HEX(FFFF) + .word HEX(0000) + .word HEX(9E00) + .word HEX(0000) + + /* 16-bit real mode DS */ + .word HEX(FFFF) + .word HEX(0000) + .word HEX(9200) + .word HEX(0000) /* GDT table pointer */ gdtptr: - .word HEX(27) /* Limit */ - .long gdt /* Base Address */ + .word HEX(27) /* Limit */ + .long gdt /* Base Address */ /* Real-mode IDT pointer */ rmode_idtptr: - .word HEX(3ff) /* Limit */ - .long 0 /* Base Address */ + .word HEX(3ff) /* Limit */ + .long 0 /* Base Address */ PUBLIC i386idtptr i386idtptr:

1 0

[hbelusca] 65906: [CALC] Use RegCreateKeyEx to be able to create the settings registry key in case it doesn't already exist. Patch by Ricardo Hanke. CORE-8986 #resolve #comment Fixed, thanks!
by hbelusca＠svn.reactos.org 30 Dec '14

30 Dec '14

Author: hbelusca Date: Tue Dec 30 12:21:04 2014 New Revision: 65906 URL: http://svn.reactos.org/svn/reactos?rev=65906&view=rev Log: [CALC] Use RegCreateKeyEx to be able to create the settings registry key in case it doesn't already exist. Patch by Ricardo Hanke. CORE-8986 #resolve #comment Fixed, thanks! Modified: trunk/reactos/base/applications/calc/winmain.c Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Tue Dec 30 12:21:04 2014 @@ -286,7 +286,7 @@ HKEY hKey; DWORD sepValue; - if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Calc"), 0, KEY_ALL_ACCESS, &hKey) != ERROR_SUCCESS ) + if (RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Calc"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL) != ERROR_SUCCESS) { return; }

1 0

[hpoussin] 65905: [FREELDR] Make the disk read buffer size dynamic CORE-8772 CORE-8899 #resolve #comment Should be fixed in r65904. Thanks for reporting.
by hpoussin＠svn.reactos.org 30 Dec '14

30 Dec '14

Author: hpoussin Date: Tue Dec 30 11:53:09 2014 New Revision: 65905 URL: http://svn.reactos.org/svn/reactos?rev=65905&view=rev Log: [FREELDR] Make the disk read buffer size dynamic CORE-8772 CORE-8899 #resolve #comment Should be fixed in r65904. Thanks for reporting. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] Tue Dec 30 11:53:09 2014 @@ -119,7 +119,7 @@ ULONGLONG SectorOffset; TotalSectors = (N + Context->SectorSize - 1) / Context->SectorSize; - MaxSectors = DISKREADBUFFER_SIZE / Context->SectorSize; + MaxSectors = PcDiskReadBufferSize / Context->SectorSize; SectorOffset = Context->SectorNumber + Context->SectorOffset; ret = 1; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Tue Dec 30 11:53:09 2014 @@ -40,6 +40,7 @@ BIOS_MEMORY_MAP PcBiosMemoryMap[MAX_BIOS_DESCRIPTORS]; ULONG PcBiosMapCount; +ULONG PcDiskReadBufferSize; FREELDR_MEMORY_DESCRIPTOR PcMemoryMap[MAX_BIOS_DESCRIPTORS + 1] = { @@ -201,7 +202,7 @@ bit value at address 0x413 inside the BDA, which gives us the usable size in KB */ Size = (*(PUSHORT)(ULONG_PTR)0x413) * 1024; - if (Size < MEMORY_MARGIN) + if (Size < DISKREADBUFFER || Size - DISKREADBUFFER < MIN_DISKREADBUFFER_SIZE) { FrLdrBugCheckWithMessage( MEMORY_INIT_FAILURE, @@ -211,6 +212,12 @@ "If you see this, please report to the ReactOS team!", Size); } + PcDiskReadBufferSize = (Size - DISKREADBUFFER) & ~0xfff; + if (PcDiskReadBufferSize > MAX_DISKREADBUFFER_SIZE) + { + PcDiskReadBufferSize = MAX_DISKREADBUFFER_SIZE; + } + TRACE("PcDiskReadBufferSize=0x%x\n", PcDiskReadBufferSize); /* Get the address of the Extended BIOS Data Area (EBDA). * Int 15h, AH=C1h @@ -229,7 +236,7 @@ { /* Check if this is high enough */ ULONG EbdaBase = (ULONG)Regs.w.es << 4; - if (EbdaBase < MEMORY_MARGIN) + if (EbdaBase < DISKREADBUFFER || EbdaBase - DISKREADBUFFER < MIN_DISKREADBUFFER_SIZE) { FrLdrBugCheckWithMessage( MEMORY_INIT_FAILURE, @@ -238,6 +245,11 @@ "The location of your EBDA is 0x%lx, which is too low!\n\n" "If you see this, please report to the ReactOS team!", EbdaBase); + } + if (((EbdaBase - DISKREADBUFFER) & ~0xfff) < PcDiskReadBufferSize) + { + PcDiskReadBufferSize = (EbdaBase - DISKREADBUFFER) & ~0xfff; + TRACE("After EBDA check, PcDiskReadBufferSize=0x%x\n", PcDiskReadBufferSize); } /* Calculate the (max) size of the EBDA */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] Tue Dec 30 11:53:09 2014 @@ -198,8 +198,8 @@ while (N > 0) { Length = N; - if (Length > DISKREADBUFFER_SIZE) - Length = DISKREADBUFFER_SIZE; + if (Length > PcDiskReadBufferSize) + Length = PcDiskReadBufferSize; Sectors = (Length + Context->SectorSize - 1) / Context->SectorSize; ret = MachDiskReadLogicalSectors( Context->DriveNumber, @@ -351,11 +351,11 @@ * harddisks. So, we set the buffer to known contents first, then try to * read. If the BIOS reports success but the buffer contents haven't * changed then we fail anyway */ - memset((PVOID) DISKREADBUFFER, 0xcd, DISKREADBUFFER_SIZE); + memset((PVOID) DISKREADBUFFER, 0xcd, PcDiskReadBufferSize); while (MachDiskReadLogicalSectors(0x80 + DiskCount, 0ULL, 1, (PVOID)DISKREADBUFFER)) { Changed = FALSE; - for (i = 0; ! Changed && i < DISKREADBUFFER_SIZE; i++) + for (i = 0; ! Changed && i < PcDiskReadBufferSize; i++) { Changed = ((PUCHAR)DISKREADBUFFER)[i] != 0xcd; } @@ -366,7 +366,7 @@ break; } DiskCount++; - memset((PVOID) DISKREADBUFFER, 0xcd, DISKREADBUFFER_SIZE); + memset((PVOID) DISKREADBUFFER, 0xcd, PcDiskReadBufferSize); } DiskReportError(TRUE); TRACE("BIOS reports %d harddisk%s\n", Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h [iso-8859-1] Tue Dec 30 11:53:09 2014 @@ -63,5 +63,6 @@ extern BIOS_MEMORY_MAP PcBiosMemoryMap[]; extern ULONG PcBiosMapCount; +extern ULONG PcDiskReadBufferSize; /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Tue Dec 30 11:53:09 2014 @@ -17,14 +17,14 @@ #define FREELDR_BASE HEX(F800) #define FREELDR_PE_BASE HEX(10000) #define DISKREADBUFFER HEX(8E000) /* Buffer to store data read in from the disk via the BIOS */ -#define MEMORY_MARGIN HEX(9A000) /* Highest usable address */ /* 9F000- 9FFFF is reserved for the EBDA */ #define BIOSCALLBUFSEGMENT (BIOSCALLBUFFER/16) /* Buffer to store temporary data for any Int386() call */ #define BIOSCALLBUFOFFSET HEX(0000) /* Buffer to store temporary data for any Int386() call */ #define BIOSCALLBUFSIZE PAGE_SIZE /* max is sizeof(VESA_SVGA_INFO) = 512 */ #define MAX_FREELDR_PE_SIZE (DISKREADBUFFER - FREELDR_PE_BASE) -#define DISKREADBUFFER_SIZE (MEMORY_MARGIN - DISKREADBUFFER) +#define MIN_DISKREADBUFFER_SIZE HEX(1000) +#define MAX_DISKREADBUFFER_SIZE HEX(20000) /* These addresses specify the realmode "BSS section" layout */ #define BSS_RealModeEntry (BSS_START + 0)

1 0

[hpoussin] 65904: [RAMDISK] Send the right DeviceObject in IRP_MN_QUERY_DEVICE_RELATIONS
by hpoussin＠svn.reactos.org 30 Dec '14

30 Dec '14

Author: hpoussin Date: Tue Dec 30 11:53:05 2014 New Revision: 65904 URL: http://svn.reactos.org/svn/reactos?rev=65904&view=rev Log: [RAMDISK] Send the right DeviceObject in IRP_MN_QUERY_DEVICE_RELATIONS 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] Tue Dec 30 11:53:05 2014 @@ -636,7 +636,7 @@ DriveExtension->GuidString = GuidString; DriveExtension->DiskGuid = Input->DiskGuid; DriveExtension->PhysicalDeviceObject = DeviceObject; - DriveExtension->DeviceObject = DeviceObject; + DriveExtension->DeviceObject = RamdiskBusFdo; DriveExtension->AttachedDevice = RamdiskBusFdo; DriveExtension->DiskType = Input->DiskType; DriveExtension->DiskOptions = Input->Options; @@ -1914,7 +1914,7 @@ // // Save the object pointer, and move on // - *DriveDeviceObject++ = DriveExtension->DeviceObject; + *DriveDeviceObject++ = DriveExtension->PhysicalDeviceObject; } if (DriveExtension->State < RamdiskStateBusRemoved) DiskCount++;

1 0

[hpoussin] 65903: [RAMDISK] Set correct device object in drive extension This allows booting ReactOS livecd using PXE. Welcome ReactOS to the world of computers without harddisk/cdrom.
by hpoussin＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: hpoussin Date: Mon Dec 29 23:21:25 2014 New Revision: 65903 URL: http://svn.reactos.org/svn/reactos?rev=65903&view=rev Log: [RAMDISK] Set correct device object in drive extension This allows booting ReactOS livecd using PXE. Welcome ReactOS to the world of computers without harddisk/cdrom. 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] Mon Dec 29 23:21:25 2014 @@ -636,7 +636,7 @@ DriveExtension->GuidString = GuidString; DriveExtension->DiskGuid = Input->DiskGuid; DriveExtension->PhysicalDeviceObject = DeviceObject; - DriveExtension->DeviceObject = RamdiskBusFdo; + DriveExtension->DeviceObject = DeviceObject; DriveExtension->AttachedDevice = RamdiskBusFdo; DriveExtension->DiskType = Input->DiskType; DriveExtension->DiskOptions = Input->Options;

1 0

[pschweitzer] 65902: [RAMDISK] Implement RamdiskQueryDeviceRelations() when the device is a drive According to Hervé, this allows booting ReactOS livecd using PXE (with one of his patch).
by pschweitzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: pschweitzer Date: Mon Dec 29 23:14:42 2014 New Revision: 65902 URL: http://svn.reactos.org/svn/reactos?rev=65902&view=rev Log: [RAMDISK] Implement RamdiskQueryDeviceRelations() when the device is a drive According to Hervé, this allows booting ReactOS livecd using PXE (with one of his patch). 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] Mon Dec 29 23:14:42 2014 @@ -1731,10 +1731,45 @@ DeviceExtension = DeviceObject->DeviceExtension; if (DeviceExtension->Type == RamdiskDrive) { - // - // FIXME: TODO - // - UNIMPLEMENTED_DBGBREAK(); + NTSTATUS Status; + PDEVICE_RELATIONS DeviceRelations; + + // + // We're a child device, only handle target device relations + // + if (Type != TargetDeviceRelation) + { + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + // + // 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 + // + ObReferenceObject(DeviceObject); + DeviceRelations->Objects[0] = DeviceObject; + DeviceRelations->Count = 1; + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + + // + // Return our processing & complete + // + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } //

1 0

[pschweitzer] 65901: [RAMDISK] Simplify & use IoCopyCurrentIrpStackLocationToNext()
by pschweitzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: pschweitzer Date: Mon Dec 29 22:55:21 2014 New Revision: 65901 URL: http://svn.reactos.org/svn/reactos?rev=65901&view=rev Log: [RAMDISK] Simplify & use IoCopyCurrentIrpStackLocationToNext() 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] Mon Dec 29 22:55:21 2014 @@ -2297,7 +2297,7 @@ RamdiskPnp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PIO_STACK_LOCATION IoStackLocation, NextIoStack; + PIO_STACK_LOCATION IoStackLocation; PRAMDISK_BUS_EXTENSION DeviceExtension; NTSTATUS Status; UCHAR Minor; @@ -2429,8 +2429,7 @@ // // Prepare next stack to pass it down // - NextIoStack = IoGetNextIrpStackLocation(Irp); - RtlCopyMemory(NextIoStack, IoStackLocation, sizeof(IO_STACK_LOCATION)); + IoCopyCurrentIrpStackLocationToNext(Irp); // // Initialize our notification event & our completion routine

1 0

[pschweitzer] 65900: [RAMDISK] - Implement RamdiskQueryCapabilities() which is used in case of IRP_MJ_PNP + IRP_MN_QUERY_CAPABILITIES - Implement RamdiskQueryDeviceText() which is used in case of I...
by pschweitzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: pschweitzer Date: Mon Dec 29 22:42:11 2014 New Revision: 65900 URL: http://svn.reactos.org/svn/reactos?rev=65900&view=rev Log: [RAMDISK] - Implement RamdiskQueryCapabilities() which is used in case of IRP_MJ_PNP + IRP_MN_QUERY_CAPABILITIES - Implement RamdiskQueryDeviceText() which is used in case of IRP_MJ_PNP + IRP_MN_QUERY_DEVICE_TEXT - Implement RamdiskQueryBusInformation() which is used in case of IRP_MJ_PNP + IRP_MN_QUERY_BUS_INFORMATION - Implement RamdiskIoCompletionRoutine() which is the completion routine in case of IRP forwarding - Also implement support for IRP_MJ_PNP + IRP_MN_START_DEVICE - Define the RamdiskDiskInterface GUID This slowly gets RamDisk driver PnP compliant... 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] Mon Dec 29 22:42:11 2014 @@ -62,6 +62,12 @@ 0x2F8A, 0x410F, 0x80, 0xE4, 0x05, 0xF8, 0x10, 0xE7, 0xA8, 0x8A); + +DEFINE_GUID(RamdiskDiskInterface, + 0x31D909F0, + 0x2CDF, + 0x4A20, + 0x9E, 0xD4, 0x7D, 0x65, 0x47, 0x6C, 0xA7, 0x68); typedef struct _RAMDISK_EXTENSION { @@ -2149,14 +2155,154 @@ NTSTATUS NTAPI +RamdiskQueryCapabilities(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PIO_STACK_LOCATION IoStackLocation; + PDEVICE_CAPABILITIES DeviceCapabilities; + PRAMDISK_DRIVE_EXTENSION DriveExtension; + + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + DeviceCapabilities = IoStackLocation->Parameters.DeviceCapabilities.Capabilities; + DriveExtension = DeviceObject->DeviceExtension; + + // + // 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 + // + DeviceCapabilities->Removable = MarkRamdisksAsRemovable; + DeviceCapabilities->UniqueID = TRUE; + DeviceCapabilities->SilentInstall = TRUE; + DeviceCapabilities->RawDeviceOK = TRUE; + DeviceCapabilities->SurpriseRemovalOK = (DriveExtension->DiskType != RAMDISK_REGISTRY_DISK); + DeviceCapabilities->NoDisplayInUI = TRUE; + Status = STATUS_SUCCESS; + } + + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI +RamdiskQueryDeviceText(IN PRAMDISK_DRIVE_EXTENSION DriveExtension, + IN PIRP Irp) +{ + NTSTATUS Status; + PIO_STACK_LOCATION IoStackLocation; + DEVICE_TEXT_TYPE DeviceTextType; + PWSTR OutputString = NULL; + + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + DeviceTextType = IoStackLocation->Parameters.QueryDeviceText.DeviceTextType; + Status = STATUS_SUCCESS; + + // + // Just copy our constants, according to the input + // + switch (DeviceTextType) + { + case DeviceTextDescription: + + OutputString = ExAllocatePoolWithTag(PagedPool, sizeof(L"RamDisk"), 'dmaR'); + if (OutputString == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + wcsncpy(OutputString, L"RamDisk", sizeof(L"RamDisk") / sizeof(WCHAR)); + + break; + + case DeviceTextLocationInformation: + + OutputString = ExAllocatePoolWithTag(PagedPool, sizeof(L"RamDisk\\0"), 'dmaR'); + if (OutputString == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + wcsncpy(OutputString, L"RamDisk\\0", sizeof(L"RamDisk\\0") / sizeof(WCHAR)); + + break; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = (ULONG_PTR)OutputString; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI +RamdiskQueryBusInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PPNP_BUS_INFORMATION PnpBusInfo; + NTSTATUS Status = STATUS_SUCCESS; + + // + // Allocate output memory + // + PnpBusInfo = ExAllocatePoolWithTag(PagedPool, sizeof(PNP_BUS_INFORMATION), 'dmaR'); + if (PnpBusInfo == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + else + { + // + // Copy our bus GUID and set our legacy type + // + RtlCopyMemory(&PnpBusInfo->BusTypeGuid, &GUID_BUS_TYPE_RAMDISK, sizeof(GUID)); + PnpBusInfo->LegacyBusType = PNPBus; + PnpBusInfo->BusNumber = 0; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = (ULONG_PTR)PnpBusInfo; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI +RamdiskIoCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) + +{ + // + // Just set the event to unlock caller + // + KeSetEvent((PKEVENT)Context, 0, FALSE); + + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +NTAPI RamdiskPnp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PIO_STACK_LOCATION IoStackLocation; + PIO_STACK_LOCATION IoStackLocation, NextIoStack; PRAMDISK_BUS_EXTENSION DeviceExtension; NTSTATUS Status; UCHAR Minor; - + KEVENT Event; + // // Get the device extension and stack location // @@ -2205,8 +2351,113 @@ switch (Minor) { case IRP_MN_START_DEVICE: - - UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor); + + if (DeviceExtension->Type == RamdiskDrive) + { + ULONG ResultLength; + DEVICE_INSTALL_STATE InstallState; + PRAMDISK_DRIVE_EXTENSION DriveExtension = (PRAMDISK_DRIVE_EXTENSION)DeviceExtension; + + // + // If we already have a drive name, free it + // + if (DriveExtension->DriveDeviceName.Buffer) + { + ExFreePool(DriveExtension->DriveDeviceName.Buffer); + } + + // + // Register our device interface + // + if (DriveExtension->DiskType != RAMDISK_REGISTRY_DISK) + { + Status = IoRegisterDeviceInterface(DeviceObject, + &GUID_DEVINTERFACE_VOLUME, + NULL, + &DriveExtension->DriveDeviceName); + } + else + { + Status = IoRegisterDeviceInterface(DeviceObject, + &RamdiskDiskInterface, + NULL, + &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 (DriveExtension->DiskOptions.NoDriveLetter || + DriveExtension->DriveDeviceName.Buffer == NULL) + { + DriveExtension->State = RamdiskStateStarted; + Irp->IoStatus.Status = Status; + break; + } + + // + // 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 (InstallState == InstallStateInstalled) + { + Status = IoSetDeviceInterfaceState(&DriveExtension->DriveDeviceName, TRUE); + } + + // + // We're fine & up + // + DriveExtension->State = RamdiskStateStarted; + Irp->IoStatus.Status = Status; + break; + } + + // + // Prepare next stack to pass it down + // + NextIoStack = IoGetNextIrpStackLocation(Irp); + RtlCopyMemory(NextIoStack, IoStackLocation, sizeof(IO_STACK_LOCATION)); + + // + // Initialize our notification event & our completion routine + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoSetCompletionRoutine(Irp, RamdiskIoCompletionRoutine, &Event, TRUE, TRUE, TRUE); + + // + // Call lower driver + // + Status = IoCallDriver(DeviceExtension->AttachedDevice, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + // + // If it succeed to start, then, enable ourselve and we're up! + // + if (NT_SUCCESS(Status)) + { + Status = IoSetDeviceInterfaceState(&DeviceExtension->DriveDeviceName, TRUE); + DeviceExtension->State = RamdiskStateStarted; + } + + Irp->IoStatus.Status = Status; break; case IRP_MN_QUERY_STOP_DEVICE: @@ -2286,7 +2537,7 @@ // if (DeviceExtension->Type == RamdiskDrive) { - UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor); + Status = RamdiskQueryBusInformation(DeviceObject, Irp); } break; @@ -2302,7 +2553,7 @@ // if (DeviceExtension->Type == RamdiskDrive) { - UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor); + Status = RamdiskQueryDeviceText((PRAMDISK_DRIVE_EXTENSION)DeviceExtension, Irp); } break; @@ -2325,7 +2576,7 @@ // if (DeviceExtension->Type == RamdiskDrive) { - UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor); + Status = RamdiskQueryCapabilities(DeviceObject, Irp); } break;

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