Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[cfinck] 67884: [WINSPOOL_APITEST] Make the tests actually succeed under Windows Server 2003.
by cfinck＠svn.reactos.org 24 May '15

24 May '15

Author: cfinck Date: Sun May 24 16:55:20 2015 New Revision: 67884 URL: http://svn.reactos.org/svn/reactos?rev=67884&view=rev Log: [WINSPOOL_APITEST] Make the tests actually succeed under Windows Server 2003. Modified: branches/colins-printing-for-freedom/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c branches/colins-printing-for-freedom/rostests/apitests/winspool/GetPrintProcessorDirectory.c branches/colins-printing-for-freedom/rostests/apitests/winspool/OpenPrinter.c branches/colins-printing-for-freedom/rostests/apitests/winspool/StartDocPrinter.c Modified: branches/colins-printing-for-freedom/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c [iso-8859-1] Sun May 24 16:55:20 2015 @@ -16,6 +16,7 @@ START_TEST(EnumPrintProcessorDatatypes) { DWORD cbNeeded; + DWORD cbTemp; DWORD dwReturned; PDATATYPES_INFO_1W pDatatypesInfo1; @@ -45,22 +46,28 @@ ok(!EnumPrintProcessorDatatypesW(NULL, L"wInPrInT", 1, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); ok(cbNeeded > 0, "cbNeeded is 0!\n"); - ok(dwReturned > 0, "dwReturned is 0!\n"); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); // Now provide the demanded size, but no buffer. SetLastError(0xDEADBEEF); - ok(!EnumPrintProcessorDatatypesW(NULL, L"wInPrInT", 1, NULL, cbNeeded, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(!EnumPrintProcessorDatatypesW(NULL, L"wInPrInT", 1, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); + ok(cbTemp == 0, "cbTemp is %lu!\n", cbTemp); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); // This also has to fail the same way when no Print Processor was given at all. SetLastError(0xDEADBEEF); - ok(!EnumPrintProcessorDatatypesW(NULL, NULL, 1, NULL, cbNeeded, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(!EnumPrintProcessorDatatypesW(NULL, NULL, 1, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); + ok(cbTemp == 0, "cbTemp is %lu!\n", cbTemp); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); // Same error has to occur with a valid Print Processor, but a size too small. SetLastError(0xDEADBEEF); - ok(!EnumPrintProcessorDatatypesW(NULL, L"wInPrInT", 1, NULL, cbNeeded, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(!EnumPrintProcessorDatatypesW(NULL, L"wInPrInT", 1, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); + ok(cbTemp == 0, "cbTemp is %lu!\n", cbTemp); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); // Finally use the function as intended and aim for success! pDatatypesInfo1 = HeapAlloc(GetProcessHeap(), 0, cbNeeded); Modified: branches/colins-printing-for-freedom/rostests/apitests/winspool/GetPrintProcessorDirectory.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/winspool/GetPrintProcessorDirectory.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/winspool/GetPrintProcessorDirectory.c [iso-8859-1] Sun May 24 16:55:20 2015 @@ -16,6 +16,7 @@ START_TEST(GetPrintProcessorDirectory) { DWORD cbNeeded; + DWORD cbTemp; PWSTR pwszBuffer; // Try with an invalid level, this needs to be caught first. @@ -28,6 +29,12 @@ ok(!GetPrintProcessorDirectoryW(NULL, NULL, 1, NULL, 0, NULL), "GetPrintProcessorDirectoryW returns TRUE!\n"); ok(GetLastError() == RPC_X_NULL_REF_POINTER, "GetPrintProcessorDirectoryW returns error %lu!\n", GetLastError()); + // Try with an invalid environment as well. + SetLastError(0xDEADBEEF); + ok(!GetPrintProcessorDirectoryW(NULL, L"invalid", 1, NULL, 0, &cbNeeded), "GetPrintProcessorDirectoryW returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_ENVIRONMENT, "GetPrintProcessorDirectoryW returns error %lu!\n", GetLastError()); + ok(cbNeeded == 0, "cbNeeded is %lu!\n", cbNeeded); + // Now get the required buffer size by supplying pcbNeeded. This needs to fail with ERROR_INSUFFICIENT_BUFFER. SetLastError(0xDEADBEEF); ok(!GetPrintProcessorDirectoryW(NULL, NULL, 1, NULL, 0, &cbNeeded), "GetPrintProcessorDirectoryW returns TRUE!\n"); @@ -36,18 +43,15 @@ // Now provide the demanded size, but no buffer. SetLastError(0xDEADBEEF); - ok(!GetPrintProcessorDirectoryW(NULL, NULL, 1, NULL, cbNeeded, &cbNeeded), "GetPrintProcessorDirectoryW returns TRUE!\n"); + ok(!GetPrintProcessorDirectoryW(NULL, NULL, 1, NULL, cbNeeded, &cbTemp), "GetPrintProcessorDirectoryW returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "GetPrintProcessorDirectoryW returns error %lu!\n", GetLastError()); + ok(cbTemp == 0, "cbNeeded is %lu!\n", cbNeeded); // Same error has to occur with a size too small. SetLastError(0xDEADBEEF); - ok(!GetPrintProcessorDirectoryW(NULL, NULL, 1, NULL, 1, &cbNeeded), "GetPrintProcessorDirectoryW returns TRUE!\n"); + ok(!GetPrintProcessorDirectoryW(NULL, NULL, 1, NULL, 1, &cbTemp), "GetPrintProcessorDirectoryW returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "GetPrintProcessorDirectoryW returns error %lu!\n", GetLastError()); - - // Try with an invalid environment as well. - SetLastError(0xDEADBEEF); - ok(!GetPrintProcessorDirectoryW(NULL, L"invalid", 1, NULL, 0, &cbNeeded), "GetPrintProcessorDirectoryW returns TRUE!\n"); - ok(GetLastError() == ERROR_INVALID_ENVIRONMENT, "GetPrintProcessorDirectoryW returns error %lu!\n", GetLastError()); + ok(cbTemp == 0, "cbNeeded is %lu!\n", cbNeeded); // Finally use the function as intended and aim for success! pwszBuffer = HeapAlloc(GetProcessHeap(), 0, cbNeeded); Modified: branches/colins-printing-for-freedom/rostests/apitests/winspool/OpenPrinter.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/winspool/OpenPrinter.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/winspool/OpenPrinter.c [iso-8859-1] Sun May 24 16:55:20 2015 @@ -17,11 +17,14 @@ { HANDLE hPrinter; + // Give no handle at all, this has to fail SetLastError(0xDEADBEEF); ok(!OpenPrinterW(NULL, NULL, NULL), "OpenPrinterW returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "OpenPrinterW returns error %lu!\n", GetLastError()); + // Open a handle to the local print server SetLastError(0xDEADBEEF); - ok(!OpenPrinterW(NULL, &hPrinter, NULL), "OpenPrinterW returns TRUE!\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "OpenPrinterW returns error %lu!\n", GetLastError()); + ok(OpenPrinterW(NULL, &hPrinter, NULL), "OpenPrinterW returns FALSE!\n"); + ok(GetLastError() == ERROR_SUCCESS, "OpenPrinterW returns error %lu!\n", GetLastError()); + ClosePrinter(hPrinter); } Modified: branches/colins-printing-for-freedom/rostests/apitests/winspool/StartDocPrinter.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/winspool/StartDocPrinter.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/winspool/StartDocPrinter.c [iso-8859-1] Sun May 24 16:55:20 2015 @@ -21,12 +21,12 @@ SetLastError(0xDEADBEEF); dwResult = StartDocPrinterW(NULL, 0, NULL); ok(dwResult == 0, "StartDocPrinterW returns %lu!\n", dwResult); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "StartDocPrinter returns error %lu!\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "StartDocPrinter returns error %lu!\n", GetLastError()); SetLastError(0xDEADBEEF); dwResult = StartDocPrinterW(NULL, 1, NULL); ok(dwResult == 0, "StartDocPrinterW returns %lu!\n", dwResult); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "StartDocPrinter returns error %lu!\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "StartDocPrinter returns error %lu!\n", GetLastError()); SetLastError(0xDEADBEEF); dwResult = StartDocPrinterW(NULL, 0, (LPBYTE)&docInfo);

1 0

[pschweitzer] 67883: [NTFS] Use non-paged lookaside list for IRP context allocation
by pschweitzer＠svn.reactos.org 24 May '15

24 May '15

Author: pschweitzer Date: Sun May 24 15:26:15 2015 New Revision: 67883 URL: http://svn.reactos.org/svn/reactos?rev=67883&view=rev Log: [NTFS] Use non-paged lookaside list for IRP context allocation Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c trunk/reactos/drivers/filesystems/ntfs/misc.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Sun May 24 15:26:15 2015 @@ -117,7 +117,7 @@ } else { - ExFreePoolWithTag(IrpContext, 'PRIN'); + ExFreeToNPagedLookasideList(&NtfsGlobalData->IrpContextLookasideList, IrpContext); } IoSetTopLevelIrp(NULL); Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] Sun May 24 15:26:15 2015 @@ -70,9 +70,7 @@ TRACE_(NTFS, "NtfsAllocateIrpContext()\n"); - IrpContext = (PNTFS_IRP_CONTEXT)ExAllocatePoolWithTag(NonPagedPool, - sizeof(NTFS_IRP_CONTEXT), - 'PRIN'); + IrpContext = (PNTFS_IRP_CONTEXT)ExAllocateFromNPagedLookasideList(&NtfsGlobalData->IrpContextLookasideList); if (IrpContext == NULL) return NULL; Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] Sun May 24 15:26:15 2015 @@ -96,6 +96,10 @@ NtfsGlobalData->FastIoDispatch.FastIoWrite = NtfsFastIoWrite; DriverObject->FastIoDispatch = &NtfsGlobalData->FastIoDispatch; + /* Initialize lookaside list for IRP contexts */ + ExInitializeNPagedLookasideList(&NtfsGlobalData->IrpContextLookasideList, + NULL, NULL, 0, sizeof(NTFS_IRP_CONTEXT), 'PRIN', 0); + /* Driver can't be unloaded */ DriverObject->DriverUnload = NULL; Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun May 24 15:26:15 2015 @@ -137,6 +137,7 @@ CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; ULONG Flags; FAST_IO_DISPATCH FastIoDispatch; + NPAGED_LOOKASIDE_LIST IrpContextLookasideList; } NTFS_GLOBAL_DATA, *PNTFS_GLOBAL_DATA;

1 0

[ekohl] 67882: [NTOSKRNL] IoCreateDevice: Assign SePublicOpenUnrestrictedSd to new devices. CORE-9176
by ekohl＠svn.reactos.org 24 May '15

24 May '15

Author: ekohl Date: Sun May 24 14:38:55 2015 New Revision: 67882 URL: http://svn.reactos.org/svn/reactos?rev=67882&view=rev Log: [NTOSKRNL] IoCreateDevice: Assign SePublicOpenUnrestrictedSd to new devices. CORE-9176 Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sun May 24 14:38:55 2015 @@ -846,14 +846,14 @@ /* Initialize the name */ RtlInitUnicodeString(&AutoName, AutoNameBuffer); DeviceName = &AutoName; - } + } /* Initialize the Object Attributes */ InitializeObjectAttributes(&ObjectAttributes, DeviceName, OBJ_KERNEL_HANDLE, NULL, - NULL); + SePublicOpenUnrestrictedSd); /* Honor exclusive flag */ if (Exclusive) ObjectAttributes.Attributes |= OBJ_EXCLUSIVE;

1 0

[akhaldi] 67881: [KBDHU] Fix MSVC build when the default code page is a MBCS. By Yuntian Zhang. CORE-7417
by akhaldi＠svn.reactos.org 24 May '15

24 May '15

Author: akhaldi Date: Sun May 24 14:26:31 2015 New Revision: 67881 URL: http://svn.reactos.org/svn/reactos?rev=67881&view=rev Log: [KBDHU] Fix MSVC build when the default code page is a MBCS. By Yuntian Zhang. CORE-7417 Modified: trunk/reactos/dll/keyboard/kbdhu/kbdhu.c Modified: trunk/reactos/dll/keyboard/kbdhu/kbdhu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhu/kbdhu.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhu/kbdhu.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdhu/kbdhu.c [iso-8859-1] Sun May 24 14:26:31 2015 @@ -175,7 +175,7 @@ { '7', 0, {'7', '='} }, { '8', 0, {'8', '('} }, { '9', 0, {'9', ')'} }, - { '0', 0, {'ö', 'Ö'} }, + { '0', 0, {0xf6, 0xd6} }, /* First letter row */ { 'Q', CAPLOK, {'q', 'Q'} }, { 'W', CAPLOK, {'w', 'W'} }, @@ -208,10 +208,10 @@ /* Specials */ /* Ctrl-_ generates US */ - { VK_OEM_PLUS ,0, {'ó', 'Ó'} }, - { VK_OEM_1 ,0, {'é', 'É'} }, - { VK_OEM_7 ,0, {'û', 'Û'} }, - { VK_OEM_3 ,0, {'0', '§'} }, + { VK_OEM_PLUS ,0, {0xf3, 0xd3} }, + { VK_OEM_1 ,0, {0xe9, 0xc9} }, + { VK_OEM_7 ,0, {0xfb, 0xdb} }, + { VK_OEM_3 ,0, {'0', 0xa7} }, { VK_OEM_COMMA ,0, {',', '?'} }, { VK_OEM_PERIOD ,0, {'.', ':'} }, { VK_OEM_2 ,0, {'-', '_'} }, @@ -229,9 +229,9 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ /* Legacy (telnet-style) ascii escapes */ - { VK_OEM_4, 0, {'õ', 'Õ', 0x1b /* ESC */} }, - { VK_OEM_6, 0, {'ú', 'Ú', 0x1d /* GS */} }, - { VK_OEM_5, 0, {'û','Û', 0x1c /* FS */} }, + { VK_OEM_4, 0, {0xf5, 0xd5, 0x1b /* ESC */} }, + { VK_OEM_6, 0, {0xfa, 0xda, 0x1d /* GS */} }, + { VK_OEM_5, 0, {0xfb, 0xdb, 0x1c /* FS */} }, { VK_RETURN,0, {'\r', '\r', '\n'} }, { 0,0 } };

1 0

[pschweitzer] 67880: [FASTFAT] - Add a debugging assert that will save your lot of time if you attempt to manually queue a wrong IRP. You cannot queue an IRP which is set to be later queued again. ...
by pschweitzer＠svn.reactos.org 24 May '15

24 May '15

Author: pschweitzer Date: Sun May 24 12:39:10 2015 New Revision: 67880 URL: http://svn.reactos.org/svn/reactos?rev=67880&view=rev Log: [FASTFAT] - Add a debugging assert that will save your lot of time if you attempt to manually queue a wrong IRP. You cannot queue an IRP which is set to be later queued again. This is a broken behavior. - Remove a bit of code duplication Modified: trunk/reactos/drivers/filesystems/fastfat/misc.c Modified: trunk/reactos/drivers/filesystems/fastfat/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] Sun May 24 12:39:10 2015 @@ -112,6 +112,8 @@ ASSERT(IrpContext); + FsRtlEnterFileSystem(); + switch (IrpContext->MajorFunction) { case IRP_MJ_CLOSE: @@ -202,6 +204,8 @@ VfatFreeIrpContext(IrpContext); } + FsRtlExitFileSystem(); + return Status; } @@ -228,9 +232,7 @@ } else { - FsRtlEnterFileSystem(); Status = VfatDispatchRequest(IrpContext); - FsRtlExitFileSystem(); } return Status; } @@ -302,9 +304,7 @@ InterlockedDecrement(&QueueCount); DPRINT("VfatDoRequest(IrpContext %p), MajorFunction %x, %d\n", IrpContext, ((PVFAT_IRP_CONTEXT)IrpContext)->MajorFunction, QueueCount); - FsRtlEnterFileSystem(); VfatDispatchRequest((PVFAT_IRP_CONTEXT)IrpContext); - FsRtlExitFileSystem(); } static @@ -317,6 +317,8 @@ ASSERT(IrpContext != NULL); ASSERT(IrpContext->Irp != NULL); + ASSERT(!(IrpContext->Flags & IRPCONTEXT_QUEUE) && + (IrpContext->Flags & IRPCONTEXT_COMPLETE)); IrpContext->Flags |= IRPCONTEXT_CANWAIT; IoMarkIrpPending(IrpContext->Irp);

1 0

[hbelusca] 67879: [NTVDM] - Update the CrtModeControl byte in the BDA when we change video modes. - Implement INT 10h, AX=1003h "Toggle Intensity/Blinking Bit". - Partially implement INT 10h, AH=1B...
by hbelusca＠svn.reactos.org 24 May '15

24 May '15

Author: hbelusca Date: Sun May 24 12:35:29 2015 New Revision: 67879 URL: http://svn.reactos.org/svn/reactos?rev=67879&view=rev Log: [NTVDM] - Update the CrtModeControl byte in the BDA when we change video modes. - Implement INT 10h, AX=1003h "Toggle Intensity/Blinking Bit". - Partially implement INT 10h, AH=1Bh "Functionality/State Information (VGA)". Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.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] Sun May 24 12:35:29 2015 @@ -97,7 +97,8 @@ WORD CharacterHeight; // 0x85 BYTE VGAOptions; // 0x87 BYTE VGASwitches; // 0x88 - BYTE VGAFlags[2]; // 0x89 + BYTE VGAFlags; // 0x89 + BYTE VGADccIDActive; // 0x8a DWORD Reserved3; // 0x8b BYTE Reserved4; // 0x8f BYTE Reserved5[2]; // 0x90 Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Sun May 24 12:35:29 2015 @@ -1942,6 +1942,8 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +PVGA_STATIC_FUNC_TABLE VgaStaticFuncTable; + /* PRIVATE FUNCTIONS **********************************************************/ static BOOLEAN VidBiosScrollWindow(SCROLL_DIRECTION Direction, @@ -2127,7 +2129,14 @@ Bda->CrtBasePort = (Registers->Misc & 0x01) ? VGA_CRTC_INDEX_COLOR : VGA_CRTC_INDEX_MONO; /* Bit 1 indicates whether display is color (0) or monochrome (1) */ - Bda->VGAOptions = (Bda->VGAOptions & 0xFD) | (!(Registers->Misc & 0x01) << 1); + Bda->VGAOptions = (Bda->VGAOptions & 0xFD) | (!(Registers->Misc & 0x01) << 1); + Bda->CrtModeControl = (Bda->CrtModeControl & 0xFB) | (!(Registers->Misc & 0x01) << 1); + + /* Update blink bit in BDA */ + if (Registers->Attribute[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_BLINK) + Bda->CrtModeControl |= (1 << 5); + else + Bda->CrtModeControl &= ~(1 << 5); /* Turn the video off */ IOWriteB(VGA_SEQ_INDEX, VGA_SEQ_CLOCK_REG); @@ -2408,11 +2417,6 @@ /* Clear the VGA memory if needed */ if (!DoNotClear) VgaClearMemory(); - // Bda->CrtModeControl; - // Bda->CrtColorPaletteMask; - // Bda->EGAFlags; - // Bda->VGAFlags; - /* Update the values in the BDA */ Bda->VideoMode = ModeNumber; Bda->VideoPageSize = VideoModePageSize[ModeNumber]; @@ -2422,6 +2426,10 @@ /* 256 KB Video RAM; set bit 7 if we do not clear the screen */ Bda->VGAOptions = 0x60 | (Bda->VGAOptions & 0x7F) | (DoNotClear ? 0x80 : 0x00); Bda->VGASwitches = 0xF9; /* High-resolution */ + + // Bda->VGAFlags; + // Bda->CrtModeControl; + // Bda->CrtColorPaletteMask; /* Set the start address in the CRTC */ IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_LOW_REG); @@ -2885,6 +2893,35 @@ break; } + /* Toggle Intensity/Blinking Bit */ + case 0x03: + { + /* Read the old AC mode control register value */ + BYTE VgaAcControlReg; + IOWriteB(VGA_AC_INDEX, VGA_AC_CONTROL_REG); + VgaAcControlReg = IOReadB(VGA_AC_READ); + + /* Toggle the blinking bit and write the new value */ + if (getBL()) + { + VgaAcControlReg |= VGA_AC_CONTROL_BLINK; + Bda->CrtModeControl |= (1 << 5); + } + else + { + VgaAcControlReg &= ~VGA_AC_CONTROL_BLINK; + Bda->CrtModeControl &= ~(1 << 5); + } + + IOWriteB(VGA_AC_INDEX, VGA_AC_CONTROL_REG); + IOWriteB(VGA_AC_WRITE, VgaAcControlReg); + + /* Enable screen and disable palette access */ + IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state + IOWriteB(VGA_AC_INDEX, 0x20); + break; + } + /* Get Single Palette Register */ case 0x07: { @@ -3223,15 +3260,70 @@ switch (getAL()) { case 0x00: /* Get Display combination code */ - setAX(MAKEWORD(0x1A, 0x1A)); - setBX(MAKEWORD(0x08, 0x00)); /* VGA w/ color analog display */ - break; + { + setBL(Bda->VGADccIDActive); + setBH(0x00); // No alternate display + + /* Return success */ + setAL(0x1A); + break; + } case 0x01: /* Set Display combination code */ - DPRINT1("Set Display combination code - Unsupported\n"); - break; + { + DPRINT1("Set Display combination code - Unsupported\n"); + break; + } default: - break; + break; } + break; + } + + /* Functionality/State Information (VGA) */ + case 0x1B: + { + PVGA_DYNAMIC_FUNC_TABLE Table = SEG_OFF_TO_PTR(getES(), getDI()); + + /* Check for only supported subfunction */ + if (getBX() != 0x0000) + { + DPRINT1("INT 10h, AH=1Bh, unsupported subfunction 0x%04x\n", getBX()); + break; + } + + /* Fill the VGA dynamic functionality table with our information */ + + Table->StaticFuncTablePtr = MAKELONG(VIDEO_STATE_INFO_OFFSET, VIDEO_BIOS_DATA_SEG); + + Table->VideoMode = Bda->VideoMode; + Table->ScreenColumns = Bda->ScreenColumns; + Table->VideoPageSize = Bda->VideoPageSize; + Table->VideoPageOffset = Bda->VideoPageOffset; + RtlCopyMemory(Table->CursorPosition, Bda->CursorPosition, sizeof(Bda->CursorPosition)); + Table->CursorEndLine = Bda->CursorEndLine; + Table->CursorStartLine = Bda->CursorStartLine; + Table->VideoPage = Bda->VideoPage; + Table->CrtBasePort = Bda->CrtBasePort; + Table->CrtModeControl = Bda->CrtModeControl; + Table->CrtColorPaletteMask = Bda->CrtColorPaletteMask; + Table->ScreenRows = Bda->ScreenRows; + Table->CharacterHeight = Bda->CharacterHeight; + + Table->VGADccIDActive = Bda->VGADccIDActive; + Table->VGADccIDAlternate = 0x00; // No alternate display + // Table->CurrModeSupportedColorsNum; + // Table->CurrModeSupportedPagesNum; + // Table->Scanlines; + // Table->PrimaryCharTable; + // Table->SecondaryCharTable; + // Table->VGAFlags; + Table->VGAAvailMemory = (Bda->VGAOptions & 0x60) >> 5; + // Table->VGASavePtrStateFlags; + // Table->VGADispInfo; + UNIMPLEMENTED; + + /* Return success */ + setAL(0x1B); break; } @@ -3287,7 +3379,19 @@ ((PULONG)BaseAddress)[0x42] = (ULONG)NULL; // Relocated Default INT 10h Video Services ((PULONG)BaseAddress)[0x6D] = (ULONG)NULL; // Video BIOS Entry Point - /* Fill the tables */ + /* Initialize the VGA static function table */ + VgaStaticFuncTable = SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, VIDEO_STATE_INFO_OFFSET); + RtlZeroMemory(VgaStaticFuncTable, sizeof(*VgaStaticFuncTable)); + VgaStaticFuncTable->SupportedModes[0] = 0xFF; // Modes 0x00 to 0x07 supported + VgaStaticFuncTable->SupportedModes[1] = 0xFF; // Modes 0x08 to 0x0F supported + VgaStaticFuncTable->SupportedModes[2] = 0x0F; // Modes 0x10 to 0x13 supported + VgaStaticFuncTable->SupportedScanlines = 0x07; // Scanlines 200, 350 and 400 supported + VgaStaticFuncTable->TextCharBlocksNumber = 0; + VgaStaticFuncTable->MaxActiveTextCharBlocksNumber = 0; + VgaStaticFuncTable->VGAFuncSupportFlags = 0x0CFD; // See: http://www.ctyme.com/intr/rb-0221.htm#Table46 + VgaStaticFuncTable->VGASavePtrFuncFlags = 0x18; // See: http://www.ctyme.com/intr/rb-0221.htm#Table47 + + /* Fill the font tables */ RtlMoveMemory(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, FONT_8x8_OFFSET), Font8x8, sizeof(Font8x8)); RtlMoveMemory(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, FONT_8x16_OFFSET), @@ -3307,6 +3411,10 @@ // (that should be done here, or maybe in VGA ??) // + Bda->CrtModeControl = 0x00; + Bda->CrtColorPaletteMask = 0x00; + Bda->VGADccIDActive = 0x08; // VGA w/ color analog active display + /* Set the default video mode */ VidBiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h [iso-8859-1] Sun May 24 12:35:29 2015 @@ -29,6 +29,8 @@ #define FONT_8x16_OFFSET 0x0800 #define FONT_8x14_OFFSET 0x1800 +#define VIDEO_STATE_INFO_OFFSET 0x3000 // == 0x1800 + (sizeof(Font8x14) == 0x0E00) + 0x0A00 for padding + typedef enum { SCROLL_UP, @@ -36,6 +38,65 @@ SCROLL_LEFT, SCROLL_RIGHT } SCROLL_DIRECTION; + +#pragma pack(push, 1) + +typedef struct _VGA_STATIC_FUNC_TABLE +{ + BYTE SupportedModes[3]; // 0x00 + DWORD Reserved0; // 0x03 + BYTE SupportedScanlines; // 0x07 + BYTE TextCharBlocksNumber; // 0x08 + BYTE MaxActiveTextCharBlocksNumber; // 0x09 + WORD VGAFuncSupportFlags; // 0x0a + WORD Reserved1; // 0x0c + BYTE VGASavePtrFuncFlags; // 0x0e + BYTE Reserved2; // 0x0f +} VGA_STATIC_FUNC_TABLE, *PVGA_STATIC_FUNC_TABLE; + +typedef struct _VGA_DYNAMIC_FUNC_TABLE +{ + DWORD StaticFuncTablePtr; // 0x00 + + /* + * The following fields follow the same order as in the BDA, + * from offset 0x49 up to offset 0x66... + */ + BYTE VideoMode; // 0x04 + WORD ScreenColumns; // 0x05 + WORD VideoPageSize; // 0x07 + WORD VideoPageOffset; // 0x09 + WORD CursorPosition[BIOS_MAX_PAGES]; // 0x0b + BYTE CursorEndLine; // 0x1b + BYTE CursorStartLine; // 0x1c + BYTE VideoPage; // 0x1d + WORD CrtBasePort; // 0x1e + BYTE CrtModeControl; // 0x20 + BYTE CrtColorPaletteMask; // 0x21 + /* ... and offsets 0x84 and 0x85. */ + BYTE ScreenRows; // 0x22 + WORD CharacterHeight; // 0x23 + + BYTE VGADccIDActive; // 0x25 + BYTE VGADccIDAlternate; // 0x26 + WORD CurrModeSupportedColorsNum; // 0x27 + BYTE CurrModeSupportedPagesNum; // 0x29 + BYTE Scanlines; // 0x2a + BYTE PrimaryCharTable; // 0x2b + BYTE SecondaryCharTable; // 0x2c + + /* Contains part of information from BDA::VGAFlags (offset 0x89) */ + BYTE VGAFlags; // 0x2d + + BYTE Reserved0[3]; // 0x2e + BYTE VGAAvailMemory; // 0x31 + BYTE VGASavePtrStateFlags; // 0x32 + BYTE VGADispInfo; // 0x33 + + BYTE Reserved1[12]; // 0x34 - 0x40 +} VGA_DYNAMIC_FUNC_TABLE, *PVGA_DYNAMIC_FUNC_TABLE; + +#pragma pack(pop) /* FUNCTIONS ******************************************************************/

1 0

[pschweitzer] 67878: [NTFS] Implement request qeueing (based on FastFAT work)
by pschweitzer＠svn.reactos.org 24 May '15

24 May '15

Author: pschweitzer Date: Sun May 24 12:28:51 2015 New Revision: 67878 URL: http://svn.reactos.org/svn/reactos?rev=67878&view=rev Log: [NTFS] Implement request qeueing (based on FastFAT work) Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Sun May 24 12:28:51 2015 @@ -31,7 +31,28 @@ #define NDEBUG #include <debug.h> +static LONG QueueCount = 0; + /* FUNCTIONS ****************************************************************/ + +static WORKER_THREAD_ROUTINE NtfsDoRequest; + +static +NTSTATUS +NtfsQueueRequest(PNTFS_IRP_CONTEXT IrpContext) +{ + InterlockedIncrement(&QueueCount); + DPRINT("NtfsQueueRequest(IrpContext %p), %d\n", IrpContext, QueueCount); + + ASSERT(!(IrpContext->Flags & IRPCONTEXT_QUEUE) && + (IrpContext->Flags & IRPCONTEXT_COMPLETE)); + IrpContext->Flags |= IRPCONTEXT_CANWAIT; + IoMarkIrpPending(IrpContext->Irp); + ExInitializeWorkItem(&IrpContext->WorkQueueItem, NtfsDoRequest, IrpContext); + ExQueueWorkItem(&IrpContext->WorkQueueItem, CriticalWorkQueue); + + return STATUS_PENDING; +} static NTSTATUS @@ -92,7 +113,7 @@ /* Reset our status flags before queueing the IRP */ IrpContext->Flags |= IRPCONTEXT_COMPLETE; IrpContext->Flags &= ~IRPCONTEXT_QUEUE; - UNIMPLEMENTED_DBGBREAK(); + Status = NtfsQueueRequest(IrpContext); } else { @@ -103,6 +124,17 @@ FsRtlExitFileSystem(); return Status; +} + +static +VOID +NTAPI +NtfsDoRequest(PVOID IrpContext) +{ + InterlockedDecrement(&QueueCount); + DPRINT("NtfsDoRequest(IrpContext %p), MajorFunction %x, %d\n", + IrpContext, ((PNTFS_IRP_CONTEXT)IrpContext)->MajorFunction, QueueCount); + NtfsDispatch((PNTFS_IRP_CONTEXT)IrpContext); } /*

1 0

[pschweitzer] 67877: [NTFS] - Only free the IRP context in case the request is not to be queued - Stubplement request queueing support in NtfsDispatch()
by pschweitzer＠svn.reactos.org 24 May '15

24 May '15

Author: pschweitzer Date: Sun May 24 12:20:51 2015 New Revision: 67877 URL: http://svn.reactos.org/svn/reactos?rev=67877&view=rev Log: [NTFS] - Only free the IRP context in case the request is not to be queued - Stubplement request queueing support in NtfsDispatch() Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Sun May 24 12:20:51 2015 @@ -87,8 +87,17 @@ IoCompleteRequest(Irp, IrpContext->PriorityBoost); } - if (IrpContext) + if (IrpContext->Flags & IRPCONTEXT_QUEUE) + { + /* Reset our status flags before queueing the IRP */ + IrpContext->Flags |= IRPCONTEXT_COMPLETE; + IrpContext->Flags &= ~IRPCONTEXT_QUEUE; + UNIMPLEMENTED_DBGBREAK(); + } + else + { ExFreePoolWithTag(IrpContext, 'PRIN'); + } IoSetTopLevelIrp(NULL); FsRtlExitFileSystem();

1 0

[pschweitzer] 67876: [NTFS] Handle IRP_MJ_WRITE with the dispatch routine
by pschweitzer＠svn.reactos.org 24 May '15

24 May '15

Author: pschweitzer Date: Sun May 24 12:17:43 2015 New Revision: 67876 URL: http://svn.reactos.org/svn/reactos?rev=67876&view=rev Log: [NTFS] Handle IRP_MJ_WRITE with the dispatch routine Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/rw.c Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Sun May 24 12:17:43 2015 @@ -71,6 +71,10 @@ case IRP_MJ_DEVICE_CONTROL: Status = NtfsDeviceControl(IrpContext); break; + + case IRP_MJ_WRITE: + Status = NtfsWrite(IrpContext); + break; } ASSERT((!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] Sun May 24 12:17:43 2015 @@ -122,7 +122,7 @@ DriverObject->MajorFunction[IRP_MJ_CREATE] = NtfsFsdCreate; DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsFsdClose; DriverObject->MajorFunction[IRP_MJ_READ] = NtfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_WRITE] = NtfsFsdWrite; + DriverObject->MajorFunction[IRP_MJ_WRITE] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = NtfsFsdDispatch; Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun May 24 12:17:43 2015 @@ -762,10 +762,8 @@ NTSTATUS NtfsRead(PNTFS_IRP_CONTEXT IrpContext); -DRIVER_DISPATCH NtfsFsdWrite; -NTSTATUS NTAPI -NtfsFsdWrite(PDEVICE_OBJECT DeviceObject, - PIRP Irp); +NTSTATUS +NtfsWrite(PNTFS_IRP_CONTEXT IrpContext); /* volinfo.c */ Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sun May 24 12:17:43 2015 @@ -186,7 +186,7 @@ PIRP Irp; PDEVICE_OBJECT DeviceObject; - DPRINT("NtfsRead(DeviceObject %p)\n", IrpContext); + DPRINT("NtfsRead(IrpContext %p)\n", IrpContext); DeviceObject = IrpContext->DeviceObject; Irp = IrpContext->Irp; @@ -225,14 +225,11 @@ NTSTATUS -NTAPI -NtfsFsdWrite(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +NtfsWrite(PNTFS_IRP_CONTEXT IrpContext) { - DPRINT("NtfwWrite(DeviceObject %x Irp %x)\n",DeviceObject,Irp); - - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - Irp->IoStatus.Information = 0; + DPRINT("NtfsWrite(IrpContext %p)\n",IrpContext); + + IrpContext->Irp->IoStatus.Information = 0; return STATUS_NOT_SUPPORTED; }

1 0

[pschweitzer] 67875: [NTFS] Split NtfsFsdDispatch() in two. Now, NtfsFsdDispatch() will only take care of allocating the IRP context and complete the IRP in case it failed (that fixes a null-pointe...
by pschweitzer＠svn.reactos.org 24 May '15

24 May '15

Author: pschweitzer Date: Sun May 24 10:48:15 2015 New Revision: 67875 URL: http://svn.reactos.org/svn/reactos?rev=67875&view=rev Log: [NTFS] Split NtfsFsdDispatch() in two. Now, NtfsFsdDispatch() will only take care of allocating the IRP context and complete the IRP in case it failed (that fixes a null-pointer dereference, just for the record). NtfsDispatch() will really dispatch the IRP to the internal functions. So that it can be called either directly from NtfsFsdDispatch() or by a queued IRP (to be implemented). Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Sun May 24 10:48:15 2015 @@ -33,61 +33,45 @@ /* FUNCTIONS ****************************************************************/ -/* - * FUNCTION: This function manages IRP for various major functions - * ARGUMENTS: - * DriverObject = object describing this driver - * Irp = IRP to be passed to internal functions - * RETURNS: Status of I/O Request - */ +static NTSTATUS -NTAPI -NtfsFsdDispatch(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +NtfsDispatch(PNTFS_IRP_CONTEXT IrpContext) { - PNTFS_IRP_CONTEXT IrpContext = NULL; + PIRP Irp = IrpContext->Irp; NTSTATUS Status = STATUS_UNSUCCESSFUL; - TRACE_(NTFS, "NtfsFsdDispatch()\n"); + TRACE_(NTFS, "NtfsDispatch()\n"); FsRtlEnterFileSystem(); - ASSERT(DeviceObject); - ASSERT(Irp); NtfsIsIrpTopLevel(Irp); - IrpContext = NtfsAllocateIrpContext(DeviceObject, Irp); - if (IrpContext) + switch (IrpContext->MajorFunction) { - switch (IrpContext->MajorFunction) - { - case IRP_MJ_QUERY_VOLUME_INFORMATION: - Status = NtfsQueryVolumeInformation(IrpContext); - break; + case IRP_MJ_QUERY_VOLUME_INFORMATION: + Status = NtfsQueryVolumeInformation(IrpContext); + break; - case IRP_MJ_SET_VOLUME_INFORMATION: - Status = NtfsSetVolumeInformation(IrpContext); - break; + case IRP_MJ_SET_VOLUME_INFORMATION: + Status = NtfsSetVolumeInformation(IrpContext); + break; - case IRP_MJ_QUERY_INFORMATION: - Status = NtfsQueryInformation(IrpContext); - break; + case IRP_MJ_QUERY_INFORMATION: + Status = NtfsQueryInformation(IrpContext); + break; - case IRP_MJ_DIRECTORY_CONTROL: - Status = NtfsDirectoryControl(IrpContext); - break; + case IRP_MJ_DIRECTORY_CONTROL: + Status = NtfsDirectoryControl(IrpContext); + break; - case IRP_MJ_READ: - Status = NtfsRead(IrpContext); - break; + case IRP_MJ_READ: + Status = NtfsRead(IrpContext); + break; - case IRP_MJ_DEVICE_CONTROL: - Status = NtfsDeviceControl(IrpContext); - break; - } + case IRP_MJ_DEVICE_CONTROL: + Status = NtfsDeviceControl(IrpContext); + break; } - else - Status = STATUS_INSUFFICIENT_RESOURCES; ASSERT((!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || ((IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || @@ -107,3 +91,35 @@ return Status; } + +/* + * FUNCTION: This function manages IRP for various major functions + * ARGUMENTS: + * DriverObject = object describing this driver + * Irp = IRP to be passed to internal functions + * RETURNS: Status of I/O Request + */ +NTSTATUS +NTAPI +NtfsFsdDispatch(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PNTFS_IRP_CONTEXT IrpContext = NULL; + NTSTATUS Status; + + TRACE_(NTFS, "NtfsFsdDispatch()\n"); + + IrpContext = NtfsAllocateIrpContext(DeviceObject, Irp); + if (IrpContext == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + else + { + Status = NtfsDispatch(IrpContext); + } + + return Status; +}

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2015