Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 69361: [NTVDM] - Don't hardcode magic values of characters if they have C escape codes. - Print an extra newline on call to the Ctrl-C handler, as it is done on real DOS. - Use a do{}whi...
by hbelusca＠svn.reactos.org 26 Sep '15

26 Sep '15

Author: hbelusca Date: Sat Sep 26 03:24:55 2015 New Revision: 69361 URL: http://svn.reactos.org/svn/reactos?rev=69361&view=rev Log: [NTVDM] - Don't hardcode magic values of characters if they have C escape codes. - Print an extra newline on call to the Ctrl-C handler, as it is done on real DOS. - Use a do{}while loop which loops while we don't have read a CR character. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c 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] Sat Sep 26 03:24:55 2015 @@ -68,7 +68,7 @@ * Check if this is a special character * NOTE: \r and \n are handled by the underlying driver! */ - if (Character < 0x20 && Character != 0x0A && Character != 0x0D) + if (Character < 0x20 && Character != '\r' && Character != '\n') { DosPrintCharacter(DOS_OUTPUT_HANDLE, '^'); Character += 'A' - 1; 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] Sat Sep 26 03:24:55 2015 @@ -164,6 +164,10 @@ BOOLEAN DosControlBreak(VOID) { setCF(0); + + /* Print an extra newline */ + DosPrintCharacter(DOS_OUTPUT_HANDLE, '\r'); + DosPrintCharacter(DOS_OUTPUT_HANDLE, '\n'); /* Call interrupt 0x23 */ Int32Call(&DosContext, 0x23); 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] Sat Sep 26 03:24:55 2015 @@ -675,11 +675,11 @@ PDOS_DEVICE_NODE Node = DosGetDriverNode(Descriptor->DevicePointer); BYTE LineSize = 0; PCHAR Pointer = FAR_POINTER(Buffer); - - while (TRUE) + CHAR Character; + + do { USHORT Amount = 1; - CHAR Character; /* Read a character from the device */ Node->ReadRoutine(Node, @@ -757,9 +757,8 @@ } } - /* Stop on a carriage return */ - if (Character == '\r') break; - } + /* Stop on a carriage return */ + } while (Character != '\r'); return LineSize - 1; } @@ -841,11 +840,11 @@ { /* Translated input from a character device that isn't CON */ PCHAR Pointer = FAR_POINTER(Buffer); + CHAR Character; while (*BytesRead < Count) { USHORT Amount = 1; - CHAR Character; /* Read a character from the device */ Node->ReadRoutine(Node,

1 0

[aandrejevic] 69360: [NTVDM] DosReadFile echoes the line feed when it encounters it. A backspace should delete the '^' sign for special characters.
by aandrejevic＠svn.reactos.org 26 Sep '15

26 Sep '15

Author: aandrejevic Date: Sat Sep 26 02:51:37 2015 New Revision: 69360 URL: http://svn.reactos.org/svn/reactos?rev=69360&view=rev Log: [NTVDM] DosReadFile echoes the line feed when it encounters it. A backspace should delete the '^' sign for special characters. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c 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] Sat Sep 26 02:51:37 2015 @@ -53,15 +53,6 @@ break; } - case '\r': - case '\n': - { - /* Print both a carriage return and a newline */ - DosPrintCharacter(DOS_OUTPUT_HANDLE, '\r'); - DosPrintCharacter(DOS_OUTPUT_HANDLE, '\n'); - break; - } - case '\b': { /* Erase the character */ @@ -73,8 +64,11 @@ default: { - /* Check if this is a special character */ - if (Character < 0x20) + /* + * Check if this is a special character + * NOTE: \r and \n are handled by the underlying driver! + */ + if (Character < 0x20 && Character != 0x0A && Character != 0x0D) { DosPrintCharacter(DOS_OUTPUT_HANDLE, '^'); Character += 'A' - 1; 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] Sat Sep 26 02:51:37 2015 @@ -725,14 +725,25 @@ break; } + case '\n': + { + DosEchoCharacter('\r'); + DosEchoCharacter('\n'); + break; + } + case '\b': { if (LineSize > 0) { LineSize--; - if (Pointer[LineSize] == 0) LineSize--; - DosEchoCharacter(Character); + + /* Erase the '^' too */ + if (Pointer[LineSize] > 0x00 && Pointer[LineSize] < 0x20) + { + DosEchoCharacter(Character); + } } break; @@ -813,6 +824,9 @@ { /* A line feed marks the true end of the line */ SysVars->UnreadConInput = 0; + + /* Echo the line feed */ + DosEchoCharacter('\n'); break; } else

1 0

[aandrejevic] 69359: [NTVDM] Fix INT 21h/0Ah. DosReadCharacter shouldn't echo all the time.
by aandrejevic＠svn.reactos.org 26 Sep '15

26 Sep '15

Author: aandrejevic Date: Sat Sep 26 00:05:10 2015 New Revision: 69359 URL: http://svn.reactos.org/svn/reactos?rev=69359&view=rev Log: [NTVDM] Fix INT 21h/0Ah. DosReadCharacter shouldn't echo all the time. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h 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] Sat Sep 26 00:05:10 2015 @@ -79,16 +79,14 @@ DosPrintCharacter(DOS_OUTPUT_HANDLE, '^'); Character += 'A' - 1; } - else - { - /* Echo the character */ - DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); - } - } - } -} - -CHAR DosReadCharacter(WORD FileHandle) + + /* Echo the character */ + DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); + } + } +} + +CHAR DosReadCharacter(WORD FileHandle, BOOLEAN Echo) { WORD BytesRead; PDOS_FILE_DESCRIPTOR Descriptor = NULL; @@ -111,8 +109,8 @@ 1, &BytesRead); - /* Check if the file is actually the CON device */ - if (Descriptor && Descriptor->DeviceInfo & FILE_INFO_DEVICE) + /* Check if we should echo and the file is actually the CON device */ + if (Echo && Descriptor && Descriptor->DeviceInfo & FILE_INFO_DEVICE) { /* Echo the character */ DosEchoCharacter(Sda->ByteBuffer); 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] Sat Sep 26 00:05:10 2015 @@ -214,7 +214,7 @@ { DPRINT("INT 21h, AH = 01h\n"); - Character = DosReadCharacter(DOS_INPUT_HANDLE); + Character = DosReadCharacter(DOS_INPUT_HANDLE, TRUE); if (Character == 0x03 && DosControlBreak()) break; setAL(Character); @@ -292,7 +292,7 @@ if (DosCheckInput()) { Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_ZF; - setAL(DosReadCharacter(DOS_INPUT_HANDLE)); + setAL(DosReadCharacter(DOS_INPUT_HANDLE, FALSE)); } else { @@ -309,7 +309,7 @@ case 0x07: { DPRINT("Direct char input without echo\n"); - setAL(DosReadCharacter(DOS_INPUT_HANDLE)); + setAL(DosReadCharacter(DOS_INPUT_HANDLE, FALSE)); break; } @@ -318,7 +318,7 @@ { DPRINT("Char input without echo\n"); - Character = DosReadCharacter(DOS_INPUT_HANDLE); + Character = DosReadCharacter(DOS_INPUT_HANDLE, FALSE); if (Character == 0x03 && DosControlBreak()) break; setAL(Character); @@ -348,19 +348,18 @@ /* Read Buffered Input */ case 0x0A: { - WORD BytesRead; PDOS_INPUT_BUFFER InputBuffer = (PDOS_INPUT_BUFFER)SEG_OFF_TO_PTR(getDS(), getDX()); DPRINT("Read Buffered Input\n"); if (InputBuffer->MaxLength == 0) break; /* Read from standard input */ - DosReadFile(DOS_INPUT_HANDLE, - MAKELONG(getDX() + FIELD_OFFSET(DOS_INPUT_BUFFER, Buffer), getDS()), - InputBuffer->MaxLength, - &BytesRead); - - InputBuffer->Length = LOBYTE(BytesRead); + InputBuffer->Length = DosReadLineBuffered( + DOS_INPUT_HANDLE, + MAKELONG(getDX() + FIELD_OFFSET(DOS_INPUT_BUFFER, Buffer), getDS()), + InputBuffer->MaxLength + ); + break; } 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] Sat Sep 26 00:05:10 2015 @@ -318,7 +318,7 @@ * DOS BIOS Functions * See bios.c */ -CHAR DosReadCharacter(WORD FileHandle); +CHAR DosReadCharacter(WORD FileHandle, BOOLEAN Echo); BOOLEAN DosCheckInput(VOID); VOID DosPrintCharacter(WORD FileHandle, CHAR Character); 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] Sat Sep 26 00:05:10 2015 @@ -669,6 +669,90 @@ return ERROR_SUCCESS; } +BYTE DosReadLineBuffered(WORD FileHandle, DWORD Buffer, BYTE MaxSize) +{ + PDOS_FILE_DESCRIPTOR Descriptor = DosGetHandleFileDescriptor(FileHandle); + PDOS_DEVICE_NODE Node = DosGetDriverNode(Descriptor->DevicePointer); + BYTE LineSize = 0; + PCHAR Pointer = FAR_POINTER(Buffer); + + while (TRUE) + { + USHORT Amount = 1; + CHAR Character; + + /* Read a character from the device */ + Node->ReadRoutine(Node, + MAKELONG(DOS_DATA_OFFSET(Sda.ByteBuffer), + DOS_DATA_SEGMENT), + &Amount); + if (Amount == 0) break; + + Character = Sda->ByteBuffer; + + if (LineSize == MaxSize - 1 && Character != '\r' && Character != '\b') + { + /* Line buffer full */ + // TODO: Should we beep? + continue; + } + + switch (Character) + { + /* Extended character */ + case '\0': + { + /* Read the scancode and discard it */ + Amount = 1; + Node->ReadRoutine(Node, + MAKELONG(DOS_DATA_OFFSET(Sda.ByteBuffer), + DOS_DATA_SEGMENT), + &Amount); + break; + } + + /* Ctrl-C */ + case 0x03: + { + DosEchoCharacter(Character); + + if (DosControlBreak()) + { + /* Set the character to CR to end the loop */ + Character = '\r'; + } + + break; + } + + case '\b': + { + if (LineSize > 0) + { + LineSize--; + if (Pointer[LineSize] == 0) LineSize--; + + DosEchoCharacter(Character); + } + + break; + } + + default: + { + /* Store the character in the buffer */ + Pointer[LineSize++] = Character; + DosEchoCharacter(Character); + } + } + + /* Stop on a carriage return */ + if (Character == '\r') break; + } + + return LineSize - 1; +} + WORD DosReadFile(WORD FileHandle, DWORD Buffer, WORD Count, @@ -706,85 +790,11 @@ /* Check if the buffer is empty */ if (!SysVars->UnreadConInput) { - ULONG LineSize = 0; - SysVars->UnreadConInput = FIELD_OFFSET(DOS_DATA, UnreadConInputBuffer); - ConBuffer = (PCHAR)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, SysVars->UnreadConInput); - - while (TRUE) - { - USHORT Amount = 1; - CHAR Character; - - /* Read a character from the CON device */ - Node->ReadRoutine(Node, - MAKELONG(DOS_DATA_OFFSET(Sda.ByteBuffer), - DOS_DATA_SEGMENT), - &Amount); - if (Amount == 0) break; - - Character = Sda->ByteBuffer; - - if (LineSize == sizeof(DosData->UnreadConInputBuffer)-1 && - Character != '\r' && Character != '\b') - { - /* Line buffer full */ - // TODO: Should we beep? - continue; - } - - switch (Character) - { - /* Extended character */ - case '\0': - { - /* Read the scancode and discard it */ - Amount = 1; - Node->ReadRoutine(Node, - MAKELONG(DOS_DATA_OFFSET(Sda.ByteBuffer), - DOS_DATA_SEGMENT), - &Amount); - break; - } - - /* Ctrl-C */ - case 0x03: - { - DosEchoCharacter(Character); - - if (DosControlBreak()) - { - /* Set the character to CR to end the loop */ - Character = '\r'; - } - - break; - } - - case '\b': - { - if (LineSize > 0) - { - LineSize--; - if (ConBuffer[LineSize] == 0) LineSize--; - - DosEchoCharacter(Character); - } - - break; - } - - default: - { - /* Store the character in the buffer */ - ConBuffer[LineSize++] = Character; - DosEchoCharacter(Character); - } - } - - /* Stop on a carriage return */ - if (Character == '\r') break; - } + + DosReadLineBuffered(FileHandle, + MAKELONG(SysVars->UnreadConInput, DOS_DATA_SEGMENT), + sizeof(DosData->UnreadConInputBuffer)); } *BytesRead = 0; Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h [iso-8859-1] Sat Sep 26 00:05:10 2015 @@ -123,6 +123,7 @@ LPDWORD NewOffset ); +BYTE DosReadLineBuffered(WORD FileHandle, DWORD Buffer, BYTE MaxSize); BOOL DosFlushFileBuffers(WORD FileHandle); BOOLEAN DosLockFile(WORD DosHandle, DWORD Offset, DWORD Size); BOOLEAN DosUnlockFile(WORD DosHandle, DWORD Offset, DWORD Size);

1 0

[hbelusca] 69358: [NTVDM] - Fix a comment. - Do not hardcode buffer size. - LPVOID -> PVOID.
by hbelusca＠svn.reactos.org 25 Sep '15

25 Sep '15

Author: hbelusca Date: Fri Sep 25 22:42:08 2015 New Revision: 69358 URL: http://svn.reactos.org/svn/reactos?rev=69358&view=rev Log: [NTVDM] - Fix a comment. - Do not hardcode buffer size. - LPVOID -> PVOID. 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 Sep 25 22:42:08 2015 @@ -725,7 +725,8 @@ Character = Sda->ByteBuffer; - if (LineSize == 127 && Character != '\r' && Character != '\b') + if (LineSize == sizeof(DosData->UnreadConInputBuffer)-1 && + Character != '\r' && Character != '\b') { /* Line buffer full */ // TODO: Should we beep? @@ -843,7 +844,7 @@ else { DWORD BytesRead32 = 0; - LPVOID LocalBuffer; + PVOID LocalBuffer; if (Count <= sizeof(StaticBuffer)) { @@ -913,7 +914,7 @@ else { DWORD BytesWritten32 = 0; - LPVOID LocalBuffer; + PVOID LocalBuffer; /* * Writing zero bytes truncates or extends the file @@ -1015,7 +1016,7 @@ return Result; } - /* Update the descriptor */ + /* Update the position */ Descriptor->Position = FilePointer; /* Return the file pointer, if requested */

1 0

[aandrejevic] 69357: [NTVDM] Don't echo when STDIN isn't the CON device.
by aandrejevic＠svn.reactos.org 25 Sep '15

25 Sep '15

Author: aandrejevic Date: Fri Sep 25 22:09:37 2015 New Revision: 69357 URL: http://svn.reactos.org/svn/reactos?rev=69357&view=rev Log: [NTVDM] Don't echo when STDIN isn't the CON device. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c 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 Sep 25 22:09:37 2015 @@ -43,6 +43,51 @@ /* PUBLIC FUNCTIONS ***********************************************************/ +VOID DosEchoCharacter(CHAR Character) +{ + switch (Character) + { + case '\0': + { + /* Nothing */ + break; + } + + case '\r': + case '\n': + { + /* Print both a carriage return and a newline */ + DosPrintCharacter(DOS_OUTPUT_HANDLE, '\r'); + DosPrintCharacter(DOS_OUTPUT_HANDLE, '\n'); + break; + } + + case '\b': + { + /* Erase the character */ + DosPrintCharacter(DOS_OUTPUT_HANDLE, '\b'); + DosPrintCharacter(DOS_OUTPUT_HANDLE, ' '); + DosPrintCharacter(DOS_OUTPUT_HANDLE, '\b'); + break; + } + + default: + { + /* Check if this is a special character */ + if (Character < 0x20) + { + DosPrintCharacter(DOS_OUTPUT_HANDLE, '^'); + Character += 'A' - 1; + } + else + { + /* Echo the character */ + DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); + } + } + } +} + CHAR DosReadCharacter(WORD FileHandle) { WORD BytesRead; @@ -65,6 +110,13 @@ MAKELONG(DOS_DATA_OFFSET(Sda.ByteBuffer), DOS_DATA_SEGMENT), 1, &BytesRead); + + /* Check if the file is actually the CON device */ + if (Descriptor && Descriptor->DeviceInfo & FILE_INFO_DEVICE) + { + /* Echo the character */ + DosEchoCharacter(Sda->ByteBuffer); + } /* Restore the old mode and return the character */ if (Descriptor) Descriptor->DeviceInfo = OldDeviceInfo; 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 Sep 25 22:09:37 2015 @@ -161,51 +161,6 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -VOID DosEchoCharacter(CHAR Character) -{ - switch (Character) - { - case '\0': - { - /* Nothing */ - break; - } - - case '\r': - case '\n': - { - /* Print both a carriage return and a newline */ - DosPrintCharacter(DOS_OUTPUT_HANDLE, '\r'); - DosPrintCharacter(DOS_OUTPUT_HANDLE, '\n'); - break; - } - - case '\b': - { - /* Erase the character */ - DosPrintCharacter(DOS_OUTPUT_HANDLE, '\b'); - DosPrintCharacter(DOS_OUTPUT_HANDLE, ' '); - DosPrintCharacter(DOS_OUTPUT_HANDLE, '\b'); - break; - } - - default: - { - /* Check if this is a special character */ - if (Character < 0x20) - { - DosPrintCharacter(DOS_OUTPUT_HANDLE, '^'); - Character += 'A' - 1; - } - else - { - /* Echo the character */ - DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); - } - } - } -} - BOOLEAN DosControlBreak(VOID) { setCF(0); @@ -260,7 +215,6 @@ DPRINT("INT 21h, AH = 01h\n"); Character = DosReadCharacter(DOS_INPUT_HANDLE); - DosEchoCharacter(Character); if (Character == 0x03 && DosControlBreak()) break; setAL(Character); @@ -337,11 +291,8 @@ /* Input */ if (DosCheckInput()) { - CHAR Character = DosReadCharacter(DOS_INPUT_HANDLE); - DosEchoCharacter(Character); - Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_ZF; - setAL(Character); + setAL(DosReadCharacter(DOS_INPUT_HANDLE)); } else {

1 0

[aandrejevic] 69356: [NTVDM] Fix DOS character device I/O. Implement CON line buffering. Make sure INT 21h functions 01h, 06h, 07h, 08h, 0Ah and 3Fh work as expected for CON input.
by aandrejevic＠svn.reactos.org 25 Sep '15

25 Sep '15

Author: aandrejevic Date: Fri Sep 25 22:00:57 2015 New Revision: 69356 URL: http://svn.reactos.org/svn/reactos?rev=69356&view=rev Log: [NTVDM] Fix DOS character device I/O. Implement CON line buffering. Make sure INT 21h functions 01h, 06h, 07h, 08h, 0Ah and 3Fh work as expected for CON input. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h 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 Sep 25 22:00:57 2015 @@ -17,6 +17,7 @@ #include "../dem.h" #include "dos.h" #include "dosfiles.h" +#include "handle.h" #include "memory.h" #include "bios/bios.h" @@ -45,6 +46,16 @@ CHAR DosReadCharacter(WORD FileHandle) { WORD BytesRead; + PDOS_FILE_DESCRIPTOR Descriptor = NULL; + WORD OldDeviceInfo; + + /* Find the standard input descriptor and switch it to binary mode */ + Descriptor = DosGetHandleFileDescriptor(FileHandle); + if (Descriptor) + { + OldDeviceInfo = Descriptor->DeviceInfo; + Descriptor->DeviceInfo |= FILE_INFO_BINARY; + } Sda->ByteBuffer = '\0'; DPRINT("DosReadCharacter\n"); @@ -55,6 +66,8 @@ 1, &BytesRead); + /* Restore the old mode and return the character */ + if (Descriptor) Descriptor->DeviceInfo = OldDeviceInfo; return Sda->ByteBuffer; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] Fri Sep 25 22:00:57 2015 @@ -63,15 +63,8 @@ Pointer[BytesRead++] = Character; - if (Character != 0 && DoEcho) - DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); - /* Stop on first carriage return */ - if (Character == '\r') - { - if (DoEcho) DosPrintCharacter(DOS_OUTPUT_HANDLE, '\n'); - break; - } + if (Character == '\r') break; } *Length = BytesRead; 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 Sep 25 22:00:57 2015 @@ -44,9 +44,6 @@ /* Easy accessors to useful DOS data area parts */ PDOS_SYSVARS SysVars; PDOS_SDA Sda; - -/* Echo state for INT 21h, AH = 01h and AH = 3Fh */ -BOOLEAN DoEcho = FALSE; /* PRIVATE FUNCTIONS **********************************************************/ @@ -162,7 +159,54 @@ return TRUE; } -static BOOLEAN DosControlBreak(VOID) +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID DosEchoCharacter(CHAR Character) +{ + switch (Character) + { + case '\0': + { + /* Nothing */ + break; + } + + case '\r': + case '\n': + { + /* Print both a carriage return and a newline */ + DosPrintCharacter(DOS_OUTPUT_HANDLE, '\r'); + DosPrintCharacter(DOS_OUTPUT_HANDLE, '\n'); + break; + } + + case '\b': + { + /* Erase the character */ + DosPrintCharacter(DOS_OUTPUT_HANDLE, '\b'); + DosPrintCharacter(DOS_OUTPUT_HANDLE, ' '); + DosPrintCharacter(DOS_OUTPUT_HANDLE, '\b'); + break; + } + + default: + { + /* Check if this is a special character */ + if (Character < 0x20) + { + DosPrintCharacter(DOS_OUTPUT_HANDLE, '^'); + Character += 'A' - 1; + } + else + { + /* Echo the character */ + DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); + } + } + } +} + +BOOLEAN DosControlBreak(VOID) { setCF(0); @@ -177,8 +221,6 @@ return FALSE; } - -/* PUBLIC FUNCTIONS ***********************************************************/ VOID WINAPI DosInt20h(LPWORD Stack) { @@ -217,14 +259,9 @@ { DPRINT("INT 21h, AH = 01h\n"); - // FIXME: Under DOS 2+, input / output handle may be redirected!!!! - DoEcho = TRUE; Character = DosReadCharacter(DOS_INPUT_HANDLE); - DoEcho = FALSE; - - // FIXME: Check whether Ctrl-C / Ctrl-Break is pressed, and call INT 23h if so. - // Check also Ctrl-P and set echo-to-printer flag. - // Ctrl-Z is not interpreted. + DosEchoCharacter(Character); + if (Character == 0x03 && DosControlBreak()) break; setAL(Character); break; @@ -300,8 +337,11 @@ /* Input */ if (DosCheckInput()) { + CHAR Character = DosReadCharacter(DOS_INPUT_HANDLE); + DosEchoCharacter(Character); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_ZF; - setAL(DosReadCharacter(DOS_INPUT_HANDLE)); + setAL(Character); } else { @@ -314,17 +354,21 @@ break; } + /* Direct Character Input without Echo */ + case 0x07: + { + DPRINT("Direct char input without echo\n"); + setAL(DosReadCharacter(DOS_INPUT_HANDLE)); + break; + } + /* Character Input without Echo */ - case 0x07: case 0x08: { DPRINT("Char input without echo\n"); Character = DosReadCharacter(DOS_INPUT_HANDLE); - - // FIXME: For 0x07, do not check Ctrl-C/Break. - // For 0x08, do check those control sequences and if needed, - // call INT 0x23. + if (Character == 0x03 && DosControlBreak()) break; setAL(Character); break; @@ -353,82 +397,19 @@ /* Read Buffered Input */ case 0x0A: { - WORD Count = 0; + WORD BytesRead; PDOS_INPUT_BUFFER InputBuffer = (PDOS_INPUT_BUFFER)SEG_OFF_TO_PTR(getDS(), getDX()); DPRINT("Read Buffered Input\n"); - - while (Count < InputBuffer->MaxLength) - { - /* Try to read a character (wait) */ - Character = DosReadCharacter(DOS_INPUT_HANDLE); - - switch (Character) - { - /* Extended character */ - case '\0': - { - /* Read the scancode */ - DosReadCharacter(DOS_INPUT_HANDLE); - break; - } - - /* Ctrl-C */ - case 0x03: - { - DosPrintCharacter(DOS_OUTPUT_HANDLE, '^'); - DosPrintCharacter(DOS_OUTPUT_HANDLE, 'C'); - - if (DosControlBreak()) - { - /* Set the character to a newline to exit the loop */ - Character = '\r'; - } - - break; - } - - /* Backspace */ - case '\b': - { - if (Count > 0) - { - Count--; - - /* Erase the character */ - DosPrintCharacter(DOS_OUTPUT_HANDLE, '\b'); - DosPrintCharacter(DOS_OUTPUT_HANDLE, ' '); - DosPrintCharacter(DOS_OUTPUT_HANDLE, '\b'); - } - - break; - } - - default: - { - /* Append it to the buffer */ - InputBuffer->Buffer[Count] = Character; - - /* Check if this is a special character */ - if (Character < 0x20 && Character != 0x0A && Character != 0x0D) - { - DosPrintCharacter(DOS_OUTPUT_HANDLE, '^'); - Character += 'A' - 1; - } - - /* Echo the character */ - DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); - } - } - - if (Character == '\r') break; - if (Character == '\b') continue; - Count++; /* Carriage returns are NOT counted */ - } - - /* Update the length */ - InputBuffer->Length = Count; - + if (InputBuffer->MaxLength == 0) break; + + /* Read from standard input */ + DosReadFile(DOS_INPUT_HANDLE, + MAKELONG(getDX() + FIELD_OFFSET(DOS_INPUT_BUFFER, Buffer), getDS()), + InputBuffer->MaxLength, + &BytesRead); + + InputBuffer->Length = LOBYTE(BytesRead); break; } @@ -1054,12 +1035,10 @@ DPRINT("DosReadFile(0x%04X)\n", getBX()); - DoEcho = TRUE; ErrorCode = DosReadFile(getBX(), MAKELONG(getDX(), getDS()), getCX(), &BytesRead); - DoEcho = FALSE; if (ErrorCode == ERROR_SUCCESS) { 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 Sep 25 22:00:57 2015 @@ -246,6 +246,7 @@ WORD DosVersion; // DOS version to report to programs (can be different from the true one) DOS_SDA Sda; CHAR CurrentDirectories[NUM_DRIVES][DOS_DIR_LENGTH]; + BYTE UnreadConInputBuffer[128]; BYTE DosStack[384]; BYTE Sft[ANYSIZE_ARRAY]; } DOS_DATA, *PDOS_DATA; @@ -293,7 +294,6 @@ /* VARIABLES ******************************************************************/ -extern BOOLEAN DoEcho; // FIXME: Maybe move inside BiosData? (it's set by BIOS but used by CON driver in DOS BIOS) extern PBIOS_DATA BiosData; extern PDOS_DATA DosData; extern PDOS_SYSVARS SysVars; @@ -324,6 +324,9 @@ BOOLEAN DosBIOSInitialize(VOID); +BOOLEAN DosControlBreak(VOID); +VOID DosEchoCharacter(CHAR Character); + /* * DOS Kernel Functions * See dos.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 Sep 25 22:00:57 2015 @@ -691,9 +691,154 @@ PDOS_DEVICE_NODE Node = DosGetDriverNode(Descriptor->DevicePointer); if (!Node->ReadRoutine) return ERROR_INVALID_FUNCTION; - /* Read the device */ - Node->ReadRoutine(Node, Buffer, &Count); - *BytesRead = Count; + if (Descriptor->DeviceInfo & FILE_INFO_BINARY) + { + /* Read from the device directly */ + Node->ReadRoutine(Node, Buffer, &Count); + *BytesRead = Count; + } + else if (Descriptor->DeviceInfo & FILE_INFO_STDIN) + { + /* Line-buffered CON input */ + PCHAR ConBuffer = NULL; + PCHAR Pointer = FAR_POINTER(Buffer); + + /* Check if the buffer is empty */ + if (!SysVars->UnreadConInput) + { + ULONG LineSize = 0; + + SysVars->UnreadConInput = FIELD_OFFSET(DOS_DATA, UnreadConInputBuffer); + ConBuffer = (PCHAR)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, SysVars->UnreadConInput); + + while (TRUE) + { + USHORT Amount = 1; + CHAR Character; + + /* Read a character from the CON device */ + Node->ReadRoutine(Node, + MAKELONG(DOS_DATA_OFFSET(Sda.ByteBuffer), + DOS_DATA_SEGMENT), + &Amount); + if (Amount == 0) break; + + Character = Sda->ByteBuffer; + + if (LineSize == 127 && Character != '\r' && Character != '\b') + { + /* Line buffer full */ + // TODO: Should we beep? + continue; + } + + switch (Character) + { + /* Extended character */ + case '\0': + { + /* Read the scancode and discard it */ + Amount = 1; + Node->ReadRoutine(Node, + MAKELONG(DOS_DATA_OFFSET(Sda.ByteBuffer), + DOS_DATA_SEGMENT), + &Amount); + break; + } + + /* Ctrl-C */ + case 0x03: + { + DosEchoCharacter(Character); + + if (DosControlBreak()) + { + /* Set the character to CR to end the loop */ + Character = '\r'; + } + + break; + } + + case '\b': + { + if (LineSize > 0) + { + LineSize--; + if (ConBuffer[LineSize] == 0) LineSize--; + + DosEchoCharacter(Character); + } + + break; + } + + default: + { + /* Store the character in the buffer */ + ConBuffer[LineSize++] = Character; + DosEchoCharacter(Character); + } + } + + /* Stop on a carriage return */ + if (Character == '\r') break; + } + } + + *BytesRead = 0; + ConBuffer = (PCHAR)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, SysVars->UnreadConInput); + + while (*BytesRead < Count) + { + Pointer[(*BytesRead)++] = *ConBuffer; + + if (*ConBuffer == '\r') + { + /* A carriage return turns into a line feed */ + *ConBuffer = '\n'; + } + else if (*ConBuffer == '\n') + { + /* A line feed marks the true end of the line */ + SysVars->UnreadConInput = 0; + break; + } + else + { + /* Move to the next character */ + SysVars->UnreadConInput++; + ConBuffer++; + } + } + } + else + { + /* Translated input from a character device that isn't CON */ + PCHAR Pointer = FAR_POINTER(Buffer); + + while (*BytesRead < Count) + { + USHORT Amount = 1; + CHAR Character; + + /* Read a character from the device */ + Node->ReadRoutine(Node, + MAKELONG(DOS_DATA_OFFSET(Sda.ByteBuffer), + DOS_DATA_SEGMENT), + &Amount); + if (Amount == 0) break; + + Character = Sda->ByteBuffer; + // TODO: Process it somehow? + + /* Store the character in the output buffer */ + Pointer[(*BytesRead)++] = Character; + + /* Check for EOF */ + if (Character == 0x1A) break; + } + } } else { Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h [iso-8859-1] Fri Sep 25 22:00:57 2015 @@ -8,6 +8,9 @@ /* DEFINES ********************************************************************/ +#define FILE_INFO_STDIN (1 << 0) +#define FILE_INFO_STDOUT (1 << 1) +#define FILE_INFO_BINARY (1 << 5) #define FILE_INFO_DEVICE (1 << 7) #pragma pack(push, 1)

1 0

[sginsberg] 69355: [KDBG] Let's try to have one single version of DPFLTR_DEFAULT_ID shall we -- 101 as part of DPFLTR_TYPE enum is correct, 0xFFFFFFFF as an incorrect define for the "internal" defa...
by sginsberg＠svn.reactos.org 25 Sep '15

25 Sep '15

Author: sginsberg Date: Fri Sep 25 19:28:05 2015 New Revision: 69355 URL: http://svn.reactos.org/svn/reactos?rev=69355&view=rev Log: [KDBG] Let's try to have one single version of DPFLTR_DEFAULT_ID shall we -- 101 as part of DPFLTR_TYPE enum is correct, 0xFFFFFFFF as an incorrect define for the "internal" default ID is wrong. Modified: trunk/reactos/include/reactos/debug.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Fri Sep 25 19:28:05 2015 @@ -90,7 +90,6 @@ #define __NOTICE(level, fmt, ...) DbgPrint(#level ": %s at %s:%d " fmt, __FUNCTION__, __RELFILE__, __LINE__, ##__VA_ARGS__) /* Print stuff only on Debug Builds*/ -#define DPFLTR_DEFAULT_ID -1 #if DBG /* These are always printed */ Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Fri Sep 25 19:28:05 2015 @@ -377,7 +377,7 @@ Level = 1 << Level; /* Check if it is not the default component */ - if (ComponentId != DPFLTR_DEFAULT_ID) + if (ComponentId != MAXULONG) { /* No, search for an existing entry in the table */ for (i = 0; i < KdComponentTableEntries; i++) @@ -409,7 +409,7 @@ Level &= ~DPFLTR_MASK; /* Check if it is the default component */ - if (ComponentId == DPFLTR_DEFAULT_ID) + if (ComponentId == MAXULONG) { /* Yes, modify the default mask */ if (State) Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Fri Sep 25 19:28:05 2015 @@ -210,7 +210,7 @@ } ComponentTable[] = { - { "DEFAULT", DPFLTR_DEFAULT_ID }, + { "DEFAULT", MAXULONG }, { "SYSTEM", DPFLTR_SYSTEM_ID }, { "SMSS", DPFLTR_SMSS_ID }, { "SETUP", DPFLTR_SETUP_ID },

1 0

[sginsberg] 69354: [NDK] Put ZwCreateKeyedEvent in NDK where it belongs. [EX] Remove "KeGetCurrentProcess" and just use the EPROCESS Pcb member for type correctness instead of inventing a new macro...
by sginsberg＠svn.reactos.org 25 Sep '15

25 Sep '15

Author: sginsberg Date: Fri Sep 25 18:40:56 2015 New Revision: 69354 URL: http://svn.reactos.org/svn/reactos?rev=69354&view=rev Log: [NDK] Put ZwCreateKeyedEvent in NDK where it belongs. [EX] Remove "KeGetCurrentProcess" and just use the EPROCESS Pcb member for type correctness instead of inventing a new macro to hide the casting. [PS] Remove stray INIT_FUNCTION (doesn't do much on a prototype). [IO] Define _IO_DEBUG_ to 0 again after someone forgot to leave it on 4 years ago (only bloated the code since IopTraceLevel was 0 anyway). Modified: trunk/reactos/include/ndk/exfuncs.h trunk/reactos/ntoskrnl/ex/keyedevt.c trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] Fri Sep 25 18:40:56 2015 @@ -673,6 +673,17 @@ _In_ POBJECT_ATTRIBUTES ObjectAttributes ); +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSAPI +NTSTATUS +NTAPI +ZwCreateKeyedEvent( + _Out_ PHANDLE OutHandle, + _In_ ACCESS_MASK AccessMask, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG Flags +); + NTSYSAPI NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/keyedevt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] Fri Sep 25 18:40:56 2015 @@ -24,16 +24,6 @@ LIST_ENTRY ReleaseListHead; } HashTable[NUM_KEY_HASH_BUCKETS]; } EX_KEYED_EVENT, *PEX_KEYED_EVENT; - -NTSTATUS -NTAPI -ZwCreateKeyedEvent( - _Out_ PHANDLE OutHandle, - _In_ ACCESS_MASK AccessMask, - _In_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ ULONG Flags); - -#define KeGetCurrentProcess() ((PKPROCESS)PsGetCurrentProcess()) /* GLOBALS *******************************************************************/ @@ -128,14 +118,14 @@ _In_ BOOLEAN Release) { PETHREAD Thread, CurrentThread; - PKPROCESS CurrentProcess; + PEPROCESS CurrentProcess; PLIST_ENTRY ListEntry, WaitListHead1, WaitListHead2; NTSTATUS Status; ULONG_PTR HashIndex; PVOID PreviousKeyedWaitValue; /* Get the current process */ - CurrentProcess = KeGetCurrentProcess(); + CurrentProcess = PsGetCurrentProcess(); /* Calculate the hash index */ HashIndex = (ULONG_PTR)KeyedWaitValue >> 5; @@ -171,7 +161,7 @@ ListEntry = ListEntry->Flink; /* Check if this thread is a correct waiter */ - if ((Thread->Tcb.Process == CurrentProcess) && + if ((Thread->Tcb.Process == &CurrentProcess->Pcb) && (Thread->KeyedWaitValue == KeyedWaitValue)) { /* Remove the thread from the list */ Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Fri Sep 25 18:40:56 2015 @@ -10,7 +10,7 @@ // // Define this if you want debugging support // -#define _IO_DEBUG_ 0x01 +#define _IO_DEBUG_ 0x00 // // These define the Debug Masks Supported Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] Fri Sep 25 18:40:56 2015 @@ -417,7 +417,6 @@ // NTSTATUS NTAPI -INIT_FUNCTION ApphelpCacheInitialize(VOID); VOID

1 0

[pschweitzer] 69353: [KMTESTS:IO] Add more tests for IoCreateFile(), this time purely dealing with symlinks reparse points. They won't run on ReactOS (obviously) as we don't have RW NTFS support. O...
by pschweitzer＠svn.reactos.org 25 Sep '15

25 Sep '15

Author: pschweitzer Date: Fri Sep 25 15:57:28 2015 New Revision: 69353 URL: http://svn.reactos.org/svn/reactos?rev=69353&view=rev Log: [KMTESTS:IO] Add more tests for IoCreateFile(), this time purely dealing with symlinks reparse points. They won't run on ReactOS (obviously) as we don't have RW NTFS support. On Windows, they show interesting results.... With Windows 2003, creating the symlink is allowed and works, but then Windows is totally unable to deal with it and keeps complaining about an unhandled reparse tag. The only way to open it is to open the reparse point itself. Not that working symlinks... Not sure which part is not able to handle the said reparse tag. NTFS? Io? With Windows Vista+, it just works fine. Symlink is created & functionnal. Broken logic! Modified: trunk/rostests/kmtests/ntos_io/IoCreateFile.c Modified: trunk/rostests/kmtests/ntos_io/IoCreateFile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoCreateF… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] Fri Sep 25 15:57:28 2015 @@ -420,6 +420,370 @@ static VOID NTAPI +TestSymlinks(VOID) +{ + HANDLE ReparseHandle; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + PREPARSE_DATA_BUFFER Reparse; + FILE_DISPOSITION_INFORMATION ToDelete; + PFILE_OBJECT FileObject; + UNICODE_STRING SysDir, Foobar, Regedit; + ULONG Size; + + /* Get Windows/ReactOS directory */ + InitializeObjectAttributes(&ObjectAttributes, + &SystemRoot, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenFile(&ReparseHandle, + FILE_READ_DATA, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_DIRECTORY_FILE); + if (skip(NT_SUCCESS(Status), "Opening \\SystemRoot failed: %lx\n", Status)) + { + return; + } + + Status = ObReferenceObjectByHandle(ReparseHandle, + FILE_READ_DATA, + *IoFileObjectType, + UserMode, + (PVOID *)&FileObject, + NULL); + if (skip(NT_SUCCESS(Status), "Querying name failed: %lx\n", Status)) + { + ZwClose(ReparseHandle); + return; + } + + SysDir.Buffer = ExAllocatePool(NonPagedPool, FileObject->FileName.Length + sizeof(L"\\??\\C:")); + if (skip(SysDir.Buffer != NULL, "Allocating memory failed\n")) + { + ObDereferenceObject(FileObject); + ZwClose(ReparseHandle); + return; + } + + SysDir.Length = sizeof(L"\\??\\C:") - sizeof(UNICODE_NULL); + SysDir.MaximumLength = FileObject->FileName.Length + sizeof(L"\\??\\C:"); + RtlCopyMemory(SysDir.Buffer, L"\\??\\C:", sizeof(L"\\??\\C:") - sizeof(UNICODE_NULL)); + RtlAppendUnicodeStringToString(&SysDir, &FileObject->FileName); + + Foobar.Buffer = ExAllocatePool(NonPagedPool, FileObject->FileName.Length + sizeof(L"\\foobar.exe")); + if (skip(Foobar.Buffer != NULL, "Allocating memory failed\n")) + { + ExFreePool(SysDir.Buffer); + ObDereferenceObject(FileObject); + ZwClose(ReparseHandle); + return; + } + + Foobar.Length = 0; + Foobar.MaximumLength = FileObject->FileName.Length + sizeof(L"\\foobar.exe"); + RtlCopyUnicodeString(&Foobar, &FileObject->FileName); + RtlCopyMemory(&Foobar.Buffer[Foobar.Length / sizeof(WCHAR)], L"\\foobar.exe", sizeof(L"\\foobar.exe") - sizeof(UNICODE_NULL)); + Foobar.Length += (sizeof(L"\\foobar.exe") - sizeof(UNICODE_NULL)); + + Regedit.Buffer = ExAllocatePool(NonPagedPool, FileObject->FileName.Length + sizeof(L"\\regedit.exe")); + if (skip(Regedit.Buffer != NULL, "Allocating memory failed\n")) + { + ExFreePool(Foobar.Buffer); + ExFreePool(SysDir.Buffer); + ObDereferenceObject(FileObject); + ZwClose(ReparseHandle); + return; + } + + Regedit.Length = 0; + Regedit.MaximumLength = FileObject->FileName.Length + sizeof(L"\\regedit.exe"); + RtlCopyUnicodeString(&Regedit, &FileObject->FileName); + RtlCopyMemory(&Regedit.Buffer[Regedit.Length / sizeof(WCHAR)], L"\\regedit.exe", sizeof(L"\\regedit.exe") - sizeof(UNICODE_NULL)); + Regedit.Length += (sizeof(L"\\regedit.exe") - sizeof(UNICODE_NULL)); + + ObDereferenceObject(FileObject); + ZwClose(ReparseHandle); + + ToDelete.DeleteFile = TRUE; + Size = FIELD_OFFSET(REPARSE_DATA_BUFFER, SymbolicLinkReparseBuffer.PathBuffer) + SysDir.Length * 2 + sizeof(L"\\regedit.exe") * 2 - sizeof(L"\\??\\") - sizeof(UNICODE_NULL); + + InitializeObjectAttributes(&ObjectAttributes, + &SystemRootFoobar, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwCreateFile(&ReparseHandle, + GENERIC_READ | GENERIC_WRITE | DELETE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_SUPERSEDE, + FILE_NON_DIRECTORY_FILE, + NULL, + 0); + ok_eq_hex(Status, STATUS_SUCCESS); + if (skip(NT_SUCCESS(Status), "Creating file failed: %lx\n", Status)) + { + ExFreePool(Regedit.Buffer); + ExFreePool(Foobar.Buffer); + ExFreePool(SysDir.Buffer); + return; + } + + Reparse = ExAllocatePool(NonPagedPool, Size); + RtlZeroMemory(Reparse, Size); + Reparse->ReparseTag = IO_REPARSE_TAG_SYMLINK; + Reparse->ReparseDataLength = 12 + SysDir.Length * 2 + sizeof(L"\\regedit.exe") * 2 - sizeof(L"\\??\\") - sizeof(UNICODE_NULL); + Reparse->SymbolicLinkReparseBuffer.SubstituteNameLength = SysDir.Length + sizeof(L"\\regedit.exe") - sizeof(UNICODE_NULL); + Reparse->SymbolicLinkReparseBuffer.PrintNameLength = SysDir.Length + sizeof(L"\\regedit.exe") - sizeof(L"\\??\\"); + Reparse->SymbolicLinkReparseBuffer.SubstituteNameOffset = Reparse->SymbolicLinkReparseBuffer.PrintNameLength; + RtlCopyMemory(Reparse->SymbolicLinkReparseBuffer.PathBuffer, + (WCHAR *)((ULONG_PTR)SysDir.Buffer + sizeof(L"\\??\\") - sizeof(UNICODE_NULL)), + SysDir.Length - sizeof(L"\\??\\") + sizeof(UNICODE_NULL)); + RtlCopyMemory((WCHAR *)((ULONG_PTR)Reparse->SymbolicLinkReparseBuffer.PathBuffer + SysDir.Length - sizeof(L"\\??\\") + sizeof(UNICODE_NULL)), + L"\\regedit.exe", sizeof(L"\\regedit.exe") - sizeof(UNICODE_NULL)); + RtlCopyMemory((WCHAR *)((ULONG_PTR)Reparse->SymbolicLinkReparseBuffer.PathBuffer + Reparse->SymbolicLinkReparseBuffer.SubstituteNameOffset), + SysDir.Buffer, SysDir.Length); + RtlCopyMemory((WCHAR *)((ULONG_PTR)Reparse->SymbolicLinkReparseBuffer.PathBuffer + Reparse->SymbolicLinkReparseBuffer.SubstituteNameOffset + SysDir.Length), + L"\\regedit.exe", sizeof(L"\\regedit.exe") - sizeof(UNICODE_NULL)); + + Status = ZwFsControlFile(ReparseHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_SET_REPARSE_POINT, + Reparse, + Size, + NULL, + 0); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + ZwClose(ReparseHandle); + + Status = ZwCreateFile(&ReparseHandle, + FILE_WRITE_ATTRIBUTES | DELETE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_SUPERSEDE, + FILE_NON_DIRECTORY_FILE | FILE_OPEN_REPARSE_POINT | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT, + NULL, + 0); + if (skip(NT_SUCCESS(Status), "Creating symlink failed: %lx\n", Status)) + { + Status = ZwOpenFile(&ReparseHandle, + DELETE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_DELETE, + FILE_NON_DIRECTORY_FILE | FILE_DELETE_ON_CLOSE); + ok_eq_hex(Status, STATUS_SUCCESS); + ZwClose(ReparseHandle); + ExFreePool(Regedit.Buffer); + ExFreePool(Foobar.Buffer); + ExFreePool(SysDir.Buffer); + ExFreePool(Reparse); + return; + } + + Status = ZwFsControlFile(ReparseHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_SET_REPARSE_POINT, + Reparse, + Size, + NULL, + 0); + } + + if (skip(NT_SUCCESS(Status), "Creating symlink failed: %lx\n", Status)) + { + ZwSetInformationFile(ReparseHandle, + &IoStatusBlock, + &ToDelete, + sizeof(ToDelete), + FileDispositionInformation); + ZwClose(ReparseHandle); + ExFreePool(Regedit.Buffer); + ExFreePool(Foobar.Buffer); + ExFreePool(SysDir.Buffer); + ExFreePool(Reparse); + return; + } + + ZwClose(ReparseHandle); + + Status = ZwCreateFile(&ReparseHandle, + GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN, + FILE_NON_DIRECTORY_FILE, + NULL, + 0); + ok(Status == STATUS_SUCCESS || /* Windows Vista+ */ + Status == STATUS_IO_REPARSE_TAG_NOT_HANDLED, /* Windows 2003 (SP1, SP2) */ + "ZwCreateFile returned unexpected status: %lx\n", Status); + if (NT_SUCCESS(Status)) + { + Status = ObReferenceObjectByHandle(ReparseHandle, + FILE_READ_DATA, + *IoFileObjectType, + UserMode, + (PVOID *)&FileObject, + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + if (NT_SUCCESS(Status)) + { + ok(RtlCompareUnicodeString(&Regedit, &FileObject->FileName, TRUE) == 0, + "Expected: %wZ. Opened: %wZ\n", &Regedit, &FileObject->FileName); + ObDereferenceObject(FileObject); + } + + ZwClose(ReparseHandle); + } + + ExFreePool(Regedit.Buffer); + + Status = IoCreateFile(&ReparseHandle, + GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN, + FILE_NON_DIRECTORY_FILE, + NULL, + 0, + CreateFileTypeNone, + NULL, + IO_NO_PARAMETER_CHECKING | IO_STOP_ON_SYMLINK); + ok(Status == STATUS_STOPPED_ON_SYMLINK || /* Windows Vista+ */ + Status == STATUS_IO_REPARSE_TAG_NOT_HANDLED, /* Windows 2003 (SP1, SP2) */ + "ZwCreateFile returned unexpected status: %lx\n", Status); + if (NT_SUCCESS(Status)) + { + ZwClose(ReparseHandle); + } + + Status = ZwCreateFile(&ReparseHandle, + GENERIC_READ | GENERIC_WRITE | DELETE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN, + FILE_NON_DIRECTORY_FILE | FILE_OPEN_REPARSE_POINT | FILE_OPEN_FOR_BACKUP_INTENT, + NULL, + 0); + if (skip(NT_SUCCESS(Status), "Creating opening reparse point: %lx\n", Status)) + { + Status = ZwOpenFile(&ReparseHandle, + DELETE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_DELETE, + FILE_NON_DIRECTORY_FILE | FILE_DELETE_ON_CLOSE); + ok_eq_hex(Status, STATUS_SUCCESS); + ZwClose(ReparseHandle); + ExFreePool(Foobar.Buffer); + ExFreePool(SysDir.Buffer); + ExFreePool(Reparse); + return; + } + + Status = ObReferenceObjectByHandle(ReparseHandle, + FILE_READ_DATA, + *IoFileObjectType, + UserMode, + (PVOID *)&FileObject, + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + if (NT_SUCCESS(Status)) + { + ok(RtlCompareUnicodeString(&Foobar, &FileObject->FileName, TRUE) == 0, + "Expected: %wZ. Opened: %wZ\n", &Foobar, &FileObject->FileName); + ObDereferenceObject(FileObject); + } + + ExFreePool(Foobar.Buffer); + + RtlZeroMemory(Reparse, Size); + Status = ZwFsControlFile(ReparseHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_GET_REPARSE_POINT, + NULL, + 0, + Reparse, + Size); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_hex(IoStatusBlock.Information, Size); + if (NT_SUCCESS(Status)) + { + PWSTR Buffer; + UNICODE_STRING ReparsePath, FullPath; + + ok_eq_hex(Reparse->ReparseTag, IO_REPARSE_TAG_SYMLINK); + ok_eq_hex(Reparse->ReparseDataLength, 12 + SysDir.Length * 2 + sizeof(L"\\regedit.exe") * 2 - sizeof(L"\\??\\") - sizeof(UNICODE_NULL)); + ok_eq_hex(Reparse->SymbolicLinkReparseBuffer.Flags, 0); + + FullPath.Length = 0; + FullPath.MaximumLength = SysDir.Length + sizeof(L"\\regedit.exe") - sizeof(UNICODE_NULL); + Buffer = FullPath.Buffer = ExAllocatePool(NonPagedPool, FullPath.MaximumLength); + if (!skip(Buffer != NULL, "Memory allocation failed!\n")) + { + RtlCopyUnicodeString(&FullPath, &SysDir); + RtlCopyMemory(&FullPath.Buffer[FullPath.Length / sizeof(WCHAR)], L"\\regedit.exe", sizeof(L"\\regedit.exe") - sizeof(UNICODE_NULL)); + FullPath.Length += (sizeof(L"\\regedit.exe") - sizeof(UNICODE_NULL)); + ReparsePath.Buffer = (PWSTR)((ULONG_PTR)Reparse->SymbolicLinkReparseBuffer.PathBuffer + Reparse->SymbolicLinkReparseBuffer.SubstituteNameOffset); + ReparsePath.Length = ReparsePath.MaximumLength = Reparse->SymbolicLinkReparseBuffer.SubstituteNameLength; + ok(RtlCompareUnicodeString(&ReparsePath, &FullPath, TRUE) == 0, "Expected: %wZ. Got: %wZ\n", &ReparsePath, &FullPath); + + FullPath.Length -= (sizeof(L"\\??\\") - sizeof(UNICODE_NULL)); + FullPath.MaximumLength -= (sizeof(L"\\??\\") - sizeof(UNICODE_NULL)); + FullPath.Buffer = (PWSTR)((ULONG_PTR)Buffer + sizeof(L"\\??\\") - sizeof(UNICODE_NULL)); + ReparsePath.Buffer = (PWSTR)((ULONG_PTR)Reparse->SymbolicLinkReparseBuffer.PathBuffer + Reparse->SymbolicLinkReparseBuffer.PrintNameOffset); + ReparsePath.Length = ReparsePath.MaximumLength = Reparse->SymbolicLinkReparseBuffer.PrintNameLength; + ok(RtlCompareUnicodeString(&ReparsePath, &FullPath, TRUE) == 0, "Expected: %wZ. Got: %wZ\n", &ReparsePath, &FullPath); + + ExFreePool(Buffer); + } + } + + ExFreePool(SysDir.Buffer); + ExFreePool(Reparse); + + ZwSetInformationFile(ReparseHandle, + &IoStatusBlock, + &ToDelete, + sizeof(ToDelete), + FileDispositionInformation); + ZwClose(ReparseHandle); +} + +//static +VOID +NTAPI UserModeTest(VOID) { NTSTATUS Status; @@ -512,6 +876,8 @@ HANDLE ThreadHandle; PVOID ThreadObject = NULL; + TestSymlinks(); + /* Justify the next comment/statement */ UserModeTest();

1 0

[pschweitzer] 69352: [KERNEL32_APITEST] Rename apitest Mailslot test to MailslotRead to avoid testman issue with mailslot winetest
by pschweitzer＠svn.reactos.org 25 Sep '15

25 Sep '15

Author: pschweitzer Date: Fri Sep 25 14:53:08 2015 New Revision: 69352 URL: http://svn.reactos.org/svn/reactos?rev=69352&view=rev Log: [KERNEL32_APITEST] Rename apitest Mailslot test to MailslotRead to avoid testman issue with mailslot winetest Modified: trunk/rostests/apitests/kernel32/testlist.c Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Fri Sep 25 14:53:08 2015 @@ -27,7 +27,7 @@ { "GetModuleFileName", func_GetModuleFileName }, { "interlck", func_interlck }, { "lstrcpynW", func_lstrcpynW }, - { "Mailslot", func_Mailslot }, + { "MailslotRead", func_Mailslot }, { "MultiByteToWideChar", func_MultiByteToWideChar }, { "PrivMoveFileIdentityW", func_PrivMoveFileIdentityW }, { "SetCurrentDirectory", func_SetCurrentDirectory },

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