Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 67621: [CDFS] - Mark volumes as read-only. Patch by Barrett Karish. CORE-9655 #resolve
by tfaber＠svn.reactos.org 10 May '15

10 May '15

Author: tfaber Date: Sun May 10 14:09:47 2015 New Revision: 67621 URL: http://svn.reactos.org/svn/reactos?rev=67621&view=rev Log: [CDFS] - Mark volumes as read-only. Patch by Barrett Karish. CORE-9655 #resolve Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] Sun May 10 14:09:47 2015 @@ -95,7 +95,7 @@ return STATUS_BUFFER_OVERFLOW; FsAttributeInfo->FileSystemAttributes = - FILE_CASE_PRESERVED_NAMES | FILE_UNICODE_ON_DISK; + FILE_CASE_PRESERVED_NAMES | FILE_UNICODE_ON_DISK | FILE_READ_ONLY_VOLUME; FsAttributeInfo->MaximumComponentNameLength = 255; FsAttributeInfo->FileSystemNameLength = 8;

1 0

[hbelusca] 67620: [NTVDM]: Fix current directory stuff.
by hbelusca＠svn.reactos.org 10 May '15

10 May '15

Author: hbelusca Date: Sun May 10 13:34:02 2015 New Revision: 67620 URL: http://svn.reactos.org/svn/reactos?rev=67620&view=rev Log: [NTVDM]: Fix current directory stuff. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c 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] Sun May 10 13:34:02 2015 @@ -38,7 +38,7 @@ CALLBACK16 DosContext; -/*static*/ BYTE CurrentDrive; +/*static*/ BYTE CurrentDrive = 0x00; static CHAR LastDrive = 'Z'; // The last drive can be redefined with the LASTDRIVE command. At the moment, set the real maximum possible, 'Z'. static CHAR CurrentDirectories[NUM_DRIVES][DOS_DIR_LENGTH]; static PBYTE InDos; @@ -81,6 +81,8 @@ BYTE DriveNumber; DWORD Attributes; LPSTR Path; + CHAR CurrentDirectory[MAX_PATH]; + CHAR DosDirectory[DOS_DIR_LENGTH]; /* Make sure the directory path is not too long */ if (strlen(Directory) >= DOS_DIR_LENGTH) @@ -89,14 +91,23 @@ return FALSE; } - /* Get the drive number */ - DriveNumber = Directory[0] - 'A'; - - /* Make sure the drive exists */ - if (DriveNumber > (LastDrive - 'A')) + /* Check whether the directory string is of format "?:..." */ + if (strlen(Directory) >= 2 && Directory[1] == ':') { - DosLastError = ERROR_PATH_NOT_FOUND; - return FALSE; + /* Get the drive number */ + DriveNumber = RtlUpperChar(Directory[0]) - 'A'; + + /* Make sure the drive exists */ + if (DriveNumber > (LastDrive - 'A')) + { + DosLastError = ERROR_PATH_NOT_FOUND; + return FALSE; + } + } + else + { + /* Keep the current drive number */ + DriveNumber = CurrentDrive; } /* Get the file attributes */ @@ -120,9 +131,23 @@ return FALSE; } } + + /* Get the (possibly new) current directory (needed if we specified a relative directory) */ + if (!GetCurrentDirectoryA(sizeof(CurrentDirectory), CurrentDirectory)) + { + // TODO: Use some kind of default path? + return FALSE; + } + + /* Convert it to a DOS path */ + if (!GetShortPathNameA(CurrentDirectory, DosDirectory, sizeof(DosDirectory))) + { + // TODO: Use some kind of default path? + return FALSE; + } /* Get the directory part of the path */ - Path = strchr(Directory, '\\'); + Path = strchr(DosDirectory, '\\'); if (Path != NULL) { /* Skip the backslash */ @@ -786,7 +811,7 @@ /* Get Free Disk Space */ case 0x36: { - CHAR RootPath[3] = "X:\\"; + CHAR RootPath[3] = "?:\\"; DWORD SectorsPerCluster; DWORD BytesPerSector; DWORD NumberOfFreeClusters; @@ -1896,10 +1921,10 @@ #if 1 UCHAR i; + PDOS_SFT Sft; + LPSTR Path; CHAR CurrentDirectory[MAX_PATH]; CHAR DosDirectory[DOS_DIR_LENGTH]; - LPSTR Path; - PDOS_SFT Sft; const BYTE NullDriverRoutine[] = { /* Strategy routine entry */ @@ -1925,21 +1950,21 @@ RtlZeroMemory(CurrentDirectories, sizeof(CurrentDirectories)); /* Get the current directory */ - if (!GetCurrentDirectoryA(MAX_PATH, CurrentDirectory)) + if (!GetCurrentDirectoryA(sizeof(CurrentDirectory), CurrentDirectory)) { // TODO: Use some kind of default path? return FALSE; } - /* Convert that to a DOS path */ - if (!GetShortPathNameA(CurrentDirectory, DosDirectory, DOS_DIR_LENGTH)) + /* Convert it to a DOS path */ + if (!GetShortPathNameA(CurrentDirectory, DosDirectory, sizeof(DosDirectory))) { // TODO: Use some kind of default path? return FALSE; } /* Set the drive */ - CurrentDrive = DosDirectory[0] - 'A'; + CurrentDrive = RtlUpperChar(DosDirectory[0]) - 'A'; /* Get the directory part of the path */ Path = strchr(DosDirectory, '\\');

1 0

[hbelusca] 67619: [NTVDM]: Fix DOS file find. Introduced in r61507, it was indeed untested...
by hbelusca＠svn.reactos.org 10 May '15

10 May '15

Author: hbelusca Date: Sun May 10 12:25:27 2015 New Revision: 67619 URL: http://svn.reactos.org/svn/reactos?rev=67619&view=rev Log: [NTVDM]: Fix DOS file find. Introduced in r61507, it was indeed untested... Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c 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] Sun May 10 12:25:27 2015 @@ -546,65 +546,87 @@ { BOOLEAN Success = TRUE; WIN32_FIND_DATAA FindData; + HANDLE SearchHandle; PDOS_FIND_FILE_BLOCK FindFileBlock = (PDOS_FIND_FILE_BLOCK)lpFindFileData; + + /* Start a search */ + SearchHandle = FindFirstFileA(FileName, &FindData); + if (SearchHandle == INVALID_HANDLE_VALUE) return GetLastError(); + + do + { + /* Check the attributes and retry as long as we haven't found a matching file */ + if (((FindData.dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | + FILE_ATTRIBUTE_DIRECTORY)) + & ~AttribMask)) + { + break; + } + } + while ((Success = FindNextFileA(SearchHandle, &FindData))); + + /* If we failed at some point, close the search and return an error */ + if (!Success) + { + FindClose(SearchHandle); + return GetLastError(); + } /* Fill the block */ FindFileBlock->DriveLetter = CurrentDrive + 'A'; FindFileBlock->AttribMask = AttribMask; - FindFileBlock->SearchHandle = FindFirstFileA(FileName, &FindData); - if (FindFileBlock->SearchHandle == INVALID_HANDLE_VALUE) return GetLastError(); + FindFileBlock->SearchHandle = SearchHandle; + FindFileBlock->Attributes = LOBYTE(FindData.dwFileAttributes); + FileTimeToDosDateTime(&FindData.ftLastWriteTime, + &FindFileBlock->FileDate, + &FindFileBlock->FileTime); + FindFileBlock->FileSize = FindData.nFileSizeHigh ? 0xFFFFFFFF + : FindData.nFileSizeLow; + /* Build a short path name */ + if (*FindData.cAlternateFileName) + strncpy(FindFileBlock->FileName, FindData.cAlternateFileName, sizeof(FindFileBlock->FileName)); + else + GetShortPathNameA(FindData.cFileName, FindFileBlock->FileName, sizeof(FindFileBlock->FileName)); + + return ERROR_SUCCESS; +} + +DWORD +WINAPI +demFileFindNext(OUT PVOID lpFindFileData) +{ + WIN32_FIND_DATAA FindData; + PDOS_FIND_FILE_BLOCK FindFileBlock = (PDOS_FIND_FILE_BLOCK)lpFindFileData; do { - /* Check the attributes */ - if (!((FindData.dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_DIRECTORY)) - & ~AttribMask)) - { - break; - } - } - while ((Success = FindNextFileA(FindFileBlock->SearchHandle, &FindData))); - - if (!Success) return GetLastError(); - + /* Continue searching as long as we haven't found a matching file */ + + /* If we failed at some point, close the search and return an error */ + if (!FindNextFileA(FindFileBlock->SearchHandle, &FindData)) + { + FindClose(FindFileBlock->SearchHandle); + return GetLastError(); + } + } + while ((FindData.dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | + FILE_ATTRIBUTE_DIRECTORY)) + & ~FindFileBlock->AttribMask); + + /* Update the block */ FindFileBlock->Attributes = LOBYTE(FindData.dwFileAttributes); FileTimeToDosDateTime(&FindData.ftLastWriteTime, &FindFileBlock->FileDate, &FindFileBlock->FileTime); FindFileBlock->FileSize = FindData.nFileSizeHigh ? 0xFFFFFFFF : FindData.nFileSizeLow; - strcpy(FindFileBlock->FileName, FindData.cAlternateFileName); - - return ERROR_SUCCESS; -} - -DWORD -WINAPI -demFileFindNext(OUT PVOID lpFindFileData) -{ - WIN32_FIND_DATAA FindData; - PDOS_FIND_FILE_BLOCK FindFileBlock = (PDOS_FIND_FILE_BLOCK)lpFindFileData; - - do - { - if (!FindNextFileA(FindFileBlock->SearchHandle, &FindData)) - return GetLastError(); - - /* Update the block */ - FindFileBlock->Attributes = LOBYTE(FindData.dwFileAttributes); - FileTimeToDosDateTime(&FindData.ftLastWriteTime, - &FindFileBlock->FileDate, - &FindFileBlock->FileTime); - FindFileBlock->FileSize = FindData.nFileSizeHigh ? 0xFFFFFFFF - : FindData.nFileSizeLow; - strcpy(FindFileBlock->FileName, FindData.cAlternateFileName); - } - while((FindData.dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_DIRECTORY)) - & ~FindFileBlock->AttribMask); + /* Build a short path name */ + if (*FindData.cAlternateFileName) + strncpy(FindFileBlock->FileName, FindData.cAlternateFileName, sizeof(FindFileBlock->FileName)); + else + GetShortPathNameA(FindData.cFileName, FindFileBlock->FileName, sizeof(FindFileBlock->FileName)); return ERROR_SUCCESS; }

1 0

[hbelusca] 67618: [NTVDM]: Fix (again) command-line parsing in DosCreateProcess.
by hbelusca＠svn.reactos.org 10 May '15

10 May '15

Author: hbelusca Date: Sun May 10 11:34:35 2015 New Revision: 67618 URL: http://svn.reactos.org/svn/reactos?rev=67618&view=rev Log: [NTVDM]: Fix (again) command-line parsing in DosCreateProcess. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sun May 10 11:34:35 2015 @@ -259,10 +259,12 @@ /* Buffer for command line conversion: 1 byte for size; 127 bytes for contents */ CHAR CmdLineBuffer[1 + DOS_CMDLINE_LENGTH]; - DPRINT1("DosLoadExecutable(%d, %s, 0x%08X, 0x%08X)\n", + DPRINT1("DosLoadExecutable(%d, '%s', 0x%08X, 0x%08X, 0x%08X)\n", LoadType, ExecutablePath, - Parameters); + Parameters, + CommandLine, + Environment); /* Try to get the full path to the executable */ if (GetFullPathNameA(ExecutablePath, sizeof(FullPath), FullPath, NULL)) @@ -683,7 +685,7 @@ DWORD BinaryType; LPVOID Environment = NULL; VDM_COMMAND_INFO CommandInfo; - CHAR CmdLine[MAX_PATH]; // DOS_CMDLINE_LENGTH + 1 + CHAR CmdLine[MAX_PATH + DOS_CMDLINE_LENGTH + 1]; CHAR AppName[MAX_PATH]; CHAR PifFile[MAX_PATH]; CHAR Desktop[MAX_PATH]; @@ -714,18 +716,23 @@ StartupInfo.cb = sizeof(StartupInfo); /* - * Convert the DOS command line to Win32-compatible format. + * Convert the DOS command line to Win32-compatible format, by concatenating + * the program name with the converted command line. * Format of the DOS command line: 1 byte for size; 127 bytes for contents. */ + CmdLinePtr = CmdLine; + strncpy(CmdLinePtr, ProgramName, MAX_PATH); // Concatenate the program name + CmdLinePtr += strlen(CmdLinePtr); + *CmdLinePtr++ = ' '; // Add separating space + CmdLineSize = min(*(PBYTE)FAR_POINTER(Parameters->CommandLine), DOS_CMDLINE_LENGTH); - RtlCopyMemory(CmdLine, + RtlCopyMemory(CmdLinePtr, (LPSTR)FAR_POINTER(Parameters->CommandLine) + 1, CmdLineSize); /* NULL-terminate it */ - CmdLine[CmdLineSize] = '\0'; + CmdLinePtr[CmdLineSize] = '\0'; /* Remove any trailing return carriage character and NULL-terminate the command line */ - CmdLinePtr = CmdLine; while (*CmdLinePtr && *CmdLinePtr != '\r' && *CmdLinePtr != '\n') CmdLinePtr++; *CmdLinePtr = '\0';

1 0

[pschweitzer] 67617: [NTFS] Addendum to r67540: don't complete the IRP twice (NtfsQueryInformation() + NtfsFsdDispatch()). This fixes regression
by pschweitzer＠svn.reactos.org 10 May '15

10 May '15

Author: pschweitzer Date: Sun May 10 10:30:40 2015 New Revision: 67617 URL: http://svn.reactos.org/svn/reactos?rev=67617&view=rev Log: [NTFS] Addendum to r67540: don't complete the IRP twice (NtfsQueryInformation() + NtfsFsdDispatch()). This fixes regression Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Sun May 10 10:30:40 2015 @@ -301,16 +301,12 @@ Status = STATUS_INVALID_PARAMETER; } - Irp->IoStatus.Status = Status; - if (NT_SUCCESS(Status)) Irp->IoStatus.Information = Stack->Parameters.QueryFile.Length - BufferLength; else Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; }

1 0

[hbelusca] 67616: [NTVDM]: temporary fix for "lastdrive": put it to 'Z' (max drive letter you can have on DOS). A better fix would be DOS listing all the accessible drives in the current PC and com...
by hbelusca＠svn.reactos.org 10 May '15

10 May '15

Author: hbelusca Date: Sun May 10 10:28:33 2015 New Revision: 67616 URL: http://svn.reactos.org/svn/reactos?rev=67616&view=rev Log: [NTVDM]: temporary fix for "lastdrive": put it to 'Z' (max drive letter you can have on DOS). A better fix would be DOS listing all the accessible drives in the current PC and compute the last one. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c 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] Sun May 10 10:28:33 2015 @@ -39,7 +39,7 @@ CALLBACK16 DosContext; /*static*/ BYTE CurrentDrive; -static CHAR LastDrive = 'E'; +static CHAR LastDrive = 'Z'; // The last drive can be redefined with the LASTDRIVE command. At the moment, set the real maximum possible, 'Z'. static CHAR CurrentDirectories[NUM_DRIVES][DOS_DIR_LENGTH]; static PBYTE InDos;

1 0

[pschweitzer] 67615: [NTFS] Handle IRP_MJ_DIRECTORY_CONTROL with the dispatch routine
by pschweitzer＠svn.reactos.org 10 May '15

10 May '15

Author: pschweitzer Date: Sun May 10 10:17:29 2015 New Revision: 67615 URL: http://svn.reactos.org/svn/reactos?rev=67615&view=rev Log: [NTFS] Handle IRP_MJ_DIRECTORY_CONTROL with the dispatch routine Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/dispatch.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun May 10 10:17:29 2015 @@ -436,52 +436,30 @@ NTSTATUS -NTAPI -NtfsFsdDirectoryControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PNTFS_IRP_CONTEXT IrpContext = NULL; +NtfsDirectoryControl(PNTFS_IRP_CONTEXT IrpContext) +{ NTSTATUS Status = STATUS_UNSUCCESSFUL; DPRINT1("NtfsDirectoryControl() called\n"); - FsRtlEnterFileSystem(); - ASSERT(DeviceObject); - ASSERT(Irp); - - NtfsIsIrpTopLevel(Irp); - - IrpContext = NtfsAllocateIrpContext(DeviceObject, Irp); - if (IrpContext) - { - switch (IrpContext->MinorFunction) - { - case IRP_MN_QUERY_DIRECTORY: - Status = NtfsQueryDirectory(IrpContext); - break; - - case IRP_MN_NOTIFY_CHANGE_DIRECTORY: - DPRINT1("IRP_MN_NOTIFY_CHANGE_DIRECTORY\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - - default: - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - } - else - Status = STATUS_INSUFFICIENT_RESOURCES; - - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - if (IrpContext) - ExFreePoolWithTag(IrpContext, 'PRIN'); - - IoSetTopLevelIrp(NULL); - FsRtlExitFileSystem(); + switch (IrpContext->MinorFunction) + { + case IRP_MN_QUERY_DIRECTORY: + Status = NtfsQueryDirectory(IrpContext); + break; + + case IRP_MN_NOTIFY_CHANGE_DIRECTORY: + DPRINT1("IRP_MN_NOTIFY_CHANGE_DIRECTORY\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + default: + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + IrpContext->Irp->IoStatus.Information = 0; + return Status; } 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 10 10:17:29 2015 @@ -72,6 +72,10 @@ case IRP_MJ_QUERY_INFORMATION: Status = NtfsQueryInformation(IrpContext); break; + + case IRP_MJ_DIRECTORY_CONTROL: + Status = NtfsDirectoryControl(IrpContext); + break; } } else 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 10 10:17:29 2015 @@ -126,7 +126,7 @@ DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = NtfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = NtfsFsdDirectoryControl; + DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = NtfsFsdFileSystemControl; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = NtfsFsdDeviceControl; 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 10 10:17:29 2015 @@ -541,10 +541,8 @@ /* dirctl.c */ -DRIVER_DISPATCH NtfsFsdDirectoryControl; -NTSTATUS NTAPI -NtfsFsdDirectoryControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp); +NTSTATUS +NtfsDirectoryControl(PNTFS_IRP_CONTEXT IrpContext); /* dispatch.c */

1 0

[pschweitzer] 67614: [NTFS] NTFS doesn't need CdfsGetEntryName()
by pschweitzer＠svn.reactos.org 10 May '15

10 May '15

Author: pschweitzer Date: Sun May 10 10:02:53 2015 New Revision: 67614 URL: http://svn.reactos.org/svn/reactos?rev=67614&view=rev Log: [NTFS] NTFS doesn't need CdfsGetEntryName() Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun May 10 10:02:53 2015 @@ -34,96 +34,6 @@ /* FUNCTIONS ****************************************************************/ -#if 0 -static NTSTATUS -CdfsGetEntryName(PDEVICE_EXTENSION DeviceExt, - PVOID *Context, - PVOID *Block, - PLARGE_INTEGER StreamOffset, - ULONG DirLength, - PVOID *Ptr, - PWSTR Name, - PULONG pIndex, - PULONG pIndex2) -/* - * FUNCTION: Retrieves the file name, be it in short or long file name format - */ -{ - PDIR_RECORD Record; - NTSTATUS Status; - ULONG Index = 0; - ULONG Offset = 0; - ULONG BlockOffset = 0; - - Record = (PDIR_RECORD)*Block; - while(Index < *pIndex) - { - BlockOffset += Record->RecordLength; - Offset += Record->RecordLength; - - Record = (PDIR_RECORD)(*Block + BlockOffset); - if (BlockOffset >= BLOCKSIZE || Record->RecordLength == 0) - { - DPRINT("Map next sector\n"); - CcUnpinData(*Context); - StreamOffset->QuadPart += BLOCKSIZE; - Offset = ROUND_UP(Offset, BLOCKSIZE); - BlockOffset = 0; - - if (!CcMapData(DeviceExt->StreamFileObject, - StreamOffset, - BLOCKSIZE, TRUE, - Context, Block)) - { - DPRINT("CcMapData() failed\n"); - return(STATUS_UNSUCCESSFUL); - } - Record = (PDIR_RECORD)(*Block + BlockOffset); - } - - if (Offset >= DirLength) - return(STATUS_NO_MORE_ENTRIES); - - Index++; - } - - DPRINT("Index %lu RecordLength %lu Offset %lu\n", - Index, Record->RecordLength, Offset); - - if (Record->FileIdLength == 1 && Record->FileId[0] == 0) - { - wcscpy(Name, L"."); - } - else if (Record->FileIdLength == 1 && Record->FileId[0] == 1) - { - wcscpy(Name, L".."); - } - else - { - if (DeviceExt->CdInfo.JolietLevel == 0) - { - ULONG i; - - for (i = 0; i < Record->FileIdLength && Record->FileId[i] != ';'; i++) - Name[i] = (WCHAR)Record->FileId[i]; - Name[i] = 0; - } - else - { - CdfsSwapString(Name, Record->FileId, Record->FileIdLength); - } - } - - DPRINT("Name '%S'\n", Name); - - *Ptr = Record; - - *pIndex = Index; - - return(STATUS_SUCCESS); -} -#endif - static NTSTATUS NtfsGetNameInformation(PDEVICE_EXTENSION DeviceExt,

1 0

[aandrejevic] 67613: [NTVDM] Make sure the BOP doesn't repeat when the timeout expires in INT 15h, AH = 41h.
by aandrejevic＠svn.reactos.org 10 May '15

10 May '15

Author: aandrejevic Date: Sun May 10 02:10:19 2015 New Revision: 67613 URL: http://svn.reactos.org/svn/reactos?rev=67613&view=rev Log: [NTVDM] Make sure the BOP doesn't repeat when the timeout expires in INT 15h, AH = 41h. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c 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] Sun May 10 02:10:19 2015 @@ -181,6 +181,7 @@ if (getBL() != 0 && (Bda->TickCounter - StartingCount) >= getBL()) { /* Timeout expired */ + setCF(0); break; }

1 0

[aandrejevic] 67612: [NTVDM] - Modify the int32 dispatch to clear the CF only on entry, so that we can track in our handlers whether it was the first time the BOP executed. - Implement INT 15h, AH ...
by aandrejevic＠svn.reactos.org 10 May '15

10 May '15

Author: aandrejevic Date: Sun May 10 01:42:39 2015 New Revision: 67612 URL: http://svn.reactos.org/svn/reactos?rev=67612&view=rev Log: [NTVDM] - Modify the int32 dispatch to clear the CF only on entry, so that we can track in our handlers whether it was the first time the BOP executed. - Implement INT 15h, AH = 41h (Wait On External Event). - Fix INT 15h, AX = E801h - modify the stack CF instead of the handler CF. - Make INT 16h AH = 00h clear CF when there is a character, so that the BOP doesn't repeat. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c trunk/reactos/subsystems/mvdm/ntvdm/int32.c 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] Sun May 10 01:42:39 2015 @@ -164,6 +164,89 @@ break; } + /* Wait On External Event */ + case 0x41: + { + BYTE Value; + BOOLEAN Return; + static DWORD StartingCount; + + /* Check if this is the first time this BOP occurred */ + if (!getCF()) + { + /* Set the starting count */ + StartingCount = Bda->TickCounter; + } + + if (getBL() != 0 && (Bda->TickCounter - StartingCount) >= getBL()) + { + /* Timeout expired */ + break; + } + + if (getAL() & (1 << 4)) + { + /* Read from the I/O port */ + Value = IOReadB(getDX()); + } + else + { + /* Read from the memory */ + Value = *(LPBYTE)SEG_OFF_TO_PTR(getES(), getDI()); + } + + switch (getAL() & 7) + { + /* Any external event */ + case 0: + { + /* Return if this is not the first time the BOP occurred */ + Return = getCF(); + break; + } + + /* Compare and return if equal */ + case 1: + { + Return = Value == getBH(); + break; + } + + /* Compare and return if not equal */ + case 2: + { + Return = Value != getBH(); + break; + } + + /* Test and return if not zero */ + case 3: + { + Return = (Value & getBH()) != 0; + break; + } + + /* Test and return if zero */ + case 4: + { + Return = (Value & getBH()) == 0; + break; + } + + default: + { + DPRINT1("INT 15h, AH = 41h - Unknown condition type: %u\n", getAL() & 7); + Return = TRUE; + break; + } + } + + /* Repeat the BOP if we shouldn't return */ + setCF(!Return); + + break; + } + /* Keyboard intercept */ case 0x4F: { @@ -303,11 +386,12 @@ /* The amount of memory above 16M, in 64K blocks */ ULONG Above16M = (MAX_ADDRESS > 0x01000000) ? (MAX_ADDRESS - 0x01000000) >> 16: 0; - setCF(0); setAX(Above1M); setBX(Above16M); setCX(Above1M); setDX(Above16M); + + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else if (getAL() == 0x20 && getEDX() == 'SMAP') { 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] Sun May 10 01:42:39 2015 @@ -107,6 +107,7 @@ BiosKbdBufferPop(); setAX(Character); + setCF(0); break; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/int3… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/int32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/int32.c [iso-8859-1] Sun May 10 01:42:39 2015 @@ -40,9 +40,10 @@ /* Push the value of the interrupt to be called */ 0x6A, 0xFF, // push i (patchable to 0x6A, 0xIntNum) + 0xF8, // clc + /* The BOP Sequence */ // BOP_SEQ: - 0xF8, // clc BOP(BOP_CONTROL), // Control BOP BOP_CONTROL_INT32, // 32-bit Interrupt dispatcher @@ -52,7 +53,7 @@ 0xF4, // hlt - 0xEB, 0xF5, // jmp BOP_SEQ (offset -11) + 0xEB, 0xF6, // jmp BOP_SEQ (offset -10) // EXIT: 0x44, 0x44, // inc sp, inc sp

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