Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-07 21:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTVDM]: Improve some dprints.

Browse source 
svn path=/trunk/; revision=64183
This commit is contained in:
Hermès Bélusca-Maïto 2014-09-17 21:22:04 +00:00
parent 07607739ca
commit 981d39b0e5
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/subsystems/ntvdm/callback.c
View file

@ -212,7 +212,7 @@ RegisterInt32(IN ULONG FarPtr,
#if 0 #if 0
if (Int32Proc[IntNumber] != NULL) if (Int32Proc[IntNumber] != NULL)
{ {
DPRINT1("RegisterInt32: Interrupt 0x%X already registered!\n", IntNumber); DPRINT1("RegisterInt32: Interrupt 0x%02X already registered!\n", IntNumber);
return 0; return 0;
} }
#endif #endif
@ -240,7 +240,7 @@ Int32Call(IN PCALLBACK16 Context,
PUCHAR Trampoline = TrampolineBase; PUCHAR Trampoline = TrampolineBase;
UCHAR OldTrampoline[INT16_TRAMPOLINE_SIZE]; UCHAR OldTrampoline[INT16_TRAMPOLINE_SIZE];
DPRINT("Int32Call(0x%X)\n", IntNumber); DPRINT("Int32Call(0x%02X)\n", IntNumber);
/* Save the old trampoline */ /* Save the old trampoline */
((PULONGLONG)&OldTrampoline)[0] = ((PULONGLONG)TrampolineBase)[0]; ((PULONGLONG)&OldTrampoline)[0] = ((PULONGLONG)TrampolineBase)[0];

25
reactos/subsystems/ntvdm/dos/mouse32.c
View file

@ -108,8 +108,10 @@ static VOID CallMouseUserHandlers(USHORT CallMask)
setSI(DriverState.MickeysPerCellHoriz); setSI(DriverState.MickeysPerCellHoriz);
setDI(DriverState.MickeysPerCellVert); setDI(DriverState.MickeysPerCellVert);
DPRINT1("Calling Handler0 0x%08x with CallMask 0x%04x\n", DPRINT1("Calling Handler0 %04X:%04X with CallMask 0x%04X\n",
DriverState.Handler0.Callback, CallMask); HIWORD(DriverState.Handler0.Callback),
LOWORD(DriverState.Handler0.Callback),
CallMask);
/* Call the callback */ /* Call the callback */
RunCallback16(&DosContext, DriverState.Handler0.Callback); RunCallback16(&DosContext, DriverState.Handler0.Callback);
@ -148,8 +150,11 @@ static VOID CallMouseUserHandlers(USHORT CallMask)
setSI(DriverState.MickeysPerCellHoriz); setSI(DriverState.MickeysPerCellHoriz);
setDI(DriverState.MickeysPerCellVert); setDI(DriverState.MickeysPerCellVert);
DPRINT1("Calling Handler[%d] 0x%08x with CallMask 0x%04x\n", DPRINT1("Calling Handler[%d] %04X:%04X with CallMask 0x%04X\n",
i, DriverState.Handlers[i].Callback, CallMask); i,
HIWORD(DriverState.Handlers[i].Callback),
LOWORD(DriverState.Handlers[i].Callback),
CallMask);
/* Call the callback */ /* Call the callback */
RunCallback16(&DosContext, DriverState.Handlers[i].Callback); RunCallback16(&DosContext, DriverState.Handlers[i].Callback);
@ -353,7 +358,7 @@ static VOID WINAPI BiosMouseService(LPWORD Stack)
} }
else else
{ {
DPRINT1("Invalid BX value 0x%04x\n", BX); DPRINT1("Invalid BX value 0x%04X\n", BX);
} }
break; break;
@ -376,8 +381,10 @@ static VOID WINAPI BiosMouseService(LPWORD Stack)
{ {
DriverState.Handler0.CallMask = getCX(); DriverState.Handler0.CallMask = getCX();
DriverState.Handler0.Callback = MAKELONG(getDX(), getES()); // Far pointer to the callback DriverState.Handler0.Callback = MAKELONG(getDX(), getES()); // Far pointer to the callback
DPRINT1("Define callback 0x%04x, 0x%08x\n", DPRINT1("Define callback 0x%04X, %04X:%04X\n",
DriverState.Handler0.CallMask, DriverState.Handler0.Callback); DriverState.Handler0.CallMask,
HIWORD(DriverState.Handler0.Callback),
LOWORD(DriverState.Handler0.Callback));
break; break;
} }
@ -446,8 +453,8 @@ static VOID WINAPI BiosMouseService(LPWORD Stack)
ULONG Callback = MAKELONG(getDX(), getES()); // Far pointer to the callback ULONG Callback = MAKELONG(getDX(), getES()); // Far pointer to the callback
BOOLEAN Success = FALSE; BOOLEAN Success = FALSE;
DPRINT1("Define v6.0+ callback 0x%04x, 0x%08x\n", DPRINT1("Define v6.0+ callback 0x%04X, %04X:%04X\n",
CallMask, Callback); CallMask, HIWORD(Callback), LOWORD(Callback));
if (CallMask == 0x0000) if (CallMask == 0x0000)
{ {