Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[hbelusca] 60899: [NTVDM] DOS: Implement INT 21h, AH 62h as a call to INT 21h, AH 51h.
by hbelusca＠svn.reactos.org 09 Nov '13

09 Nov '13

Author: hbelusca Date: Sat Nov 9 16:11:52 2013 New Revision: 60899 URL: http://svn.reactos.org/svn/reactos?rev=60899&view=rev Log: [NTVDM] DOS: Implement INT 21h, AH 62h as a call to INT 21h, AH 51h. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Sat Nov 9 16:11:52 2013 @@ -1598,7 +1598,7 @@ break; } - /* Disk Reset */ + /* Disk Reset */ case 0x0D: { PDOS_PSP PspBlock = SEGMENT_TO_PSP(CurrentPsp); @@ -2328,9 +2328,14 @@ break; } - /* Get Current Process ID (Get PSP Address) */ + /* Internal - Get Current Process ID (Get PSP Address) */ case 0x51: { + /* + * Identical to the documented AH=62h. + * See Ralf Brown: http://www.ctyme.com/intr/rb-2982.htm + * for more information. + */ setBX(CurrentPsp); break; } @@ -2388,6 +2393,24 @@ setAX(ERROR_INVALID_FUNCTION); } + break; + } + + /* Get Current PSP Address */ + case 0x62: + { + /* + * Identical to the undocumented AH=51h. + * See Ralf Brown: http://www.ctyme.com/intr/rb-3140.htm + * for more information. + */ + setAH(0x51); // Call the internal function. + /* + * Instead of calling ourselves really recursively as in: + * DosInt21h(Stack); + * prefer resetting the CF flag to let the BOP repeat. + */ + setCF(1); break; }

1 0

[hbelusca] 60898: [NTVDM]: Improve DisplayMessage by also displaying the message in the debug log.
by hbelusca＠svn.reactos.org 09 Nov '13

09 Nov '13

Author: hbelusca Date: Sat Nov 9 15:53:52 2013 New Revision: 60898 URL: http://svn.reactos.org/svn/reactos?rev=60898&view=rev Log: [NTVDM]: Improve DisplayMessage by also displaying the message in the debug log. Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sat Nov 9 15:53:52 2013 @@ -41,6 +41,7 @@ va_start(Parameters, Format); _vsnwprintf(Buffer, 256, Format, Parameters); + DPRINT1("\n\nNTVDM Subsystem\n%S\n\n", Buffer); MessageBoxW(NULL, Buffer, L"NTVDM Subsystem", MB_OK); va_end(Parameters); }

1 0

[aandrejevic] 60897: [NTVDM] Display the opcode when an unhandled exception occurs.
by aandrejevic＠svn.reactos.org 09 Nov '13

09 Nov '13

Author: aandrejevic Date: Sat Nov 9 15:48:07 2013 New Revision: 60897 URL: http://svn.reactos.org/svn/reactos?rev=60897&view=rev Log: [NTVDM] Display the opcode when an unhandled exception occurs. Modified: branches/ntvdm/subsystems/ntvdm/bop.c Modified: branches/ntvdm/subsystems/ntvdm/bop.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bop.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bop.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bop.c [iso-8859-1] Sat Nov 9 15:48:07 2013 @@ -296,18 +296,31 @@ VOID WINAPI Exception(BYTE ExceptionNumber, LPWORD Stack) { WORD CodeSegment, InstructionPointer; + PBYTE Opcode; ASSERT(ExceptionNumber < 8); /* Get the CS:IP */ InstructionPointer = Stack[STACK_IP]; CodeSegment = Stack[STACK_CS]; + Opcode = (PBYTE)SEG_OFF_TO_PTR(CodeSegment, InstructionPointer); /* Display a message to the user */ - DisplayMessage(L"Exception: %s occured at %04X:%04X", + DisplayMessage(L"Exception: %s occured at %04X:%04X\n" + L"Opcode: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", ExceptionName[ExceptionNumber], CodeSegment, - InstructionPointer); + InstructionPointer, + Opcode[0], + Opcode[1], + Opcode[2], + Opcode[3], + Opcode[4], + Opcode[5], + Opcode[6], + Opcode[7], + Opcode[8], + Opcode[9]); /* Stop the VDM */ VdmRunning = FALSE;

1 0

[hbelusca] 60896: [FAST486][NTVDM]: Rename the last two IO functions parameters in the same way as some CSR functions (ElementCount == DataCount; ElementSize == DataSize).
by hbelusca＠svn.reactos.org 09 Nov '13

09 Nov '13

Author: hbelusca Date: Sat Nov 9 15:00:19 2013 New Revision: 60896 URL: http://svn.reactos.org/svn/reactos?rev=60896&view=rev Log: [FAST486][NTVDM]: Rename the last two IO functions parameters in the same way as some CSR functions (ElementCount == DataCount; ElementSize == DataSize). Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/fast486.c branches/ntvdm/subsystems/ntvdm/emulator.c Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Sat Nov 9 15:00:19 2013 @@ -185,8 +185,8 @@ PFAST486_STATE State, ULONG Port, PVOID Buffer, - ULONG Size, - UCHAR Width + ULONG DataCount, + UCHAR DataSize ); typedef @@ -196,8 +196,8 @@ PFAST486_STATE State, ULONG Port, PVOID Buffer, - ULONG Size, - UCHAR Width + ULONG DataCount, + UCHAR DataSize ); typedef Modified: branches/ntvdm/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] Sat Nov 9 15:00:19 2013 @@ -146,24 +146,24 @@ static VOID NTAPI -Fast486IoReadCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size, UCHAR Width) +Fast486IoReadCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) { UNREFERENCED_PARAMETER(State); UNREFERENCED_PARAMETER(Port); UNREFERENCED_PARAMETER(Buffer); - UNREFERENCED_PARAMETER(Size); - UNREFERENCED_PARAMETER(Width); -} - -static VOID -NTAPI -Fast486IoWriteCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size, UCHAR Width) + UNREFERENCED_PARAMETER(DataCount); + UNREFERENCED_PARAMETER(DataSize); +} + +static VOID +NTAPI +Fast486IoWriteCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) { UNREFERENCED_PARAMETER(State); UNREFERENCED_PARAMETER(Port); UNREFERENCED_PARAMETER(Buffer); - UNREFERENCED_PARAMETER(Size); - UNREFERENCED_PARAMETER(Width); + UNREFERENCED_PARAMETER(DataCount); + UNREFERENCED_PARAMETER(DataSize); } static VOID Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Sat Nov 9 15:00:19 2013 @@ -82,14 +82,14 @@ } } -static VOID WINAPI EmulatorReadIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size, UCHAR Width) +static VOID WINAPI EmulatorReadIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) { INT i, j; LPBYTE Address = (LPBYTE)Buffer; UNREFERENCED_PARAMETER(State); - for (i = 0; i < Size; i++) for (j = 0; j < Width; j++) + for (i = 0; i < DataCount; i++) for (j = 0; j < DataSize; j++) { ULONG CurrentPort = Port + j; @@ -169,14 +169,14 @@ } } -static VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size, UCHAR Width) +static VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) { INT i, j; LPBYTE Address = (LPBYTE)Buffer; UNREFERENCED_PARAMETER(State); - for (i = 0; i < Size; i++) for (j = 0; j < Width; j++) + for (i = 0; i < DataCount; i++) for (j = 0; j < DataSize; j++) { ULONG CurrentPort = Port + j;

1 0

[tfaber] 60895: [SHELL32] - Quote paths containing spaces when executing shell commands. Patch by Huw Campbell. CORE-7542 #resolve
by tfaber＠svn.reactos.org 09 Nov '13

09 Nov '13

Author: tfaber Date: Sat Nov 9 14:31:08 2013 New Revision: 60895 URL: http://svn.reactos.org/svn/reactos?rev=60895&view=rev Log: [SHELL32] - Quote paths containing spaces when executing shell commands. Patch by Huw Campbell. CORE-7542 #resolve Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] Sat Nov 9 14:31:08 2013 @@ -238,7 +238,12 @@ --cchRemaining; } else if (pApp->wszCmd[++i] == '1') - StringCchCopyExW(pszEnd, cchRemaining, pwszFilePath, &pszEnd, &cchRemaining, 0); + { + if (StrChrW(pwszFilePath, L' ') && cchRemaining > 3) + StringCchPrintfExW(pszEnd, cchRemaining, &pszEnd, &cchRemaining, 0, L"\"%ls\"", pwszFilePath); + else + StringCchCopyExW(pszEnd, cchRemaining, pwszFilePath, &pszEnd, &cchRemaining, 0); + } } /* NULL-terminate the command string */ if (cchRemaining > 0) @@ -1182,7 +1187,7 @@ /* Load applications list */ m_pAppList->Load(); m_pAppList->LoadRecommended(m_wszPath); - + /* Create submenu only if there is more than one application and menu has a default item */ if (m_pAppList->GetRecommendedCount() > 1) {

1 0

[hbelusca] 60894: [FAST486]: Code formatting only (remove endlines spaces).
by hbelusca＠svn.reactos.org 09 Nov '13

09 Nov '13

Author: hbelusca Date: Sat Nov 9 14:23:40 2013 New Revision: 60894 URL: http://svn.reactos.org/svn/reactos?rev=60894&view=rev Log: [FAST486]: Code formatting only (remove endlines spaces). Modified: branches/ntvdm/lib/fast486/common.c branches/ntvdm/lib/fast486/common.inl branches/ntvdm/lib/fast486/extraops.c branches/ntvdm/lib/fast486/opcodes.c branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.c [iso-8859-1] Sat Nov 9 14:23:40 2013 @@ -141,7 +141,7 @@ /* Check if this is the last page */ if (Page == PAGE_ALIGN(LinearAddress + Size - 1)) - { + { /* Copy only a part of the page */ PageLength = PAGE_OFFSET(LinearAddress + Size); } @@ -255,7 +255,7 @@ /* Check if this is the last page */ if (Page == PAGE_ALIGN(LinearAddress + Size - 1)) - { + { /* Copy only a part of the page */ PageLength = PAGE_OFFSET(LinearAddress + Size); } Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Sat Nov 9 14:23:40 2013 @@ -398,7 +398,7 @@ else { /* Read from the real-mode IVT */ - + /* Paging is always disabled in real mode */ State->MemReadCallback(State, State->Idtr.Address @@ -518,7 +518,7 @@ if (Mode == 1) { CHAR Offset; - + /* Fetch the byte */ if (!Fast486FetchByte(State, (PUCHAR)&Offset)) { @@ -532,7 +532,7 @@ else if ((Mode == 2) || ((Mode == 0) && (RegMem == FAST486_REG_EBP))) { LONG Offset; - + /* Fetch the dword */ if (!Fast486FetchDword(State, (PULONG)&Offset)) { @@ -641,7 +641,7 @@ if (Mode == 1) { CHAR Offset; - + /* Fetch the byte */ if (!Fast486FetchByte(State, (PUCHAR)&Offset)) { @@ -655,7 +655,7 @@ else if ((Mode == 2) || ((Mode == 0) && (RegMem == 6))) { SHORT Offset; - + /* Fetch the word */ if (!Fast486FetchWord(State, (PUSHORT)&Offset)) { Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Sat Nov 9 14:23:40 2013 @@ -427,7 +427,7 @@ Fast486Exception(State, FAST486_EXCEPTION_UD); return FALSE; } - + if (ModRegRm.Register != 0) { /* CR2 and CR3 and are stored in array indexes 1 and 2 */ @@ -1517,7 +1517,7 @@ if (Jump) { - /* Move the instruction pointer */ + /* Move the instruction pointer */ State->InstPtr.Long += Offset; } @@ -1701,7 +1701,7 @@ /* Exception occurred */ return FALSE; } - + /* Calculate the result */ Result = Source + Destination; @@ -1740,7 +1740,7 @@ /* Exception occurred */ return FALSE; } - + /* Calculate the result */ Result = Source + Destination; Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Sat Nov 9 14:23:40 2013 @@ -684,7 +684,7 @@ if (Jump) { - /* Move the instruction pointer */ + /* Move the instruction pointer */ State->InstPtr.Long += Offset; } @@ -997,7 +997,7 @@ /* Read the value from AL */ Data = State->GeneralRegs[FAST486_REG_EAX].LowByte; - + /* Write the byte to the I/O port */ State->IoWriteCallback(State, Port, &Data, 1, sizeof(UCHAR)); @@ -1069,7 +1069,7 @@ return FALSE; } - /* Move the instruction pointer */ + /* Move the instruction pointer */ State->InstPtr.Long += Offset; return TRUE; @@ -1231,7 +1231,7 @@ /* Exception occurred */ return FALSE; } - + /* Calculate the result */ Result = FirstValue + SecondValue; @@ -1262,7 +1262,7 @@ /* Exception occurred */ return FALSE; } - + /* Calculate the result */ Result = FirstValue + SecondValue; @@ -1465,7 +1465,7 @@ /* Exception occurred */ return FALSE; } - + /* Calculate the result */ Result = FirstValue | SecondValue; @@ -1494,7 +1494,7 @@ /* Exception occurred */ return FALSE; } - + /* Calculate the result */ Result = FirstValue | SecondValue; @@ -1689,7 +1689,7 @@ /* Exception occurred */ return FALSE; } - + /* Calculate the result */ Result = FirstValue & SecondValue; @@ -1718,7 +1718,7 @@ /* Exception occurred */ return FALSE; } - + /* Calculate the result */ Result = FirstValue & SecondValue; @@ -1908,7 +1908,7 @@ /* Exception occurred */ return FALSE; } - + /* Calculate the result */ Result = FirstValue ^ SecondValue; @@ -1937,7 +1937,7 @@ /* Exception occurred */ return FALSE; } - + /* Calculate the result */ Result = FirstValue ^ SecondValue; @@ -2128,7 +2128,7 @@ /* Exception occurred */ return FALSE; } - + /* Calculate the result */ Result = FirstValue & SecondValue; @@ -2151,7 +2151,7 @@ /* Exception occurred */ return FALSE; } - + /* Calculate the result */ Result = FirstValue & SecondValue; @@ -2375,7 +2375,7 @@ /* Exception occurred */ return FALSE; } - + /* Write the value from the register to the R/M */ if (!Fast486WriteModrmWordOperands(State, &ModRegRm, @@ -2510,7 +2510,7 @@ /* Exception occurred */ return FALSE; } - + /* Calculate the result */ Result = FirstValue + SecondValue + State->Flags.Cf; @@ -2545,7 +2545,7 @@ /* Exception occurred */ return FALSE; } - + /* Calculate the result */ Result = FirstValue + SecondValue + State->Flags.Cf; @@ -2803,7 +2803,7 @@ /* Swap the order */ SWAP(FirstValue, SecondValue); } - + /* Calculate the result */ Result = FirstValue - SecondValue - Carry; @@ -2834,14 +2834,14 @@ /* Exception occurred */ return FALSE; } - + /* Check if this is the instruction that writes to R/M */ if (!(Opcode & FAST486_OPCODE_WRITE_REG)) { /* Swap the order */ SWAP(FirstValue, SecondValue); } - + /* Calculate the result */ Result = FirstValue - SecondValue - Carry; @@ -3129,7 +3129,7 @@ /* Swap the order */ SWAP(FirstValue, SecondValue); } - + /* Calculate the result */ Result = FirstValue - SecondValue; @@ -3169,14 +3169,14 @@ /* Exception occurred */ return FALSE; } - + /* Check if this is the instruction that writes to R/M */ if (!(Opcode & FAST486_OPCODE_WRITE_REG)) { /* Swap the order */ SWAP(FirstValue, SecondValue); } - + /* Calculate the result */ Result = FirstValue - SecondValue; @@ -3791,7 +3791,7 @@ if (Opcode & FAST486_OPCODE_WRITE_REG) Result = SecondValue; else Result = FirstValue; - + /* Write back the result */ return Fast486WriteModrmDwordOperands(State, &ModRegRm, @@ -3810,7 +3810,7 @@ /* Exception occurred */ return FALSE; } - + if (Opcode & FAST486_OPCODE_WRITE_REG) Result = SecondValue; else Result = FirstValue; @@ -4234,7 +4234,7 @@ /* Call the VM86 monitor */ Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, 0); } - + } return TRUE; @@ -4975,7 +4975,7 @@ if (Condition) { - /* Move the instruction pointer */ + /* Move the instruction pointer */ State->InstPtr.Long += Offset; } @@ -5010,7 +5010,7 @@ return FALSE; } - /* Move the instruction pointer */ + /* Move the instruction pointer */ State->InstPtr.Long += Offset; } else @@ -5031,7 +5031,7 @@ return FALSE; } - /* Move the instruction pointer */ + /* Move the instruction pointer */ State->InstPtr.LowWord += Offset; } @@ -5059,7 +5059,7 @@ return FALSE; } - /* Move the instruction pointer */ + /* Move the instruction pointer */ State->InstPtr.Long += Offset; } else @@ -5073,7 +5073,7 @@ return FALSE; } - /* Move the instruction pointer */ + /* Move the instruction pointer */ State->InstPtr.LowWord += Offset; } @@ -5607,7 +5607,7 @@ || (State->PrefixFlags & FAST486_PREFIX_REPNZ)) { BOOLEAN Repeat = TRUE; - + if (OperandSize) { if ((--State->GeneralRegs[FAST486_REG_ECX].Long) == 0) @@ -5915,7 +5915,7 @@ || (State->PrefixFlags & FAST486_PREFIX_REPNZ)) { BOOLEAN Repeat = TRUE; - + if (OperandSize) { if ((--State->GeneralRegs[FAST486_REG_ECX].Long) == 0) Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Sat Nov 9 14:23:40 2013 @@ -325,7 +325,7 @@ { return Fast486WriteModrmByteOperands(State, &ModRegRm, FALSE, Value); } - + return TRUE; } @@ -333,7 +333,7 @@ { FAST486_MOD_REG_RM ModRegRm; BOOLEAN OperandSize, AddressSize; - + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; TOGGLE_OPSIZE(OperandSize); @@ -408,7 +408,7 @@ CHAR ImmByte; FAST486_MOD_REG_RM ModRegRm; BOOLEAN OperandSize, AddressSize; - + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; TOGGLE_OPSIZE(OperandSize); @@ -478,7 +478,7 @@ ULONG Value; FAST486_MOD_REG_RM ModRegRm; BOOLEAN OperandSize, AddressSize; - + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; TOGGLE_OPSIZE(OperandSize); @@ -567,7 +567,7 @@ UCHAR Count; FAST486_MOD_REG_RM ModRegRm; BOOLEAN OperandSize, AddressSize; - + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; TOGGLE_OPSIZE(OperandSize); @@ -757,7 +757,7 @@ { FAST486_MOD_REG_RM ModRegRm; BOOLEAN OperandSize, AddressSize; - + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; TOGGLE_OPSIZE(OperandSize); @@ -844,7 +844,7 @@ { FAST486_MOD_REG_RM ModRegRm; BOOLEAN OperandSize, AddressSize; - + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; TOGGLE_OPSIZE(OperandSize); @@ -1037,7 +1037,7 @@ ULONG Dummy, Value = 0, SignFlag; FAST486_MOD_REG_RM ModRegRm; BOOLEAN OperandSize, AddressSize; - + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; TOGGLE_OPSIZE(OperandSize); @@ -1336,7 +1336,7 @@ { FAST486_MOD_REG_RM ModRegRm; BOOLEAN OperandSize, AddressSize; - + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; TOGGLE_OPSIZE(OperandSize); @@ -1879,7 +1879,7 @@ BOOLEAN OperandSize, AddressSize; UINT DataSize; UCHAR BitNumber; - + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; TOGGLE_OPSIZE(OperandSize);

1 0

[hbelusca] 60893: [FAST486]: Fix OUT instruction (IoWrite instead of IoRead).
by hbelusca＠svn.reactos.org 09 Nov '13

09 Nov '13

Author: hbelusca Date: Sat Nov 9 14:15:39 2013 New Revision: 60893 URL: http://svn.reactos.org/svn/reactos?rev=60893&view=rev Log: [FAST486]: Fix OUT instruction (IoWrite instead of IoRead). Modified: branches/ntvdm/lib/fast486/opcodes.c Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Sat Nov 9 14:15:39 2013 @@ -1041,7 +1041,7 @@ ULONG Data = State->GeneralRegs[FAST486_REG_EAX].Long; /* Write a dword to the I/O port */ - State->IoReadCallback(State, Port, &Data, 1, sizeof(ULONG)); + State->IoWriteCallback(State, Port, &Data, 1, sizeof(ULONG)); } else {

1 0

[ekohl] 60892: [SAMLIB] Fix the SamQuerySecurityObject implementation.
by ekohl＠svn.reactos.org 09 Nov '13

09 Nov '13

Author: ekohl Date: Sat Nov 9 13:06:42 2013 New Revision: 60892 URL: http://svn.reactos.org/svn/reactos?rev=60892&view=rev Log: [SAMLIB] Fix the SamQuerySecurityObject implementation. Modified: trunk/reactos/dll/win32/samlib/samlib.c Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sat Nov 9 13:06:42 2013 @@ -1609,31 +1609,37 @@ IN SECURITY_INFORMATION SecurityInformation, OUT PSECURITY_DESCRIPTOR *SecurityDescriptor) { - SAMPR_SR_SECURITY_DESCRIPTOR LocalSecurityDescriptor; - PSAMPR_SR_SECURITY_DESCRIPTOR pLocalSecurityDescriptor; + PSAMPR_SR_SECURITY_DESCRIPTOR SamSecurityDescriptor = NULL; NTSTATUS Status; TRACE("SamQuerySecurityObject(%p %lu %p)\n", ObjectHandle, SecurityInformation, SecurityDescriptor); - LocalSecurityDescriptor.Length = 0; - LocalSecurityDescriptor.SecurityDescriptor = NULL; - - RpcTryExcept - { - pLocalSecurityDescriptor = &LocalSecurityDescriptor; - + *SecurityDescriptor = NULL; + + RpcTryExcept + { Status = SamrQuerySecurityObject((SAMPR_HANDLE)ObjectHandle, SecurityInformation, - &pLocalSecurityDescriptor); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - - *SecurityDescriptor = LocalSecurityDescriptor.SecurityDescriptor; + &SamSecurityDescriptor); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + TRACE("SamSecurityDescriptor: %p\n", SamSecurityDescriptor); + + if (SamSecurityDescriptor != NULL) + { + TRACE("SamSecurityDescriptor->Length: %lu\n", SamSecurityDescriptor->Length); + TRACE("SamSecurityDescriptor->SecurityDescriptor: %p\n", SamSecurityDescriptor->SecurityDescriptor); + + *SecurityDescriptor = SamSecurityDescriptor->SecurityDescriptor; + + midl_user_free(SamSecurityDescriptor); + } return Status; }

1 0

[aandrejevic] 60891: [FAST486][NTVDM] The behavior of the I/O port bus depends on the data width. In the case of 16-bit/32-bit access, two/four adjacent ports will be accessed.
by aandrejevic＠svn.reactos.org 09 Nov '13

09 Nov '13

Author: aandrejevic Date: Sat Nov 9 03:30:27 2013 New Revision: 60891 URL: http://svn.reactos.org/svn/reactos?rev=60891&view=rev Log: [FAST486][NTVDM] The behavior of the I/O port bus depends on the data width. In the case of 16-bit/32-bit access, two/four adjacent ports will be accessed. Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/fast486.c branches/ntvdm/lib/fast486/opcodes.c branches/ntvdm/subsystems/ntvdm/emulator.c Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Sat Nov 9 03:30:27 2013 @@ -185,7 +185,8 @@ PFAST486_STATE State, ULONG Port, PVOID Buffer, - ULONG Size + ULONG Size, + UCHAR Width ); typedef @@ -195,7 +196,8 @@ PFAST486_STATE State, ULONG Port, PVOID Buffer, - ULONG Size + ULONG Size, + UCHAR Width ); typedef Modified: branches/ntvdm/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] Sat Nov 9 03:30:27 2013 @@ -146,22 +146,24 @@ static VOID NTAPI -Fast486IoReadCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size) +Fast486IoReadCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size, UCHAR Width) { UNREFERENCED_PARAMETER(State); UNREFERENCED_PARAMETER(Port); UNREFERENCED_PARAMETER(Buffer); UNREFERENCED_PARAMETER(Size); -} - -static VOID -NTAPI -Fast486IoWriteCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size) + UNREFERENCED_PARAMETER(Width); +} + +static VOID +NTAPI +Fast486IoWriteCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size, UCHAR Width) { UNREFERENCED_PARAMETER(State); UNREFERENCED_PARAMETER(Port); UNREFERENCED_PARAMETER(Buffer); UNREFERENCED_PARAMETER(Size); + UNREFERENCED_PARAMETER(Width); } static VOID Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Sat Nov 9 03:30:27 2013 @@ -906,7 +906,7 @@ } /* Read a byte from the I/O port */ - State->IoReadCallback(State, Port, &Data, sizeof(UCHAR)); + State->IoReadCallback(State, Port, &Data, 1, sizeof(UCHAR)); /* Store the result in AL */ State->GeneralRegs[FAST486_REG_EAX].LowByte = Data; @@ -950,7 +950,7 @@ ULONG Data; /* Read a dword from the I/O port */ - State->IoReadCallback(State, Port, &Data, sizeof(ULONG)); + State->IoReadCallback(State, Port, &Data, 1, sizeof(ULONG)); /* Store the value in EAX */ State->GeneralRegs[FAST486_REG_EAX].Long = Data; @@ -960,7 +960,7 @@ USHORT Data; /* Read a word from the I/O port */ - State->IoReadCallback(State, Port, &Data, sizeof(USHORT)); + State->IoReadCallback(State, Port, &Data, 1, sizeof(USHORT)); /* Store the value in AX */ State->GeneralRegs[FAST486_REG_EAX].LowWord = Data; @@ -999,7 +999,7 @@ Data = State->GeneralRegs[FAST486_REG_EAX].LowByte; /* Write the byte to the I/O port */ - State->IoWriteCallback(State, Port, &Data, sizeof(UCHAR)); + State->IoWriteCallback(State, Port, &Data, 1, sizeof(UCHAR)); return TRUE; } @@ -1041,7 +1041,7 @@ ULONG Data = State->GeneralRegs[FAST486_REG_EAX].Long; /* Write a dword to the I/O port */ - State->IoReadCallback(State, Port, &Data, sizeof(ULONG)); + State->IoReadCallback(State, Port, &Data, 1, sizeof(ULONG)); } else { @@ -1049,7 +1049,7 @@ USHORT Data = State->GeneralRegs[FAST486_REG_EAX].LowWord; /* Write a word to the I/O port */ - State->IoWriteCallback(State, Port, &Data, sizeof(USHORT)); + State->IoWriteCallback(State, Port, &Data, 1, sizeof(USHORT)); } return TRUE; @@ -5997,7 +5997,8 @@ State->IoReadCallback(State, State->GeneralRegs[FAST486_REG_EDX].LowWord, Block, - Processed * DataSize); + Processed, + DataSize); if (State->Flags.Df) { @@ -6059,6 +6060,7 @@ State->IoReadCallback(State, State->GeneralRegs[FAST486_REG_EDX].LowWord, &Data, + 1, DataSize); /* Write to the destination operand */ @@ -6174,7 +6176,8 @@ State->IoWriteCallback(State, State->GeneralRegs[FAST486_REG_EDX].LowWord, Block, - Processed * DataSize); + Processed, + DataSize); if (!State->Flags.Df) { @@ -6212,6 +6215,7 @@ State->IoWriteCallback(State, State->GeneralRegs[FAST486_REG_EDX].LowWord, &Data, + 1, DataSize); /* Increment/decrement ESI */ Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Sat Nov 9 03:30:27 2013 @@ -82,28 +82,30 @@ } } -static VOID WINAPI EmulatorReadIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size) -{ - INT i; +static VOID WINAPI EmulatorReadIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size, UCHAR Width) +{ + INT i, j; LPBYTE Address = (LPBYTE)Buffer; UNREFERENCED_PARAMETER(State); - for (i = 0; i < Size; i++) - { - switch (Port) + for (i = 0; i < Size; i++) for (j = 0; j < Width; j++) + { + ULONG CurrentPort = Port + j; + + switch (CurrentPort) { case PIC_MASTER_CMD: case PIC_SLAVE_CMD: { - *(Address++) = PicReadCommand(Port); + *(Address++) = PicReadCommand(CurrentPort); break; } case PIC_MASTER_DATA: case PIC_SLAVE_DATA: { - *(Address++) = PicReadData(Port); + *(Address++) = PicReadData(CurrentPort); break; } @@ -111,7 +113,7 @@ case PIT_DATA_PORT(1): case PIT_DATA_PORT(2): { - *(Address++) = PitReadData(Port - PIT_DATA_PORT(0)); + *(Address++) = PitReadData(CurrentPort - PIT_DATA_PORT(0)); break; } @@ -155,28 +157,30 @@ case VGA_STAT_MONO: case VGA_STAT_COLOR: { - *(Address++) = VgaReadPort(Port); + *(Address++) = VgaReadPort(CurrentPort); break; } default: { - DPRINT1("Read from unknown port: 0x%X\n", Port); + DPRINT1("Read from unknown port: 0x%X\n", CurrentPort); } } } } -static VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size) -{ - INT i; +static VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size, UCHAR Width) +{ + INT i, j; LPBYTE Address = (LPBYTE)Buffer; UNREFERENCED_PARAMETER(State); - for (i = 0; i < Size; i++) - { - switch (Port) + for (i = 0; i < Size; i++) for (j = 0; j < Width; j++) + { + ULONG CurrentPort = Port + j; + + switch (CurrentPort) { case PIT_COMMAND_PORT: { @@ -188,21 +192,21 @@ case PIT_DATA_PORT(1): case PIT_DATA_PORT(2): { - PitWriteData(Port - PIT_DATA_PORT(0), *(Address++)); + PitWriteData(CurrentPort - PIT_DATA_PORT(0), *(Address++)); break; } case PIC_MASTER_CMD: case PIC_SLAVE_CMD: { - PicWriteCommand(Port, *(Address++)); + PicWriteCommand(CurrentPort, *(Address++)); break; } case PIC_MASTER_DATA: case PIC_SLAVE_DATA: { - PicWriteData(Port, *(Address++)); + PicWriteData(CurrentPort, *(Address++)); break; } @@ -252,13 +256,13 @@ case VGA_STAT_MONO: case VGA_STAT_COLOR: { - VgaWritePort(Port, *(Address++)); + VgaWritePort(CurrentPort, *(Address++)); break; } default: { - DPRINT1("Write to unknown port: 0x%X\n", Port); + DPRINT1("Write to unknown port: 0x%X\n", CurrentPort); } } }

1 0

[hbelusca] 60890: [NTVDM]: Add offset information to the BIOS Data Area, and add missing fields. See the provided links in the patch for more information.
by hbelusca＠svn.reactos.org 09 Nov '13

09 Nov '13

Author: hbelusca Date: Sat Nov 9 00:28:26 2013 New Revision: 60890 URL: http://svn.reactos.org/svn/reactos?rev=60890&view=rev Log: [NTVDM]: Add offset information to the BIOS Data Area, and add missing fields. See the provided links in the patch for more information. Modified: branches/ntvdm/subsystems/ntvdm/bios.h Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Sat Nov 9 00:28:26 2013 @@ -24,12 +24,12 @@ #define BIOS_SEGMENT 0xF000 -#define BIOS_VIDEO_INTERRUPT 0x10 -#define BIOS_EQUIPMENT_INTERRUPT 0x11 -#define BIOS_MEMORY_SIZE 0x12 -#define BIOS_KBD_INTERRUPT 0x16 -#define BIOS_TIME_INTERRUPT 0x1A -#define BIOS_SYS_TIMER_INTERRUPT 0x1C +#define BIOS_VIDEO_INTERRUPT 0x10 +#define BIOS_EQUIPMENT_INTERRUPT 0x11 +#define BIOS_MEMORY_SIZE 0x12 +#define BIOS_KBD_INTERRUPT 0x16 +#define BIOS_TIME_INTERRUPT 0x1A +#define BIOS_SYS_TIMER_INTERRUPT 0x1C #define CONSOLE_FONT_HEIGHT 8 #define BIOS_KBD_BUFFER_SIZE 16 @@ -69,53 +69,81 @@ #pragma pack(push, 1) +/* + * BIOS Data Area at 0040:XXXX + * + * See: http://webpages.charter.net/danrollins/techhelp/0093.HTM + * and: http://www.bioscentral.com/misc/bda.htm + * for more information. + */ typedef struct { - WORD SerialPorts[4]; - WORD ParallelPorts[3]; - WORD EbdaSegment; // Sometimes, ParallelPort - WORD EquipmentList; - BYTE Reserved0; // Errors in PCjr infrared keyboard link - WORD MemorySize; - WORD Reserved1; // Scratch pad for manufacturing error tests - WORD KeybdShiftFlags; - BYTE AlternateKeypad; - WORD KeybdBufferHead; - WORD KeybdBufferTail; - WORD KeybdBuffer[BIOS_KBD_BUFFER_SIZE]; - BYTE DriveRecalibrate; - BYTE DriveMotorStatus; - BYTE MotorShutdownCounter; - BYTE LastDisketteOperation; - BYTE Reserved2[7]; - BYTE VideoMode; - WORD ScreenColumns; - WORD VideoPageSize; - WORD VideoPageOffset; - WORD CursorPosition[BIOS_MAX_PAGES]; - BYTE CursorEndLine; - BYTE CursorStartLine; - BYTE VideoPage; - WORD CrtBasePort; - BYTE CrtModeControl; - BYTE CrtColorPaletteMask; - DWORD Uptime; - BYTE Reserved3; - DWORD TickCounter; - BYTE MidnightPassed; - BYTE BreakFlag; - WORD SoftReset; - BYTE LastDiskOperation; - BYTE NumDisks; - BYTE DriveControlByte; - BYTE DiskPortOffset; - BYTE LptTimeOut[4]; - BYTE ComTimeOut[4]; - WORD KeybdBufferStart; - WORD KeybdBufferEnd; - BYTE ScreenRows; - WORD CharacterHeight; + WORD SerialPorts[4]; // 0x00 + WORD ParallelPorts[3]; // 0x08 + WORD EbdaSegment; // 0x0e - ParallelPort in PC/XT + WORD EquipmentList; // 0x10 + BYTE Reserved0; // 0x12 - Errors in PCjr infrared keyboard link + WORD MemorySize; // 0x13 + WORD Reserved1; // 0x15 - Scratch pad for manufacturing error tests + WORD KeybdShiftFlags; // 0x17 + BYTE AlternateKeypad; // 0x19 + WORD KeybdBufferHead; // 0x1a + WORD KeybdBufferTail; // 0x1c + WORD KeybdBuffer[BIOS_KBD_BUFFER_SIZE]; // 0x1e + BYTE DriveRecalibrate; // 0x3e + BYTE DriveMotorStatus; // 0x3f + BYTE MotorShutdownCounter; // 0x40 + BYTE LastDisketteOperation; // 0x41 + BYTE Reserved2[7]; // 0x42 + BYTE VideoMode; // 0x49 + WORD ScreenColumns; // 0x4a + WORD VideoPageSize; // 0x4c + WORD VideoPageOffset; // 0x4e + WORD CursorPosition[BIOS_MAX_PAGES]; // 0x50 + BYTE CursorEndLine; // 0x60 + BYTE CursorStartLine; // 0x61 + BYTE VideoPage; // 0x62 + WORD CrtBasePort; // 0x63 + BYTE CrtModeControl; // 0x65 + BYTE CrtColorPaletteMask; // 0x66 + BYTE CassetteData[5]; // 0x67 + DWORD TickCounter; // 0x6c + BYTE MidnightPassed; // 0x70 + BYTE BreakFlag; // 0x71 + WORD SoftReset; // 0x72 + BYTE LastDiskOperation; // 0x74 + BYTE NumDisks; // 0x75 + BYTE DriveControlByte; // 0x76 + BYTE DiskPortOffset; // 0x77 + BYTE LptTimeOut[4]; // 0x78 + BYTE ComTimeOut[4]; // 0x7c + WORD KeybdBufferStart; // 0x80 + WORD KeybdBufferEnd; // 0x82 + BYTE ScreenRows; // 0x84 + WORD CharacterHeight; // 0x85 + BYTE EGAFlags[2]; // 0x87 + BYTE VGAFlags[2]; // 0x89 + DWORD Reserved3; // 0x8b + BYTE Reserved4; // 0x8f + BYTE Reserved5[2]; // 0x90 + BYTE Reserved6[2]; // 0x92 + BYTE Reserved7[2]; // 0x94 + WORD Reserved8; // 0x96 + DWORD Reserved9; // 0x98 + DWORD Reserved10; // 0x9c + DWORD Reserved11[2]; // 0xa0 + DWORD EGAPtr; // 0xa8 + BYTE Reserved12[68]; // 0xac + BYTE Reserved13[16]; // 0xf0 + + DWORD Reserved14; // 0x100 + BYTE Reserved15[12]; // 0x104 + BYTE Reserved16[17]; // 0x110 + BYTE Reserved17[15]; // 0x121 + BYTE Reserved18[3]; // 0x130 } BIOS_DATA_AREA, *PBIOS_DATA_AREA; + +C_ASSERT(sizeof(BIOS_DATA_AREA) == 0x133); #pragma pack(pop)

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2013