ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-28 19:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTVDM]

Browse Source 
- Let the mouse driver use its own 32-to-16 call scratch buffer.
- Simplify some code.

svn path=/trunk/; revision=68362
This commit is contained in:
Hermès Bélusca-Maïto
2015-07-07 00:11:18 +00:00
parent c77efa29ff
commit cf5ce092b5
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/subsystems/mvdm/ntvdm/cpu/callback.c
-2
View File
@@ -29,8 +29,6 @@
/* PRIVATE VARIABLES **********************************************************/
#define TRAMPOLINE_SIZE sizeof(ULONGLONG)
static BYTE Yield[] =
{
0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
reactos/subsystems/mvdm/ntvdm/cpu/callback.h
+2
View File
@@ -21,6 +21,8 @@ do { \
} while(0)
// #define UnSimulate16 MAKELONG(EMULATOR_BOP, BOP_UNSIMULATE) // BOP(BOP_UNSIMULATE)
#define TRAMPOLINE_SIZE sizeof(ULONGLONG)
typedef struct _CALLBACK16
{
ULONG TrampolineFarPtr; // Where the trampoline zone is placed
reactos/subsystems/mvdm/ntvdm/dos/mouse32.c
+22 -20
View File
@@ -26,7 +26,6 @@
#include "memory.h"
#include "io.h"
#include "dos32krnl/dos.h"
#include "dos32krnl/memory.h"
/* PRIVATE VARIABLES **********************************************************/
@@ -39,6 +38,7 @@ typedef struct _MOUSE_DRIVER
{
CHAR Copyright[sizeof(MouseCopyright)];
WORD Version;
BYTE MouseContextScratch[TRAMPOLINE_SIZE];
BYTE MouseDosInt16Stub[Int16To32StubSize];
BYTE MouseIrqInt16Stub[Int16To32StubSize];
} MOUSE_DRIVER, *PMOUSE_DRIVER;
@@ -46,8 +46,9 @@ typedef struct _MOUSE_DRIVER
#pragma pack(pop)
/* Global data contained in guest memory */
WORD MouseDataSegment;
PMOUSE_DRIVER MouseData;
static WORD MouseDataSegment;
static PMOUSE_DRIVER MouseData;
static CALLBACK16 MouseContext;
#define MICKEYS_PER_CELL_HORIZ 8
#define MICKEYS_PER_CELL_VERT 16
@@ -198,7 +199,7 @@ static VOID CallMouseUserHandlers(USHORT CallMask)
CallMask);
/* Call the callback */
RunCallback16(&DosContext, DriverState.Handler0.Callback);
RunCallback16(&MouseContext, DriverState.Handler0.Callback);
setAX(AX);
setBX(BX);
@@ -241,7 +242,7 @@ static VOID CallMouseUserHandlers(USHORT CallMask)
CallMask);
/* Call the callback */
RunCallback16(&DosContext, DriverState.Handlers[i].Callback);
RunCallback16(&MouseContext, DriverState.Handlers[i].Callback);
setAX(AX);
setBX(BX);
@@ -915,28 +916,26 @@ static VOID WINAPI DosMouseService(LPWORD Stack)
VOID DosMouseEnable(VOID)
{
if (!DriverEnabled)
{
DriverEnabled = TRUE;
if (DriverEnabled) return;
/* Get the old IRQ handler */
OldIrqHandler = ((PDWORD)BaseAddress)[MOUSE_IRQ_INT];
DriverEnabled = TRUE;
/* Set the IRQ handler */
RegisterInt32(MAKELONG(FIELD_OFFSET(MOUSE_DRIVER, MouseIrqInt16Stub), MouseDataSegment),
MOUSE_IRQ_INT, DosMouseIrq, NULL);
}
/* Get the old IRQ handler */
OldIrqHandler = ((PDWORD)BaseAddress)[MOUSE_IRQ_INT];
/* Set the IRQ handler */
RegisterInt32(MAKELONG(FIELD_OFFSET(MOUSE_DRIVER, MouseIrqInt16Stub), MouseDataSegment),
MOUSE_IRQ_INT, DosMouseIrq, NULL);
}
VOID DosMouseDisable(VOID)
{
if (DriverEnabled)
{
/* Restore the old IRQ handler */
((PDWORD)BaseAddress)[MOUSE_IRQ_INT] = OldIrqHandler;
if (!DriverEnabled) return;
DriverEnabled = FALSE;
}
/* Restore the old IRQ handler */
((PDWORD)BaseAddress)[MOUSE_IRQ_INT] = OldIrqHandler;
DriverEnabled = FALSE;
}
VOID DosMouseUpdatePosition(PCOORD NewPosition)
@@ -1001,6 +1000,9 @@ BOOLEAN DosMouseInitialize(VOID)
if (MouseDataSegment == 0) return FALSE;
MouseData = (PMOUSE_DRIVER)SEG_OFF_TO_PTR(MouseDataSegment, 0x0000);
/* Initialize the callback context */
InitializeContext(&MouseContext, MouseDataSegment, FIELD_OFFSET(MOUSE_DRIVER, MouseContextScratch));
/* Clear the state */
RtlZeroMemory(&DriverState, sizeof(DriverState));