Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 68161: [NTDLL_APITEST] - Fix GCC build
by tfaber＠svn.reactos.org 16 Jun '15

16 Jun '15

Author: tfaber Date: Tue Jun 16 11:40:51 2015 New Revision: 68161 URL: http://svn.reactos.org/svn/reactos?rev=68161&view=rev Log: [NTDLL_APITEST] - Fix GCC build Modified: trunk/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c Modified: trunk/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtQueryVol… ============================================================================== --- trunk/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c [iso-8859-1] Tue Jun 16 11:40:51 2015 @@ -136,7 +136,7 @@ ok(IoStatusBlock.Information >= FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel), "IoStatusBlock.Information = %Iu, expected >=%lu\n", IoStatusBlock.Information, (ULONG)sizeof(FILE_FS_VOLUME_INFORMATION)); ok(VolumeInfo->VolumeCreationTime.QuadPart != 0x5555555555555555, "VolumeInfo->VolumeCreationTime = %I64d\n", VolumeInfo->VolumeCreationTime.QuadPart); - ok(VolumeInfo->VolumeSerialNumber != 0x55555555, "VolumeInfo->VolumeSerialNumber = %u\n", VolumeInfo->VolumeSerialNumber); + ok(VolumeInfo->VolumeSerialNumber != 0x55555555, "VolumeInfo->VolumeSerialNumber = %lu\n", VolumeInfo->VolumeSerialNumber); ok(VolumeInfo->SupportsObjects == FALSE || VolumeInfo->SupportsObjects == TRUE, "VolumeInfo->SupportsObjects = %u\n", VolumeInfo->SupportsObjects); ok(VolumeInfo->VolumeLabelLength % sizeof(WCHAR) == 0, "VolumeInfo->VolumeLabelLength = %Iu\n", VolumeInfo->VolumeLabelLength); if (VolumeInfo->VolumeLabelLength >= sizeof(WCHAR))

1 0

[tfaber] 68160: [NTDLL_APITEST] - Test FileFsVolumeInformation in NtQueryVolumeInformationFile test CORE-9820
by tfaber＠svn.reactos.org 16 Jun '15

16 Jun '15

Author: tfaber Date: Tue Jun 16 11:33:35 2015 New Revision: 68160 URL: http://svn.reactos.org/svn/reactos?rev=68160&view=rev Log: [NTDLL_APITEST] - Test FileFsVolumeInformation in NtQueryVolumeInformationFile test CORE-9820 Modified: trunk/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c Modified: trunk/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtQueryVol… ============================================================================== --- trunk/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c [iso-8859-1] Tue Jun 16 11:33:35 2015 @@ -10,30 +10,13 @@ #include <wine/test.h> #include <ndk/ntndk.h> -START_TEST(NtQueryVolumeInformationFile) +static +VOID +TestFileFsDeviceInformation(HANDLE handle) { IO_STATUS_BLOCK IoStatusBlock; FILE_FS_DEVICE_INFORMATION FileFsDevice; - OBJECT_ATTRIBUTES attr; - HANDLE handle; - WCHAR path[MAX_PATH]; - UNICODE_STRING pathW; NTSTATUS status; - - /*Store a valid Handle*/ - GetWindowsDirectoryW(path, MAX_PATH); - RtlDosPathNameToNtPathName_U(path, &pathW, NULL, NULL); - - InitializeObjectAttributes(&attr, &pathW, OBJ_CASE_INSENSITIVE, NULL, NULL); - status = NtOpenFile(&handle, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &IoStatusBlock, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT); - - RtlFreeUnicodeString(&pathW); - - if (!NT_SUCCESS(status)) - { - skip("NtOpenFile failed: 0x%lx\n", status); - return; - } /*Testing VALID handle, with NULL IN parameters*/ SetLastError(0xdeadb33f); @@ -69,17 +52,131 @@ ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Expected STATUS_OBJECT_TYPE_MISMATCH, got 0x%lx\n", status); ok(GetLastError() == 0xdeaddead, "Expected 0xdeaddead, got %lx\n", GetLastError()); + /*Almost all NULL. Then it checks against the Length!*/ + SetLastError(0xdeadbeef); + status = NtQueryVolumeInformationFile(NULL, NULL, NULL, 0, FileFsDeviceInformation); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got 0x%lx\n", status); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %lx\n", GetLastError()); +} + +static +VOID +TestFileFsVolumeInformation(HANDLE handle) +{ + IO_STATUS_BLOCK IoStatusBlock; + ULONG Buffer[(sizeof(FILE_FS_VOLUME_INFORMATION) + MAX_PATH * sizeof(WCHAR)) / sizeof(ULONG)]; + PFILE_FS_VOLUME_INFORMATION VolumeInfo = (PFILE_FS_VOLUME_INFORMATION)Buffer; + NTSTATUS status; + + status = NtQueryVolumeInformationFile(handle, NULL, NULL, 0, FileFsVolumeInformation); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Got status 0x%lx\n", status); + + RtlFillMemory(&IoStatusBlock, sizeof(IoStatusBlock), 0x55); + status = NtQueryVolumeInformationFile(handle, &IoStatusBlock, NULL, 0, FileFsVolumeInformation); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Got status 0x%lx\n", status); + ok(IoStatusBlock.Status == 0x55555555, "IoStatusBlock.Status = 0x%lx\n", IoStatusBlock.Status); + ok(IoStatusBlock.Information == (ULONG_PTR)0x5555555555555555, "IoStatusBlock.Information = %Iu\n", IoStatusBlock.Information); + + status = NtQueryVolumeInformationFile(handle, NULL, VolumeInfo, 0, FileFsVolumeInformation); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Got status 0x%lx\n", status); + + RtlFillMemory(&IoStatusBlock, sizeof(IoStatusBlock), 0x55); + status = NtQueryVolumeInformationFile(handle, &IoStatusBlock, (PUCHAR)Buffer + 2, sizeof(FILE_FS_VOLUME_INFORMATION), FileFsVolumeInformation); + ok(status == STATUS_DATATYPE_MISALIGNMENT, "Got status 0x%lx\n", status); + ok(IoStatusBlock.Status == 0x55555555, "IoStatusBlock.Status = 0x%lx\n", IoStatusBlock.Status); + ok(IoStatusBlock.Information == (ULONG_PTR)0x5555555555555555, "IoStatusBlock.Information = %Iu\n", IoStatusBlock.Information); + + RtlFillMemory(&IoStatusBlock, sizeof(IoStatusBlock), 0x55); + status = NtQueryVolumeInformationFile(handle, &IoStatusBlock, VolumeInfo, 0, FileFsVolumeInformation); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Got status 0x%lx\n", status); + ok(IoStatusBlock.Status == 0x55555555, "IoStatusBlock.Status = 0x%lx\n", IoStatusBlock.Status); + ok(IoStatusBlock.Information == (ULONG_PTR)0x5555555555555555, "IoStatusBlock.Information = %Iu\n", IoStatusBlock.Information); + + RtlFillMemory(&IoStatusBlock, sizeof(IoStatusBlock), 0x55); + status = NtQueryVolumeInformationFile(handle, &IoStatusBlock, VolumeInfo, FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel), FileFsVolumeInformation); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Got status 0x%lx\n", status); + ok(IoStatusBlock.Status == 0x55555555, "IoStatusBlock.Status = 0x%lx\n", IoStatusBlock.Status); + ok(IoStatusBlock.Information == (ULONG_PTR)0x5555555555555555, "IoStatusBlock.Information = %Iu\n", IoStatusBlock.Information); + + RtlFillMemory(&IoStatusBlock, sizeof(IoStatusBlock), 0x55); + status = NtQueryVolumeInformationFile(handle, &IoStatusBlock, VolumeInfo, sizeof(FILE_FS_VOLUME_INFORMATION) - 1, FileFsVolumeInformation); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Got status 0x%lx\n", status); + ok(IoStatusBlock.Status == 0x55555555, "IoStatusBlock.Status = 0x%lx\n", IoStatusBlock.Status); + ok(IoStatusBlock.Information == (ULONG_PTR)0x5555555555555555, "IoStatusBlock.Information = %Iu\n", IoStatusBlock.Information); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + RtlFillMemory(&IoStatusBlock, sizeof(IoStatusBlock), 0x55); + status = NtQueryVolumeInformationFile(handle, &IoStatusBlock, VolumeInfo, sizeof(FILE_FS_VOLUME_INFORMATION), FileFsVolumeInformation); + ok(status == STATUS_SUCCESS || status == STATUS_BUFFER_OVERFLOW, "Got status 0x%lx\n", status); + ok(IoStatusBlock.Status == status, "IoStatusBlock.Status = 0x%lx, expected 0x%lx\n", IoStatusBlock.Status, status); + if (status == STATUS_SUCCESS) + { + ok(VolumeInfo->VolumeLabelLength <= sizeof(FILE_FS_VOLUME_INFORMATION) - FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel), + "VolumeInfo->VolumeLabelLength = %Iu\n", VolumeInfo->VolumeLabelLength); + ok(IoStatusBlock.Information >= FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel), + "IoStatusBlock.Information = %Iu, expected >=%lu\n", IoStatusBlock.Information, (ULONG)FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel)); + ok(IoStatusBlock.Information <= sizeof(FILE_FS_VOLUME_INFORMATION), + "IoStatusBlock.Information = %Iu, expected <=%lu\n", IoStatusBlock.Information, (ULONG)sizeof(FILE_FS_VOLUME_INFORMATION)); + } + else + { + ok(VolumeInfo->VolumeLabelLength > sizeof(FILE_FS_VOLUME_INFORMATION) - FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel), + "VolumeInfo->VolumeLabelLength = %Iu\n", VolumeInfo->VolumeLabelLength); + ok(IoStatusBlock.Information == sizeof(FILE_FS_VOLUME_INFORMATION), + "IoStatusBlock.Information = %Iu, expected %lu\n", IoStatusBlock.Information, (ULONG)sizeof(FILE_FS_VOLUME_INFORMATION)); + } + ok(VolumeInfo->VolumeLabel[VolumeInfo->VolumeLabelLength / sizeof(WCHAR)] == 0x5555, + "Got %x\n", VolumeInfo->VolumeLabel[VolumeInfo->VolumeLabelLength / sizeof(WCHAR)]); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + RtlFillMemory(&IoStatusBlock, sizeof(IoStatusBlock), 0x55); + status = NtQueryVolumeInformationFile(handle, &IoStatusBlock, VolumeInfo, sizeof(Buffer), FileFsVolumeInformation); + ok(status == STATUS_SUCCESS, "Got status 0x%lx\n", status); + ok(IoStatusBlock.Status == STATUS_SUCCESS, "IoStatusBlock.Status = 0x%lx\n", IoStatusBlock.Status); + ok(IoStatusBlock.Information >= FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel), + "IoStatusBlock.Information = %Iu, expected >=%lu\n", IoStatusBlock.Information, (ULONG)sizeof(FILE_FS_VOLUME_INFORMATION)); + ok(VolumeInfo->VolumeCreationTime.QuadPart != 0x5555555555555555, "VolumeInfo->VolumeCreationTime = %I64d\n", VolumeInfo->VolumeCreationTime.QuadPart); + ok(VolumeInfo->VolumeSerialNumber != 0x55555555, "VolumeInfo->VolumeSerialNumber = %u\n", VolumeInfo->VolumeSerialNumber); + ok(VolumeInfo->SupportsObjects == FALSE || VolumeInfo->SupportsObjects == TRUE, "VolumeInfo->SupportsObjects = %u\n", VolumeInfo->SupportsObjects); + ok(VolumeInfo->VolumeLabelLength % sizeof(WCHAR) == 0, "VolumeInfo->VolumeLabelLength = %Iu\n", VolumeInfo->VolumeLabelLength); + if (VolumeInfo->VolumeLabelLength >= sizeof(WCHAR)) + ok(VolumeInfo->VolumeLabel[VolumeInfo->VolumeLabelLength / sizeof(WCHAR) - 1] != 0x5555, "Incorrect VolumeLabel or Length\n"); + ok(VolumeInfo->VolumeLabel[VolumeInfo->VolumeLabelLength / sizeof(WCHAR)] == 0x5555, + "Got %x\n", VolumeInfo->VolumeLabel[VolumeInfo->VolumeLabelLength / sizeof(WCHAR)]); +} + +START_TEST(NtQueryVolumeInformationFile) +{ + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES attr; + HANDLE handle; + WCHAR path[MAX_PATH]; + UNICODE_STRING pathW; + NTSTATUS status; + + /*Store a valid Handle*/ + GetWindowsDirectoryW(path, MAX_PATH); + RtlDosPathNameToNtPathName_U(path, &pathW, NULL, NULL); + + InitializeObjectAttributes(&attr, &pathW, OBJ_CASE_INSENSITIVE, NULL, NULL); + status = NtOpenFile(&handle, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &IoStatusBlock, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT); + + RtlFreeUnicodeString(&pathW); + + if (!NT_SUCCESS(status)) + { + skip("NtOpenFile failed: 0x%lx\n", status); + return; + } + /*Now all NULL. Priority check: FsInformationClass value!*/ SetLastError(0xcacacaca); status = NtQueryVolumeInformationFile(NULL, NULL, NULL, 0, 0); ok(status == STATUS_INVALID_INFO_CLASS, "Expected STATUS_INVALID_INFO_CLASS, got 0x%lx\n", status); ok(GetLastError() == 0xcacacaca, "Expected 0xcacacaca, got %lx\n", GetLastError()); - /*Almost all NULL. Then it checks against the Length!*/ - SetLastError(0xdeadbeef); - status = NtQueryVolumeInformationFile(NULL, NULL, NULL, 0, FileFsDeviceInformation); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got 0x%lx\n", status); - ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %lx\n", GetLastError()); + TestFileFsDeviceInformation(handle); + TestFileFsVolumeInformation(handle); NtClose(handle); }

1 0

[hbelusca] 68159: [NTVDM]: Commit what I have in my local wc so far (and which is commitable & works): - Simplify PicIRQComplete helper function. - Set up temporary stack for the BIOS. - Initialize...
by hbelusca＠svn.reactos.org 15 Jun '15

15 Jun '15

Author: hbelusca Date: Mon Jun 15 23:43:16 2015 New Revision: 68159 URL: http://svn.reactos.org/svn/reactos?rev=68159&view=rev Log: [NTVDM]: Commit what I have in my local wc so far (and which is commitable & works): - Simplify PicIRQComplete helper function. - Set up temporary stack for the BIOS. - Initialize the "User Data Area" that is found at 0050:xxxx (see http://helppc.netcore2k.net/table/memory-map for more details). - Some INT --> UINT - Simplify few macros. - Simplify DOS initialization; add few functions that will be useful later on. - Remove trailing whitespace. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c trunk/reactos/subsystems/mvdm/ntvdm/memory.c trunk/reactos/subsystems/mvdm/ntvdm/memory.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -111,14 +111,32 @@ DWORD EGAPtr; // 0xa8 BYTE Reserved12[68]; // 0xac BYTE Reserved13[16]; // 0xf0 +} BIOS_DATA_AREA, *PBIOS_DATA_AREA; +C_ASSERT(sizeof(BIOS_DATA_AREA) == 0x100); - DWORD Reserved14; // 0x100 - BYTE Reserved15[12]; // 0x104 - BYTE Reserved16[17]; // 0x110 - BYTE Reserved17[15]; // 0x121 - BYTE Reserved18[3]; // 0x130 -} BIOS_DATA_AREA, *PBIOS_DATA_AREA; -C_ASSERT(sizeof(BIOS_DATA_AREA) == 0x133); +/* + * User Data Area at 0050:XXXX + * + * See: http://helppc.netcore2k.net/table/memory-map + * for more information. + */ +typedef struct +{ + BYTE PrintScreen; // 0x00 + BYTE Basic0[3]; // 0x01 + BYTE SingleDisketteFlag; // 0x04 + BYTE PostArea[10]; // 0x05 + BYTE Basic1; // 0x0f + WORD Basic2; // 0x10 + DWORD Basic3; // 0x12 + DWORD Basic4; // 0x16 + DWORD Basic5; // 0x1a + WORD Reserved0; // 0x1e + WORD DynStorage; // 0x20 + BYTE DisketteInitStorage[14]; // 0x22 + DWORD Reserved1; // 0x30 +} USER_DATA_AREA, *PUSER_DATA_AREA; +C_ASSERT(sizeof(USER_DATA_AREA) == 0x34); /* * BIOS Configuration Table at F000:E6F5 for 100% compatible BIOSes. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -224,7 +224,7 @@ Return = (Value & getBH()) != 0; break; } - + /* Test and return if zero */ case 4: { @@ -554,15 +554,11 @@ } -VOID PicIRQComplete(LPWORD Stack) -{ - /* Get the interrupt number */ - BYTE IntNum = LOBYTE(Stack[STACK_INT_NUM]); - +VOID PicIRQComplete(BYTE IntNum) +{ /* * If this was a PIC IRQ, send an End-of-Interrupt to the PIC. */ - if (IntNum >= BIOS_PIC_MASTER_INT && IntNum < BIOS_PIC_MASTER_INT + 8) { /* It was an IRQ from the master PIC */ @@ -585,7 +581,7 @@ DPRINT("Master - IrqNumber = 0x%02X\n", IrqNumber); - PicIRQComplete(Stack); + PicIRQComplete(LOBYTE(Stack[STACK_INT_NUM])); } static VOID WINAPI BiosHandleSlavePicIRQ(LPWORD Stack) @@ -597,7 +593,7 @@ DPRINT("Slave - IrqNumber = 0x%02X\n", IrqNumber); - PicIRQComplete(Stack); + PicIRQComplete(LOBYTE(Stack[STACK_INT_NUM])); } // Timer IRQ 0 @@ -612,7 +608,7 @@ */ Int32Call(&BiosContext, BIOS_SYS_TIMER_INTERRUPT); // BiosSystemTimerInterrupt(Stack); - PicIRQComplete(Stack); + PicIRQComplete(LOBYTE(Stack[STACK_INT_NUM])); } @@ -795,15 +791,17 @@ /* Disable interrupts */ setIF(0); + /* Set the data segment */ + setDS(BDA_SEGMENT); + /* Initialize the stack */ - // That's what says IBM... (stack at 30:00FF going downwards) + // Temporary stack for POST (to be used only before initializing the INT vectors) // setSS(0x0000); // setSP(0x0400); - setSS(0x0050); // Stack at 50:0400, going downwards - setSP(0x0400); - - /* Set data segment */ - setDS(BDA_SEGMENT); + // + // Stack to be used after the initialization of the INT vectors + setSS(0x0000); // Stack at 00:8000, going downwards + setSP(0x8000); /* * Perform early CMOS shutdown status checks @@ -911,6 +909,9 @@ /* Initialize the BDA and the BIOS ROM Information */ InitializeBiosData(); InitializeBiosInfo(); + + /* Initialize the User Data Area at 0050:XXXX */ + RtlZeroMemory(SEG_OFF_TO_PTR(0x50, 0x0000), sizeof(USER_DATA_AREA)); /* * Initialize IVT and hardware Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -40,7 +40,7 @@ } while(0); VOID EnableHwIRQ(UCHAR hwirq, EMULATOR_INT32_PROC func); -VOID PicIRQComplete(LPWORD Stack); +VOID PicIRQComplete(BYTE IntNum); #endif // _BIOS32P_H_ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -118,7 +118,7 @@ case 0x11: { WORD Character; - + if (BiosKbdBufferTop(&Character)) { /* There is a character, clear ZF and return it */ @@ -315,7 +315,7 @@ Character, ScanCode, Bda->KeybdShiftFlags); Quit: - PicIRQComplete(Stack); + PicIRQComplete(LOBYTE(Stack[STACK_INT_NUM])); } /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -26,7 +26,7 @@ // Mouse IRQ 12 static VOID WINAPI BiosMouseIrq(LPWORD Stack) { - PicIRQComplete(Stack); + PicIRQComplete(LOBYTE(Stack[STACK_INT_NUM])); } VOID BiosMousePs2Interface(LPWORD Stack) Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -16,6 +16,8 @@ #include "ntvdm.h" #include "emulator.h" +#include <isvbop.h> + #include "utils.h" #include "dem.h" @@ -40,18 +42,18 @@ switch (FuncNum) { - case 0x11: // Load the DOS kernel + /* Load the DOS kernel */ + case 0x11: { BOOLEAN Success = FALSE; + LPCSTR DosKernelFileName = "ntdos.sys"; HANDLE hDosKernel; ULONG ulDosKernelSize = 0; DPRINT1("You are loading Windows NT DOS!\n"); /* Open the DOS kernel file */ - hDosKernel = FileOpen("ntdos.sys", &ulDosKernelSize); - - /* If we failed, bail out */ + hDosKernel = FileOpen(DosKernelFileName, &ulDosKernelSize); if (hDosKernel == NULL) goto Quit; /* @@ -64,7 +66,8 @@ ulDosKernelSize, &ulDosKernelSize); - DPRINT1("Windows NT DOS loading %s at %04X:%04X, size 0x%X ; GetLastError() = %u\n", + DPRINT1("Windows NT DOS file '%s' loading %s at %04X:%04X, size 0x%X ; GetLastError() = %u\n", + DosKernelFileName, (Success ? "succeeded" : "failed"), getDI(), 0x0000, ulDosKernelSize, @@ -77,6 +80,8 @@ if (!Success) { /* We failed everything, stop the VDM */ + DisplayMessage(L"Windows NT DOS kernel file '%S' loading failed (Error: %u). The VDM will shut down.", + DosKernelFileName, GetLastError()); EmulatorTerminate(); return; } @@ -301,16 +306,16 @@ // /* 16-bit bootstrap code at 0000:7C00 */ -/* Of course, this is not in real bootsector format, because we don't care */ +/* Of course, this is not in real bootsector format, because we don't care about it for now */ static BYTE Bootsector1[] = { - LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_LOAD_DOS, // Call DOS Loading + LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_LOAD_DOS }; /* This portion of code is run if we failed to load the DOS */ +// NOTE: This may also be done by the BIOS32. static BYTE Bootsector2[] = { - 0xEA, // jmp far ptr - 0x5B, 0xE0, 0x00, 0xF0, // F000:E05B /** HACK! What to do instead?? **/ + LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_UNSIMULATE }; static VOID WINAPI DosInitialize(LPWORD Stack); @@ -319,7 +324,7 @@ { /* We write the bootsector at 0000:7C00 */ ULONG_PTR Address = (ULONG_PTR)SEG_OFF_TO_PTR(0x0000, 0x7C00); - CHAR DosKernelFileName[] = ""; // No DOS file name, therefore we'll load DOS32 + CHAR DosKernelFileName[] = ""; // No DOS BIOS file name, therefore we will load DOS32 DPRINT("DosBootsectorInitialize\n"); @@ -336,43 +341,47 @@ // -// This function is called by the DOS bootsector. We finish to load -// the DOS, then we jump to 0070:0000. +// This function is called by the DOS bootsector in case we load DOS32. +// It sets up the DOS32 start code then jumps to 0070:0000. // -/* 16-bit startup code at 0070:0000 */ +/* 16-bit startup code for DOS32 at 0070:0000 */ static BYTE Startup[] = { - LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_START_DOS, // Call DOS Start + LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_START_DOS, + LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_UNSIMULATE }; static VOID WINAPI DosStart(LPWORD Stack); static VOID WINAPI DosInitialize(LPWORD Stack) { - BOOLEAN Success = FALSE; - - /* Get the DOS kernel file name (NULL-terminated) */ + /* Get the DOS BIOS file name (NULL-terminated) */ // FIXME: Isn't it possible to use some DS:SI instead?? - LPCSTR DosKernelFileName = (LPCSTR)SEG_OFF_TO_PTR(getCS(), getIP()); - setIP(getIP() + strlen(DosKernelFileName) + 1); // Skip it - - DPRINT("DosInitialize('%s')\n", DosKernelFileName); + LPCSTR DosBiosFileName = (LPCSTR)SEG_OFF_TO_PTR(getCS(), getIP()); + setIP(getIP() + strlen(DosBiosFileName) + 1); // Skip it + + DPRINT("DosInitialize('%s')\n", DosBiosFileName); + + /* + * We succeeded, deregister the DOS Loading BOP + * so that no app will be able to call us back. + */ + RegisterBop(BOP_LOAD_DOS, NULL); /* Register the DOS BOPs */ RegisterBop(BOP_DOS, DosSystemBop ); RegisterBop(BOP_CMD, DosCmdInterpreterBop); - if (DosKernelFileName && DosKernelFileName[0] != '\0') - { + if (DosBiosFileName && DosBiosFileName[0] != '\0') + { + BOOLEAN Success = FALSE; HANDLE hDosBios; ULONG ulDosBiosSize = 0; /* Open the DOS BIOS file */ - hDosBios = FileOpen(DosKernelFileName, &ulDosBiosSize); - - /* If we failed, bail out */ - if (hDosBios == NULL) goto QuitCustom; + hDosBios = FileOpen(DosBiosFileName, &ulDosBiosSize); + if (hDosBios == NULL) goto Quit; /* Attempt to load the DOS BIOS into memory */ Success = FileLoadByHandle(hDosBios, @@ -380,7 +389,8 @@ ulDosBiosSize, &ulDosBiosSize); - DPRINT1("DOS BIOS loading %s at %04X:%04X, size 0x%X ; GetLastError() = %u\n", + DPRINT1("DOS BIOS file '%s' loading %s at %04X:%04X, size 0x%X ; GetLastError() = %u\n", + DosBiosFileName, (Success ? "succeeded" : "failed"), 0x0070, 0x0000, ulDosBiosSize, @@ -389,52 +399,32 @@ /* Close the DOS BIOS file */ FileClose(hDosBios); - if (!Success) goto QuitCustom; - - /* Position execution pointers and return */ - setCS(0x0070); - setIP(0x0000); - - /* Return control */ -QuitCustom: +Quit: if (!Success) - DisplayMessage(L"Custom DOS '%S' loading failed, what to do??", DosKernelFileName); + { + DisplayMessage(L"DOS BIOS file '%S' loading failed (Error: %u). The VDM will shut down.", + DosBiosFileName, GetLastError()); + return; + } } else { - Success = DosBIOSInitialize(); - // Success &= DosKRNLInitialize(); - - if (!Success) goto Quit32; - - /* Write the "bootsector" */ + /* Load the 16-bit startup code for DOS32 and register its Starting BOP */ RtlCopyMemory(SEG_OFF_TO_PTR(0x0070, 0x0000), Startup, sizeof(Startup)); - /* Register the DOS Starting BOP */ + // This is the equivalent of BOP_LOAD_DOS, function 0x11 "Load the DOS kernel" + // for the Windows NT DOS. RegisterBop(BOP_START_DOS, DosStart); - - /* Position execution pointers and return */ - setCS(0x0070); - setIP(0x0000); - - /* Return control */ -Quit32: - if (!Success) - DisplayMessage(L"DOS32 loading failed, what to do??"); - } - - if (Success) - { - /* - * We succeeded, deregister the DOS Loading BOP - * so that no app will be able to call us back. - */ - RegisterBop(BOP_LOAD_DOS, NULL); - } + } + + /* Position execution pointers for DOS startup and return */ + setCS(0x0070); + setIP(0x0000); } static VOID WINAPI DosStart(LPWORD Stack) { + BOOLEAN Success; #ifdef STANDALONE DWORD Result; CHAR ApplicationName[MAX_PATH]; @@ -450,6 +440,15 @@ * so that no app will be able to call us back. */ RegisterBop(BOP_START_DOS, NULL); + + Success = DosBIOSInitialize(); +// Success &= DosKRNLInitialize(); + if (!Success) + { + DisplayMessage(L"DOS32 loading failed (Error: %u). The VDM will shut down.", GetLastError()); + EmulatorTerminate(); + return; + } /* Load the mouse driver */ DosMouseInitialize(); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -30,8 +30,6 @@ #undef FreeEnvironmentStrings #define FreeEnvironmentStrings FreeEnvironmentStringsA -#define CHARACTER_ADDRESS 0x007000FF /* 0070:00FF */ - /* PRIVATE VARIABLES **********************************************************/ // static BYTE CurrentDrive; @@ -102,39 +100,10 @@ &BytesWritten); } -BOOLEAN DosBIOSInitialize(VOID) -{ - PDOS_MCB Mcb = SEGMENT_TO_MCB(FIRST_MCB_SEGMENT); - +BOOLEAN DosBuildSysEnvBlock(VOID) +{ LPSTR SourcePtr, Environment; LPSTR DestPtr = (LPSTR)SEG_OFF_TO_PTR(SYSTEM_ENV_BLOCK, 0); - -#if 0 - UCHAR i; - CHAR CurrentDirectory[MAX_PATH]; - CHAR DosDirectory[DOS_DIR_LENGTH]; - LPSTR Path; - - FILE *Stream; - WCHAR Buffer[256]; -#endif - - /* Initialize the MCB */ - Mcb->BlockType = 'Z'; - Mcb->Size = USER_MEMORY_SIZE; - Mcb->OwnerPsp = 0; - - /* Initialize the link MCB to the UMB area */ - Mcb = SEGMENT_TO_MCB(FIRST_MCB_SEGMENT + USER_MEMORY_SIZE + 1); - Mcb->BlockType = 'M'; - Mcb->Size = UMB_START_SEGMENT - FIRST_MCB_SEGMENT - USER_MEMORY_SIZE - 2; - Mcb->OwnerPsp = SYSTEM_PSP; - - /* Initialize the UMB area */ - Mcb = SEGMENT_TO_MCB(UMB_START_SEGMENT); - Mcb->BlockType = 'Z'; - Mcb->Size = UMB_END_SEGMENT - UMB_START_SEGMENT; - Mcb->OwnerPsp = 0; /* Get the environment strings */ SourcePtr = Environment = GetEnvironmentStrings(); @@ -178,6 +147,40 @@ /* Free the memory allocated for environment strings */ FreeEnvironmentStrings(Environment); + return TRUE; +} + +BOOLEAN DosBIOSInitialize(VOID) +{ +#if 0 + UCHAR i; + CHAR CurrentDirectory[MAX_PATH]; + CHAR DosDirectory[DOS_DIR_LENGTH]; + LPSTR Path; + + FILE *Stream; + WCHAR Buffer[256]; +#endif + + /* Set the data segment */ + setDS(DOS_DATA_SEGMENT); + + /* Initialize the DOS stack */ + // Stack just before FIRST_MCB_SEGMENT and after SYSTEM_ENV_BLOCK + // FIXME: Add a block of fixed size for the stack in DOS_DATA instead! + setSS(0x0F00); + setSP(0x0FF0); + setBP(0x091E); // DOS base stack pointer relic value + + /* Initialize memory management */ + DosInitializeMemory(); + + /* Build the system master environment block (inherited by the shell) */ + if (!DosBuildSysEnvBlock()) + { + DPRINT1("An error occurred when setting up the system environment block.\n"); + } + #if 0 Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -1502,7 +1502,6 @@ /* Return the DOS "list of lists" in ES:BX */ setES(DOS_DATA_SEGMENT); setBX(DOS_DATA_OFFSET(SysVars.FirstDpb)); - break; } @@ -1877,6 +1876,7 @@ /* * This call should leave the flags on the stack for some reason, * so move the stack by one word. + * See: http://www.techhelpmanual.com/565-int_25h_26h__absolute_disk_read_write.html */ Stack[STACK_INT_NUM] = Stack[STACK_IP]; Stack[STACK_IP] = Stack[STACK_CS]; @@ -1896,6 +1896,7 @@ /* * This call should leave the flags on the stack for some reason, * so move the stack by one word. + * See: http://www.techhelpmanual.com/565-int_25h_26h__absolute_disk_read_write.html */ Stack[STACK_INT_NUM] = Stack[STACK_IP]; Stack[STACK_IP] = Stack[STACK_CS]; @@ -1966,19 +1967,27 @@ DWORD DriverEntry; if (!XmsGetDriverEntry(&DriverEntry)) break; - if (getAL() == 0x00) - { - /* The driver is loaded */ - setAL(0x80); - } - else if (getAL() == 0x10) - { - setES(HIWORD(DriverEntry)); - setBX(LOWORD(DriverEntry)); - } - else - { - DPRINT1("Unknown DOS XMS Function: INT 0x2F, AH = 43h, AL = %xh\n", getAL()); + switch (getAL()) + { + /* Installation Check */ + case 0x00: + { + /* The driver is loaded */ + setAL(0x80); + break; + } + + /* Get Driver Address */ + case 0x10: + { + setES(HIWORD(DriverEntry)); + setBX(LOWORD(DriverEntry)); + break; + } + + default: + DPRINT1("Unknown DOS XMS Function: INT 0x2F, AH = 43h, AL = %xh\n", getAL()); + break; } break; @@ -2125,7 +2134,7 @@ RegisterDosInt32(0x27, DosInt27h ); // Terminate and Stay Resident RegisterDosInt32(0x28, DosIdle ); // DOS Idle Interrupt RegisterDosInt32(0x29, DosFastConOut ); // DOS 2+ Fast Console Output - RegisterDosInt32(0x2F, DosInt2Fh ); + RegisterDosInt32(0x2F, DosInt2Fh ); // Multiplex Interrupt /* Unimplemented DOS interrupts */ RegisterDosInt32(0x2A, NULL); // Network - Installation Check Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -624,7 +624,7 @@ return (WORD)GetLastError(); } } - + DescriptorId = DosFindFreeDescriptor(); if (DescriptorId == 0xFF) { @@ -1026,7 +1026,7 @@ { /* Not ready */ *Length = 0; - } + } } return TRUE; Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -153,7 +153,7 @@ } PageEntry = GetLogicalPage(HandleEntry, LogicalPage); - if (!PageEntry) return EMS_STATUS_INV_LOGICAL_PAGE; + if (!PageEntry) return EMS_STATUS_INV_LOGICAL_PAGE; Mapping[PhysicalPage] = (PVOID)((ULONG_PTR)EmsMemory + ARRAY_INDEX(PageEntry, PageTable) * EMS_PAGE_SIZE); @@ -501,7 +501,6 @@ EmsReadMemory, EmsWriteMemory); - /* Create the device */ Node = DosCreateDeviceEx(DOS_DEVATTR_IOCTL | DOS_DEVATTR_CHARACTER, EMS_DEVICE_NAME, Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -485,7 +485,7 @@ if (Entry && Entry->Handle != 0) { - INT i; + UINT i; UCHAR Handles = 0; for (i = 0; i < XMS_MAX_HANDLES; i++) @@ -557,7 +557,7 @@ { WORD Segment; WORD MaxAvailable; - + Segment = DosResizeMemory(getDX(), getBX(), &MaxAvailable); if (Segment) Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -274,7 +274,7 @@ /* It is, split it into two blocks */ NextMcb = SEGMENT_TO_MCB(Segment + NewSize + 1); - + /* Initialize the new MCB structure */ NextMcb->BlockType = Mcb->BlockType; NextMcb->Size = Mcb->Size - NewSize - 1; @@ -312,7 +312,7 @@ /* Return the maximum possible size */ if (MaxAvailable) *MaxAvailable = ReturnSize; } - + return Success; } @@ -402,3 +402,26 @@ Mcb->OwnerPsp = NewOwner; } +VOID DosInitializeMemory(VOID) +{ + PDOS_MCB Mcb = SEGMENT_TO_MCB(FIRST_MCB_SEGMENT); + + /* Initialize the MCB */ + Mcb->BlockType = 'Z'; + Mcb->Size = USER_MEMORY_SIZE; + Mcb->OwnerPsp = 0; + + /* Initialize the link MCB to the UMB area */ + Mcb = SEGMENT_TO_MCB(FIRST_MCB_SEGMENT + USER_MEMORY_SIZE + 1); + Mcb->BlockType = 'M'; + Mcb->Size = UMB_START_SEGMENT - FIRST_MCB_SEGMENT - USER_MEMORY_SIZE - 2; + Mcb->OwnerPsp = SYSTEM_PSP; + + /* Initialize the UMB area */ + Mcb = SEGMENT_TO_MCB(UMB_START_SEGMENT); + Mcb->BlockType = 'Z'; + Mcb->Size = UMB_END_SEGMENT - UMB_START_SEGMENT; + Mcb->OwnerPsp = 0; +} + +/* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -11,7 +11,7 @@ /* TYPEDEFS *******************************************************************/ -#define SEGMENT_TO_MCB(seg) ((PDOS_MCB)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), 0))) +#define SEGMENT_TO_MCB(seg) ((PDOS_MCB)SEG_OFF_TO_PTR((seg), 0)) enum DOS_ALLOC_STRATEGY { @@ -45,6 +45,8 @@ BOOLEAN DosUnlinkUmb(VOID); VOID DosChangeMemoryOwner(WORD Segment, WORD NewOwner); +VOID DosInitializeMemory(VOID); + #endif // _DOS_MEMORY_H_ /* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -8,16 +8,16 @@ /* DEFINITIONS ****************************************************************/ -#define DOS_CMDLINE_LENGTH 127 +#define DOS_CMDLINE_LENGTH 127 #define DOS_PROGRAM_NAME_TAG 0x0001 -#define SEGMENT_TO_PSP(seg) ((PDOS_PSP)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), 0))) +#define SEGMENT_TO_PSP(seg) ((PDOS_PSP)SEG_OFF_TO_PTR((seg), 0)) typedef enum { DOS_LOAD_AND_EXECUTE = 0x00, - DOS_LOAD_ONLY = 0x01, - DOS_LOAD_OVERLAY = 0x03 + DOS_LOAD_ONLY = 0x01, + DOS_LOAD_OVERLAY = 0x03 } DOS_EXEC_TYPE; #pragma pack(push, 1) @@ -75,13 +75,11 @@ typedef struct _DOS_REGISTER_STATE { WORD AX, BX, CX, DX, SI, DI, BP, DS, ES; +// WORD IP, CS, Flags; // They are supposed to be already + // pushed on stack by the DOS caller. } DOS_REGISTER_STATE, *PDOS_REGISTER_STATE; #pragma pack(pop) - -/* VARIABLES ******************************************************************/ - -extern WORD CurrentPsp; /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -339,7 +339,7 @@ DosUpdateButtons(ButtonState); /* Complete the IRQ */ - PicIRQComplete(Stack); + PicIRQComplete(LOBYTE(Stack[STACK_INT_NUM])); } static VOID WINAPI DosMouseService(LPWORD Stack) Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -16,19 +16,18 @@ /* DEFINES ********************************************************************/ /* Basic Memory Management */ +#define MEM_ALIGN_DOWN(ptr, align) (PVOID)((ULONG_PTR)(ptr) & ~((align) - 1l)) #define MEM_ALIGN_UP(ptr, align) MEM_ALIGN_DOWN((ULONG_PTR)(ptr) + (align) - 1l, (align)) -#define MEM_ALIGN_DOWN(ptr, align) (PVOID)((ULONG_PTR)(ptr) & ~((align) - 1l)) #define TO_LINEAR(seg, off) (((seg) << 4) + (off)) #define MAX_SEGMENT 0xFFFF #define MAX_OFFSET 0xFFFF #define MAX_ADDRESS 0x1000000 // 16 MB of RAM; see also: kernel32/client/vdm.c!BaseGetVdmConfigInfo -#define FAR_POINTER(x) \ - (PVOID)((ULONG_PTR)BaseAddress + TO_LINEAR(HIWORD(x), LOWORD(x))) - #define SEG_OFF_TO_PTR(seg, off) \ (PVOID)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), (off))) + +#define FAR_POINTER(x) SEG_OFF_TO_PTR(HIWORD(x), LOWORD(x)) #define REAL_TO_PHYS(ptr) (PVOID)((ULONG_PTR)(ptr) + (ULONG_PTR)BaseAddress) #define PHYS_TO_REAL(ptr) (PVOID)((ULONG_PTR)(ptr) - (ULONG_PTR)BaseAddress) Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -105,7 +105,7 @@ { /* Update the NMI enabled flag */ NmiEnabled = !(Value & CMOS_DISABLE_NMI); - + /* Get the register number */ Value &= ~CMOS_DISABLE_NMI; Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -258,7 +258,7 @@ BYTE PicGetInterrupt(VOID) { - INT i; + UINT i; /* Search the master PIC interrupts by priority */ for (i = 0; i < 8; i++) @@ -299,7 +299,7 @@ } } } - + /* Spurious interrupt */ if (MasterPic.InServiceRegister & (1 << 2)) return SlavePic.IntOffset + 7; else return MasterPic.IntOffset + 7; @@ -330,7 +330,7 @@ /* * Adjust the interrupt request number according to the parameters, * by adding an offset == 8 to the interrupt number. - * + * * Indeed VDDs calling this function usually subtracts 8 so that they give: * * ms | line | corresponding interrupt number Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -777,7 +777,7 @@ VGA_MAX_COLORS * sizeof(PALETTEENTRY)); TextPalette = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(LOGPALETTE) + + sizeof(LOGPALETTE) + (VGA_AC_PAL_F_REG + 1) * sizeof(PALETTEENTRY)); if ((Palette == NULL) || (TextPalette == NULL)) goto Cleanup; @@ -1461,7 +1461,7 @@ case VGA_SEQ_INDEX: return VgaSeqIndex; - + case VGA_SEQ_DATA: return VgaSeqRegisters[VgaSeqIndex]; @@ -1985,7 +1985,7 @@ for (i = 0; i < Size; i++) { VideoAddress = VgaTranslateReadAddress(Address + i); - + /* Copy the value to the buffer */ BufPtr[i] = VgaMemory[VideoAddress]; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -149,7 +149,7 @@ if (Address >= 0xFFFFFFF0) Address -= 0xFFF00000; /* If the A20 line is disabled, mask bit 20 */ - if (!A20Line) Address &= ~(1 << 20); + if (!A20Line) Address &= ~(1 << 20); if ((Address + Size - 1) >= MAX_ADDRESS) { @@ -171,7 +171,7 @@ } else { - for (i = FirstPage; i <= LastPage; i++) + for (i = FirstPage; i <= LastPage; i++) { Offset = (i == FirstPage) ? (Address & (PAGE_SIZE - 1)) : 0; Length = ((i == LastPage) ? (Address + Size - (LastPage << 12)) : PAGE_SIZE) - Offset; @@ -190,7 +190,7 @@ UNREFERENCED_PARAMETER(State); /* If the A20 line is disabled, mask bit 20 */ - if (!A20Line) Address &= ~(1 << 20); + if (!A20Line) Address &= ~(1 << 20); if (Address >= MAX_ADDRESS) return; Size = min(Size, MAX_ADDRESS - Address); @@ -204,7 +204,7 @@ } else { - for (i = FirstPage; i <= LastPage; i++) + for (i = FirstPage; i <= LastPage; i++) { Offset = (i == FirstPage) ? (Address & (PAGE_SIZE - 1)) : 0; Length = ((i == LastPage) ? (Address + Size - (LastPage << 12)) : PAGE_SIZE) - Offset; Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] Mon Jun 15 23:43:16 2015 @@ -27,7 +27,7 @@ ULONG Address, PVOID Buffer, ULONG Size -); +); /* FUNCTIONS ******************************************************************/

1 0

[ekohl] 68158: [USETUP] Improve the recovery console: - Add help texts. - Implement the partinfo command which displays the partition table of the chosen drive.
by ekohl＠svn.reactos.org 15 Jun '15

15 Jun '15

Author: ekohl Date: Mon Jun 15 22:44:12 2015 New Revision: 68158 URL: http://svn.reactos.org/svn/reactos?rev=68158&view=rev Log: [USETUP] Improve the recovery console: - Add help texts. - Implement the partinfo command which displays the partition table of the chosen drive. Modified: trunk/reactos/base/setup/usetup/cmdcons.c Modified: trunk/reactos/base/setup/usetup/cmdcons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cmdcons.… ============================================================================== --- trunk/reactos/base/setup/usetup/cmdcons.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/cmdcons.c [iso-8859-1] Mon Jun 15 22:44:12 2015 @@ -27,8 +27,13 @@ LPSTR name; INT flags; INT (*func)(PCONSOLE_STATE, LPSTR); + VOID (*help)(VOID); } COMMAND, *LPCOMMAND; + +static +VOID +HelpCls(VOID); static INT @@ -37,30 +42,53 @@ LPSTR param); static +VOID +HelpDumpSector(VOID); + +static INT CommandDumpSector( PCONSOLE_STATE State, LPSTR param); static +VOID +HelpExit(VOID); + +static INT CommandExit( PCONSOLE_STATE State, LPSTR param); static +VOID +HelpHelp(VOID); + +static INT CommandHelp( PCONSOLE_STATE State, LPSTR param); +static +VOID +HelpPartInfo(VOID); + +static +INT +CommandPartInfo( + PCONSOLE_STATE State, + LPSTR param); + COMMAND Commands[] = { - {"cls", 0, CommandCls}, - {"dumpsector", 0, CommandDumpSector}, - {"exit", 0, CommandExit}, - {"help", 0, CommandHelp}, + {"cls", 0, CommandCls, HelpCls}, + {"dumpsector", 0, CommandDumpSector, HelpDumpSector}, + {"exit", 0, CommandExit, HelpExit}, + {"help", 0, CommandHelp, HelpHelp}, + {"partinfo", 0, CommandPartInfo, HelpPartInfo}, {NULL, 0, NULL} }; @@ -220,36 +248,24 @@ static +VOID +HelpCls(VOID) +{ + CONSOLE_ConOutPrintf("CLS\n\nClears the screen.\n\n"); +} + + +static INT CommandCls( PCONSOLE_STATE State, LPSTR param) { -#if 0 - HANDLE hOutput; - COORD coPos; - DWORD dwWritten; - -#if 0 - if (!strncmp(param, "/?", 2)) - { - ConOutResPaging(TRUE,STRING_CLS_HELP); + if (!strcmp(param, "/?")) + { + HelpCls(); return 0; } -#endif - - coPos.X = 0; - coPos.Y = 0; - - hOutput = GetStdHandle(STD_OUTPUT_HANDLE); - FillConsoleOutputAttribute(hOutput, csbi.wAttributes, - State->maxx * State->maxy, - coPos, &dwWritten); - FillConsoleOutputCharacter(hOutput, ' ', - State->maxx * State->maxy, - coPos, &dwWritten); - SetConsoleCursorPosition(hOutput, coPos); -#endif CONSOLE_ClearScreen(); CONSOLE_SetCursorXY(0, 0); @@ -304,6 +320,15 @@ CONSOLE_ConOutPrintf("\n"); } + +static +VOID +HelpDumpSector(VOID) +{ + CONSOLE_ConOutPrintf("DUMPSECT DiskNumber Sector\n\nDumps a disk sector to the screen.\n\n"); +} + + static INT CommandDumpSector( @@ -327,9 +352,9 @@ DPRINT1("param: %s\n", param); - if (!strncmp(param, "/?", 2)) - { - CONSOLE_ConOutPrintf("DUMPSECT DiskNumber Sector\n\nDumps a disk sector to the screen.\n\n"); + if (!strcmp(param, "/?")) + { + HelpDumpSector(); return 0; } @@ -453,25 +478,36 @@ static +VOID +HelpExit(VOID) +{ + CONSOLE_ConOutPrintf("EXIT\n\nExits the repair console.\n\n"); +} + + +static INT CommandExit( PCONSOLE_STATE State, LPSTR param) { -#if 0 - if (!strncmp(param, "/?", 2)) - { - ConOutResPaging(TRUE,STRING_EXIT_HELP); - /* Just make sure */ - bExit = FALSE; - /* Dont exit */ + if (!strcmp(param, "/?")) + { + HelpExit(); return 0; } -#endif State->bExit = TRUE; return 0; +} + + +static +VOID +HelpHelp(VOID) +{ + CONSOLE_ConOutPrintf("HELP [Command]\n\nShows help on repair console commands.\n\n"); } @@ -481,11 +517,196 @@ PCONSOLE_STATE State, LPSTR param) { + LPCOMMAND cmdptr; + + DPRINT1("param: %p %u '%s'\n", param, strlen(param), param); + + if (!strcmp(param, "/?")) + { + HelpHelp(); + return 0; + } + + if (param != NULL && strlen(param) > 0) + { + for (cmdptr = Commands; cmdptr->name != NULL; cmdptr++) + { + if (!stricmp(param, cmdptr->name)) + { + if (cmdptr->help != NULL) + { + cmdptr->help(); + return 0; + } + } + } + } + CONSOLE_ConOutPrintf("CLS\n"); CONSOLE_ConOutPrintf("DUMPSECTOR\n"); CONSOLE_ConOutPrintf("EXIT\n"); CONSOLE_ConOutPrintf("HELP\n"); CONSOLE_ConOutPrintf("\n"); + + return 0; +} + + +static +VOID +HelpPartInfo(VOID) +{ + CONSOLE_ConOutPrintf("PARTINFO DiskNumber\n\nDumps a partiton table to the screen.\n\n"); +} + + +static +INT +CommandPartInfo( + PCONSOLE_STATE State, + LPSTR param) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING PathName; + HANDLE hDisk = NULL; + DISK_GEOMETRY DiskGeometry; + NTSTATUS Status; + + LPTSTR *argv = NULL; + INT argc = 0; + WCHAR DriveName[40]; + ULONG ulDrive, i; + PDRIVE_LAYOUT_INFORMATION LayoutBuffer = NULL; + PPARTITION_INFORMATION PartitionInfo; + + DPRINT1("param: %s\n", param); + + if (!strcmp(param, "/?")) + { + HelpPartInfo(); + return 0; + } + + argv = split(param, &argc); + + DPRINT1("argc: %d\n", argc); + DPRINT1("argv: %p\n", argv); + + if (argc != 1) + { + goto done; + } + + DPRINT1("Device: %s\n", argv[0]); + + ulDrive = strtoul(argv[0], NULL, 0); + + /* Build full drive name */ + swprintf(DriveName, L"\\Device\\Harddisk%lu\\Partition0", ulDrive); + + RtlInitUnicodeString(&PathName, + DriveName); + + InitializeObjectAttributes(&ObjectAttributes, + &PathName, + OBJ_CASE_INSENSITIVE | OBJ_INHERIT, + NULL, + NULL); + + Status = NtOpenFile(&hDisk, + GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE | FILE_RANDOM_ACCESS); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateFile failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = NtDeviceIoControlFile(hDisk, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + sizeof(DISK_GEOMETRY)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtDeviceIoControlFile failed (Status 0x%08lx)\n", Status); + goto done; + } + + CONSOLE_ConOutPrintf("Drive number: %lu\n", ulDrive); + CONSOLE_ConOutPrintf("Cylinders: %I64u\nMediaType: %x\nTracksPerCylinder: %lu\n" + "SectorsPerTrack: %lu\nBytesPerSector: %lu\n\n", + DiskGeometry.Cylinders.QuadPart, + DiskGeometry.MediaType, + DiskGeometry.TracksPerCylinder, + DiskGeometry.SectorsPerTrack, + DiskGeometry.BytesPerSector); + + LayoutBuffer = RtlAllocateHeap(ProcessHeap, + HEAP_ZERO_MEMORY, + 8192); + if (LayoutBuffer == NULL) + { + DPRINT1("LayoutBuffer allocation failed\n"); + goto done; + } + + Status = NtDeviceIoControlFile(hDisk, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_DISK_GET_DRIVE_LAYOUT, + NULL, + 0, + LayoutBuffer, + 8192); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtDeviceIoControlFile(IOCTL_DISK_GET_DRIVE_LAYOUT) failed (Status 0x%08lx)\n", Status); + goto done; + } + + CONSOLE_ConOutPrintf("Partitions: %lu Signature: %lx\n\n", + LayoutBuffer->PartitionCount, + LayoutBuffer->Signature); + + CONSOLE_ConOutPrintf(" # Start Size Hidden Nr Type Boot\n"); + CONSOLE_ConOutPrintf("-- --------------- --------------- ------------ -- ---- ----\n"); + + for (i = 0; i < LayoutBuffer->PartitionCount; i++) + { + PartitionInfo = &LayoutBuffer->PartitionEntry[i]; + + CONSOLE_ConOutPrintf("%2lu %15I64u %15I64u %12lu %2lu %2x %c\n", + i, + PartitionInfo->StartingOffset.QuadPart / DiskGeometry.BytesPerSector, + PartitionInfo->PartitionLength.QuadPart / DiskGeometry.BytesPerSector, + PartitionInfo->HiddenSectors, + PartitionInfo->PartitionNumber, + PartitionInfo->PartitionType, + PartitionInfo->BootIndicator ? '*': ' '); + } + + CONSOLE_ConOutPrintf("\n"); + +done: + if (LayoutBuffer != NULL) + RtlFreeHeap(ProcessHeap, 0, LayoutBuffer); + + if (hDisk != NULL) + NtClose(hDisk); + + freep(argv); return 0; } @@ -696,7 +917,6 @@ if (str[0]) History (0, str); #endif - str[charcount++] = '\n'; str[charcount] = '\0'; CONSOLE_ConOutChar('\n'); bReturn = TRUE; @@ -902,7 +1122,7 @@ break; } - if (strcmp(com, cmdptr->name) == 0) + if (stricmp(com, cmdptr->name) == 0) { cmdptr->func(State, rest); break;

1 0

[akhaldi] 68157: [UDFS] Remove definitions that exist in platform headers and use those instead.
by akhaldi＠svn.reactos.org 15 Jun '15

15 Jun '15

Author: akhaldi Date: Mon Jun 15 21:19:04 2015 New Revision: 68157 URL: http://svn.reactos.org/svn/reactos?rev=68157&view=rev Log: [UDFS] Remove definitions that exist in platform headers and use those instead. Modified: trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_hw.h trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_usr.h trunk/reactos/drivers/filesystems/udfs/Include/nt_native.h Modified: trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_hw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_hw.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_hw.h [iso-8859-1] Mon Jun 15 21:19:04 2015 @@ -3540,36 +3540,6 @@ // DVD structure blocks -typedef struct _DVD_DESCRIPTOR_HEADER { - UCHAR Length[2]; - UCHAR Reserved[2]; -} DVD_DESCRIPTOR_HEADER, *PDVD_DESCRIPTOR_HEADER; - -typedef struct _DVD_LAYER_DESCRIPTOR { - DVD_DESCRIPTOR_HEADER Header; -// UCHAR Length[2]; - UCHAR BookVersion : 4; // Part Version - UCHAR BookType : 4; // Disk Category - - UCHAR MinimumRate : 4; - UCHAR DiskSize : 4; - - UCHAR LayerType : 4; - UCHAR TrackPath : 1; - UCHAR NumberOfLayers : 2; - UCHAR Reserved1 : 1; - - UCHAR TrackDensity : 4; - UCHAR LinearDensity : 4; - - UCHAR StartingDataSector[4]; - UCHAR EndDataSector[4]; - UCHAR EndLayerZeroSector[4]; - UCHAR Reserved5 : 7; - UCHAR BCAFlag : 1; - UCHAR Reserved6; -} DVD_LAYER_DESCRIPTOR, *PDVD_LAYER_DESCRIPTOR; - #define DvdBookType_ROM 0 #define DvdBookType_RAM 1 #define DvdBookType_R 2 @@ -3649,21 +3619,6 @@ CDVD_KEY_DATA TitleKey; } CDVD_TITLE_KEY_HEADER, *PCDVD_TITLE_KEY_HEADER; -typedef struct _DVD_COPYRIGHT_DESCRIPTOR { - UCHAR CopyrightProtectionType; - UCHAR RegionManagementInformation; - UCHAR Reserved[2]; -} DVD_COPYRIGHT_DESCRIPTOR, *PDVD_COPYRIGHT_DESCRIPTOR; - -typedef struct _DVD_RPC_KEY { - UCHAR UserResetsAvailable:3; - UCHAR ManufacturerResetsAvailable:3; - UCHAR TypeCode:2; - UCHAR RegionMask; - UCHAR RpcScheme; - UCHAR Reserved2[1]; -} DVD_RPC_KEY, * PDVD_RPC_KEY; - #pragma pack(pop) #endif //__CDRW_DEVICE_H__ Modified: trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_usr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_usr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_usr.h [iso-8859-1] Mon Jun 15 21:19:04 2015 @@ -29,6 +29,9 @@ #include "cdrw_hw.h" //#include "ntdddisk.h" +#include <ntddcdrm.h> +#include <ntddcdvd.h> + #ifndef CTL_CODE #pragma pack(push, 8) #include "winioctl.h" @@ -53,62 +56,9 @@ #define FILE_DEVICE_CDRW 0x00000999 #endif -#ifndef FILE_DEVICE_CD_ROM -#define FILE_DEVICE_CD_ROM 0x00000002 -#endif //FILE_DEVICE_CD_ROM - -#ifndef IOCTL_CDROM_BASE -#define IOCTL_CDROM_BASE FILE_DEVICE_CD_ROM -#endif //IOCTL_CDROM_BASE - -#ifndef FILE_DEVICE_DVD -#define FILE_DEVICE_DVD 0x00000033 -#endif //FILE_DEVICE_DVD - -#ifndef IOCTL_DVD_BASE -#define IOCTL_DVD_BASE FILE_DEVICE_DVD -#endif //IOCTL_DVD_BASE - -#ifndef FILE_DEVICE_DISK -#define FILE_DEVICE_DISK 0x00000007 -#endif //FILE_DEVICE_DISK - -#ifndef IOCTL_DISK_BASE -#define IOCTL_DISK_BASE FILE_DEVICE_DISK -#endif //IOCTL_DISK_BASE - -#ifndef IOCTL_CDROM_UNLOAD_DRIVER -#define IOCTL_CDROM_UNLOAD_DRIVER CTL_CODE(IOCTL_CDROM_BASE, 0x0402, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_READ_TOC CTL_CODE(IOCTL_CDROM_BASE, 0x0000, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_GET_CONTROL CTL_CODE(IOCTL_CDROM_BASE, 0x000D, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_PLAY_AUDIO_MSF CTL_CODE(IOCTL_CDROM_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_SEEK_AUDIO_MSF CTL_CODE(IOCTL_CDROM_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_STOP_AUDIO CTL_CODE(IOCTL_CDROM_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_PAUSE_AUDIO CTL_CODE(IOCTL_CDROM_BASE, 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_RESUME_AUDIO CTL_CODE(IOCTL_CDROM_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_GET_VOLUME CTL_CODE(IOCTL_CDROM_BASE, 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_SET_VOLUME CTL_CODE(IOCTL_CDROM_BASE, 0x000A, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_READ_Q_CHANNEL CTL_CODE(IOCTL_CDROM_BASE, 0x000B, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_GET_LAST_SESSION CTL_CODE(IOCTL_CDROM_BASE, 0x000E, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_RAW_READ CTL_CODE(IOCTL_CDROM_BASE, 0x000F, METHOD_OUT_DIRECT, FILE_READ_ACCESS) -#define IOCTL_CDROM_DISK_TYPE CTL_CODE(IOCTL_CDROM_BASE, 0x0010, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_CDROM_CHECK_VERIFY CTL_CODE(IOCTL_CDROM_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CDROM_MEDIA_REMOVAL CTL_CODE(IOCTL_CDROM_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CDROM_EJECT_MEDIA CTL_CODE(IOCTL_CDROM_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CDROM_LOAD_MEDIA CTL_CODE(IOCTL_CDROM_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_RESERVE CTL_CODE(IOCTL_CDROM_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_RELEASE CTL_CODE(IOCTL_CDROM_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_FIND_NEW_DEVICES CTL_CODE(IOCTL_CDROM_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_GET_DRIVE_GEOMETRY CTL_CODE(IOCTL_CDROM_BASE, 0x0013, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX CTL_CODE(IOCTL_CDROM_BASE, 0x0014, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_READ_TOC_EX CTL_CODE(IOCTL_CDROM_BASE, 0x0015, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_GET_CONFIGURATION CTL_CODE(IOCTL_CDROM_BASE, 0x0016, METHOD_BUFFERED, FILE_READ_ACCESS) - -#endif //IOCTL_CDROM_UNLOAD_DRIVER #ifdef CDRW_RESTRICT_ACCESS @@ -1378,12 +1328,6 @@ //********************************************************************************************** -typedef enum _TRACK_MODE_TYPE { - YellowMode2, - XAForm2, - CDDA -} TRACK_MODE_TYPE, *PTRACK_MODE_TYPE; - typedef struct _RAW_READ_USER_IN { LARGE_INTEGER DiskOffset; ULONG SectorCount; @@ -1406,49 +1350,6 @@ #define AudioStatus_PlayError 0x14 #define AudioStatus_NoStatus 0x15 -typedef struct _SUB_Q_HEADER { - UCHAR Reserved; - UCHAR AudioStatus; - UCHAR DataLength[2]; -} SUB_Q_HEADER, *PSUB_Q_HEADER; - -typedef struct _SUB_Q_CURRENT_POSITION { - SUB_Q_HEADER Header; - UCHAR FormatCode; - UCHAR Control : 4; - UCHAR ADR : 4; - UCHAR TrackNumber; - UCHAR IndexNumber; - UCHAR AbsoluteAddress[4]; - UCHAR TrackRelativeAddress[4]; -} SUB_Q_CURRENT_POSITION, *PSUB_Q_CURRENT_POSITION; - -typedef struct _SUB_Q_MEDIA_CATALOG_NUMBER { - SUB_Q_HEADER Header; - UCHAR FormatCode; - UCHAR Reserved[3]; - UCHAR Reserved1 : 7; - UCHAR Mcval : 1; - UCHAR MediaCatalog[15]; -} SUB_Q_MEDIA_CATALOG_NUMBER, *PSUB_Q_MEDIA_CATALOG_NUMBER; - -typedef struct _SUB_Q_TRACK_ISRC { - SUB_Q_HEADER Header; - UCHAR FormatCode; - UCHAR Reserved0; - UCHAR Track; - UCHAR Reserved1; - UCHAR Reserved2 : 7; - UCHAR Tcval : 1; - UCHAR TrackIsrc[15]; -} SUB_Q_TRACK_ISRC, *PSUB_Q_TRACK_ISRC; - -typedef union _SUB_Q_CHANNEL_DATA_USER_OUT { - SUB_Q_CURRENT_POSITION CurrentPosition; - SUB_Q_MEDIA_CATALOG_NUMBER MediaCatalog; - SUB_Q_TRACK_ISRC TrackIsrc; -} SUB_Q_CHANNEL_DATA_USER_OUT, *PSUB_Q_CHANNEL_DATA_USER_OUT; - #define IOCTL_CDROM_SUB_Q_CHANNEL 0x00 #define IOCTL_CDROM_CURRENT_POSITION 0x01 #define IOCTL_CDROM_MEDIA_CATALOG 0x02 @@ -1491,18 +1392,6 @@ typedef READ_TOC_CD_TEXT READ_CD_TEXT_USER_OUT; typedef PREAD_TOC_CD_TEXT PREAD_CD_TEXT_USER_OUT; - -//********************************************************************************************** - -typedef struct _VOLUME_CONTROL { - UCHAR PortVolume[4]; -} VOLUME_CONTROL, *PVOLUME_CONTROL; - -typedef VOLUME_CONTROL VOLUME_CONTROL_USER_IN; -typedef PVOLUME_CONTROL PVOLUME_CONTROL_USER_IN; - -typedef VOLUME_CONTROL VOLUME_CONTROL_USER_OUT; -typedef PVOLUME_CONTROL PVOLUME_CONTROL_USER_OUT; //********************************************************************************************** @@ -1652,18 +1541,6 @@ //********************************************************************************************** - -//********************************************************************************************** - -typedef enum DVD_STRUCTURE_FORMAT { - DvdPhysicalDescriptor, - DvdCopyrightDescriptor, - DvdDiskKeyDescriptor, - DvdBCADescriptor, - DvdManufacturerDescriptor, - DvdMaxDescriptor -} DVD_STRUCTURE_FORMAT, *PDVD_STRUCTURE_FORMAT; - typedef ULONG DVD_SESSION_ID, *PDVD_SESSION_ID; typedef struct _DVD_READ_STRUCTURE_USER_IN { @@ -1686,18 +1563,6 @@ } DVD_START_SESSION_USER_OUT, *PDVD_START_SESSION_USER_OUT; //********************************************************************************************** - -typedef enum { - DvdChallengeKey = 0x01, - DvdBusKey1, - DvdBusKey2, - DvdTitleKey, - DvdAsf, - DvdSetRpcKey = 0x6, - DvdGetRpcKey = 0x8, - DvdDiskKey = 0x80, - DvdInvalidateAGID = 0x3f -} DVD_KEY_TYPE; typedef struct _DVD_READ_KEY_USER_IN { ULONG KeyLength; @@ -1711,9 +1576,6 @@ // UCHAR KeyData[0]; } DVD_READ_KEY_USER_IN, *PDVD_READ_KEY_USER_IN; -typedef DVD_READ_KEY_USER_IN DVD_COPY_PROTECT_KEY; -typedef PDVD_READ_KEY_USER_IN PDVD_COPY_PROTECT_KEY; - typedef DVD_READ_KEY_USER_IN DVD_READ_KEY_USER_OUT; typedef PDVD_READ_KEY_USER_IN PDVD_READ_KEY_USER_OUT; @@ -1721,16 +1583,6 @@ typedef DVD_START_SESSION_USER_OUT DVD_END_SESSION_USER_IN; typedef PDVD_START_SESSION_USER_OUT PDVD_END_SESSION_USER_IN; - -//********************************************************************************************** - -typedef DVD_READ_KEY_USER_IN DVD_SEND_KEY_USER_IN; -typedef PDVD_READ_KEY_USER_IN PDVD_SEND_KEY_USER_IN; - -typedef struct _DVD_SET_RPC_KEY { - UCHAR PreferredDriveRegionCode; - UCHAR Reserved[3]; -} DVD_SET_RPC_KEY, * PDVD_SET_RPC_KEY; //********************************************************************************************** @@ -1760,9 +1612,6 @@ ULONG DiskData; } CDROM_DISK_DATA_USER_OUT, *PCDROM_DISK_DATA_USER_OUT; - -#define CDROM_DISK_AUDIO_TRACK (0x00000001) -#define CDROM_DISK_DATA_TRACK (0x00000002) //********************************************************************************************** Modified: trunk/reactos/drivers/filesystems/udfs/Include/nt_native.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/nt_native.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/nt_native.h [iso-8859-1] Mon Jun 15 21:19:04 2015 @@ -577,50 +577,6 @@ #define DEVICE_TYPE ULONG -#define FILE_DEVICE_BEEP 0x00000001 -#define FILE_DEVICE_CD_ROM 0x00000002 -#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 -#define FILE_DEVICE_CONTROLLER 0x00000004 -#define FILE_DEVICE_DATALINK 0x00000005 -#define FILE_DEVICE_DFS 0x00000006 -#define FILE_DEVICE_DISK 0x00000007 -#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008 -#define FILE_DEVICE_FILE_SYSTEM 0x00000009 -#define FILE_DEVICE_INPORT_PORT 0x0000000a -#define FILE_DEVICE_KEYBOARD 0x0000000b -#define FILE_DEVICE_MAILSLOT 0x0000000c -#define FILE_DEVICE_MIDI_IN 0x0000000d -#define FILE_DEVICE_MIDI_OUT 0x0000000e -#define FILE_DEVICE_MOUSE 0x0000000f -#define FILE_DEVICE_MULTI_UNC_PROVIDER 0x00000010 -#define FILE_DEVICE_NAMED_PIPE 0x00000011 -#define FILE_DEVICE_NETWORK 0x00000012 -#define FILE_DEVICE_NETWORK_BROWSER 0x00000013 -#define FILE_DEVICE_NETWORK_FILE_SYSTEM 0x00000014 -#define FILE_DEVICE_NULL 0x00000015 -#define FILE_DEVICE_PARALLEL_PORT 0x00000016 -#define FILE_DEVICE_PHYSICAL_NETCARD 0x00000017 -#define FILE_DEVICE_PRINTER 0x00000018 -#define FILE_DEVICE_SCANNER 0x00000019 -#define FILE_DEVICE_SERIAL_MOUSE_PORT 0x0000001a -#define FILE_DEVICE_SERIAL_PORT 0x0000001b -#define FILE_DEVICE_SCREEN 0x0000001c -#define FILE_DEVICE_SOUND 0x0000001d -#define FILE_DEVICE_STREAMS 0x0000001e -#define FILE_DEVICE_TAPE 0x0000001f -#define FILE_DEVICE_TAPE_FILE_SYSTEM 0x00000020 -#define FILE_DEVICE_TRANSPORT 0x00000021 -#define FILE_DEVICE_UNKNOWN 0x00000022 -#define FILE_DEVICE_VIDEO 0x00000023 -#define FILE_DEVICE_VIRTUAL_DISK 0x00000024 -#define FILE_DEVICE_WAVE_IN 0x00000025 -#define FILE_DEVICE_WAVE_OUT 0x00000026 -#define FILE_DEVICE_8042_PORT 0x00000027 -#define FILE_DEVICE_NETWORK_REDIRECTOR 0x00000028 -#define FILE_DEVICE_BATTERY 0x00000029 -#define FILE_DEVICE_BUS_EXTENDER 0x0000002a -#define FILE_DEVICE_MODEM 0x0000002b -#define FILE_DEVICE_VDM 0x0000002c // // Macro definition for defining IOCTL and FSCTL function control codes. Note // that function codes 0-2047 are reserved for Microsoft Corporation, and

1 0

[ekohl] 68156: [USETUP] Fix broken filesystem detection. - Treat FAT32 filesystems like FAT filesystems because we do not provide a FAT32 entry in the filesystemlist. - HACK: Do not try to check an...
by ekohl＠svn.reactos.org 15 Jun '15

15 Jun '15

Author: ekohl Date: Mon Jun 15 20:47:30 2015 New Revision: 68156 URL: http://svn.reactos.org/svn/reactos?rev=68156&view=rev Log: [USETUP] Fix broken filesystem detection. - Treat FAT32 filesystems like FAT filesystems because we do not provide a FAT32 entry in the filesystemlist. - HACK: Do not try to check an unidentified filesystem. CORE-9815 #resolve Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Jun 15 20:47:30 2015 @@ -2938,20 +2938,17 @@ CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); CurrentFileSystem = PartEntry->FileSystem; - if (CurrentFileSystem->FileSystemName == NULL) + if (CurrentFileSystem == NULL || CurrentFileSystem->FileSystemName == NULL) { if ((PartEntry->PartitionType == PARTITION_FAT_12) || (PartEntry->PartitionType == PARTITION_FAT_16) || (PartEntry->PartitionType == PARTITION_HUGE) || - (PartEntry->PartitionType == PARTITION_XINT13)) + (PartEntry->PartitionType == PARTITION_XINT13) || + (PartEntry->PartitionType == PARTITION_FAT32) || + (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) { FileSystemName = L"FAT"; } - else if ((PartEntry->PartitionType == PARTITION_FAT32) || - (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) - { - FileSystemName = L"FAT32"; - } else if (PartEntry->PartitionType == PARTITION_EXT2) { FileSystemName = L"EXT2"; @@ -2960,13 +2957,22 @@ { FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */ } + + DPRINT("FileSystemName: %S\n", FileSystemName); if (FileSystemName != NULL) CurrentFileSystem = GetFileSystemByName(FileSystemList, FileSystemName); } - if (CurrentFileSystem == NULL || CurrentFileSystem->ChkdskFunc == NULL) + /* HACK: Do not try to check a partition with an unknown filesytem */ + if (CurrentFileSystem == NULL) + { + PartEntry->NeedsCheck = FALSE; + return CHECK_FILE_SYSTEM_PAGE; + } + + if (CurrentFileSystem->ChkdskFunc == NULL) { sprintf(Buffer, "Setup is currently unable to check a partition formatted in %S.\n"

1 0

[akhaldi] 68155: [THEMEUI] Revert r67304 (Leverage add_registry_inf() as suggested by Timo). Figuring out why that doesn't work is left as an exercise for the reader. See CORE-5984 for details.
by akhaldi＠svn.reactos.org 15 Jun '15

15 Jun '15

Author: akhaldi Date: Mon Jun 15 20:42:08 2015 New Revision: 68155 URL: http://svn.reactos.org/svn/reactos?rev=68155&view=rev Log: [THEMEUI] Revert r67304 (Leverage add_registry_inf() as suggested by Timo). Figuring out why that doesn't work is left as an exercise for the reader. See CORE-5984 for details. Removed: trunk/reactos/dll/win32/themeui/themeui_reg.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/dll/win32/themeui/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Mon Jun 15 20:42:08 2015 @@ -284,6 +284,18 @@ HKCR,"sysfile","NoOpen",0x00000000,"" HKCR,"sysfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-171" HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" + +; MS Styles (Themes) +HKCR,".msstyles","",0x00000000,"msstylesfile" +HKCR,"msstylesfile","",0x00000000,"Visual Style File" +HKCR,"msstylesfile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" +HKCR,"msstylesfile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenMSTheme file:""%1""" + +; Theme File +HKCR,".theme","",0x00000000,"themefile" +HKCR,"themefile","",0x00000000,"Theme File" +HKCR,"themefile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" +HKCR,"themefile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenTheme /file:""%1""" ; URL shortcuts (e.g. used in favorites folder of IExplorer) HKCR,".url","",0x00000000,"InternetShortcut" Modified: trunk/reactos/dll/win32/themeui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/themeui/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/themeui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/themeui/CMakeLists.txt [iso-8859-1] Mon Jun 15 20:42:08 2015 @@ -1,5 +1,4 @@ add_library(themeui SHARED themeui.rc) set_module_type(themeui win32dll ENTRYPOINT 0) -add_registry_inf(themeui_reg.inf) add_cd_file(TARGET themeui DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/win32/themeui/themeui_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/themeui/themeui_… ============================================================================== --- trunk/reactos/dll/win32/themeui/themeui_reg.inf [iso-8859-1] (original) +++ trunk/reactos/dll/win32/themeui/themeui_reg.inf (removed) @@ -1,11 +0,0 @@ -; MS Styles (Themes) -HKCR,".msstyles","",0x00000000,"msstylesfile" -HKCR,"msstylesfile","",0x00000000,"Visual Style File" -HKCR,"msstylesfile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" -HKCR,"msstylesfile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenMSTheme file:""%1""" - -; Theme File -HKCR,".theme","",0x00000000,"themefile" -HKCR,"themefile","",0x00000000,"Theme File" -HKCR,"themefile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" -HKCR,"themefile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenTheme /file:""%1"""

1 0

[akhaldi] 68154: [CMAKE] Use a separate set for the optimization level in GCC release builds. We should revisit this to see if we need this rbuild era block nowadays.
by akhaldi＠svn.reactos.org 15 Jun '15

15 Jun '15

Author: akhaldi Date: Mon Jun 15 18:59:46 2015 New Revision: 68154 URL: http://svn.reactos.org/svn/reactos?rev=68154&view=rev Log: [CMAKE] Use a separate set for the optimization level in GCC release builds. We should revisit this to see if we need this rbuild era block nowadays. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=68154&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Jun 15 18:59:46 2015 @@ -129,20 +129,25 @@ endif() # Optimizations -if(OPTIMIZE STREQUAL "1") - add_compile_flags("-Os -ftracer") -elseif(OPTIMIZE STREQUAL "2") - add_compile_flags("-Os") -elseif(OPTIMIZE STREQUAL "3") - add_compile_flags("-Og") -elseif(OPTIMIZE STREQUAL "4") - add_compile_flags("-O1") -elseif(OPTIMIZE STREQUAL "5") - add_compile_flags("-O2") -elseif(OPTIMIZE STREQUAL "6") +# FIXME: Revisit this to see if we even need these levels +if(CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_flags("-O3") -elseif(OPTIMIZE STREQUAL "7") - add_compile_flags("-Ofast") +else() + if(OPTIMIZE STREQUAL "1") + add_compile_flags("-Os -ftracer") + elseif(OPTIMIZE STREQUAL "2") + add_compile_flags("-Os") + elseif(OPTIMIZE STREQUAL "3") + add_compile_flags("-Og") + elseif(OPTIMIZE STREQUAL "4") + add_compile_flags("-O1") + elseif(OPTIMIZE STREQUAL "5") + add_compile_flags("-O2") + elseif(OPTIMIZE STREQUAL "6") + add_compile_flags("-O3") + elseif(OPTIMIZE STREQUAL "7") + add_compile_flags("-Ofast") + endif() endif() # Link-time code generation

1 0

[akhaldi] 68153: [CMAKE] Disable treating warnings as errors in GCC release builds, at least until we get everything under control, for example CORE-7885.
by akhaldi＠svn.reactos.org 15 Jun '15

15 Jun '15

Author: akhaldi Date: Mon Jun 15 18:48:38 2015 New Revision: 68153 URL: http://svn.reactos.org/svn/reactos?rev=68153&view=rev Log: [CMAKE] Disable treating warnings as errors in GCC release builds, at least until we get everything under control, for example CORE-7885. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=68153&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Jun 15 18:48:38 2015 @@ -111,7 +111,7 @@ endif() # Warnings, errors -if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") +if((NOT CMAKE_BUILD_TYPE STREQUAL "Release") AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_compile_flags("-Werror") endif()

1 0

[tfaber] 68152: [NTOS:CC] - Properly stub CcCanIWrite, CcDeferWrite, CcFastCopyRead, CcFastCopyWrite CORE-9624
by tfaber＠svn.reactos.org 15 Jun '15

15 Jun '15

Author: tfaber Date: Mon Jun 15 18:44:08 2015 New Revision: 68152 URL: http://svn.reactos.org/svn/reactos?rev=68152&view=rev Log: [NTOS:CC] - Properly stub CcCanIWrite, CcDeferWrite, CcFastCopyRead, CcFastCopyWrite CORE-9624 Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=681… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Mon Jun 15 18:44:08 2015 @@ -342,8 +342,8 @@ { CCTRACE(CC_API_DEBUG, "FileObject=%p BytesToWrite=%lu Wait=%d Retrying=%d\n", FileObject, BytesToWrite, Wait, Retrying); - UNIMPLEMENTED; - return FALSE; + + return TRUE; } /* @@ -422,7 +422,7 @@ CCTRACE(CC_API_DEBUG, "FileObject=%p PostRoutine=%p Context1=%p Context2=%p BytesToWrite=%lu Retrying=%d\n", FileObject, PostRoutine, Context1, Context2, BytesToWrite, Retrying); - UNIMPLEMENTED; + PostRoutine(Context1, Context2); } /* @@ -438,11 +438,24 @@ OUT PVOID Buffer, OUT PIO_STATUS_BLOCK IoStatus) { + LARGE_INTEGER LargeFileOffset; + BOOLEAN Success; + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%lu Length=%lu PageCount=%lu Buffer=%p\n", FileObject, FileOffset, Length, PageCount, Buffer); - UNIMPLEMENTED; -} + DBG_UNREFERENCED_PARAMETER(PageCount); + + LargeFileOffset.QuadPart = FileOffset; + Success = CcCopyRead(FileObject, + &LargeFileOffset, + Length, + TRUE, + Buffer, + IoStatus); + NT_ASSERT(Success == TRUE); +} + /* * @unimplemented */ @@ -454,10 +467,19 @@ IN ULONG Length, IN PVOID Buffer) { + LARGE_INTEGER LargeFileOffset; + BOOLEAN Success; + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%lu Length=%lu Buffer=%p\n", FileObject, FileOffset, Length, Buffer); - UNIMPLEMENTED; + LargeFileOffset.QuadPart = FileOffset; + Success = CcCopyWrite(FileObject, + &LargeFileOffset, + Length, + TRUE, + Buffer); + NT_ASSERT(Success == TRUE); } /*

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