From 981d39b0e56583294652ac7bea954bc751b1a18d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Wed, 17 Sep 2014 21:22:04 +0000 Subject: [PATCH] [NTVDM]: Improve some dprints. svn path=/trunk/; revision=64183 --- reactos/subsystems/ntvdm/callback.c | 4 ++-- reactos/subsystems/ntvdm/dos/mouse32.c | 25 ++++++++++++++++--------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/reactos/subsystems/ntvdm/callback.c b/reactos/subsystems/ntvdm/callback.c index 6c7e552935f..47bacbb3314 100644 --- a/reactos/subsystems/ntvdm/callback.c +++ b/reactos/subsystems/ntvdm/callback.c @@ -212,7 +212,7 @@ RegisterInt32(IN ULONG FarPtr, #if 0 if (Int32Proc[IntNumber] != NULL) { - DPRINT1("RegisterInt32: Interrupt 0x%X already registered!\n", IntNumber); + DPRINT1("RegisterInt32: Interrupt 0x%02X already registered!\n", IntNumber); return 0; } #endif @@ -240,7 +240,7 @@ Int32Call(IN PCALLBACK16 Context, PUCHAR Trampoline = TrampolineBase; UCHAR OldTrampoline[INT16_TRAMPOLINE_SIZE]; - DPRINT("Int32Call(0x%X)\n", IntNumber); + DPRINT("Int32Call(0x%02X)\n", IntNumber); /* Save the old trampoline */ ((PULONGLONG)&OldTrampoline)[0] = ((PULONGLONG)TrampolineBase)[0]; diff --git a/reactos/subsystems/ntvdm/dos/mouse32.c b/reactos/subsystems/ntvdm/dos/mouse32.c index 62ab8fadb7d..e825dfe2c52 100644 --- a/reactos/subsystems/ntvdm/dos/mouse32.c +++ b/reactos/subsystems/ntvdm/dos/mouse32.c @@ -108,8 +108,10 @@ static VOID CallMouseUserHandlers(USHORT CallMask) setSI(DriverState.MickeysPerCellHoriz); setDI(DriverState.MickeysPerCellVert); - DPRINT1("Calling Handler0 0x%08x with CallMask 0x%04x\n", - DriverState.Handler0.Callback, CallMask); + DPRINT1("Calling Handler0 %04X:%04X with CallMask 0x%04X\n", + HIWORD(DriverState.Handler0.Callback), + LOWORD(DriverState.Handler0.Callback), + CallMask); /* Call the callback */ RunCallback16(&DosContext, DriverState.Handler0.Callback); @@ -148,8 +150,11 @@ static VOID CallMouseUserHandlers(USHORT CallMask) setSI(DriverState.MickeysPerCellHoriz); setDI(DriverState.MickeysPerCellVert); - DPRINT1("Calling Handler[%d] 0x%08x with CallMask 0x%04x\n", - i, DriverState.Handlers[i].Callback, CallMask); + DPRINT1("Calling Handler[%d] %04X:%04X with CallMask 0x%04X\n", + i, + HIWORD(DriverState.Handlers[i].Callback), + LOWORD(DriverState.Handlers[i].Callback), + CallMask); /* Call the callback */ RunCallback16(&DosContext, DriverState.Handlers[i].Callback); @@ -353,7 +358,7 @@ static VOID WINAPI BiosMouseService(LPWORD Stack) } else { - DPRINT1("Invalid BX value 0x%04x\n", BX); + DPRINT1("Invalid BX value 0x%04X\n", BX); } break; @@ -376,8 +381,10 @@ static VOID WINAPI BiosMouseService(LPWORD Stack) { DriverState.Handler0.CallMask = getCX(); DriverState.Handler0.Callback = MAKELONG(getDX(), getES()); // Far pointer to the callback - DPRINT1("Define callback 0x%04x, 0x%08x\n", - DriverState.Handler0.CallMask, DriverState.Handler0.Callback); + DPRINT1("Define callback 0x%04X, %04X:%04X\n", + DriverState.Handler0.CallMask, + HIWORD(DriverState.Handler0.Callback), + LOWORD(DriverState.Handler0.Callback)); break; } @@ -446,8 +453,8 @@ static VOID WINAPI BiosMouseService(LPWORD Stack) ULONG Callback = MAKELONG(getDX(), getES()); // Far pointer to the callback BOOLEAN Success = FALSE; - DPRINT1("Define v6.0+ callback 0x%04x, 0x%08x\n", - CallMask, Callback); + DPRINT1("Define v6.0+ callback 0x%04X, %04X:%04X\n", + CallMask, HIWORD(Callback), LOWORD(Callback)); if (CallMask == 0x0000) { -- 2.17.1