Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 67751: Fix Mr.GCC
by hbelusca＠svn.reactos.org 15 May '15

15 May '15

Author: hbelusca Date: Fri May 15 23:16:58 2015 New Revision: 67751 URL: http://svn.reactos.org/svn/reactos?rev=67751&view=rev Log: Fix Mr.GCC 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] Fri May 15 23:16:58 2015 @@ -903,7 +903,7 @@ { /* Get */ Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IDATE, - &CountryCodeBuffer->TimeFormat, + (LPSTR)&CountryCodeBuffer->TimeFormat, sizeof(CountryCodeBuffer->TimeFormat)); if (Return == 0) { @@ -913,7 +913,7 @@ } Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, - &CountryCodeBuffer->CurrencySymbol, + (LPSTR)&CountryCodeBuffer->CurrencySymbol, sizeof(CountryCodeBuffer->CurrencySymbol)); if (Return == 0) { @@ -923,7 +923,7 @@ } Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, - &CountryCodeBuffer->ThousandSep, + (LPSTR)&CountryCodeBuffer->ThousandSep, sizeof(CountryCodeBuffer->ThousandSep)); if (Return == 0) { @@ -933,7 +933,7 @@ } Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, - &CountryCodeBuffer->DecimalSep, + (LPSTR)&CountryCodeBuffer->DecimalSep, sizeof(CountryCodeBuffer->DecimalSep)); if (Return == 0) {

1 0

[hbelusca] 67750: [NTVDM] - Simplify CurrentDirectories array usage. - We can directly use a pointer to a DOS_DATA structure stored in the guest memory. - Use the DOS data structures for CurrentDri...
by hbelusca＠svn.reactos.org 15 May '15

15 May '15

Author: hbelusca Date: Fri May 15 23:13:40 2015 New Revision: 67750 URL: http://svn.reactos.org/svn/reactos?rev=67750&view=rev Log: [NTVDM] - Simplify CurrentDirectories array usage. - We can directly use a pointer to a DOS_DATA structure stored in the guest memory. - Use the DOS data structures for CurrentDrive (in DOS_DATA) and LastDrive (this is in fact NumLocalDrives in the SYSVARS list). - Use ANSI versions of GetLocaleInfo where applicable. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h 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] Fri May 15 23:13:40 2015 @@ -28,7 +28,7 @@ /* PRIVATE VARIABLES **********************************************************/ -/**/extern BYTE CurrentDrive;/**/ +extern PDOS_DATA DosData; /* PRIVATE FUNCTIONS **********************************************************/ @@ -575,7 +575,7 @@ } /* Fill the block */ - FindFileBlock->DriveLetter = CurrentDrive + 'A'; + FindFileBlock->DriveLetter = DosData->Sda.CurrentDrive + 'A'; FindFileBlock->AttribMask = AttribMask; FindFileBlock->SearchHandle = SearchHandle; FindFileBlock->Attributes = LOBYTE(FindData.dwFileAttributes); 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] Fri May 15 23:13:40 2015 @@ -74,7 +74,7 @@ PDOS_DEVICE_NODE Node = DosGetDriverNode(Descriptor->DevicePointer); if (!Node->InputStatusRoutine) return FALSE; - + Result = Node->InputStatusRoutine(Node); return !(Result & DOS_DEVSTAT_BUSY); } @@ -199,7 +199,7 @@ } /* Set the drive */ - CurrentDrive = DosDirectory[0] - 'A'; + Sda->CurrentDrive = DosDirectory[0] - 'A'; /* Get the directory part of the path */ Path = strchr(DosDirectory, '\\'); @@ -212,7 +212,7 @@ /* Set the directory */ if (Path != NULL) { - strncpy(CurrentDirectories[CurrentDrive], Path, DOS_DIR_LENGTH); + strncpy(CurrentDirectories[Sda->CurrentDrive], Path, DOS_DIR_LENGTH); } /* Read CONFIG.SYS */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] Fri May 15 23:13:40 2015 @@ -239,7 +239,7 @@ static VOID DosRemoveDriver(DWORD Driver) { - DWORD CurrentDriver = MAKELONG(FIELD_OFFSET(DOS_SYSVARS, NullDevice), DOS_DATA_SEGMENT); + DWORD CurrentDriver = MAKELONG(DOS_DATA_OFFSET(SysVars.NullDevice), DOS_DATA_SEGMENT); while (LOWORD(CurrentDriver) != 0xFFFF) { @@ -325,7 +325,7 @@ PDOS_DEVICE_NODE DosGetDevice(LPCSTR DeviceName) { - DWORD CurrentDriver = MAKELONG(FIELD_OFFSET(DOS_SYSVARS, NullDevice), DOS_DATA_SEGMENT); + DWORD CurrentDriver = MAKELONG(DOS_DATA_OFFSET(SysVars.NullDevice), DOS_DATA_SEGMENT); ANSI_STRING DeviceNameString; RtlInitAnsiString(&DeviceNameString, DeviceName); 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] Fri May 15 23:13:40 2015 @@ -36,12 +36,11 @@ CALLBACK16 DosContext; -/*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 PCHAR CurrentDirectories; - /* PUBLIC VARIABLES ***********************************************************/ +/* Global DOS data area contained in guest memory */ +PDOS_DATA DosData; +/* Easy accessors to useful DOS data area parts */ PDOS_SYSVARS SysVars; PDOS_SDA Sda; @@ -55,7 +54,7 @@ CHAR DirectoryPath[DOS_CMDLINE_LENGTH + 1]; /* Make sure the drive exists */ - if (Drive > (LastDrive - 'A')) return FALSE; + if (Drive >= SysVars->NumLocalDrives) return FALSE; RtlZeroMemory(DirectoryPath, sizeof(DirectoryPath)); @@ -63,14 +62,14 @@ snprintf(DirectoryPath, DOS_CMDLINE_LENGTH, "%c:\\%s", - Drive + 'A', - &CurrentDirectories[Drive * DOS_DIR_LENGTH]); + 'A' + Drive, + DosData->CurrentDirectories[Drive]); /* Change the current directory of the process */ if (!SetCurrentDirectoryA(DirectoryPath)) return FALSE; /* Set the current drive */ - CurrentDrive = Drive; + Sda->CurrentDrive = Drive; /* Return success */ return TRUE; @@ -98,7 +97,7 @@ DriveNumber = RtlUpperChar(Directory[0]) - 'A'; /* Make sure the drive exists */ - if (DriveNumber > (LastDrive - 'A')) + if (DriveNumber >= SysVars->NumLocalDrives) { Sda->LastErrorCode = ERROR_PATH_NOT_FOUND; return FALSE; @@ -107,7 +106,7 @@ else { /* Keep the current drive number */ - DriveNumber = CurrentDrive; + DriveNumber = Sda->CurrentDrive; } /* Get the file attributes */ @@ -122,7 +121,7 @@ } /* Check if this is the current drive */ - if (DriveNumber == CurrentDrive) + if (DriveNumber == Sda->CurrentDrive) { /* Change the directory */ if (!SetCurrentDirectoryA(Directory)) @@ -131,7 +130,7 @@ return FALSE; } } - + /* Get the (possibly new) current directory (needed if we specified a relative directory) */ if (!GetCurrentDirectoryA(sizeof(CurrentDirectory), CurrentDirectory)) { @@ -157,11 +156,11 @@ /* Set the directory for the drive */ if (Path != NULL) { - strncpy(&CurrentDirectories[DriveNumber * DOS_DIR_LENGTH], Path, DOS_DIR_LENGTH); + strncpy(DosData->CurrentDirectories[DriveNumber], Path, DOS_DIR_LENGTH); } else { - CurrentDirectories[DriveNumber * DOS_DIR_LENGTH] = '\0'; + DosData->CurrentDirectories[DriveNumber][0] = '\0'; } /* Return success */ @@ -198,8 +197,6 @@ SYSTEMTIME SystemTime; PCHAR String; PDOS_INPUT_BUFFER InputBuffer; - PDOS_COUNTRY_CODE_BUFFER CountryCodeBuffer; - INT Return; Sda->InDos++; @@ -487,7 +484,7 @@ case 0x0E: { DosChangeDrive(getDL()); - setAL(LastDrive - 'A' + 1); + setAL(SysVars->NumLocalDrives); break; } @@ -510,7 +507,7 @@ /* Get Default Drive */ case 0x19: { - setAL(CurrentDrive); + setAL(Sda->CurrentDrive); break; } @@ -582,8 +579,8 @@ PCHAR FileName = (PCHAR)SEG_OFF_TO_PTR(getDS(), getSI()); PDOS_FCB Fcb = (PDOS_FCB)SEG_OFF_TO_PTR(getES(), getDI()); BYTE Options = getAL(); - INT i; CHAR FillChar = ' '; + UINT i; if (FileName[1] == ':') { @@ -596,7 +593,7 @@ else { /* No drive number specified */ - if (Options & (1 << 1)) Fcb->DriveNumber = CurrentDrive + 1; + if (Options & (1 << 1)) Fcb->DriveNumber = Sda->CurrentDrive + 1; else Fcb->DriveNumber = 0; } @@ -811,13 +808,13 @@ /* Get Free Disk Space */ case 0x36: { - CHAR RootPath[3] = "?:\\"; + CHAR RootPath[] = "?:\\"; DWORD SectorsPerCluster; DWORD BytesPerSector; DWORD NumberOfFreeClusters; DWORD TotalNumberOfClusters; - if (getDL() == 0) RootPath[0] = 'A' + CurrentDrive; + if (getDL() == 0x00) RootPath[0] = 'A' + Sda->CurrentDrive; else RootPath[0] = 'A' + getDL() - 1; if (GetDiskFreeSpaceA(RootPath, @@ -898,14 +895,16 @@ /* Get/Set Country-dependent Information */ case 0x38: { - CountryCodeBuffer = (PDOS_COUNTRY_CODE_BUFFER)SEG_OFF_TO_PTR(getDS(), getDX()); + INT Return; + PDOS_COUNTRY_CODE_BUFFER CountryCodeBuffer = + (PDOS_COUNTRY_CODE_BUFFER)SEG_OFF_TO_PTR(getDS(), getDX()); if (getAL() == 0x00) { /* Get */ - Return = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IDATE, - &CountryCodeBuffer->TimeFormat, - sizeof(CountryCodeBuffer->TimeFormat) / sizeof(TCHAR)); + Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IDATE, + &CountryCodeBuffer->TimeFormat, + sizeof(CountryCodeBuffer->TimeFormat)); if (Return == 0) { Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; @@ -913,9 +912,9 @@ break; } - Return = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, - &CountryCodeBuffer->CurrencySymbol, - sizeof(CountryCodeBuffer->CurrencySymbol) / sizeof(TCHAR)); + Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, + &CountryCodeBuffer->CurrencySymbol, + sizeof(CountryCodeBuffer->CurrencySymbol)); if (Return == 0) { Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; @@ -923,9 +922,9 @@ break; } - Return = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, - &CountryCodeBuffer->ThousandSep, - sizeof(CountryCodeBuffer->ThousandSep) / sizeof(TCHAR)); + Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, + &CountryCodeBuffer->ThousandSep, + sizeof(CountryCodeBuffer->ThousandSep)); if (Return == 0) { Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; @@ -933,9 +932,9 @@ break; } - Return = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, - &CountryCodeBuffer->DecimalSep, - sizeof(CountryCodeBuffer->DecimalSep) / sizeof(TCHAR)); + Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, + &CountryCodeBuffer->DecimalSep, + sizeof(CountryCodeBuffer->DecimalSep)); if (Return == 0) { Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; @@ -1278,7 +1277,7 @@ /* Get the real drive number */ if (DriveNumber == 0) { - DriveNumber = CurrentDrive; + DriveNumber = Sda->CurrentDrive; } else { @@ -1286,13 +1285,13 @@ DriveNumber--; } - if (DriveNumber <= LastDrive - 'A') + if (DriveNumber < SysVars->NumLocalDrives) { /* * Copy the current directory into the target buffer. * It doesn't contain the drive letter and the backslash. */ - strncpy(String, &CurrentDirectories[DriveNumber * DOS_DIR_LENGTH], DOS_DIR_LENGTH); + strncpy(String, DosData->CurrentDirectories[DriveNumber], DOS_DIR_LENGTH); Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; setAX(0x0100); // Undocumented, see Ralf Brown: http://www.ctyme.com/intr/rb-2933.htm } @@ -1499,7 +1498,7 @@ /* Return the DOS "list of lists" in ES:BX */ setES(DOS_DATA_SEGMENT); - setBX(FIELD_OFFSET(DOS_SYSVARS, FirstDpb)); + setBX(DOS_DATA_OFFSET(SysVars.FirstDpb)); break; } @@ -1933,7 +1932,7 @@ break; } - + default: { DPRINT1("DOS Internal System Function INT 0x2F, AH = %xh, AL = %xh NOT IMPLEMENTED!\n", @@ -1969,62 +1968,19 @@ FILE *Stream; WCHAR Buffer[256]; - /* Get a pointer to the current directory buffer */ - CurrentDirectories = (PCHAR)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, - DOS_DATA_OFFSET(CurrentDirectories)); - - /* Clear the current directory buffer */ - RtlZeroMemory(CurrentDirectories, NUM_DRIVES * DOS_DIR_LENGTH * sizeof(CHAR)); - - /* Get the current 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; - } - - /* Set the drive */ - CurrentDrive = RtlUpperChar(DosDirectory[0]) - 'A'; - - /* Get the directory part of the path */ - Path = strchr(DosDirectory, '\\'); - if (Path != NULL) - { - /* Skip the backslash */ - Path++; - } - - /* Set the directory */ - if (Path != NULL) - { - strncpy(&CurrentDirectories[CurrentDrive * DOS_DIR_LENGTH], Path, DOS_DIR_LENGTH); - } - - /* Read CONFIG.SYS */ - Stream = _wfopen(DOS_CONFIG_PATH, L"r"); - if (Stream != NULL) - { - while (fgetws(Buffer, 256, Stream)) - { - // TODO: Parse the line - } - fclose(Stream); - } + /* Initialize the global DOS data area */ + DosData = (PDOS_DATA)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, 0x0000); + RtlZeroMemory(DosData, sizeof(*DosData)); /* Initialize the list of lists */ - SysVars = (PDOS_SYSVARS)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, DOS_DATA_OFFSET(SysVars)); - RtlZeroMemory(SysVars, sizeof(DOS_SYSVARS)); + SysVars = &DosData->SysVars; + RtlZeroMemory(SysVars, sizeof(*SysVars)); SysVars->FirstMcb = FIRST_MCB_SEGMENT; SysVars->FirstSft = MAKELONG(DOS_DATA_OFFSET(Sft), DOS_DATA_SEGMENT); SysVars->CurrentDirs = MAKELONG(DOS_DATA_OFFSET(CurrentDirectories), DOS_DATA_SEGMENT); + /* The last drive can be redefined with the LASTDRIVE command. At the moment, set the real maximum possible, 'Z'. */ + SysVars->NumLocalDrives = 'Z' - 'A' + 1; /* Initialize the NUL device driver */ SysVars->NullDevice.Link = 0xFFFFFFFF; @@ -2040,8 +1996,39 @@ sizeof(NullDriverRoutine)); /* Initialize the swappable data area */ - Sda = (PDOS_SDA)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, DOS_DATA_OFFSET(Sda)); - RtlZeroMemory(Sda, sizeof(DOS_SDA)); + Sda = &DosData->Sda; + RtlZeroMemory(Sda, sizeof(*Sda)); + + /* Get the current 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; + } + + /* Set the drive */ + Sda->CurrentDrive = RtlUpperChar(DosDirectory[0]) - 'A'; + + /* Get the directory part of the path */ + Path = strchr(DosDirectory, '\\'); + if (Path != NULL) + { + /* Skip the backslash */ + Path++; + } + + /* Set the directory */ + if (Path != NULL) + { + strncpy(DosData->CurrentDirectories[Sda->CurrentDrive], Path, DOS_DIR_LENGTH); + } /* Set the current PSP to the system PSP */ Sda->CurrentPsp = SYSTEM_PSP; @@ -2058,6 +2045,17 @@ { /* Clear the file descriptor entry */ RtlZeroMemory(&Sft->FileDescriptors[i], sizeof(DOS_FILE_DESCRIPTOR)); + } + + /* Read CONFIG.SYS */ + Stream = _wfopen(DOS_CONFIG_PATH, L"r"); + if (Stream != NULL) + { + while (fgetws(Buffer, 256, Stream)) + { + // TODO: Parse the line + } + fclose(Stream); } #endif Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Fri May 15 23:13:40 2015 @@ -88,7 +88,7 @@ DWORD CurrentDirs; BYTE Reserved1[6]; BYTE NumBlockDevices; - BYTE NumLocalDrives; + BYTE NumLocalDrives; // Set by LASTDRIVE DOS_DRIVER NullDevice; BYTE NullDriverRoutine[7]; } DOS_SYSVARS, *PDOS_SYSVARS; @@ -233,12 +233,11 @@ DWORD PrevCallFrame; } DOS_SDA, *PDOS_SDA; -/* This structure is only used for DOS_DATA_OFFSET calculations */ typedef struct _DOS_DATA { DOS_SYSVARS SysVars; DOS_SDA Sda; - CHAR CurrentDirectories[NUM_DRIVES * DOS_DIR_LENGTH]; + CHAR CurrentDirectories[NUM_DRIVES][DOS_DIR_LENGTH]; BYTE Sft[ANYSIZE_ARRAY]; } DOS_DATA, *PDOS_DATA;

1 0

[aandrejevic] 67749: [NTVDM] Implement those IOCTLs (0x06 and 0x07) for files too, not just devices.
by aandrejevic＠svn.reactos.org 15 May '15

15 May '15

Author: aandrejevic Date: Fri May 15 22:29:07 2015 New Revision: 67749 URL: http://svn.reactos.org/svn/reactos?rev=67749&view=rev Log: [NTVDM] Implement those IOCTLs (0x06 and 0x07) for files too, not just devices. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c 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] Fri May 15 22:29:07 2015 @@ -939,21 +939,36 @@ /* Get Input Status */ case 0x06: { - if (Node == NULL) - { - Sda->LastErrorCode = ERROR_INVALID_FUNCTION; - return FALSE; - } - - if (Node->InputStatusRoutine && Node->InputStatusRoutine(Node)) - { - /* Set the length to 0xFF to mark that it's ready */ - *Length = 0xFF; + /* Check if this is a file or a device */ + if (Node) + { + /* Device*/ + + if (Node->InputStatusRoutine && Node->InputStatusRoutine(Node)) + { + /* Set the length to 0xFF to mark that it's ready */ + *Length = 0xFF; + } + else + { + /* Not ready */ + *Length = 0; + } } else { - /* Not ready */ - *Length = 0; + /* File */ + + if (Descriptor->Position < Descriptor->Size) + { + /* Set the length to 0xFF to mark that it's ready */ + *Length = 0xFF; + } + else + { + /* Not ready */ + *Length = 0; + } } return TRUE; @@ -962,21 +977,26 @@ /* Get Output Status */ case 0x07: { - if (Node == NULL) - { - Sda->LastErrorCode = ERROR_INVALID_FUNCTION; - return FALSE; - } - - if (Node->OutputStatusRoutine && Node->OutputStatusRoutine(Node)) - { - /* Set the length to 0xFF to mark that it's ready */ + /* Check if this is a file or a device */ + if (Node) + { + /* Device*/ + + if (Node->OutputStatusRoutine && Node->OutputStatusRoutine(Node)) + { + /* Set the length to 0xFF to mark that it's ready */ + *Length = 0xFF; + } + else + { + /* Not ready */ + *Length = 0; + } + } + else + { + /* Files are always ready for output */ *Length = 0xFF; - } - else - { - /* Not ready */ - *Length = 0; } return TRUE;

1 0

[aandrejevic] 67748: [NTVDM] Implement DOS IOCTLs 0x06 (Get Input Status) and 0x07 (Get Output Status).
by aandrejevic＠svn.reactos.org 15 May '15

15 May '15

Author: aandrejevic Date: Fri May 15 22:18:04 2015 New Revision: 67748 URL: http://svn.reactos.org/svn/reactos?rev=67748&view=rev Log: [NTVDM] Implement DOS IOCTLs 0x06 (Get Input Status) and 0x07 (Get Output Status). Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c 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] Fri May 15 22:18:04 2015 @@ -936,6 +936,52 @@ return TRUE; } + /* Get Input Status */ + case 0x06: + { + if (Node == NULL) + { + Sda->LastErrorCode = ERROR_INVALID_FUNCTION; + return FALSE; + } + + if (Node->InputStatusRoutine && Node->InputStatusRoutine(Node)) + { + /* Set the length to 0xFF to mark that it's ready */ + *Length = 0xFF; + } + else + { + /* Not ready */ + *Length = 0; + } + + return TRUE; + } + + /* Get Output Status */ + case 0x07: + { + if (Node == NULL) + { + Sda->LastErrorCode = ERROR_INVALID_FUNCTION; + return FALSE; + } + + if (Node->OutputStatusRoutine && Node->OutputStatusRoutine(Node)) + { + /* Set the length to 0xFF to mark that it's ready */ + *Length = 0xFF; + } + else + { + /* Not ready */ + *Length = 0; + } + + return TRUE; + } + /* Unsupported control code */ default: {

1 0

[pschweitzer] 67747: [NTOSKRNL] Fix symbolic names list bound check in IopCreateArcNamesCd(). Spotted by "msuhanov" CORE-9698 #resolve #comment Fixed in r67747. Thanks!
by pschweitzer＠svn.reactos.org 15 May '15

15 May '15

Author: pschweitzer Date: Fri May 15 21:08:06 2015 New Revision: 67747 URL: http://svn.reactos.org/svn/reactos?rev=67747&view=rev Log: [NTOSKRNL] Fix symbolic names list bound check in IopCreateArcNamesCd(). Spotted by "msuhanov" CORE-9698 #resolve #comment Fixed in r67747. Thanks! Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Fri May 15 21:08:06 2015 @@ -253,7 +253,7 @@ for (DiskNumber = 0, EnabledDisks = 0; DiskNumber < CdRomCount; DiskNumber++) { /* Check if we have an enabled disk */ - if (SymbolicLinkList && *SymbolicLinkList != UNICODE_NULL) + if (lSymbolicLinkList && *lSymbolicLinkList != UNICODE_NULL) { /* Create its device name using first symbolic link */ RtlInitUnicodeString(&DeviceStringW, lSymbolicLinkList);

1 0

[aandrejevic] 67746: [NTVDM] Reverse the HSYNC/VSYNC polarity when it should be reversed.
by aandrejevic＠svn.reactos.org 15 May '15

15 May '15

Author: aandrejevic Date: Fri May 15 19:51:40 2015 New Revision: 67746 URL: http://svn.reactos.org/svn/reactos?rev=67746&view=rev Log: [NTVDM] Reverse the HSYNC/VSYNC polarity when it should be reversed. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c 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] Fri May 15 19:51:40 2015 @@ -1393,15 +1393,21 @@ case VGA_INSTAT1_READ_COLOR: { BYTE Result = 0; + BOOLEAN Vsync = InVerticalRetrace; + BOOLEAN Hsync = InHorizontalRetrace; /* Reset the AC latch */ VgaAcLatch = FALSE; + /* Reverse the polarity, if needed */ + if (VgaMiscRegister & VGA_MISC_VSYNCP) Vsync = !Vsync; + if (VgaMiscRegister & VGA_MISC_HSYNCP) Hsync = !Hsync; + /* Set a flag if there is a vertical or horizontal retrace */ - if (InVerticalRetrace || InHorizontalRetrace) Result |= VGA_STAT_DD; + if (Vsync || Hsync) Result |= VGA_STAT_DD; /* Set an additional flag if there was a vertical retrace */ - if (InVerticalRetrace) Result |= VGA_STAT_VRETRACE; + if (Vsync) Result |= VGA_STAT_VRETRACE; /* Clear the flags */ InHorizontalRetrace = InVerticalRetrace = FALSE;

1 0

[akhaldi] 67745: [SYSDM] Simplify loading usrmgr.cpl. By Jared Smudde. CORE-9694
by akhaldi＠svn.reactos.org 15 May '15

15 May '15

Author: akhaldi Date: Fri May 15 16:47:21 2015 New Revision: 67745 URL: http://svn.reactos.org/svn/reactos?rev=67745&view=rev Log: [SYSDM] Simplify loading usrmgr.cpl. By Jared Smudde. CORE-9694 Modified: trunk/reactos/dll/cpl/sysdm/userprofile.c Modified: trunk/reactos/dll/cpl/sysdm/userprofile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/userprofile.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/userprofile.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/userprofile.c [iso-8859-1] Fri May 15 16:47:21 2015 @@ -155,12 +155,7 @@ if (nmhdr->idFrom == IDC_USERACCOUNT_LINK && nmhdr->code == NM_CLICK) { - ShellExecute(hwndDlg, - TEXT("open"), - TEXT("rundll32.exe"), - TEXT("shell32.dll, Control_RunDLL usrmgr.cpl"), - NULL, - SW_SHOWNORMAL); + ShellExecuteW(hwndDlg, NULL, L"usrmgr.cpl", NULL, NULL, 0); } break; }

1 0

[pschweitzer] 67744: [FASTFAT] Hey Arch, if you simplify, do it completely! Addendum to r67743: don't double free the context
by pschweitzer＠svn.reactos.org 15 May '15

15 May '15

Author: pschweitzer Date: Fri May 15 16:33:20 2015 New Revision: 67744 URL: http://svn.reactos.org/svn/reactos?rev=67744&view=rev Log: [FASTFAT] Hey Arch, if you simplify, do it completely! Addendum to r67743: don't double free the context 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] Fri May 15 16:33:20 2015 @@ -85,8 +85,6 @@ Status = FsRtlProcessFileLock(&Fcb->FileLock, IrpContext->Irp, NULL); - - VfatFreeIrpContext(IrpContext); return Status; }

1 0

[pschweitzer] 67743: [FASTFAT] Bring in initiated work on IRPs in NTFS (and complete it). This simplifies the way IRPs and their context are handled in the driver. Only VfatDispatchRequest() is res...
by pschweitzer＠svn.reactos.org 15 May '15

15 May '15

Author: pschweitzer Date: Fri May 15 16:03:29 2015 New Revision: 67743 URL: http://svn.reactos.org/svn/reactos?rev=67743&view=rev Log: [FASTFAT] Bring in initiated work on IRPs in NTFS (and complete it). This simplifies the way IRPs and their context are handled in the driver. Only VfatDispatchRequest() is responsible of completing IRPs (if required), freeing the IRP context (if required), and queueing the IRP for later completion (if required). This allows removing duplicated code, hacks, and so on. It might help reducing IRP leaks, or memory leaks. By default, VfatDispatchRequest() will complete the IRP and delete the IRP context. In case you don't want it to complete the IRP (because you passed it down, for instance), remove the IRPCONTEXT_COMPLETE flag. See for instance: VfatDeviceControl(). In case you want to queue the IRP (you previously called: VfatQueueRequest()), call the newly introduced VfatMarkIrpContextForQueue() function that will prepare it. Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c trunk/reactos/drivers/filesystems/fastfat/close.c trunk/reactos/drivers/filesystems/fastfat/create.c trunk/reactos/drivers/filesystems/fastfat/dir.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/fastfat/flush.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/misc.c trunk/reactos/drivers/filesystems/fastfat/pnp.c trunk/reactos/drivers/filesystems/fastfat/rw.c trunk/reactos/drivers/filesystems/fastfat/vfat.h trunk/reactos/drivers/filesystems/fastfat/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Fri May 15 16:03:29 2015 @@ -152,14 +152,14 @@ if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) { - Status = STATUS_SUCCESS; - goto ByeBye; + IrpContext->Irp->IoStatus.Information = 0; + return STATUS_SUCCESS; } if (!ExAcquireResourceExclusiveLite(&IrpContext->DeviceExt->DirResource, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) { - return VfatQueueRequest(IrpContext); + return VfatMarkIrpContextForQueue(IrpContext); } Status = VfatCleanupFile(IrpContext); @@ -168,15 +168,10 @@ if (Status == STATUS_PENDING) { - return VfatQueueRequest(IrpContext); + return VfatMarkIrpContextForQueue(IrpContext); } -ByeBye: - IrpContext->Irp->IoStatus.Status = Status; IrpContext->Irp->IoStatus.Information = 0; - - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); return Status; } Modified: trunk/reactos/drivers/filesystems/fastfat/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] Fri May 15 16:03:29 2015 @@ -83,8 +83,8 @@ if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) { DPRINT("Closing file system\n"); - Status = STATUS_SUCCESS; - goto ByeBye; + IrpContext->Irp->IoStatus.Information = 0; + return STATUS_SUCCESS; } #if 0 /* There occurs a dead look at the call to CcRosDeleteFileCache/ObDereferenceObject/VfatClose @@ -94,17 +94,13 @@ if (!ExAcquireResourceExclusiveLite(&IrpContext->DeviceExt->DirResource, TRUE)) #endif { - return VfatQueueRequest(IrpContext); + return VfatMarkIrpContextForQueue(IrpContext); } Status = VfatCloseFile(IrpContext->DeviceExt, IrpContext->FileObject); ExReleaseResourceLite(&IrpContext->DeviceExt->DirResource); -ByeBye: - IrpContext->Irp->IoStatus.Status = Status; IrpContext->Irp->IoStatus.Information = 0; - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); return Status; } Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Fri May 15 16:03:29 2015 @@ -941,15 +941,14 @@ /* DeviceObject represents FileSystem instead of logical volume */ DPRINT ("FsdCreate called with file system\n"); IrpContext->Irp->IoStatus.Information = FILE_OPENED; - IrpContext->Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(IrpContext->Irp, IO_DISK_INCREMENT); - VfatFreeIrpContext(IrpContext); + IrpContext->PriorityBoost = IO_DISK_INCREMENT; + return STATUS_SUCCESS; } if (!(IrpContext->Flags & IRPCONTEXT_CANWAIT)) { - return(VfatQueueRequest(IrpContext)); + return VfatMarkIrpContextForQueue(IrpContext); } IrpContext->Irp->IoStatus.Information = 0; @@ -957,10 +956,9 @@ Status = VfatCreateFile(IrpContext->DeviceObject, IrpContext->Irp); ExReleaseResourceLite(&IrpContext->DeviceExt->DirResource); - IrpContext->Irp->IoStatus.Status = Status; - IoCompleteRequest(IrpContext->Irp, - (CCHAR)(NT_SUCCESS(Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT)); - VfatFreeIrpContext(IrpContext); + if (NT_SUCCESS(Status)) + IrpContext->PriorityBoost = IO_DISK_INCREMENT; + return Status; } Modified: trunk/reactos/drivers/filesystems/fastfat/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] Fri May 15 16:03:29 2015 @@ -508,7 +508,7 @@ (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) { ExReleaseResourceLite(&pFcb->MainResource); - return VfatQueueRequest(IrpContext); + return VfatMarkIrpContextForQueue(IrpContext); } while ((Status == STATUS_SUCCESS) && (BufferLength > 0)) @@ -592,29 +592,28 @@ return Status; } -NTSTATUS VfatNotifyChangeDirectory(PVFAT_IRP_CONTEXT * IrpContext) +NTSTATUS VfatNotifyChangeDirectory(PVFAT_IRP_CONTEXT IrpContext) { PVCB pVcb; PVFATFCB pFcb; PIO_STACK_LOCATION Stack; - Stack = (*IrpContext)->Stack; - pVcb = (*IrpContext)->DeviceExt; - pFcb = (PVFATFCB) (*IrpContext)->FileObject->FsContext; + Stack = IrpContext->Stack; + pVcb = IrpContext->DeviceExt; + pFcb = (PVFATFCB) IrpContext->FileObject->FsContext; FsRtlNotifyFullChangeDirectory(pVcb->NotifySync, &(pVcb->NotifyList), - (*IrpContext)->FileObject->FsContext2, + IrpContext->FileObject->FsContext2, (PSTRING)&(pFcb->PathNameU), BooleanFlagOn(Stack->Flags, SL_WATCH_TREE), FALSE, Stack->Parameters.NotifyDirectory.CompletionFilter, - (*IrpContext)->Irp, + IrpContext->Irp, NULL, NULL); - /* We don't need the IRP context as we won't handle IRP completion */ - VfatFreeIrpContext(*IrpContext); - *IrpContext = NULL; + /* We won't handle IRP completion */ + IrpContext->Flags &= ~IRPCONTEXT_COMPLETE; return STATUS_PENDING; } @@ -637,7 +636,7 @@ break; case IRP_MN_NOTIFY_CHANGE_DIRECTORY: - Status = VfatNotifyChangeDirectory(&IrpContext); + Status = VfatNotifyChangeDirectory(IrpContext); break; default: @@ -648,19 +647,9 @@ break; } - if (Status == STATUS_PENDING) - { - /* Only queue if there's IRP context */ - if (IrpContext) - { - Status = VfatQueueRequest(IrpContext); - } - } - else - { - IrpContext->Irp->IoStatus.Status = Status; - IoCompleteRequest (IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); + if (Status == STATUS_PENDING && IrpContext->Flags & IRPCONTEXT_COMPLETE) + { + return VfatMarkIrpContextForQueue(IrpContext); } return Status; Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Fri May 15 16:03:29 2015 @@ -1381,7 +1381,7 @@ if (!ExAcquireResourceSharedLite(&FCB->MainResource, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) { - return VfatQueueRequest(IrpContext); + return VfatMarkIrpContextForQueue(IrpContext); } } @@ -1459,14 +1459,11 @@ ExReleaseResourceLite(&FCB->MainResource); } - IrpContext->Irp->IoStatus.Status = Status; if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) IrpContext->Irp->IoStatus.Information = IrpContext->Stack->Parameters.QueryFile.Length - BufferLength; else IrpContext->Irp->IoStatus.Information = 0; - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); return Status; } @@ -1510,10 +1507,7 @@ (PLARGE_INTEGER)SystemBuffer)) { DPRINT("Couldn't set file size!\n"); - IrpContext->Irp->IoStatus.Status = STATUS_USER_MAPPED_FILE; IrpContext->Irp->IoStatus.Information = 0; - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); return STATUS_USER_MAPPED_FILE; } DPRINT("Can set file size\n"); @@ -1524,7 +1518,7 @@ if (!ExAcquireResourceExclusiveLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) { - return VfatQueueRequest(IrpContext); + return VfatMarkIrpContextForQueue(IrpContext); } } @@ -1537,7 +1531,8 @@ { ExReleaseResourceLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource); } - return VfatQueueRequest(IrpContext); + + return VfatMarkIrpContextForQueue(IrpContext); } } @@ -1592,11 +1587,7 @@ ExReleaseResourceLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource); } - IrpContext->Irp->IoStatus.Status = Status; IrpContext->Irp->IoStatus.Information = 0; - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); - return Status; } Modified: trunk/reactos/drivers/filesystems/fastfat/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/flush.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/flush.c [iso-8859-1] Fri May 15 16:03:29 2015 @@ -150,8 +150,8 @@ /* This request is not allowed on the main device object. */ if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) { - Status = STATUS_INVALID_DEVICE_REQUEST; - goto ByeBye; + IrpContext->Irp->IoStatus.Information = 0; + return STATUS_INVALID_DEVICE_REQUEST; } Fcb = (PVFATFCB)IrpContext->FileObject->FsContext; @@ -170,12 +170,7 @@ ExReleaseResourceLite (&Fcb->MainResource); } -ByeBye: - IrpContext->Irp->IoStatus.Status = Status; IrpContext->Irp->IoStatus.Information = 0; - IoCompleteRequest (IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); - return Status; } Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Fri May 15 16:03:29 2015 @@ -1066,9 +1066,5 @@ break; } - IrpContext->Irp->IoStatus.Status = Status; - - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); return Status; } 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] Fri May 15 16:03:29 2015 @@ -51,6 +51,10 @@ static LONG QueueCount = 0; +static VOID VfatFreeIrpContext(PVFAT_IRP_CONTEXT); +static PVFAT_IRP_CONTEXT VfatAllocateIrpContext(PDEVICE_OBJECT, PIRP); +static NTSTATUS VfatQueueRequest(PVFAT_IRP_CONTEXT); + /* FUNCTIONS ****************************************************************/ static @@ -69,28 +73,21 @@ if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) { - Status = STATUS_INVALID_DEVICE_REQUEST; - goto Fail; + return STATUS_INVALID_DEVICE_REQUEST; } if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) { - Status = STATUS_INVALID_PARAMETER; - goto Fail; - } - + return STATUS_INVALID_PARAMETER; + } + + IrpContext->Flags &= ~IRPCONTEXT_COMPLETE; Status = FsRtlProcessFileLock(&Fcb->FileLock, IrpContext->Irp, NULL); VfatFreeIrpContext(IrpContext); return Status; - -Fail: - IrpContext->Irp->IoStatus.Status = Status; - IoCompleteRequest(IrpContext->Irp, (CCHAR)(NT_SUCCESS(Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT)); - VfatFreeIrpContext(IrpContext); - return Status; } static @@ -100,6 +97,8 @@ { IoSkipCurrentIrpStackLocation(IrpContext->Irp); + IrpContext->Flags &= ~IRPCONTEXT_COMPLETE; + return IoCallDriver(IrpContext->DeviceExt->StorageDevice, IrpContext->Irp); } @@ -108,6 +107,8 @@ VfatDispatchRequest( IN PVFAT_IRP_CONTEXT IrpContext) { + NTSTATUS Status; + DPRINT("VfatDispatchRequest (IrpContext %p), is called for %s\n", IrpContext, IrpContext->MajorFunction >= IRP_MJ_MAXIMUM_FUNCTION ? "????" : MajorFunctionNames[IrpContext->MajorFunction]); @@ -116,42 +117,94 @@ switch (IrpContext->MajorFunction) { case IRP_MJ_CLOSE: - return VfatClose(IrpContext); + Status = VfatClose(IrpContext); + break; + case IRP_MJ_CREATE: - return VfatCreate(IrpContext); + Status = VfatCreate(IrpContext); + break; + case IRP_MJ_READ: - return VfatRead (IrpContext); + Status = VfatRead(IrpContext); + break; + case IRP_MJ_WRITE: - return VfatWrite (IrpContext); + Status = VfatWrite (IrpContext); + break; + case IRP_MJ_FILE_SYSTEM_CONTROL: - return VfatFileSystemControl(IrpContext); + Status = VfatFileSystemControl(IrpContext); + break; + case IRP_MJ_QUERY_INFORMATION: - return VfatQueryInformation (IrpContext); + Status = VfatQueryInformation (IrpContext); + break; + case IRP_MJ_SET_INFORMATION: - return VfatSetInformation (IrpContext); + Status = VfatSetInformation (IrpContext); + break; + case IRP_MJ_DIRECTORY_CONTROL: - return VfatDirectoryControl(IrpContext); + Status = VfatDirectoryControl(IrpContext); + break; + case IRP_MJ_QUERY_VOLUME_INFORMATION: - return VfatQueryVolumeInformation(IrpContext); + Status = VfatQueryVolumeInformation(IrpContext); + break; + case IRP_MJ_SET_VOLUME_INFORMATION: - return VfatSetVolumeInformation(IrpContext); + Status = VfatSetVolumeInformation(IrpContext); + break; + case IRP_MJ_LOCK_CONTROL: - return VfatLockControl(IrpContext); + Status = VfatLockControl(IrpContext); + break; + case IRP_MJ_DEVICE_CONTROL: - return VfatDeviceControl(IrpContext); + Status = VfatDeviceControl(IrpContext); + break; + case IRP_MJ_CLEANUP: - return VfatCleanup(IrpContext); + Status = VfatCleanup(IrpContext); + break; + case IRP_MJ_FLUSH_BUFFERS: - return VfatFlush(IrpContext); + Status = VfatFlush(IrpContext); + break; + case IRP_MJ_PNP: - return VfatPnp(IrpContext); + Status = VfatPnp(IrpContext); + break; + default: DPRINT1("Unexpected major function %x\n", IrpContext->MajorFunction); - IrpContext->Irp->IoStatus.Status = STATUS_DRIVER_INTERNAL_ERROR; - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); - return STATUS_DRIVER_INTERNAL_ERROR; - } + Status = STATUS_DRIVER_INTERNAL_ERROR; + } + + ASSERT((!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || + ((IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || + (!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && (IrpContext->Flags & IRPCONTEXT_QUEUE))); + + if (IrpContext->Flags & IRPCONTEXT_COMPLETE) + { + IrpContext->Irp->IoStatus.Status = Status; + IoCompleteRequest(IrpContext->Irp, IrpContext->PriorityBoost); + } + + if (IrpContext->Flags & IRPCONTEXT_QUEUE) + { + /* Reset our status flags before queueing the IRP */ + IrpContext->Flags |= IRPCONTEXT_COMPLETE; + IrpContext->Flags &= ~IRPCONTEXT_QUEUE; + Status = VfatQueueRequest(IrpContext); + } + else + { + /* Unless the IRP was queued, always free the IRP context */ + VfatFreeIrpContext(IrpContext); + } + + return Status; } NTSTATUS @@ -184,6 +237,7 @@ return Status; } +static VOID VfatFreeIrpContext( PVFAT_IRP_CONTEXT IrpContext) @@ -192,6 +246,7 @@ ExFreeToNPagedLookasideList(&VfatGlobalData->IrpContextLookasideList, IrpContext); } +static PVFAT_IRP_CONTEXT VfatAllocateIrpContext( PDEVICE_OBJECT DeviceObject, @@ -218,7 +273,7 @@ MajorFunction = IrpContext->MajorFunction = IrpContext->Stack->MajorFunction; IrpContext->MinorFunction = IrpContext->Stack->MinorFunction; IrpContext->FileObject = IrpContext->Stack->FileObject; - IrpContext->Flags = 0; + IrpContext->Flags = IRPCONTEXT_COMPLETE; if (MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL || MajorFunction == IRP_MJ_DEVICE_CONTROL || MajorFunction == IRP_MJ_SHUTDOWN) @@ -233,6 +288,7 @@ } KeInitializeEvent(&IrpContext->Event, NotificationEvent, FALSE); IrpContext->RefCount = 0; + IrpContext->PriorityBoost = IO_NO_INCREMENT; } return IrpContext; } @@ -253,6 +309,7 @@ FsRtlExitFileSystem(); } +static NTSTATUS VfatQueueRequest( PVFAT_IRP_CONTEXT IrpContext) Modified: trunk/reactos/drivers/filesystems/fastfat/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/pnp.c [iso-8859-1] Fri May 15 16:03:29 2015 @@ -33,17 +33,14 @@ case IRP_MN_REMOVE_DEVICE: case IRP_MN_CANCEL_REMOVE_DEVICE: Status = STATUS_NOT_IMPLEMENTED; - IrpContext->Irp->IoStatus.Status = Status; - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); break; default: IoSkipCurrentIrpStackLocation(IrpContext->Irp); Vcb = (PVCB)IrpContext->Stack->DeviceObject->DeviceExtension; + IrpContext->Flags &= ~IRPCONTEXT_COMPLETE; Status = IoCallDriver(Vcb->StorageDevice, IrpContext->Irp); } - VfatFreeIrpContext(IrpContext); - return Status; } Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Fri May 15 16:03:29 2015 @@ -572,9 +572,9 @@ PFATINFO FatInfo = &IrpContext->DeviceExt->FatInfo; IrpContext->Stack->Parameters.Read.ByteOffset.QuadPart += FatInfo->dataStart * FatInfo->BytesPerSector; IoSkipCurrentIrpStackLocation(IrpContext->Irp); + IrpContext->Flags &= ~IRPCONTEXT_COMPLETE; DPRINT("Read from page file, disk offset %I64x\n", IrpContext->Stack->Parameters.Read.ByteOffset.QuadPart); Status = IoCallDriver(IrpContext->DeviceExt->StorageDevice, IrpContext->Irp); - VfatFreeIrpContext(IrpContext); return Status; } @@ -740,13 +740,7 @@ Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoWriteAccess); if (NT_SUCCESS(Status)) { - Status = VfatQueueRequest(IrpContext); - } - else - { - IrpContext->Irp->IoStatus.Status = Status; - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); + Status = VfatMarkIrpContextForQueue(IrpContext); } } else @@ -760,9 +754,8 @@ ByteOffset.QuadPart + IrpContext->Irp->IoStatus.Information; } - IoCompleteRequest(IrpContext->Irp, - (CCHAR)(NT_SUCCESS(Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT)); - VfatFreeIrpContext(IrpContext); + if (NT_SUCCESS(Status)) + IrpContext->PriorityBoost = IO_DISK_INCREMENT; } DPRINT("%x\n", Status); return Status; @@ -805,9 +798,9 @@ PFATINFO FatInfo = &IrpContext->DeviceExt->FatInfo; IrpContext->Stack->Parameters.Write.ByteOffset.QuadPart += FatInfo->dataStart * FatInfo->BytesPerSector; IoSkipCurrentIrpStackLocation(IrpContext->Irp); + IrpContext->Flags &= ~IRPCONTEXT_COMPLETE; DPRINT("Write to page file, disk offset %I64x\n", IrpContext->Stack->Parameters.Write.ByteOffset.QuadPart); Status = IoCallDriver(IrpContext->DeviceExt->StorageDevice, IrpContext->Irp); - VfatFreeIrpContext(IrpContext); return Status; } @@ -1074,13 +1067,7 @@ Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoReadAccess); if (NT_SUCCESS(Status)) { - Status = VfatQueueRequest(IrpContext); - } - else - { - IrpContext->Irp->IoStatus.Status = Status; - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); + Status = VfatMarkIrpContextForQueue(IrpContext); } } else @@ -1093,9 +1080,8 @@ ByteOffset.QuadPart + IrpContext->Irp->IoStatus.Information; } - IoCompleteRequest(IrpContext->Irp, - (CCHAR)(NT_SUCCESS(Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT)); - VfatFreeIrpContext(IrpContext); + if (NT_SUCCESS(Status)) + IrpContext->PriorityBoost = IO_DISK_INCREMENT; } DPRINT("%x\n", Status); return Status; Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Fri May 15 16:03:29 2015 @@ -446,8 +446,10 @@ } DOSDATE, *PDOSDATE; -#define IRPCONTEXT_CANWAIT 0x0001 -#define IRPCONTEXT_PENDINGRETURNED 0x0002 +#define IRPCONTEXT_CANWAIT 0x0001 +#define IRPCONTEXT_COMPLETE 0x0002 +#define IRPCONTEXT_QUEUE 0x0004 +#define IRPCONTEXT_PENDINGRETURNED 0x0008 typedef struct { @@ -462,6 +464,7 @@ PFILE_OBJECT FileObject; ULONG RefCount; KEVENT Event; + CCHAR PriorityBoost; } VFAT_IRP_CONTEXT, *PVFAT_IRP_CONTEXT; typedef struct _VFAT_DIRENTRY_CONTEXT @@ -480,6 +483,18 @@ USHORT CreationDate; USHORT CreationTime; } VFAT_MOVE_CONTEXT, *PVFAT_MOVE_CONTEXT; + +FORCEINLINE +NTSTATUS +VfatMarkIrpContextForQueue(PVFAT_IRP_CONTEXT IrpContext) +{ + PULONG Flags = &IrpContext->Flags; + + *Flags &= ~IRPCONTEXT_COMPLETE; + *Flags |= IRPCONTEXT_QUEUE; + + return STATUS_PENDING; +} /* blockdev.c */ @@ -902,19 +917,6 @@ /* misc.c */ -NTSTATUS -VfatQueueRequest( - PVFAT_IRP_CONTEXT IrpContext); - -PVFAT_IRP_CONTEXT -VfatAllocateIrpContext( - PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -VOID -VfatFreeIrpContext( - PVFAT_IRP_CONTEXT IrpContext); - DRIVER_DISPATCH VfatBuildRequest; Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] Fri May 15 16:03:29 2015 @@ -363,7 +363,8 @@ if (!ExAcquireResourceSharedLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) { - return VfatQueueRequest(IrpContext); + DPRINT1("DirResource failed!\n"); + return VfatMarkIrpContextForQueue(IrpContext); } /* INITIALIZATION */ @@ -405,14 +406,12 @@ } ExReleaseResourceLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource); - IrpContext->Irp->IoStatus.Status = RC; + if (NT_SUCCESS(RC)) IrpContext->Irp->IoStatus.Information = IrpContext->Stack->Parameters.QueryVolume.Length - BufferLength; else IrpContext->Irp->IoStatus.Information = 0; - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); return RC; } @@ -439,7 +438,7 @@ if (!ExAcquireResourceExclusiveLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) { - return VfatQueueRequest(IrpContext); + return VfatMarkIrpContextForQueue(IrpContext); } FsInformationClass = Stack->Parameters.SetVolume.FsInformationClass; @@ -462,10 +461,7 @@ } ExReleaseResourceLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource); - IrpContext->Irp->IoStatus.Status = Status; IrpContext->Irp->IoStatus.Information = 0; - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); return Status; }

1 0

[aandrejevic] 67742: [NTVDM] - Properly initialize the current directories on startup. - Add a missing colon after the drive letter.
by aandrejevic＠svn.reactos.org 15 May '15

15 May '15

Author: aandrejevic Date: Fri May 15 00:39:34 2015 New Revision: 67742 URL: http://svn.reactos.org/svn/reactos?rev=67742&view=rev Log: [NTVDM] - Properly initialize the current directories on startup. - Add a missing colon after the drive letter. 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] Fri May 15 00:39:34 2015 @@ -62,7 +62,7 @@ /* Find the path to the new current directory */ snprintf(DirectoryPath, DOS_CMDLINE_LENGTH, - "%c\\%s", + "%c:\\%s", Drive + 'A', &CurrentDirectories[Drive * DOS_DIR_LENGTH]); @@ -1974,7 +1974,7 @@ DOS_DATA_OFFSET(CurrentDirectories)); /* Clear the current directory buffer */ - RtlZeroMemory(CurrentDirectories, sizeof(CurrentDirectories)); + RtlZeroMemory(CurrentDirectories, NUM_DRIVES * DOS_DIR_LENGTH * sizeof(CHAR)); /* Get the current directory */ if (!GetCurrentDirectoryA(sizeof(CurrentDirectory), CurrentDirectory))

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