Author: hbelusca Date: Wed Sep 17 21:22:04 2014 New Revision: 64183
URL: http://svn.reactos.org/svn/reactos?rev=64183&view=rev Log: [NTVDM]: Improve some dprints.
Modified: trunk/reactos/subsystems/ntvdm/callback.c trunk/reactos/subsystems/ntvdm/dos/mouse32.c
Modified: trunk/reactos/subsystems/ntvdm/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/callback.c... ============================================================================== --- trunk/reactos/subsystems/ntvdm/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/callback.c [iso-8859-1] Wed Sep 17 21:22:04 2014 @@ -212,7 +212,7 @@ #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 @@ 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];
Modified: trunk/reactos/subsystems/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/mouse3... ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/mouse32.c [iso-8859-1] Wed Sep 17 21:22:04 2014 @@ -108,8 +108,10 @@ 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 @@ 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 @@ } else { - DPRINT1("Invalid BX value 0x%04x\n", BX); + DPRINT1("Invalid BX value 0x%04X\n", BX); }
break; @@ -376,8 +381,10 @@ { 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 @@ 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) {