Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[jimtabor] 60909: - Sync up wine dde test to current. CORE-????.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Nov 9 23:30:25 2013 New Revision: 60909 URL: http://svn.reactos.org/svn/reactos?rev=60909&view=rev Log: - Sync up wine dde test to current. CORE-????. Modified: trunk/rostests/winetests/user32/dde.c Modified: trunk/rostests/winetests/user32/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dde.c?re… ============================================================================== --- trunk/rostests/winetests/user32/dde.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dde.c [iso-8859-1] Sat Nov 9 23:30:25 2013 @@ -53,7 +53,7 @@ while (diff > 0) { if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); diff = time - GetTickCount(); min_timeout = 10; } @@ -80,7 +80,7 @@ static void destroy_dde_window(HWND *hwnd, LPCSTR name) { DestroyWindow(*hwnd); - UnregisterClass(name, GetModuleHandleA(0)); + UnregisterClassA(name, GetModuleHandleA(NULL)); } static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -255,7 +255,7 @@ while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) { - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } destroy_dde_window(&hwnd, "dde_server"); @@ -825,10 +825,10 @@ /* set up DDE server */ server_pid = 0; - res = DdeInitialize(&server_pid, server_ddeml_callback, APPCLASS_STANDARD, 0); + res = DdeInitializeA(&server_pid, server_ddeml_callback, APPCLASS_STANDARD, 0); ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); - server = DdeCreateStringHandle(server_pid, "TestDDEServer", CP_WINANSI); + server = DdeCreateStringHandleA(server_pid, "TestDDEServer", CP_WINANSI); ok(server != NULL, "Expected non-NULL string handle\n"); hdata = DdeNameService(server_pid, server, 0, DNS_REGISTER); @@ -836,7 +836,7 @@ while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) { - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } ret = DdeUninitialize(server_pid); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -1074,7 +1074,7 @@ flush_events(); - item = GlobalAddAtom("request"); + item = GlobalAddAtomA("request"); ok(item != 0, "Expected non-NULL item\n"); /* WM_DDE_REQUEST, bad clipboard format */ @@ -2672,7 +2672,7 @@ while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) { - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } ret = DdeUninitialize(server_pid); @@ -2686,7 +2686,7 @@ int argc; char **argv; char buffer[MAX_PATH]; - STARTUPINFO startup; + STARTUPINFOA startup; PROCESS_INFORMATION proc; DWORD dde_inst = 0xdeadbeef; @@ -2715,7 +2715,7 @@ return; } - ZeroMemory(&startup, sizeof(STARTUPINFO)); + ZeroMemory(&startup, sizeof(STARTUPINFOA)); sprintf(buffer, "%s dde ddeml", argv[0]); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW;

10 years, 10 months

[hbelusca] 60908: [NTVDM] Finish my Interruption revamp. - Move interrupt-related code from bop.c to int32.c - Introduce InitializeInt32 helper so that one can initialize all the needed 16-bit stub...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 9 23:01:11 2013 New Revision: 60908 URL: http://svn.reactos.org/svn/reactos?rev=60908&view=rev Log: [NTVDM] Finish my Interruption revamp. - Move interrupt-related code from bop.c to int32.c - Introduce InitializeInt32 helper so that one can initialize all the needed 16-bit stubs for the 32-bit interrupts. - Remove unneeded defines in emulator.h and an exported variable in ntvdm.h. Added: branches/ntvdm/subsystems/ntvdm/int32.c (with props) branches/ntvdm/subsystems/ntvdm/int32.h (with props) Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bop.c branches/ntvdm/subsystems/ntvdm/bop.h branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/emulator.h branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Sat Nov 9 23:01:11 2013 @@ -6,15 +6,16 @@ list(APPEND SOURCE bios.c bop.c + cmos.c dos.c emulator.c + int32.c pic.c + ps2.c registers.c + speaker.c timer.c - ps2.c - speaker.c vga.c - cmos.c ntvdm.c ntvdm.rc ${CMAKE_CURRENT_BINARY_DIR}/ntvdm.def) Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sat Nov 9 23:01:11 2013 @@ -11,14 +11,14 @@ #define NDEBUG #include "emulator.h" -#include "bop.h" - #include "bios.h" + #include "vga.h" #include "pic.h" #include "ps2.h" #include "timer.h" +#include "int32.h" #include "registers.h" /* PRIVATE VARIABLES **********************************************************/ @@ -461,11 +461,6 @@ BOOLEAN BiosInitialize(VOID) { - USHORT i; - WORD Offset = 0; - LPDWORD IntVecTable = (LPDWORD)BaseAddress; - LPBYTE BiosCode = (LPBYTE)SEG_OFF_TO_PTR(BIOS_SEGMENT, 0); - /* Initialize the BDA */ Bda = (PBIOS_DATA_AREA)SEG_OFF_TO_PTR(BDA_SEGMENT, 0); Bda->EquipmentList = BIOS_EQUIPMENT_LIST; @@ -479,43 +474,10 @@ Bda->KeybdBufferStart = FIELD_OFFSET(BIOS_DATA_AREA, KeybdBuffer); Bda->KeybdBufferEnd = Bda->KeybdBufferStart + BIOS_KBD_BUFFER_SIZE * sizeof(WORD); - /* Generate ISR stubs and fill the IVT */ - for (i = 0x00; i <= 0xFF; i++) - { - IntVecTable[i] = MAKELONG(Offset, BIOS_SEGMENT); - - BiosCode[Offset++] = 0xFB; // sti - - BiosCode[Offset++] = 0x6A; // push i - BiosCode[Offset++] = (UCHAR)i; - - BiosCode[Offset++] = 0x6A; // push 0 - BiosCode[Offset++] = 0x00; - -// BOP_SEQ: - BiosCode[Offset++] = 0xF8; // clc - - BiosCode[Offset++] = LOBYTE(EMULATOR_BOP); // BOP sequence - BiosCode[Offset++] = HIBYTE(EMULATOR_BOP); - BiosCode[Offset++] = EMULATOR_CTRL_BOP; // Control BOP - BiosCode[Offset++] = CTRL_BOP_INT32; // 32-bit Interrupt dispatcher - - BiosCode[Offset++] = 0x73; // jnc EXIT (offset +3) - BiosCode[Offset++] = 0x03; - - // HACK: The following instruction should be HLT! - BiosCode[Offset++] = 0x90; // nop - - BiosCode[Offset++] = 0xEB; // jmp BOP_SEQ (offset -10) - BiosCode[Offset++] = 0xF6; - -// EXIT: - BiosCode[Offset++] = 0x83; // add sp, 4 - BiosCode[Offset++] = 0xC4; - BiosCode[Offset++] = 0x04; - - BiosCode[Offset++] = 0xCF; // iret - } + /* Initialize the 32-bit Interrupt system */ + InitializeInt32(BIOS_SEGMENT); + + /* Register the BIOS 32-bit Interrupts */ RegisterInt32(BIOS_VIDEO_INTERRUPT , BiosVideoService ); RegisterInt32(BIOS_EQUIPMENT_INTERRUPT, BiosEquipmentService ); RegisterInt32(BIOS_MEMORY_SIZE , BiosGetMemorySize ); 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 23:01:11 2013 @@ -14,21 +14,10 @@ #include "emulator.h" #include "bop.h" -#include "bios.h" -#include "dos.h" +#include "int32.h" #include "registers.h" -LPCWSTR ExceptionName[] = -{ - L"Division By Zero", - L"Debug", - L"Unexpected Error", - L"Breakpoint", - L"Integer Overflow", - L"Bound Range Exceeded", - L"Invalid Opcode", - L"FPU Not Available" -}; +/* PRIVATE VARIABLES **********************************************************/ /* * This is the list of registered BOP handlers. @@ -293,356 +282,7 @@ ControlBop }; -/* - * This is the list of registered 32-bit Interrupt handlers. - */ -EMULATOR_INT32_PROC Int32Proc[EMULATOR_MAX_INT_NUM] = -{ - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL -}; - - - -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\n" - L"Opcode: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", - ExceptionName[ExceptionNumber], - CodeSegment, - 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; - return; -} - -// VOID WINAPI IrqDispatch(BYTE IrqNumber, LPWORD Stack) -// { - // /* Check if this was an PIC IRQ */ - // if (IntNum >= BIOS_PIC_MASTER_INT && IntNum < BIOS_PIC_MASTER_INT + 8) - // { - // /* It was an IRQ from the master PIC */ - // BiosHandleIrq(IntNum - BIOS_PIC_MASTER_INT, Stack); - // } - // else if (IntNum >= BIOS_PIC_SLAVE_INT && IntNum < BIOS_PIC_SLAVE_INT + 8) - // { - // /* It was an IRQ from the slave PIC */ - // BiosHandleIrq(IntNum - BIOS_PIC_SLAVE_INT + 8, Stack); - // } - - // return; -// } - -VOID WINAPI Int32Dispatch(LPWORD Stack) -{ - BYTE IntNum; - - /* Get the interrupt number */ - IntNum = LOBYTE(Stack[STACK_INT_NUM]); - - /* Check if this was an exception */ - if (IntNum < 8) - { - Exception(IntNum, Stack); - return; - } - - /* Check if this was an PIC IRQ */ - if (IntNum >= BIOS_PIC_MASTER_INT && IntNum < BIOS_PIC_MASTER_INT + 8) - { - /* It was an IRQ from the master PIC */ - BiosHandleIrq(IntNum - BIOS_PIC_MASTER_INT, Stack); - return; - } - else if (IntNum >= BIOS_PIC_SLAVE_INT && IntNum < BIOS_PIC_SLAVE_INT + 8) - { - /* It was an IRQ from the slave PIC */ - BiosHandleIrq(IntNum - BIOS_PIC_SLAVE_INT + 8, Stack); - return; - } - - /* Call the 32-bit Interrupt handler */ - if (Int32Proc[IntNum] != NULL) - Int32Proc[IntNum](Stack); - else - DPRINT1("Unhandled 32-bit interrupt: 0x%02X\n", IntNum); -} +/* PUBLIC FUNCTIONS ***********************************************************/ VOID WINAPI ControlBop(LPWORD Stack) { @@ -654,12 +294,6 @@ Int32Dispatch(Stack); else DPRINT1("Unassigned Control BOP Function: 0x%02X\n", FuncNum); -} - - -VOID WINAPI RegisterInt32(BYTE IntNumber, EMULATOR_INT32_PROC IntHandler) -{ - Int32Proc[IntNumber] = IntHandler; } VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode) Modified: branches/ntvdm/subsystems/ntvdm/bop.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bop.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bop.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bop.h [iso-8859-1] Sat Nov 9 23:01:11 2013 @@ -17,21 +17,14 @@ #define EMULATOR_CTRL_BOP 0xFF // Control BOP Handler #define CTRL_BOP_DEFLT 0x00 // Default Control BOP Function - #define CTRL_BOP_INT32 0xFF // 32-bit Interrupt dispatcher #define EMULATOR_MAX_BOP_NUM 0xFF + 1 - -/* 32-bit Interrupt Identifiers */ -#define EMULATOR_MAX_INT_NUM 0xFF + 1 /* FUNCTIONS ******************************************************************/ typedef VOID (WINAPI *EMULATOR_BOP_PROC)(LPWORD Stack); -typedef VOID (WINAPI *EMULATOR_INT32_PROC)(LPWORD Stack); VOID WINAPI ControlBop(LPWORD Stack); - -VOID WINAPI RegisterInt32(BYTE IntNumber, EMULATOR_INT32_PROC IntHandler); VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode); #endif // _BOP_H_ 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 23:01:11 2013 @@ -11,11 +11,10 @@ #define NDEBUG #include "emulator.h" -#include "bop.h" - #include "dos.h" + #include "bios.h" - +#include "int32.h" #include "registers.h" /* PRIVATE VARIABLES **********************************************************/ @@ -2570,7 +2569,7 @@ DosSystemFileTable[1] = GetStdHandle(STD_OUTPUT_HANDLE); DosSystemFileTable[2] = GetStdHandle(STD_ERROR_HANDLE); - /* Register the DOS-32 Interrupts */ + /* Register the DOS 32-bit Interrupts */ RegisterInt32(0x20, DosInt20h ); RegisterInt32(0x21, DosInt21h ); RegisterInt32(0x23, DosBreakInterrupt); Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Sat Nov 9 23:01:11 2013 @@ -33,11 +33,6 @@ #define EMULATOR_FLAG_VIF (1 << 19) #define EMULATOR_FLAG_VIP (1 << 20) #define EMULATOR_FLAG_ID (1 << 21) - -/* Common definitions */ -#define EMULATOR_BOP 0xC4C4 -#define EMULATOR_INT_BOP 0xFF -#define EMULATOR_MAX_BOP_NUM 0xFF + 1 #define STACK_COUNTER 0 #define STACK_INT_NUM 1 Added: branches/ntvdm/subsystems/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/int32.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/int32.c (added) +++ branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] Sat Nov 9 23:01:11 2013 @@ -0,0 +1,181 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: int32.c + * PURPOSE: 32-bit Interrupt Handlers + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "emulator.h" +#include "int32.h" + +#include "bop.h" +#include "bios.h" + +/* PRIVATE VARIABLES **********************************************************/ + +LPCWSTR ExceptionName[] = +{ + L"Division By Zero", + L"Debug", + L"Unexpected Error", + L"Breakpoint", + L"Integer Overflow", + L"Bound Range Exceeded", + L"Invalid Opcode", + L"FPU Not Available" +}; + +/* + * This is the list of registered 32-bit Interrupt handlers. + */ +EMULATOR_INT32_PROC Int32Proc[EMULATOR_MAX_INT32_NUM] = { NULL }; + +/* PUBLIC FUNCTIONS ***********************************************************/ + +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\n" + L"Opcode: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", + ExceptionName[ExceptionNumber], + CodeSegment, + 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; + return; +} + +#if 0 +VOID WINAPI IrqDispatch(BYTE IrqNumber, LPWORD Stack) +{ + /* Check if this was an PIC IRQ */ + if (IntNum >= BIOS_PIC_MASTER_INT && IntNum < BIOS_PIC_MASTER_INT + 8) + { + /* It was an IRQ from the master PIC */ + BiosHandleIrq(IntNum - BIOS_PIC_MASTER_INT, Stack); + } + else if (IntNum >= BIOS_PIC_SLAVE_INT && IntNum < BIOS_PIC_SLAVE_INT + 8) + { + /* It was an IRQ from the slave PIC */ + BiosHandleIrq(IntNum - BIOS_PIC_SLAVE_INT + 8, Stack); + } + + return; +} +#endif + +VOID WINAPI Int32Dispatch(LPWORD Stack) +{ + BYTE IntNum; + + /* Get the interrupt number */ + IntNum = LOBYTE(Stack[STACK_INT_NUM]); + + /* Check if this was an exception */ + if (IntNum < 8) + { + Exception(IntNum, Stack); + return; + } + + /* Check if this was an PIC IRQ */ + if (IntNum >= BIOS_PIC_MASTER_INT && IntNum < BIOS_PIC_MASTER_INT + 8) + { + /* It was an IRQ from the master PIC */ + BiosHandleIrq(IntNum - BIOS_PIC_MASTER_INT, Stack); + return; + } + else if (IntNum >= BIOS_PIC_SLAVE_INT && IntNum < BIOS_PIC_SLAVE_INT + 8) + { + /* It was an IRQ from the slave PIC */ + BiosHandleIrq(IntNum - BIOS_PIC_SLAVE_INT + 8, Stack); + return; + } + + /* Call the 32-bit Interrupt handler */ + if (Int32Proc[IntNum] != NULL) + Int32Proc[IntNum](Stack); + else + DPRINT1("Unhandled 32-bit interrupt: 0x%02X\n", IntNum); +} + +VOID WINAPI InitializeInt32(WORD BiosSegment) +{ + USHORT i; + WORD Offset = 0; + + LPDWORD IntVecTable = (LPDWORD)BaseAddress; + LPBYTE BiosCode = (LPBYTE)SEG_OFF_TO_PTR(BiosSegment, 0); + + /* Generate ISR stubs and fill the IVT */ + for (i = 0x00; i <= 0xFF; i++) + { + IntVecTable[i] = MAKELONG(Offset, BiosSegment); + + BiosCode[Offset++] = 0xFB; // sti + + BiosCode[Offset++] = 0x6A; // push i + BiosCode[Offset++] = (UCHAR)i; + + BiosCode[Offset++] = 0x6A; // push 0 + BiosCode[Offset++] = 0x00; + +// BOP_SEQ: + BiosCode[Offset++] = 0xF8; // clc + + BiosCode[Offset++] = LOBYTE(EMULATOR_BOP); // BOP sequence + BiosCode[Offset++] = HIBYTE(EMULATOR_BOP); + BiosCode[Offset++] = EMULATOR_CTRL_BOP; // Control BOP + BiosCode[Offset++] = CTRL_BOP_INT32; // 32-bit Interrupt dispatcher + + BiosCode[Offset++] = 0x73; // jnc EXIT (offset +3) + BiosCode[Offset++] = 0x03; + + // HACK: The following instruction should be HLT! + BiosCode[Offset++] = 0x90; // nop + + BiosCode[Offset++] = 0xEB; // jmp BOP_SEQ (offset -10) + BiosCode[Offset++] = 0xF6; + +// EXIT: + BiosCode[Offset++] = 0x83; // add sp, 4 + BiosCode[Offset++] = 0xC4; + BiosCode[Offset++] = 0x04; + + BiosCode[Offset++] = 0xCF; // iret + } +} + +VOID WINAPI RegisterInt32(BYTE IntNumber, EMULATOR_INT32_PROC IntHandler) +{ + Int32Proc[IntNumber] = IntHandler; +} + +/* EOF */ Propchange: branches/ntvdm/subsystems/ntvdm/int32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/subsystems/ntvdm/int32.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/int32.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/int32.h (added) +++ branches/ntvdm/subsystems/ntvdm/int32.h [iso-8859-1] Sat Nov 9 23:01:11 2013 @@ -0,0 +1,31 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: int32.h + * PURPOSE: 32-bit Interrupt Handlers + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#ifndef _INT32_H_ +#define _INT32_H_ + +/* DEFINES ********************************************************************/ + +/* 32-bit Interrupt dispatcher function code for the Control BOP Handler */ +#define CTRL_BOP_INT32 0xFF + +/* 32-bit Interrupt Identifiers */ +#define EMULATOR_MAX_INT32_NUM 0xFF + 1 + +/* FUNCTIONS ******************************************************************/ + +typedef VOID (WINAPI *EMULATOR_INT32_PROC)(LPWORD Stack); + +VOID WINAPI Int32Dispatch(LPWORD Stack); +VOID WINAPI InitializeInt32(WORD BiosSegment); +VOID WINAPI RegisterInt32(BYTE IntNumber, EMULATOR_INT32_PROC IntHandler); + +#endif // _INT32_H_ + +/* EOF */ Propchange: branches/ntvdm/subsystems/ntvdm/int32.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Sat Nov 9 23:01:11 2013 @@ -39,7 +39,6 @@ extern LPVOID BaseAddress; extern BOOLEAN VdmRunning; -extern LPCWSTR ExceptionName[]; VOID DisplayMessage(LPCWSTR Format, ...);

10 years, 10 months

[hbelusca] 60907: [NTVDM] Start my work on modularizing registration of "32-bit" interrupts, i.e. interrupts that are implemented in 32-bit mode, but are stubbed with 16-bit code (so that 16-bit ap...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 9 22:15:40 2013 New Revision: 60907 URL: http://svn.reactos.org/svn/reactos?rev=60907&view=rev Log: [NTVDM] Start my work on modularizing registration of "32-bit" interrupts, i.e. interrupts that are implemented in 32-bit mode, but are stubbed with 16-bit code (so that 16-bit apps can call them). The 16-bit stub code uses a BOP call to our Control BOP function (BOP 0xFF) which can handle in theory many sub-functions (as the BOP 0x58 documented here: http://www.ragestorm.net/tutorial?id=27) specified as an additional BYTE in the call: 0xC4 0xC4 bop_code <optional_bop_subfunction> Here, for calling 32-bit interrupts we use our BOP 0xFF, subfunction 0xFF. The final aim would be to generate the 16-bit stub code when one calls the RegisterInt32 helper function (contrary to what's happening now, that is, the 16-bit stub code is generated for all of the interrupts at BIOS initialization time, and we use it for BIOS and DOS interrupts). Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/bop.c branches/ntvdm/subsystems/ntvdm/bop.h branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/dos.h branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sat Nov 9 22:15:40 2013 @@ -10,8 +10,10 @@ #define NDEBUG +#include "emulator.h" +#include "bop.h" + #include "bios.h" -#include "emulator.h" #include "vga.h" #include "pic.h" #include "ps2.h" @@ -461,7 +463,7 @@ { USHORT i; WORD Offset = 0; - LPWORD IntVecTable = (LPWORD)BaseAddress; + LPDWORD IntVecTable = (LPDWORD)BaseAddress; LPBYTE BiosCode = (LPBYTE)SEG_OFF_TO_PTR(BIOS_SEGMENT, 0); /* Initialize the BDA */ @@ -480,8 +482,7 @@ /* Generate ISR stubs and fill the IVT */ for (i = 0x00; i <= 0xFF; i++) { - IntVecTable[i * 2] = Offset; - IntVecTable[i * 2 + 1] = BIOS_SEGMENT; + IntVecTable[i] = MAKELONG(Offset, BIOS_SEGMENT); BiosCode[Offset++] = 0xFB; // sti @@ -494,9 +495,10 @@ // BOP_SEQ: BiosCode[Offset++] = 0xF8; // clc - BiosCode[Offset++] = LOBYTE(EMULATOR_BOP); // BOP sequence + BiosCode[Offset++] = LOBYTE(EMULATOR_BOP); // BOP sequence BiosCode[Offset++] = HIBYTE(EMULATOR_BOP); - BiosCode[Offset++] = EMULATOR_INT_BOP; + BiosCode[Offset++] = EMULATOR_CTRL_BOP; // Control BOP + BiosCode[Offset++] = CTRL_BOP_INT32; // 32-bit Interrupt dispatcher BiosCode[Offset++] = 0x73; // jnc EXIT (offset +3) BiosCode[Offset++] = 0x03; @@ -504,8 +506,8 @@ // HACK: The following instruction should be HLT! BiosCode[Offset++] = 0x90; // nop - BiosCode[Offset++] = 0xEB; // jmp BOP_SEQ (offset -9) - BiosCode[Offset++] = 0xF7; + BiosCode[Offset++] = 0xEB; // jmp BOP_SEQ (offset -10) + BiosCode[Offset++] = 0xF6; // EXIT: BiosCode[Offset++] = 0x83; // add sp, 4 @@ -514,6 +516,12 @@ BiosCode[Offset++] = 0xCF; // iret } + RegisterInt32(BIOS_VIDEO_INTERRUPT , BiosVideoService ); + RegisterInt32(BIOS_EQUIPMENT_INTERRUPT, BiosEquipmentService ); + RegisterInt32(BIOS_MEMORY_SIZE , BiosGetMemorySize ); + RegisterInt32(BIOS_KBD_INTERRUPT , BiosKeyboardService ); + RegisterInt32(BIOS_TIME_INTERRUPT , BiosTimeService ); + RegisterInt32(BIOS_SYS_TIMER_INTERRUPT, BiosSystemTimerInterrupt); /* Get the input handle to the real console, and check for success */ BiosConsoleInput = CreateFileW(L"CONIN$", @@ -818,7 +826,7 @@ BiosSetCursorPosition(Row, Column, Page); } -VOID BiosVideoService(LPWORD Stack) +VOID WINAPI BiosVideoService(LPWORD Stack) { switch (getAH()) { @@ -1194,19 +1202,19 @@ } } -VOID BiosEquipmentService(LPWORD Stack) +VOID WINAPI BiosEquipmentService(LPWORD Stack) { /* Return the equipment list */ setAX(Bda->EquipmentList); } -VOID BiosGetMemorySize(LPWORD Stack) +VOID WINAPI BiosGetMemorySize(LPWORD Stack) { /* Return the conventional memory size in kB, typically 640 kB */ setAX(Bda->MemorySize); } -VOID BiosKeyboardService(LPWORD Stack) +VOID WINAPI BiosKeyboardService(LPWORD Stack) { switch (getAH()) { @@ -1288,7 +1296,7 @@ } } -VOID BiosTimeService(LPWORD Stack) +VOID WINAPI BiosTimeService(LPWORD Stack) { switch (getAH()) { @@ -1326,7 +1334,7 @@ } } -VOID BiosSystemTimerInterrupt(LPWORD Stack) +VOID WINAPI BiosSystemTimerInterrupt(LPWORD Stack) { /* Increase the system tick count */ Bda->TickCounter++; 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 22:15:40 2013 @@ -159,13 +159,6 @@ WORD BiosGetCharacter(VOID); VOID BiosGetCursorPosition(PBYTE Row, PBYTE Column, BYTE Page); VOID BiosSetCursorPosition(BYTE Row, BYTE Column, BYTE Page); -VOID BiosVideoService(LPWORD Stack); -VOID BiosEquipmentService(LPWORD Stack); -VOID BiosGetMemorySize(LPWORD Stack); -VOID BiosKeyboardService(LPWORD Stack); -VOID BiosTimeService(LPWORD Stack); -VOID BiosHandleIrq(BYTE IrqNumber, LPWORD Stack); -VOID BiosSystemTimerInterrupt(LPWORD Stack); VOID BiosPrintCharacter(CHAR Character, BYTE Attribute, BYTE Page); BOOLEAN BiosScrollWindow( INT Direction, @@ -175,6 +168,15 @@ BYTE FillAttribute ); +VOID WINAPI BiosVideoService(LPWORD Stack); +VOID WINAPI BiosEquipmentService(LPWORD Stack); +VOID WINAPI BiosGetMemorySize(LPWORD Stack); +VOID WINAPI BiosKeyboardService(LPWORD Stack); +VOID WINAPI BiosTimeService(LPWORD Stack); +VOID WINAPI BiosSystemTimerInterrupt(LPWORD Stack); + +VOID BiosHandleIrq(BYTE IrqNumber, LPWORD Stack); + #endif // _BIOS_H_ /* EOF */ 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 22:15:40 2013 @@ -12,13 +12,10 @@ #define NDEBUG #include "emulator.h" +#include "bop.h" + #include "bios.h" -#include "bop.h" #include "dos.h" -//#include "vga.h" -//#include "pic.h" -//#include "ps2.h" -//#include "timer.h" #include "registers.h" LPCWSTR ExceptionName[] = @@ -33,6 +30,9 @@ L"FPU Not Available" }; +/* + * This is the list of registered BOP handlers. + */ EMULATOR_BOP_PROC BopProc[EMULATOR_MAX_BOP_NUM] = { NULL, @@ -292,6 +292,271 @@ NULL, ControlBop }; + +/* + * This is the list of registered 32-bit Interrupt handlers. + */ +EMULATOR_INT32_PROC Int32Proc[EMULATOR_MAX_INT_NUM] = +{ + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL +}; + + VOID WINAPI Exception(BYTE ExceptionNumber, LPWORD Stack) { @@ -344,11 +609,7 @@ // return; // } -// VOID WINAPI BiosInt(BYTE IntNumber, LPWORD Stack) -// { -// } - -VOID WINAPI IntDispatch(LPWORD Stack) +VOID WINAPI Int32Dispatch(LPWORD Stack) { BYTE IntNum; @@ -376,77 +637,48 @@ return; } - switch (IntNum) - { - case BIOS_VIDEO_INTERRUPT: - { - /* This is the video BIOS interrupt, call the BIOS */ - BiosVideoService(Stack); - break; - } - case BIOS_EQUIPMENT_INTERRUPT: - { - /* This is the BIOS "get equipment" command, call the BIOS */ - BiosEquipmentService(Stack); - break; - } - case BIOS_MEMORY_SIZE: - { - /* This is the BIOS "get memory size" command, call the BIOS */ - BiosGetMemorySize(Stack); - break; - } - case BIOS_KBD_INTERRUPT: - { - /* This is the keyboard BIOS interrupt, call the BIOS */ - BiosKeyboardService(Stack); - break; - } - case BIOS_TIME_INTERRUPT: - { - /* This is the time BIOS interrupt, call the BIOS */ - BiosTimeService(Stack); - break; - } - case BIOS_SYS_TIMER_INTERRUPT: - { - /* BIOS timer update */ - BiosSystemTimerInterrupt(Stack); - break; - } - case 0x20: - { - DosInt20h(Stack); - break; - } - case 0x21: - { - DosInt21h(Stack); - break; - } - case 0x23: - { - DosBreakInterrupt(Stack); - break; - } - case 0x2F: - { - DPRINT1("DOS System Function INT 0x2F, AH = %xh, AL = %xh NOT IMPLEMENTED!\n", - getAH(), getAL()); - Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; - break; - } - default: - { - DPRINT1("Unhandled interrupt: 0x%02X\n", IntNum); - break; - } - } + /* Call the 32-bit Interrupt handler */ + if (Int32Proc[IntNum] != NULL) + Int32Proc[IntNum](Stack); + else + DPRINT1("Unhandled 32-bit interrupt: 0x%02X\n", IntNum); } VOID WINAPI ControlBop(LPWORD Stack) { - IntDispatch(Stack); + /* Get the Function Number and skip it */ + BYTE FuncNum = *(PBYTE)SEG_OFF_TO_PTR(getCS(), getIP()); + setIP(getIP() + 1); + + if (FuncNum == CTRL_BOP_INT32) + Int32Dispatch(Stack); + else + DPRINT1("Unassigned Control BOP Function: 0x%02X\n", FuncNum); } + +VOID WINAPI RegisterInt32(BYTE IntNumber, EMULATOR_INT32_PROC IntHandler) +{ + Int32Proc[IntNumber] = IntHandler; +} + +VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode) +{ + WORD StackSegment, StackPointer; + LPWORD Stack; + + /* Get the SS:SP */ + StackSegment = State->SegmentRegs[FAST486_REG_SS].Selector; + StackPointer = State->GeneralRegs[FAST486_REG_ESP].LowWord; + + /* Get the stack */ + Stack = (LPWORD)SEG_OFF_TO_PTR(StackSegment, StackPointer); + + /* Call the BOP handler */ + if (BopProc[BopCode] != NULL) + BopProc[BopCode](Stack); + else + DPRINT1("Invalid BOP code: 0x%02X\n", BopCode); +} + /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/bop.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bop.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bop.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bop.h [iso-8859-1] Sat Nov 9 22:15:40 2013 @@ -7,10 +7,33 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ +#ifndef _BOP_H_ +#define _BOP_H_ + +/* DEFINES ********************************************************************/ + +/* BOP Identifiers */ +#define EMULATOR_BOP 0xC4C4 + +#define EMULATOR_CTRL_BOP 0xFF // Control BOP Handler + #define CTRL_BOP_DEFLT 0x00 // Default Control BOP Function + #define CTRL_BOP_INT32 0xFF // 32-bit Interrupt dispatcher + +#define EMULATOR_MAX_BOP_NUM 0xFF + 1 + +/* 32-bit Interrupt Identifiers */ +#define EMULATOR_MAX_INT_NUM 0xFF + 1 + +/* FUNCTIONS ******************************************************************/ + typedef VOID (WINAPI *EMULATOR_BOP_PROC)(LPWORD Stack); - -extern EMULATOR_BOP_PROC BopProc[EMULATOR_MAX_BOP_NUM]; +typedef VOID (WINAPI *EMULATOR_INT32_PROC)(LPWORD Stack); VOID WINAPI ControlBop(LPWORD Stack); +VOID WINAPI RegisterInt32(BYTE IntNumber, EMULATOR_INT32_PROC IntHandler); +VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode); + +#endif // _BOP_H_ + /* EOF */ 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 22:15:40 2013 @@ -10,9 +10,11 @@ #define NDEBUG +#include "emulator.h" +#include "bop.h" + #include "dos.h" #include "bios.h" -#include "emulator.h" #include "registers.h" @@ -1393,13 +1395,13 @@ } } -VOID DosInt20h(LPWORD Stack) +VOID WINAPI DosInt20h(LPWORD Stack) { /* This is the exit interrupt */ DosTerminateProcess(Stack[STACK_CS], 0); } -VOID DosInt21h(LPWORD Stack) +VOID WINAPI DosInt21h(LPWORD Stack) { BYTE Character; SYSTEMTIME SystemTime; @@ -2415,11 +2417,18 @@ } } -VOID DosBreakInterrupt(LPWORD Stack) +VOID WINAPI DosBreakInterrupt(LPWORD Stack) { UNREFERENCED_PARAMETER(Stack); VdmRunning = FALSE; +} + +VOID WINAPI DosInt2Fh(LPWORD Stack) +{ + DPRINT1("DOS System Function INT 0x2F, AH = %xh, AL = %xh NOT IMPLEMENTED!\n", + getAH(), getAL()); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; } BOOLEAN DosInitialize(VOID) @@ -2561,6 +2570,12 @@ DosSystemFileTable[1] = GetStdHandle(STD_OUTPUT_HANDLE); DosSystemFileTable[2] = GetStdHandle(STD_ERROR_HANDLE); + /* Register the DOS-32 Interrupts */ + RegisterInt32(0x20, DosInt20h ); + RegisterInt32(0x21, DosInt21h ); + RegisterInt32(0x23, DosBreakInterrupt); + RegisterInt32(0x2F, DosInt2Fh ); + return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Sat Nov 9 22:15:40 2013 @@ -136,9 +136,12 @@ CHAR DosReadCharacter(VOID); VOID DosPrintCharacter(CHAR Character); BOOLEAN DosHandleIoctl(BYTE ControlCode, WORD FileHandle); -VOID DosInt20h(LPWORD Stack); -VOID DosInt21h(LPWORD Stack); -VOID DosBreakInterrupt(LPWORD Stack); + +VOID WINAPI DosInt20h(LPWORD Stack); +VOID WINAPI DosInt21h(LPWORD Stack); +VOID WINAPI DosBreakInterrupt(LPWORD Stack); +VOID WINAPI DosInt2Fh(LPWORD Stack); + BOOLEAN DosInitialize(VOID); #endif // _DOS_H_ 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 22:15:40 2013 @@ -272,24 +272,6 @@ } } -VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode) -{ - WORD StackSegment, StackPointer; - LPWORD Stack; - - /* Get the SS:SP */ - StackSegment = State->SegmentRegs[FAST486_REG_SS].Selector; - StackPointer = State->GeneralRegs[FAST486_REG_ESP].LowWord; - - /* Get the stack */ - Stack = (LPWORD)SEG_OFF_TO_PTR(StackSegment, StackPointer); - - if (BopProc[BopCode] != NULL) - BopProc[BopCode](Stack); - else - DPRINT1("Invalid BOP code %u\n", BopCode); -} - UCHAR WINAPI EmulatorIntAcknowledge(PFAST486_STATE State) { UNREFERENCED_PARAMETER(State); Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Sat Nov 9 22:15:40 2013 @@ -120,12 +120,6 @@ UCHAR DataSize ); -VOID WINAPI EmulatorBiosOperation -( - PFAST486_STATE State, - UCHAR BopCode -); - UCHAR WINAPI EmulatorIntAcknowledge ( PFAST486_STATE State

10 years, 10 months

[hbelusca] 60906: [NTVDM] - Make usage of MAKEWORD; - Introduce BiosGetCursorPosition and use it in BiosPrintCharacter; - Use EmulatorWriteMemory instead of VgaWriteMemory somewhere in BiosPrintCha...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 9 19:55:04 2013 New Revision: 60906 URL: http://svn.reactos.org/svn/reactos?rev=60906&view=rev Log: [NTVDM] - Make usage of MAKEWORD; - Introduce BiosGetCursorPosition and use it in BiosPrintCharacter; - Use EmulatorWriteMemory instead of VgaWriteMemory somewhere in BiosPrintCharacter; - Add support for tabs in BiosPrintCharacter (taken from DosBox). Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sat Nov 9 19:55:04 2013 @@ -430,7 +430,7 @@ Resolution = VgaGetDisplayResolution(); Bda->ScreenColumns = Resolution.X; - Bda->ScreenRows = Resolution.Y - 1; + Bda->ScreenRows = Resolution.Y - 1; return TRUE; } @@ -641,13 +641,23 @@ return CharacterData; } -VOID BiosSetCursorPosition(BYTE Row, BYTE Column, BYTE Page) +VOID BiosGetCursorPosition(PBYTE Row, PBYTE Column, BYTE Page) { /* Make sure the selected video page is valid */ if (Page >= BIOS_MAX_PAGES) return; + /* Get the cursor location */ + *Row = HIBYTE(Bda->CursorPosition[Page]); + *Column = LOBYTE(Bda->CursorPosition[Page]); +} + +VOID BiosSetCursorPosition(BYTE Row, BYTE Column, BYTE Page) +{ + /* Make sure the selected video page is valid */ + if (Page >= BIOS_MAX_PAGES) return; + /* Update the position in the BDA */ - Bda->CursorPosition[Page] = (Row << 8) | Column; + Bda->CursorPosition[Page] = MAKEWORD(Column, Row); /* Check if this is the current video page */ if (Page == Bda->VideoPage) @@ -687,7 +697,7 @@ /* Fill the window */ for (i = 0; i < WindowSize; i++) { - WindowData[i] = ' ' | (FillAttribute << 8); + WindowData[i] = MAKEWORD(' ', FillAttribute); } goto Done; @@ -707,15 +717,14 @@ VOID BiosPrintCharacter(CHAR Character, BYTE Attribute, BYTE Page) { - WORD CharData = (Attribute << 8) | Character; + WORD CharData = MAKEWORD(Character, Attribute); BYTE Row, Column; /* Make sure the page exists */ if (Page >= BIOS_MAX_PAGES) return; /* Get the cursor location */ - Row = HIBYTE(Bda->CursorPosition[Page]); - Column = LOBYTE(Bda->CursorPosition[Page]); + BiosGetCursorPosition(&Row, &Column, Page); if (Character == '\a') { @@ -738,12 +747,23 @@ } /* Erase the existing character */ - CharData = (Attribute << 8) | ' '; - VgaWriteMemory(TO_LINEAR(TEXT_VIDEO_SEG, - Page * Bda->VideoPageSize - + (Row * Bda->ScreenColumns + Column) * sizeof(WORD)), - (LPVOID)&CharData, - sizeof(WORD)); + CharData = MAKEWORD(' ', Attribute); + EmulatorWriteMemory(&EmulatorContext, + TO_LINEAR(TEXT_VIDEO_SEG, + Page * Bda->VideoPageSize + + (Row * Bda->ScreenColumns + Column) * sizeof(WORD)), + (LPVOID)&CharData, + sizeof(WORD)); + } + else if (Character == '\t') + { + /* Horizontal Tabulation control character */ + do + { + // Taken from DosBox + BiosPrintCharacter(' ', Attribute, Page); + BiosGetCursorPosition(&Row, &Column, Page); + } while (Column % 8); } else if (Character == '\n') { @@ -762,8 +782,8 @@ /* Write the character */ EmulatorWriteMemory(&EmulatorContext, TO_LINEAR(TEXT_VIDEO_SEG, - Page * Bda->VideoPageSize - + (Row * Bda->ScreenColumns + Column) * sizeof(WORD)), + Page * Bda->VideoPageSize + + (Row * Bda->ScreenColumns + Column) * sizeof(WORD)), (LPVOID)&CharData, sizeof(WORD)); @@ -1174,6 +1194,18 @@ } } +VOID BiosEquipmentService(LPWORD Stack) +{ + /* Return the equipment list */ + setAX(Bda->EquipmentList); +} + +VOID BiosGetMemorySize(LPWORD Stack) +{ + /* Return the conventional memory size in kB, typically 640 kB */ + setAX(Bda->MemorySize); +} + VOID BiosKeyboardService(LPWORD Stack) { switch (getAH()) @@ -1298,18 +1330,6 @@ { /* Increase the system tick count */ Bda->TickCounter++; -} - -VOID BiosEquipmentService(LPWORD Stack) -{ - /* Return the equipment list */ - setAX(Bda->EquipmentList); -} - -VOID BiosGetMemorySize(LPWORD Stack) -{ - /* Return the conventional memory size in kB, typically 640 kB */ - setAX(Bda->MemorySize); } VOID BiosHandleIrq(BYTE IrqNumber, LPWORD Stack) 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 19:55:04 2013 @@ -17,12 +17,12 @@ #define ROM_AREA_START 0xE0000 #define ROM_AREA_END 0xFFFFF -#define BDA_SEGMENT 0x40 + +#define BDA_SEGMENT 0x40 +#define BIOS_SEGMENT 0xF000 #define BIOS_PIC_MASTER_INT 0x08 #define BIOS_PIC_SLAVE_INT 0x70 - -#define BIOS_SEGMENT 0xF000 #define BIOS_VIDEO_INTERRUPT 0x10 #define BIOS_EQUIPMENT_INTERRUPT 0x11 @@ -157,6 +157,7 @@ BOOLEAN BiosSetVideoMode(BYTE ModeNumber); WORD BiosPeekCharacter(VOID); WORD BiosGetCharacter(VOID); +VOID BiosGetCursorPosition(PBYTE Row, PBYTE Column, BYTE Page); VOID BiosSetCursorPosition(BYTE Row, BYTE Column, BYTE Page); VOID BiosVideoService(LPWORD Stack); VOID BiosEquipmentService(LPWORD Stack);

10 years, 10 months

[tkreuzer] 60905: [DIBLIB] Fix ROP operation by ANDing the result with the appropriate dest mask, for all required ROPs). Fixes MaskBlt tests.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 9 19:32:12 2013 New Revision: 60905 URL: http://svn.reactos.org/svn/reactos?rev=60905&view=rev Log: [DIBLIB] Fix ROP operation by ANDing the result with the appropriate dest mask, for all required ROPs). Fixes MaskBlt tests. Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt.c branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_DSTINVERT.c branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_MERGECOPY.c branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_PATCOPY.c branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_PATINVERT.c branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_PATPAINT.c branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCAND.c branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCCOPY.c branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCERASE.c branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCINVERT.c branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCPAINT.c branches/dib_rewrite/win32ss/gdi/diblib/DibLib_AllDstBPP.h branches/dib_rewrite/win32ss/gdi/diblib/DibLib_BitBlt.h branches/dib_rewrite/win32ss/gdi/diblib/MaskPaint.c branches/dib_rewrite/win32ss/gdi/diblib/MaskPatBlt.c branches/dib_rewrite/win32ss/gdi/diblib/MaskPatPaint.c branches/dib_rewrite/win32ss/gdi/diblib/MaskSrcBlt.c branches/dib_rewrite/win32ss/gdi/diblib/MaskSrcPaint.c branches/dib_rewrite/win32ss/gdi/diblib/MaskSrcPatBlt.c branches/dib_rewrite/win32ss/gdi/diblib/PatPaint.c branches/dib_rewrite/win32ss/gdi/diblib/RopFunctions.h branches/dib_rewrite/win32ss/gdi/diblib/SrcPaint.c branches/dib_rewrite/win32ss/gdi/diblib/SrcPatBlt.c Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME BitBlt -#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[0](D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) (pBltData->apfnDoRop[0](D,S,P) & _DEST_MASK) #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_DSTINVERT.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_DSTINVERT.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_DSTINVERT.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -6,7 +6,7 @@ #define __USES_DEST 1 #define __USES_MASK 0 -#define _DibDoRop(pBltData, M, D, S, P) ROP_DSTINVERT(D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) (ROP_DSTINVERT(D,S,P) & _DEST_MASK) #define __FUNCTIONNAME BitBlt_DSTINVERT #include "DibLib_AllDstBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_MERGECOPY.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_MERGECOPY.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_MERGECOPY.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -6,7 +6,7 @@ #define __USES_DEST 0 #define __USES_MASK 0 -#define _DibDoRop(pBltData, M, D, S, P) ROP_MERGECOPY(D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) ROP_MERGECOPY(D,S,P) /* No ANDing needed */ #define __FUNCTIONNAME BitBlt_MERGECOPY #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME BitBlt_MERGEPAINT -#define _DibDoRop(pBltData, M, D, S, P) ROP_MERGEPAINT(D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) (ROP_MERGEPAINT(D,S,P) & _DEST_MASK) #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME BitBlt_NOTPATCOPY -#define _DibDoRop(pBltData, M, D, S, P) (~(P)) +#define _DibDoRop(pBltData, M, D, S, P) (ROP_NOTPATCOPY(0,0,P) & _DEST_MASK) #include "DibLib_AllDstBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME BitBlt_NOTSRCCOPY -#define _DibDoRop(pBltData, M, D, S, P) ROP_NOTSRCCOPY(D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) (ROP_NOTSRCCOPY(D,S,P) & _DEST_MASK) #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME BitBlt_NOTSRCERASE -#define _DibDoRop(pBltData, M, D, S, P) ROP_NOTSRCERASE(D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) (ROP_NOTSRCERASE(D,S,P) & _DEST_MASK) #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_PATCOPY.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_PATCOPY.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_PATCOPY.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME BitBlt_PATCOPY -#define _DibDoRop(pBltData, M, D, S, P) ROP_PATCOPY(D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) ROP_PATCOPY(D,S,P) /* No ANDing needed */ #include "DibLib_AllDstBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_PATINVERT.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_PATINVERT.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_PATINVERT.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME BitBlt_PATINVERT -#define _DibDoRop(pBltData, M, D, S, P) ROP_PATINVERT(D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) ROP_PATINVERT(D,S,P) /* No ANDing needed */ #include "DibLib_AllDstBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_PATPAINT.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_PATPAINT.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_PATPAINT.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME BitBlt_PATPAINT -#define _DibDoRop(pBltData, M, D, S, P) ROP_PATPAINT(D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) (ROP_PATPAINT(D,S,P) & _DEST_MASK) #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCAND.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCAND.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCAND.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME BitBlt_SRCAND -#define _DibDoRop(pBltData, M, D, S, P) ROP_SRCAND(D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) ROP_SRCAND(D,S,P) /* No ANDing needed */ #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCCOPY.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCCOPY.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCCOPY.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -94,7 +94,7 @@ #define __FUNCTIONNAME BitBlt_SRCCOPY -#define _DibDoRop(pBltData, M, D, S, P) ROP_SRCCOPY(D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) ROP_SRCCOPY(D,S,P) /* No ANDing needed */ #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCERASE.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCERASE.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCERASE.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME BitBlt_SRCERASE -#define _DibDoRop(pBltData, M, D, S, P) ROP_SRCERASE(D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) (ROP_SRCERASE(D,S,P) & _DEST_MASK) #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCINVERT.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCINVERT.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCINVERT.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME BitBlt_SRCINVERT -#define _DibDoRop(pBltData, M, D, S, P) ROP_SRCINVERT(D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) ROP_SRCINVERT(D,S,P) /* No ANDing needed */ #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCPAINT.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCPAINT.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCPAINT.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME BitBlt_SRCPAINT -#define _DibDoRop(pBltData, M, D, S, P) ROP_SRCPAINT(D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) ROP_SRCPAINT(D,S,P) /* No ANDing needed */ #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/DibLib_AllDstBPP.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/DibLib_AllDstBPP.h [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/DibLib_AllDstBPP.h [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,26 +8,32 @@ #endif #define _DEST_BPP 1 +#define _DEST_MASK 1 #include "DibLib_BitBlt.h" #undef _DEST_BPP #define _DEST_BPP 4 +#define _DEST_MASK 0xf #include "DibLib_BitBlt.h" #undef _DEST_BPP #define _DEST_BPP 8 +#define _DEST_MASK 0xff #include "DibLib_BitBlt.h" #undef _DEST_BPP #define _DEST_BPP 16 +#define _DEST_MASK 0xffff #include "DibLib_BitBlt.h" #undef _DEST_BPP #define _DEST_BPP 24 +#define _DEST_MASK 0xffffff #include "DibLib_BitBlt.h" #undef _DEST_BPP #define _DEST_BPP 32 +#define _DEST_MASK 0xffffffff #include "DibLib_BitBlt.h" #undef _DEST_BPP Modified: branches/dib_rewrite/win32ss/gdi/diblib/DibLib_BitBlt.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/DibLib_BitBlt.h [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/DibLib_BitBlt.h [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -135,3 +135,4 @@ #undef _DibFunction #undef __FUNCTIONNAME2 +#undef _DEST_MASK Modified: branches/dib_rewrite/win32ss/gdi/diblib/MaskPaint.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/MaskPaint.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/MaskPaint.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME MaskPaint -#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,0,0) +#define _DibDoRop(pBltData, M, D, S, P) (pBltData->apfnDoRop[M](D,0,0) & _DEST_MASK) #include "DibLib_AllDstBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/MaskPatBlt.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/MaskPatBlt.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/MaskPatBlt.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME MaskPatBlt -#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](0,0,P) +#define _DibDoRop(pBltData, M, D, S, P) (pBltData->apfnDoRop[M](0,0,P) & _DEST_MASK) #include "DibLib_AllDstBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/MaskPatPaint.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/MaskPatPaint.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/MaskPatPaint.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME MaskPatPaint -#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,0,P) +#define _DibDoRop(pBltData, M, D, S, P) (pBltData->apfnDoRop[M](D,0,P) & _DEST_MASK) #include "DibLib_AllDstBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/MaskSrcBlt.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/MaskSrcBlt.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/MaskSrcBlt.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME MaskSrcBlt -#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,0) +#define _DibDoRop(pBltData, M, D, S, P) (pBltData->apfnDoRop[M](D,S,0) & _DEST_MASK) #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/MaskSrcPaint.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/MaskSrcPaint.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/MaskSrcPaint.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME MaskSrcPaint -#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,0) +#define _DibDoRop(pBltData, M, D, S, P) (pBltData->apfnDoRop[M](D,S,0) & _DEST_MASK) #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/MaskSrcPatBlt.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/MaskSrcPatBlt.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/MaskSrcPatBlt.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME MaskSrcPatBlt -#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,P) +#define _DibDoRop(pBltData, M, D, S, P) (pBltData->apfnDoRop[M](D,S,P) & _DEST_MASK) #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/PatPaint.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/PatPaint.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/PatPaint.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME PatPaint -#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[0](D,0,P) +#define _DibDoRop(pBltData, M, D, S, P) (pBltData->apfnDoRop[0](D,0,P) & _DEST_MASK) #include "DibLib_AllDstBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/RopFunctions.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/RopFunctions.h [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/RopFunctions.h [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -278,5 +278,6 @@ #define ROP_PATCOPY ROP_P #define ROP_PATPAINT ROP_DPSnoo #define ROP_WHITENESS ROP_1 - - +#define ROP_NOTPATCOPY ROP_Pn + + Modified: branches/dib_rewrite/win32ss/gdi/diblib/SrcPaint.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/SrcPaint.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/SrcPaint.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME SrcPaint -#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[0](D,S,0) +#define _DibDoRop(pBltData, M, D, S, P) (pBltData->apfnDoRop[0](D,S,0) & _DEST_MASK) #include "DibLib_AllSrcBPP.h" Modified: branches/dib_rewrite/win32ss/gdi/diblib/SrcPatBlt.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/SrcPatBlt.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/SrcPatBlt.c [iso-8859-1] Sat Nov 9 19:32:12 2013 @@ -8,7 +8,7 @@ #define __FUNCTIONNAME SrcPatBlt -#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[0](0,S,P) +#define _DibDoRop(pBltData, M, D, S, P) (pBltData->apfnDoRop[0](0,S,P) & _DEST_MASK) #include "DibLib_AllSrcBPP.h"

10 years, 10 months

[aandrejevic] 60904: [NTVDM] Allow COM programs to exit with a simple near return to PSP:0000. Spotted by Thomas Faber.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Nov 9 18:10:21 2013 New Revision: 60904 URL: http://svn.reactos.org/svn/reactos?rev=60904&view=rev Log: [NTVDM] Allow COM programs to exit with a simple near return to PSP:0000. Spotted by Thomas Faber. 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 18:10:21 2013 @@ -1203,6 +1203,12 @@ /* Set the stack to the last word of the segment */ EmulatorSetStack(Segment, 0xFFFE); + /* + * Set the value on the stack to 0, so that a near return + * jumps to PSP:0000 which has the exit code. + */ + *((LPWORD)SEG_OFF_TO_PTR(Segment, 0xFFFE)) = 0; + /* Execute */ CurrentPsp = Segment; DiskTransferArea = MAKELONG(0x80, Segment);

10 years, 10 months

[aandrejevic] 60903: [NTVDM] Make the emulator callbacks non-static. In BiosPrintCallback, use EmulatorWriteMemory instead of VgaWriteMemory, because VgaWriteMemory does not do any input validation...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Nov 9 17:16:04 2013 New Revision: 60903 URL: http://svn.reactos.org/svn/reactos?rev=60903&view=rev Log: [NTVDM] Make the emulator callbacks non-static. In BiosPrintCallback, use EmulatorWriteMemory instead of VgaWriteMemory, because VgaWriteMemory does not do any input validation. Improve EmulatorWriteMemory input validation and bound checking. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sat Nov 9 17:16:04 2013 @@ -760,11 +760,12 @@ /* Default character */ /* Write the character */ - VgaWriteMemory(TO_LINEAR(TEXT_VIDEO_SEG, - Page * Bda->VideoPageSize - + (Row * Bda->ScreenColumns + Column) * sizeof(WORD)), - (LPVOID)&CharData, - sizeof(WORD)); + EmulatorWriteMemory(&EmulatorContext, + TO_LINEAR(TEXT_VIDEO_SEG, + Page * Bda->VideoPageSize + + (Row * Bda->ScreenColumns + Column) * sizeof(WORD)), + (LPVOID)&CharData, + sizeof(WORD)); /* Advance the cursor */ Column++; @@ -789,6 +790,8 @@ Rectangle, Page, DEFAULT_ATTRIBUTE); + + Row--; } /* Set the cursor position */ 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 17:16:04 2013 @@ -29,7 +29,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static VOID WINAPI EmulatorReadMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) +VOID WINAPI EmulatorReadMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) { UNREFERENCED_PARAMETER(State); @@ -47,14 +47,16 @@ && (Address < VgaGetVideoLimitAddress())) { DWORD VgaAddress = max(Address, VgaGetVideoBaseAddress()); + DWORD ActualSize = min(Address + Size - 1, VgaGetVideoLimitAddress()) + - VgaAddress + 1; LPBYTE VgaBuffer = (LPBYTE)((ULONG_PTR)Buffer + VgaAddress - Address); /* Read from the VGA memory */ - VgaReadMemory(VgaAddress, VgaBuffer, Size); - } -} - -static VOID WINAPI EmulatorWriteMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) + VgaReadMemory(VgaAddress, VgaBuffer, ActualSize); + } +} + +VOID WINAPI EmulatorWriteMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) { UNREFERENCED_PARAMETER(State); @@ -75,14 +77,16 @@ && (Address < VgaGetVideoLimitAddress())) { DWORD VgaAddress = max(Address, VgaGetVideoBaseAddress()); + DWORD ActualSize = min(Address + Size - 1, VgaGetVideoLimitAddress()) + - VgaAddress + 1; LPBYTE VgaBuffer = (LPBYTE)((ULONG_PTR)Buffer + VgaAddress - Address); /* Write to the VGA memory */ - VgaWriteMemory(VgaAddress, VgaBuffer, Size); - } -} - -static VOID WINAPI EmulatorReadIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) + VgaWriteMemory(VgaAddress, VgaBuffer, ActualSize); + } +} + +VOID WINAPI EmulatorReadIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) { INT i, j; LPBYTE Address = (LPBYTE)Buffer; @@ -169,7 +173,7 @@ } } -static VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) +VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) { INT i, j; LPBYTE Address = (LPBYTE)Buffer; @@ -268,7 +272,7 @@ } } -static VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode) +VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode) { WORD StackSegment, StackPointer; LPWORD Stack; @@ -286,7 +290,7 @@ DPRINT1("Invalid BOP code %u\n", BopCode); } -static UCHAR WINAPI EmulatorIntAcknowledge(PFAST486_STATE State) +UCHAR WINAPI EmulatorIntAcknowledge(PFAST486_STATE State) { UNREFERENCED_PARAMETER(State); Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Sat Nov 9 17:16:04 2013 @@ -86,6 +86,51 @@ /* FUNCTIONS ******************************************************************/ +VOID WINAPI EmulatorReadMemory +( + PFAST486_STATE State, + ULONG Address, + PVOID Buffer, + ULONG Size +); + +VOID WINAPI EmulatorWriteMemory +( + PFAST486_STATE State, + ULONG Address, + PVOID Buffer, + ULONG Size +); + +VOID WINAPI EmulatorReadIo +( + PFAST486_STATE State, + ULONG Port, + PVOID Buffer, + ULONG DataCount, + UCHAR DataSize +); + +VOID WINAPI EmulatorWriteIo +( + PFAST486_STATE State, + ULONG Port, + PVOID Buffer, + ULONG DataCount, + UCHAR DataSize +); + +VOID WINAPI EmulatorBiosOperation +( + PFAST486_STATE State, + UCHAR BopCode +); + +UCHAR WINAPI EmulatorIntAcknowledge +( + PFAST486_STATE State +); + BOOLEAN EmulatorInitialize(VOID); VOID EmulatorSetStack(WORD Segment, DWORD Offset); VOID EmulatorExecute(WORD Segment, WORD Offset);

10 years, 10 months

[ekohl] 60902: [SAMSRV] Implement SamrQuerySecurityObject.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Nov 9 16:31:05 2013 New Revision: 60902 URL: http://svn.reactos.org/svn/reactos?rev=60902&view=rev Log: [SAMSRV] Implement SamrQuerySecurityObject. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Nov 9 16:31:05 2013 @@ -221,8 +221,97 @@ IN SECURITY_INFORMATION SecurityInformation, OUT PSAMPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT SamObject; + PSAMPR_SR_SECURITY_DESCRIPTOR SamSD = NULL; + PSECURITY_DESCRIPTOR SdBuffer = NULL; + ACCESS_MASK DesiredAccess = 0; + ULONG Length = 0; + NTSTATUS Status; + + TRACE("(%p %lx %p)\n", + ObjectHandle, SecurityInformation, SecurityDescriptor); + + *SecurityDescriptor = NULL; + + RtlAcquireResourceShared(&SampResource, + TRUE); + + if (SecurityInformation & (DACL_SECURITY_INFORMATION | + OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION)) + DesiredAccess |= READ_CONTROL; + + if (SecurityInformation & SACL_SECURITY_INFORMATION) + DesiredAccess |= ACCESS_SYSTEM_SECURITY; + + /* Validate the server handle */ + Status = SampValidateDbObject(ObjectHandle, + SamDbIgnoreObject, + DesiredAccess, + &SamObject); + if (!NT_SUCCESS(Status)) + goto done; + + SamSD = midl_user_allocate(sizeof(SAMPR_SR_SECURITY_DESCRIPTOR)); + if (SamSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(SamObject, + L"SecDesc", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + TRACE("SD Length: %lu\n", Length); + + SdBuffer = midl_user_allocate(Length); + if (SdBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(SamObject, + L"SecDesc", + NULL, + SdBuffer, + &Length); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + /* FIXME: Use SecurityInformation to return only the requested information */ + + SamSD->Length = Length; + SamSD->SecurityDescriptor = SdBuffer; + +done: + RtlReleaseResource(&SampResource); + + if (NT_SUCCESS(Status)) + { + *SecurityDescriptor = SamSD; + } + else + { + if (SdBuffer != NULL) + midl_user_free(SdBuffer); + + if (SamSD != NULL) + midl_user_free(SamSD); + } + + return Status; }

10 years, 10 months

[hbelusca] 60901: [NTVDM]: Fix informative comment.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 9 16:19:14 2013 New Revision: 60901 URL: http://svn.reactos.org/svn/reactos?rev=60901&view=rev Log: [NTVDM]: Fix informative comment. 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:19:14 2013 @@ -2334,8 +2334,9 @@ case 0x62: { /* - * Identical to the documented AH=62h. + * Undocumented AH=51h is identical to the documented AH=62h. * See Ralf Brown: http://www.ctyme.com/intr/rb-2982.htm + * and http://www.ctyme.com/intr/rb-3140.htm * for more information. */ setBX(CurrentPsp);

10 years, 10 months

[aandrejevic] 60900: [NTVDM] Instead of repeating the BOP, simply handle both 0x51 and 0x62 as the same function.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Nov 9 16:15:24 2013 New Revision: 60900 URL: http://svn.reactos.org/svn/reactos?rev=60900&view=rev Log: [NTVDM] Instead of repeating the BOP, simply handle both 0x51 and 0x62 as the same function. 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:15:24 2013 @@ -2330,6 +2330,8 @@ /* Internal - Get Current Process ID (Get PSP Address) */ case 0x51: + /* Get Current PSP Address */ + case 0x62: { /* * Identical to the documented AH=62h. @@ -2393,24 +2395,6 @@ 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; }

10 years, 10 months

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

Jump to page:

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