Skip to content

W
wine-cw
Commit db4eaf5e authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

winedos: Win64 printf format warning fixes.

parent dd6e2b36
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 97 deletions
dlls/winedos/Makefile.in
View file @ db4eaf5e
......@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = winedos.dll
IMPORTLIB = libwinedos.$(IMPLIBEXT)
IMPORTS = user32 advapi32 kernel32 ntdll
EXTRADEFS = -DWINE_NO_LONG_AS_INT
SPEC_SRCS16 = wprocs.spec
......
dlls/winedos/dma.c
View file @ db4eaf5e
......@@ -111,7 +111,7 @@ int DMA_Transfer(int channel,int reqlen,void* buffer)
break;
case 1:
/* Write */
TRACE("Perform Write transfer of %d bytes at %lx with count %x\n",ret,
TRACE("Perform Write transfer of %d bytes at %x with count %x\n",ret,
DMA_CurrentBaseAddress[channel],DMA_CurrentByteCount[channel]);
if (increment)
memcpy((void*)DMA_CurrentBaseAddress[channel],dmabuf,ret*size);
......@@ -122,7 +122,7 @@ int DMA_Transfer(int channel,int reqlen,void* buffer)
break;
case 2:
/* Read */
TRACE("Perform Read transfer of %d bytes at %lx with count %x\n",ret,
TRACE("Perform Read transfer of %d bytes at %x with count %x\n",ret,
DMA_CurrentBaseAddress[channel],DMA_CurrentByteCount[channel]);
if (increment)
memcpy(dmabuf,(void*)DMA_CurrentBaseAddress[channel],ret*size);
......@@ -174,7 +174,7 @@ void DMA_ioport_out( WORD port, BYTE val )
else {
DMA_BaseAddress[channel]=(DMA_BaseAddress[channel] & (~(0xFF << 8)))|((val & 0xFF) << 8);
DMA_CurrentBaseAddress[channel] = DMA_BaseAddress[channel];
TRACE("Write Base Address = %lx\n",DMA_BaseAddress[channel]);
TRACE("Write Base Address = %x\n",DMA_BaseAddress[channel]);
}
DMA_Toggle[dmachip] = !DMA_Toggle[dmachip];
break;
......@@ -325,7 +325,7 @@ BYTE DMA_ioport_in( WORD port )
res = DMA_CurrentBaseAddress[channel] & 0xFF;
else {
res = (DMA_CurrentBaseAddress[channel] & (0xFF << 8))>>8;
TRACE("Read Current Base Address = %lx\n",DMA_CurrentBaseAddress[channel]);
TRACE("Read Current Base Address = %x\n",DMA_CurrentBaseAddress[channel]);
}
DMA_Toggle[dmachip] = !DMA_Toggle[dmachip];
break;
......
dlls/winedos/dosaspi.c
View file @ db4eaf5e
......@@ -41,7 +41,7 @@ DOSASPI_PostProc( SRB_ExecSCSICmd *lpPRB )
memcpy(&ptrSRB,lpPRB->SenseArea + lpPRB->SRB_SenseLen,sizeof(DWORD));
TRACE("Copying data back to DOS client at 0x%8lx\n",ptrSRB);
TRACE("Copying data back to DOS client at 0x%8x\n",ptrSRB);
lpSRB16 = PTR_REAL_TO_LIN(SELECTOROF(ptrSRB),OFFSETOF(ptrSRB));
lpSRB16->cmd.SRB_TargStat = lpPRB->SRB_TargStat;
lpSRB16->cmd.SRB_HaStat = lpPRB->SRB_HaStat;
......@@ -127,7 +127,7 @@ DWORD ASPI_SendASPIDOSCommand(DWORD ptrSRB)
break;
case SC_EXEC_SCSI_CMD:
TRACE("SC_EXEC_SCSI_CMD\n");
TRACE("Copying data from DOS client at 0x%8lx\n",ptrSRB);
TRACE("Copying data from DOS client at 0x%8x\n",ptrSRB);
lpPRB = HeapAlloc(GetProcessHeap(),0,sizeof(SRB)+lpSRB16->cmd.SRB_SenseLen+sizeof(DWORD));
#define srb_dos_to_w32(name) \
lpPRB->SRB_##name = lpSRB16->cmd.SRB_##name
......@@ -171,7 +171,7 @@ DWORD ASPI_SendASPIDOSCommand(DWORD ptrSRB)
break;
}
TRACE("Returning %lx\n", retval );
TRACE("Returning %x\n", retval );
return retval;
}
......
dlls/winedos/dosvm.c
View file @ db4eaf5e
......@@ -204,11 +204,11 @@ void DOSVM_SendQueuedEvents( CONTEXT86 *context )
EnterCriticalSection(&qcrit);
TRACE( "Called in %s mode %s events pending (time=%ld)\n",
TRACE( "Called in %s mode %s events pending (time=%d)\n",
ISV86(context) ? "real" : "protected",
DOSVM_HasPendingEvents() ? "with" : "without",
GetTickCount() );
TRACE( "cs:ip=%04lx:%08lx, ss:sp=%04lx:%08lx\n",
TRACE( "cs:ip=%04x:%08x, ss:sp=%04x:%08x\n",
context->SegCs, context->Eip, context->SegSs, context->Esp);
while (context->SegCs == old_cs &&
......@@ -280,7 +280,7 @@ void WINAPI DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data
else pending_event = event;
if (!old_pending && DOSVM_HasPendingEvents()) {
TRACE("new event queued, signalling (time=%ld)\n", GetTickCount());
TRACE("new event queued, signalling (time=%d)\n", GetTickCount());
/* Alert VM86 thread about the new event. */
kill(dosvm_pid,SIGUSR2);
......@@ -288,7 +288,7 @@ void WINAPI DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data
/* Wake up DOSVM_Wait so that it can serve pending events. */
SetEvent(event_notifier);
} else {
TRACE("new event queued (time=%ld)\n", GetTickCount());
TRACE("new event queued (time=%d)\n", GetTickCount());
}
LeaveCriticalSection(&qcrit);
......@@ -455,7 +455,7 @@ void WINAPI DOSVM_Wait( CONTEXT86 *waitctx )
}
else
{
ERR_(module)( "dosvm wait error=%ld\n", GetLastError() );
ERR_(module)( "dosvm wait error=%d\n", GetLastError() );
}
}
}
......@@ -530,17 +530,17 @@ static WINE_EXCEPTION_FILTER(exception_handler)
switch(rec->ExceptionCode) {
case EXCEPTION_VM86_INTx:
TRACE_(relay)("Call DOS int 0x%02x ret=%04lx:%04lx\n"
" eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx\n"
" ebp=%08lx esp=%08lx ds=%04lx es=%04lx fs=%04lx gs=%04lx flags=%08lx\n",
TRACE_(relay)("Call DOS int 0x%02x ret=%04x:%04x\n"
" eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n"
" ebp=%08x esp=%08x ds=%04x es=%04x fs=%04x gs=%04x flags=%08x\n",
arg, context->SegCs, context->Eip,
context->Eax, context->Ebx, context->Ecx, context->Edx, context->Esi, context->Edi,
context->Ebp, context->Esp, context->SegDs, context->SegEs, context->SegFs, context->SegGs,
context->EFlags );
ret = DOSVM_EmulateInterruptRM( context, arg );
TRACE_(relay)("Ret DOS int 0x%02x ret=%04lx:%04lx\n"
" eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx\n"
" ebp=%08lx esp=%08lx ds=%04lx es=%04lx fs=%04lx gs=%04lx flags=%08lx\n",
TRACE_(relay)("Ret DOS int 0x%02x ret=%04x:%04x\n"
" eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n"
" ebp=%08x esp=%08x ds=%04x es=%04x fs=%04x gs=%04x flags=%08x\n",
arg, context->SegCs, context->Eip,
context->Eax, context->Ebx, context->Ecx, context->Edx, context->Esi, context->Edi,
context->Ebp, context->Esp, context->SegDs, context->SegEs,
......@@ -700,7 +700,7 @@ void WINAPI DOSVM_AcknowledgeIRQ( CONTEXT86 *context )
*/
BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
{
TRACE_(module)("(%p,%ld,%p)\n", hinstDLL, fdwReason, lpvReserved);
TRACE_(module)("(%p,%d,%p)\n", hinstDLL, fdwReason, lpvReserved);
if (fdwReason == DLL_PROCESS_ATTACH)
{
......
dlls/winedos/int10.c
View file @ db4eaf5e
......@@ -1467,7 +1467,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT86 *context )
break;
case 0xfe: /* GET SHADOW BUFFER */
TRACE( "GET SHADOW BUFFER %lx:%x - ignored\n",
TRACE( "GET SHADOW BUFFER %x:%x - ignored\n",
context->SegEs, DI_reg(context) );
break;
......
dlls/winedos/int13.c
View file @ db4eaf5e
......@@ -104,7 +104,7 @@ static void INT13_ReadFloppyParams( CONTEXT86 *context )
WCHAR root[] = {'A',':','\\',0}, drive_root[] = {'\\','\\','.','\\','A',':',0};
HANDLE h;
TRACE("in [ EDX=%08lx ]\n", context->Edx );
TRACE("in [ EDX=%08x ]\n", context->Edx );
SET_AL( context, 0 );
SET_BX( context, 0 );
......@@ -164,7 +164,7 @@ static void INT13_ReadFloppyParams( CONTEXT86 *context )
return;
}
TRACE("out [ EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx EDI=%08lx ]\n",
TRACE("out [ EAX=%08x EBX=%08x ECX=%08x EDX=%08x EDI=%08x ]\n",
context->Eax, context->Ebx, context->Ecx, context->Edx, context->Edi);
INT13_SetStatus( context, 0x00 ); /* success */
......
dlls/winedos/int1a.c
View file @ db4eaf5e
......@@ -43,7 +43,7 @@ void WINAPI DOSVM_Int1aHandler( CONTEXT86 *context )
SET_CX( context, HIWORD(data->Ticks) );
SET_DX( context, LOWORD(data->Ticks) );
SET_AL( context, 0 ); /* FIXME: midnight flag is unsupported */
TRACE( "GET SYSTEM TIME - ticks=%ld\n", data->Ticks );
TRACE( "GET SYSTEM TIME - ticks=%d\n", data->Ticks );
}
break;
......
dlls/winedos/int25.c
View file @ db4eaf5e
......@@ -43,8 +43,8 @@ BOOL DOSVM_RawRead(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL f
WCHAR root[] = {'\\','\\','.','\\','A',':',0};
HANDLE h;
TRACE( "abs diskread, drive %d, sector %ld, "
"count %ld, buffer %p\n",
TRACE( "abs diskread, drive %d, sector %d, "
"count %d, buffer %p\n",
drive, begin, nr_sect, dataptr );
root[4] += drive;
......
dlls/winedos/int26.c
View file @ db4eaf5e
......@@ -43,8 +43,8 @@ BOOL DOSVM_RawWrite(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL
HANDLE h;
DWORD w;
TRACE( "abs diskwrite, drive %d, sector %ld, "
"count %ld, buffer %p\n",
TRACE( "abs diskwrite, drive %d, sector %d, "
"count %d, buffer %p\n",
drive, begin, nr_sect, dataptr );
root[4] += drive;
......
dlls/winedos/int2f.c
View file @ db4eaf5e
......@@ -644,7 +644,7 @@ static void MSCDEX_Request(BYTE *driver_request, BOOL dorealmode)
ERR("CD-ROM driver: unsupported addressing mode !!\n");
Error = 0x0c;
}
TRACE(" ----> HEAD LOCATION <%ld>\n", PTR_AT(io_stru, 2, DWORD));
TRACE(" ----> HEAD LOCATION <%d>\n", PTR_AT(io_stru, 2, DWORD));
break;
case 4: /* Audio channel info */
......@@ -676,13 +676,13 @@ static void MSCDEX_Request(BYTE *driver_request, BOOL dorealmode)
* 0 see below (Door closed/opened)
*/
if (!present) PTR_AT(io_stru, 1, DWORD) |= 1;
TRACE(" ----> DEVICE STATUS <0x%08lx>\n", PTR_AT(io_stru, 1, DWORD));
TRACE(" ----> DEVICE STATUS <0x%08x>\n", PTR_AT(io_stru, 1, DWORD));
break;
case 8: /* Volume size */
PTR_AT(io_stru, 1, DWORD) = FRAME_OF_TOC(toc, toc.LastTrack + 1) -
FRAME_OF_TOC(toc, toc.FirstTrack) - 1;
TRACE(" ----> VOLUME SIZE <%ld>\n", PTR_AT(io_stru, 1, DWORD));
TRACE(" ----> VOLUME SIZE <%d>\n", PTR_AT(io_stru, 1, DWORD));
break;
case 9: /* media changed ? */
......@@ -697,7 +697,7 @@ static void MSCDEX_Request(BYTE *driver_request, BOOL dorealmode)
MSCDEX_StoreMSF(FRAME_OF_TOC(toc, toc.LastTrack + 1) -
FRAME_OF_TOC(toc, toc.FirstTrack) - 1, io_stru + 3);
TRACE(" ----> AUDIO DISK INFO <%d-%d/%08lx>\n",
TRACE(" ----> AUDIO DISK INFO <%d-%d/%08x>\n",
io_stru[1], io_stru[2], PTR_AT(io_stru, 3, DWORD));
break;
......@@ -710,7 +710,7 @@ static void MSCDEX_Request(BYTE *driver_request, BOOL dorealmode)
PTR_AT(io_stru, 2, DWORD) = 0;
io_stru[6] = 0;
}
TRACE(" ----> AUDIO TRACK INFO[%d] = [%08lx:%d]\n",
TRACE(" ----> AUDIO TRACK INFO[%d] = [%08x:%d]\n",
io_stru[1], PTR_AT(io_stru, 2, DWORD), io_stru[6]);
break;
......@@ -753,7 +753,7 @@ static void MSCDEX_Request(BYTE *driver_request, BOOL dorealmode)
PTR_AT(io_stru, 3, DWORD) = FRAME_OF_TOC(toc, toc.FirstTrack);
PTR_AT(io_stru, 7, DWORD) = FRAME_OF_TOC(toc, toc.LastTrack + 1);
}
TRACE("Audio status info: status=%04x startLoc=%ld endLoc=%ld\n",
TRACE("Audio status info: status=%04x startLoc=%d endLoc=%d\n",
PTR_AT(io_stru, 1, WORD), PTR_AT(io_stru, 3, DWORD), PTR_AT(io_stru, 7, DWORD));
break;
......@@ -846,7 +846,7 @@ static void MSCDEX_Request(BYTE *driver_request, BOOL dorealmode)
at = PTR_AT(driver_request, 20, DWORD);
TRACE(" --> SEEK AUDIO mode :<0x%02X>, [%ld]\n",
TRACE(" --> SEEK AUDIO mode :<0x%02X>, [%d]\n",
(BYTE)driver_request[13], at);
switch (driver_request[13]) {
......@@ -881,7 +881,7 @@ static void MSCDEX_Request(BYTE *driver_request, BOOL dorealmode)
beg = end = PTR_AT(driver_request, 14, DWORD);
end += PTR_AT(driver_request, 18, DWORD);
TRACE(" --> PLAY AUDIO mode :<0x%02X>, [%ld-%ld]\n",
TRACE(" --> PLAY AUDIO mode :<0x%02X>, [%d-%d]\n",
(BYTE)driver_request[13], beg, end);
switch (driver_request[13]) {
......@@ -1029,7 +1029,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
if (!driver_request) {
/* FIXME - to be deleted ?? */
ERR("ES:BX==0 ! SEGFAULT ?\n");
ERR("-->BX=0x%04x, ES=0x%04lx, DS=0x%04lx, CX=0x%04x\n",
ERR("-->BX=0x%04x, ES=0x%04x, DS=0x%04x, CX=0x%04x\n",
BX_reg(context), context->SegEs, context->SegDs, CX_reg(context));
driver_request[4] |= 0x80;
driver_request[3] = 5; /* bad request length */
......
dlls/winedos/int31.c
View file @ db4eaf5e
......@@ -209,7 +209,7 @@ static LPVOID DPMI_xalloc( DWORD len )
if (!xflag && (lastvalloced<oldlastv))
{
/* wrapped */
FIXME( "failed to allocate linearly growing memory (%ld bytes), "
FIXME( "failed to allocate linearly growing memory (%d bytes), "
"using non-linear growing...\n", len );
xflag++;
}
......@@ -221,7 +221,7 @@ static LPVOID DPMI_xalloc( DWORD len )
xflag++;
if ((xflag==2) && (lastvalloced < oldlastv)) {
FIXME( "failed to allocate any memory of %ld bytes!\n", len );
FIXME( "failed to allocate any memory of %d bytes!\n", len );
return NULL;
}
}
......@@ -421,9 +421,9 @@ int DPMI_CallRMProc( CONTEXT86 *context, LPWORD stack, int args, int iret )
int alloc = 0, already = 0;
BYTE *code;
TRACE("EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n",
TRACE("EAX=%08x EBX=%08x ECX=%08x EDX=%08x\n",
context->Eax, context->Ebx, context->Ecx, context->Edx );
TRACE("ESI=%08lx EDI=%08lx ES=%04lx DS=%04lx CS:IP=%04lx:%04x, %d WORD arguments, %s\n",
TRACE("ESI=%08x EDI=%08x ES=%04x DS=%04x CS:IP=%04x:%04x, %d WORD arguments, %s\n",
context->Esi, context->Edi, context->SegEs, context->SegDs,
context->SegCs, LOWORD(context->Eip), args, iret?"IRET":"FAR" );
......@@ -555,9 +555,9 @@ void WINAPI DOSVM_CallRMProc( CONTEXT86 *context, int iret )
context->Edi );
CONTEXT86 context16;
TRACE("RealModeCall: EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n",
TRACE("RealModeCall: EAX=%08x EBX=%08x ECX=%08x EDX=%08x\n",
p->eax, p->ebx, p->ecx, p->edx);
TRACE(" ESI=%08lx EDI=%08lx ES=%04x DS=%04x CS:IP=%04x:%04x, %d WORD arguments, %s\n",
TRACE(" ESI=%08x EDI=%08x ES=%04x DS=%04x CS:IP=%04x:%04x, %d WORD arguments, %s\n",
p->esi, p->edi, p->es, p->ds, p->cs, p->ip, CX_reg(context), iret?"IRET":"FAR" );
if (!(p->cs) && !(p->ip)) { /* remove this check
......@@ -740,7 +740,7 @@ void WINAPI DOSVM_RawModeSwitchHandler( CONTEXT86 *context )
rm_ctx.EFlags = V86_FLAG;
/* enter real mode again */
TRACE("re-entering real mode at %04lx:%04lx\n",rm_ctx.SegCs,rm_ctx.Eip);
TRACE("re-entering real mode at %04x:%04x\n",rm_ctx.SegCs,rm_ctx.Eip);
ret = DOSVM_Enter( &rm_ctx );
/* when the real-mode stuff call its mode switch address,
DOSVM_Enter will return and we will continue here */
......@@ -769,7 +769,7 @@ void WINAPI DOSVM_RawModeSwitchHandler( CONTEXT86 *context )
NtCurrentTeb()->dpmi_vif = 0;
/* Return to new address and hope that we didn't mess up */
TRACE("re-entering protected mode at %04lx:%08lx\n",
TRACE("re-entering protected mode at %04x:%08x\n",
context->SegCs, context->Eip);
}
......@@ -966,7 +966,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context )
{
DWORD base = MAKELONG( DX_reg(context), CX_reg(context) );
WORD sel = BX_reg(context);
TRACE( "set selector base address (0x%04x,0x%08lx)\n", sel, base );
TRACE( "set selector base address (0x%04x,0x%08x)\n", sel, base );
/* check if Win16 app wants to access lower 64K of DOS memory */
if (base < 0x10000 && DOSVM_IsWin16())
......@@ -979,7 +979,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context )
case 0x0008: /* Set selector limit */
{
DWORD limit = MAKELONG( DX_reg(context), CX_reg(context) );
TRACE( "set selector limit (0x%04x,0x%08lx)\n",
TRACE( "set selector limit (0x%04x,0x%08x)\n",
BX_reg(context), limit );
SetSelectorLimit16( BX_reg(context), limit );
}
......@@ -1121,7 +1121,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context )
break;
case 0x0205: /* Set protected mode interrupt vector */
TRACE("set protected mode interrupt handler (0x%02x,0x%04x:0x%08lx)\n",
TRACE("set protected mode interrupt handler (0x%02x,0x%04x:0x%08x)\n",
BL_reg(context), CX_reg(context), context->Edx);
if (DOSVM_IsDos32())
{
......@@ -1251,7 +1251,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context )
DWORD size = MAKELONG( CX_reg(context), BX_reg(context) );
BYTE *ptr;
TRACE( "allocate memory block (%ld bytes)\n", size );
TRACE( "allocate memory block (%d bytes)\n", size );
ptr = (BYTE *)DPMI_xalloc( size );
if (!ptr)
......@@ -1272,7 +1272,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context )
case 0x0502: /* Free memory block */
{
DWORD handle = MAKELONG( DI_reg(context), SI_reg(context) );
TRACE( "free memory block (0x%08lx)\n", handle );
TRACE( "free memory block (0x%08x)\n", handle );
DPMI_xfree( (void *)handle );
}
break;
......@@ -1283,7 +1283,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context )
DWORD handle = MAKELONG( DI_reg(context), SI_reg(context) );
BYTE *ptr;
TRACE( "resize memory block (0x%08lx, %ld bytes)\n", handle, size );
TRACE( "resize memory block (0x%08x, %d bytes)\n", handle, size );
ptr = (BYTE *)DPMI_xrealloc( (void *)handle, size );
if (!ptr)
......@@ -1342,7 +1342,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context )
break;
case 0x0800: /* Physical address mapping */
FIXME( "physical address mapping (0x%08lx) - unimplemented\n",
FIXME( "physical address mapping (0x%08x) - unimplemented\n",
MAKELONG(CX_reg(context),BX_reg(context)) );
break;
......
dlls/winedos/interrupts.c
View file @ db4eaf5e
......@@ -243,10 +243,10 @@ static void DOSVM_PushFlags( CONTEXT86 *context, BOOL islong, BOOL isstub )
*/
void WINAPI DOSVM_EmulateInterruptPM( CONTEXT86 *context, BYTE intnum )
{
TRACE_(relay)("Call DOS int 0x%02x ret=%04lx:%08lx\n"
" eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx\n"
" esi=%08lx edi=%08lx ebp=%08lx esp=%08lx \n"
" ds=%04lx es=%04lx fs=%04lx gs=%04lx ss=%04lx flags=%08lx\n",
TRACE_(relay)("Call DOS int 0x%02x ret=%04x:%08x\n"
" eax=%08x ebx=%08x ecx=%08x edx=%08x\n"
" esi=%08x edi=%08x ebp=%08x esp=%08x \n"
" ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n",
intnum, context->SegCs, context->Eip,
context->Eax, context->Ebx, context->Ecx, context->Edx,
context->Esi, context->Edi, context->Ebp, context->Esp,
......@@ -275,7 +275,7 @@ void WINAPI DOSVM_EmulateInterruptPM( CONTEXT86 *context, BYTE intnum )
if (intnum != context->Eip / DOSVM_STUB_PM48)
WARN( "interrupt stub has been modified "
"(interrupt is %02x, interrupt stub is %02lx)\n",
"(interrupt is %02x, interrupt stub is %02x)\n",
intnum, context->Eip/DOSVM_STUB_PM48 );
TRACE( "builtin interrupt %02x has been branched to\n", intnum );
......@@ -296,7 +296,7 @@ void WINAPI DOSVM_EmulateInterruptPM( CONTEXT86 *context, BYTE intnum )
if (intnum != context->Eip / DOSVM_STUB_PM16)
WARN( "interrupt stub has been modified "
"(interrupt is %02x, interrupt stub is %02lx)\n",
"(interrupt is %02x, interrupt stub is %02x)\n",
intnum, context->Eip/DOSVM_STUB_PM16 );
TRACE( "builtin interrupt %02x has been branched to\n", intnum );
......@@ -331,8 +331,8 @@ void DOSVM_HardwareInterruptPM( CONTEXT86 *context, BYTE intnum )
if (addr.selector == DOSVM_dpmi_segments->int48_sel)
{
TRACE( "builtin interrupt %02lx has been invoked "
"(through vector %02x)\n",
TRACE( "builtin interrupt %02x has been invoked "
"(through vector %02x)\n",
addr.offset / DOSVM_STUB_PM48, intnum );
if (intnum == 0x25 || intnum == 0x26)
......@@ -349,7 +349,7 @@ void DOSVM_HardwareInterruptPM( CONTEXT86 *context, BYTE intnum )
{
DWORD *stack;
TRACE( "invoking hooked interrupt %02x at %04x:%08lx\n",
TRACE( "invoking hooked interrupt %02x at %04x:%08x\n",
intnum, addr.selector, addr.offset );
if (DOSVM_IsIRQ(intnum))
......@@ -422,10 +422,10 @@ void DOSVM_HardwareInterruptPM( CONTEXT86 *context, BYTE intnum )
*/
BOOL WINAPI DOSVM_EmulateInterruptRM( CONTEXT86 *context, BYTE intnum )
{
TRACE_(relay)("Call DOS int 0x%02x ret=%04lx:%08lx\n"
" eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx\n"
" esi=%08lx edi=%08lx ebp=%08lx esp=%08lx \n"
" ds=%04lx es=%04lx fs=%04lx gs=%04lx ss=%04lx flags=%08lx\n",
TRACE_(relay)("Call DOS int 0x%02x ret=%04x:%08x\n"
" eax=%08x ebx=%08x ecx=%08x edx=%08x\n"
" esi=%08x edi=%08x ebp=%08x esp=%08x \n"
" ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n",
intnum, context->SegCs, context->Eip,
context->Eax, context->Ebx, context->Ecx, context->Edx,
context->Esi, context->Edi, context->Ebp, context->Esp,
......@@ -453,7 +453,7 @@ BOOL WINAPI DOSVM_EmulateInterruptRM( CONTEXT86 *context, BYTE intnum )
if (intnum != context->Eip / DOSVM_STUB_RM)
WARN( "interrupt stub has been modified "
"(interrupt is %02x, interrupt stub is %02lx)\n",
"(interrupt is %02x, interrupt stub is %02x)\n",
intnum, context->Eip/DOSVM_STUB_RM );
TRACE( "builtin interrupt %02x has been branched to\n", intnum );
......@@ -664,7 +664,7 @@ FARPROC48 DOSVM_GetPMHandler48( BYTE intnum )
*/
void DOSVM_SetPMHandler48( BYTE intnum, FARPROC48 handler )
{
TRACE("Set 32-bit protected mode interrupt vector %02x <- %04x:%08lx\n",
TRACE("Set 32-bit protected mode interrupt vector %02x <- %04x:%08x\n",
intnum, handler.selector, handler.offset );
DOSVM_Vectors48[intnum] = handler;
}
......
dlls/winedos/ioports.c
View file @ db4eaf5e
......@@ -500,7 +500,7 @@ DWORD WINAPI DOSVM_inport( int port, int size )
*/
void WINAPI DOSVM_outport( int port, int size, DWORD value )
{
TRACE("IO: 0x%lx (%d-byte value) to port 0x%04x\n", value, size, port );
TRACE("IO: 0x%x (%d-byte value) to port 0x%04x\n", value, size, port );
#ifdef HAVE_PPDEV
if (do_pp_port_access == -1) do_pp_port_access = IO_pp_init();
......
dlls/winedos/module.c
View file @ db4eaf5e
......@@ -277,7 +277,7 @@ static BOOL MZ_DoLoadImage( HANDLE hFile, LPCSTR filename, OverlayBlock *oblk, W
FreeEnvironmentStringsA( oldenv);
/* allocate memory for the executable */
TRACE("Allocating DOS memory (min=%ld, max=%ld)\n",min_size,max_size);
TRACE("Allocating DOS memory (min=%d, max=%d)\n",min_size,max_size);
avail=DOSMEM_Available();
if (avail<min_size) {
ERR("insufficient DOS memory\n");
......@@ -298,7 +298,7 @@ static BOOL MZ_DoLoadImage( HANDLE hFile, LPCSTR filename, OverlayBlock *oblk, W
}
/* load executable image */
TRACE("loading DOS %s image, %08lx bytes\n",old_com?"COM":"EXE",image_size);
TRACE("loading DOS %s image, %08x bytes\n",old_com?"COM":"EXE",image_size);
SetFilePointer(hFile,image_start,NULL,FILE_BEGIN);
if (!ReadFile(hFile,load_start,image_size,&len,NULL) || len != image_size) {
/* check if this is due to the workaround for the pre-1.10 MS linker and we
......
dlls/winedos/soundblaster.c
View file @ db4eaf5e
......@@ -139,7 +139,7 @@ static BOOL SB_Init(void)
}
result = (*lpDirectSoundCreate)(NULL,&lpdsound,NULL);
if (result != DS_OK) {
ERR("Unable to initialize Sound Subsystem err = %lx !\n",result);
ERR("Unable to initialize Sound Subsystem err = %x !\n",result);
return 0;
}
......
dlls/winedos/xms.c
View file @ db4eaf5e
......@@ -123,7 +123,7 @@ void WINAPI XMS_Handler( CONTEXT86 *context )
context->Ecx = (DWORD)info.lpMaximumApplicationAddress;
SET_BL( context, 0 ); /* No errors. */
TRACE("returning largest %ldK, total %ldK, highest 0x%lx\n",
TRACE("returning largest %dK, total %dK, highest 0x%x\n",
context->Eax, context->Edx, context->Ecx);
}
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment