winedos: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Tue Oct 3 06:51:27 CDT 2006
---
dlls/winedos/Makefile.in | 1 -
dlls/winedos/dma.c | 8 ++--
dlls/winedos/dosaspi.c | 6 ++-
dlls/winedos/dosvm.c | 24 ++++++------
dlls/winedos/int10.c | 2 +
dlls/winedos/int13.c | 4 +-
dlls/winedos/int1a.c | 2 +
dlls/winedos/int21.c | 48 ++++++++++++-------------
dlls/winedos/int25.c | 4 +-
dlls/winedos/int26.c | 4 +-
dlls/winedos/int2f.c | 18 +++++----
dlls/winedos/int31.c | 30 ++++++++-------
dlls/winedos/interrupts.c | 30 ++++++++-------
dlls/winedos/ioports.c | 2 +
dlls/winedos/module.c | 4 +-
dlls/winedos/soundblaster.c | 2 +
dlls/winedos/vxd.c | 84 ++++++++++++++++++++++---------------------
dlls/winedos/xms.c | 2 +
18 files changed, 137 insertions(+), 138 deletions(-)
diff --git a/dlls/winedos/Makefile.in b/dlls/winedos/Makefile.in
index ca80515..0af1930 100644
--- a/dlls/winedos/Makefile.in
+++ b/dlls/winedos/Makefile.in
@@ -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
diff --git a/dlls/winedos/dma.c b/dlls/winedos/dma.c
index 4daa81b..d087892 100644
--- a/dlls/winedos/dma.c
+++ b/dlls/winedos/dma.c
@@ -111,7 +111,7 @@ int DMA_Transfer(int channel,int reqlen,
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,
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;
diff --git a/dlls/winedos/dosaspi.c b/dlls/winedos/dosaspi.c
index 8fbb950..f1ff1ca 100644
--- a/dlls/winedos/dosaspi.c
+++ b/dlls/winedos/dosaspi.c
@@ -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 ptrS
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 @@ #undef srb_dos_to_w32
break;
}
- TRACE("Returning %lx\n", retval );
+ TRACE("Returning %x\n", retval );
return retval;
}
diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c
index e83f8ae..50381a6 100644
--- a/dlls/winedos/dosvm.c
+++ b/dlls/winedos/dosvm.c
@@ -204,11 +204,11 @@ void DOSVM_SendQueuedEvents( CONTEXT86 *
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, I
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, I
/* 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 *waitc
}
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_h
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( CONTEX
*/
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)
{
diff --git a/dlls/winedos/int10.c b/dlls/winedos/int10.c
index 98821f2..b1f81ab 100644
--- a/dlls/winedos/int10.c
+++ b/dlls/winedos/int10.c
@@ -1467,7 +1467,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT8
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;
diff --git a/dlls/winedos/int13.c b/dlls/winedos/int13.c
index 042b395..6b2b00c 100644
--- a/dlls/winedos/int13.c
+++ b/dlls/winedos/int13.c
@@ -104,7 +104,7 @@ #ifdef linux
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 @@ #ifdef linux
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 */
diff --git a/dlls/winedos/int1a.c b/dlls/winedos/int1a.c
index c4e3919..c0d0795 100644
--- a/dlls/winedos/int1a.c
+++ b/dlls/winedos/int1a.c
@@ -43,7 +43,7 @@ void WINAPI DOSVM_Int1aHandler( CONTEXT8
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;
diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c
index b7aa3b4..d921b55 100644
--- a/dlls/winedos/int21.c
+++ b/dlls/winedos/int21.c
@@ -1405,7 +1405,7 @@ static void INT21_SequentialReadFromFCB(
record_number = 128 * fcb->current_block_number + fcb->record_within_current_block;
position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0);
if (position != record_number * fcb->logical_record_size) {
- TRACE("seek(%d, %ld, 0) failed with %ld\n",
+ TRACE("seek(%d, %d, 0) failed with %ld\n",
fcb->file_number, record_number * fcb->logical_record_size, position);
AL_result = 0x01; /* end of file, no data read */
} else {
@@ -1421,7 +1421,7 @@ static void INT21_SequentialReadFromFCB(
AL_result = 0x03; /* end of file, partial record read */
} /* if */
} else {
- TRACE("successful read %d bytes from record %ld (position %ld) of file %d (handle %p)\n",
+ TRACE("successful read %d bytes from record %d (position %ld) of file %d (handle %p)\n",
bytes_read, record_number, position, fcb->file_number, handle);
AL_result = 0x00; /* successful */
} /* if */
@@ -1485,7 +1485,7 @@ static void INT21_SequentialWriteToFCB(
record_number = 128 * fcb->current_block_number + fcb->record_within_current_block;
position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0);
if (position != record_number * fcb->logical_record_size) {
- TRACE("seek(%d, %ld, 0) failed with %ld\n",
+ TRACE("seek(%d, %d, 0) failed with %ld\n",
fcb->file_number, record_number * fcb->logical_record_size, position);
AL_result = 0x01; /* disk full */
} else {
@@ -1496,7 +1496,7 @@ static void INT21_SequentialWriteToFCB(
fcb->file_number, disk_transfer_area, fcb->logical_record_size, bytes_written);
AL_result = 0x01; /* disk full */
} else {
- TRACE("successful written %d bytes from record %ld (position %ld) of file %d (handle %p)\n",
+ TRACE("successful written %d bytes from record %d (position %ld) of file %d (handle %p)\n",
bytes_written, record_number, position, fcb->file_number, handle);
AL_result = 0x00; /* successful */
} /* if */
@@ -1561,7 +1561,7 @@ static void INT21_ReadRandomRecordFromFC
} else {
position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0);
if (position != record_number * fcb->logical_record_size) {
- TRACE("seek(%d, %ld, 0) failed with %ld\n",
+ TRACE("seek(%d, %d, 0) failed with %ld\n",
fcb->file_number, record_number * fcb->logical_record_size, position);
AL_result = 0x01; /* end of file, no data read */
} else {
@@ -1577,7 +1577,7 @@ static void INT21_ReadRandomRecordFromFC
AL_result = 0x03; /* end of file, partial record read */
} /* if */
} else {
- TRACE("successful read %d bytes from record %ld (position %ld) of file %d (handle %p)\n",
+ TRACE("successful read %d bytes from record %d (position %ld) of file %d (handle %p)\n",
bytes_read, record_number, position, fcb->file_number, handle);
AL_result = 0x00; /* successful */
} /* if */
@@ -1634,7 +1634,7 @@ static void INT21_WriteRandomRecordToFCB
} else {
position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0);
if (position != record_number * fcb->logical_record_size) {
- TRACE("seek(%d, %ld, 0) failed with %ld\n",
+ TRACE("seek(%d, %d, 0) failed with %ld\n",
fcb->file_number, record_number * fcb->logical_record_size, position);
AL_result = 0x01; /* disk full */
} else {
@@ -1645,7 +1645,7 @@ static void INT21_WriteRandomRecordToFCB
fcb->file_number, disk_transfer_area, fcb->logical_record_size, bytes_written);
AL_result = 0x01; /* disk full */
} else {
- TRACE("successful written %d bytes from record %ld (position %ld) of file %d (handle %p)\n",
+ TRACE("successful written %d bytes from record %d (position %ld) of file %d (handle %p)\n",
bytes_written, record_number, position, fcb->file_number, handle);
AL_result = 0x00; /* successful */
} /* if */
@@ -1713,7 +1713,7 @@ static void INT21_RandomBlockReadFromFCB
} else {
position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0);
if (position != record_number * fcb->logical_record_size) {
- TRACE("seek(%d, %ld, 0) failed with %ld\n",
+ TRACE("seek(%d, %d, 0) failed with %ld\n",
fcb->file_number, record_number * fcb->logical_record_size, position);
records_read = 0;
AL_result = 0x01; /* end of file, no data read */
@@ -1734,7 +1734,7 @@ static void INT21_RandomBlockReadFromFCB
AL_result = 0x03; /* end of file, partial record read */
} /* if */
} else {
- TRACE("successful read %d bytes from record %ld (position %ld) of file %d (handle %p)\n",
+ TRACE("successful read %d bytes from record %d (position %ld) of file %d (handle %p)\n",
bytes_read, record_number, position, fcb->file_number, handle);
records_read = records_requested;
AL_result = 0x00; /* successful */
@@ -1804,7 +1804,7 @@ static void INT21_RandomBlockWriteToFCB(
} else {
position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0);
if (position != record_number * fcb->logical_record_size) {
- TRACE("seek(%d, %ld, 0) failed with %ld\n",
+ TRACE("seek(%d, %d, 0) failed with %ld\n",
fcb->file_number, record_number * fcb->logical_record_size, position);
records_written = 0;
AL_result = 0x01; /* disk full */
@@ -1819,7 +1819,7 @@ static void INT21_RandomBlockWriteToFCB(
records_written = bytes_written / fcb->logical_record_size;
AL_result = 0x01; /* disk full */
} else {
- TRACE("successful write %d bytes from record %ld (position %ld) of file %d (handle %p)\n",
+ TRACE("successful write %d bytes from record %d (position %ld) of file %d (handle %p)\n",
bytes_written, record_number, position, fcb->file_number, handle);
records_written = records_requested;
AL_result = 0x00; /* successful */
@@ -4158,7 +4158,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT8
BOOL bSetDOSExtendedError = FALSE;
TRACE( "AX=%04x BX=%04x CX=%04x DX=%04x "
- "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08lx\n",
+ "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08x\n",
AX_reg(context), BX_reg(context),
CX_reg(context), DX_reg(context),
SI_reg(context), DI_reg(context),
@@ -4261,7 +4261,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT8
break;
case 0x09: /* WRITE STRING TO STANDARD OUTPUT */
- TRACE("WRITE '$'-terminated string from %04lX:%04X to stdout\n",
+ TRACE("WRITE '$'-terminated string from %04X:%04X to stdout\n",
context->SegDs, DX_reg(context) );
{
LPSTR data = CTX_SEG_OFF_TO_LIN( context,
@@ -4405,7 +4405,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT8
break;
case 0x1a: /* SET DISK TRANSFER AREA ADDRESS */
- TRACE( "SET DISK TRANSFER AREA ADDRESS %04lX:%04X\n",
+ TRACE( "SET DISK TRANSFER AREA ADDRESS %04X:%04X\n",
context->SegDs, DX_reg(context) );
{
TDB *task = GlobalLock16( GetCurrentTask() );
@@ -4780,7 +4780,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT8
break;
case 0x3f: /* "READ" - READ FROM FILE OR DEVICE */
- TRACE( "READ from %d to %04lX:%04X for %d bytes\n",
+ TRACE( "READ from %d to %04X:%04X for %d bytes\n",
BX_reg(context),
context->SegDs,
DX_reg(context),
@@ -4821,7 +4821,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT8
break;
case 0x40: /* "WRITE" - WRITE TO FILE OR DEVICE */
- TRACE( "WRITE from %04lX:%04X to handle %d for %d byte\n",
+ TRACE( "WRITE from %04X:%04X to handle %d for %d byte\n",
context->SegDs, DX_reg(context),
BX_reg(context), CX_reg(context) );
{
@@ -4869,7 +4869,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT8
break;
case 0x42: /* "LSEEK" - SET CURRENT FILE POSITION */
- TRACE( "LSEEK handle %d offset %ld from %s\n",
+ TRACE( "LSEEK handle %d offset %d from %s\n",
BX_reg(context),
MAKELONG( DX_reg(context), CX_reg(context) ),
(AL_reg(context) == 0) ?
@@ -4970,7 +4970,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT8
break;
case 0x49: /* FREE MEMORY */
- TRACE( "FREE MEMORY segment %04lX\n", context->SegEs );
+ TRACE( "FREE MEMORY segment %04X\n", context->SegEs );
{
BOOL ok;
@@ -4995,7 +4995,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT8
break;
case 0x4a: /* RESIZE MEMORY BLOCK */
- TRACE( "RESIZE MEMORY segment %04lX to %d paragraphs\n",
+ TRACE( "RESIZE MEMORY segment %04X to %d paragraphs\n",
context->SegEs, BX_reg(context) );
{
DWORD newsize = (DWORD)BX_reg(context) << 4;
@@ -5181,14 +5181,14 @@ void WINAPI DOSVM_Int21Handler( CONTEXT8
switch (AL_reg(context))
{
case 0x00: /* LOCK */
- TRACE( "lock handle %d offset %ld length %ld\n",
+ TRACE( "lock handle %d offset %d length %d\n",
BX_reg(context), offset, length );
if (!LockFile( handle, offset, 0, length, 0 ))
bSetDOSExtendedError = TRUE;
break;
case 0x01: /* UNLOCK */
- TRACE( "unlock handle %d offset %ld length %ld\n",
+ TRACE( "unlock handle %d offset %d length %d\n",
BX_reg(context), offset, length );
if (!UnlockFile( handle, offset, 0, length, 0 ))
bSetDOSExtendedError = TRUE;
@@ -5375,10 +5375,10 @@ void WINAPI DOSVM_Int21Handler( CONTEXT8
/* Print error code if carry flag is set. */
if (context->EFlags & 0x0001)
- TRACE("failed, error %ld\n", GetLastError() );
+ TRACE("failed, error %d\n", GetLastError() );
TRACE( "returning: AX=%04x BX=%04x CX=%04x DX=%04x "
- "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08lx\n",
+ "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08x\n",
AX_reg(context), BX_reg(context),
CX_reg(context), DX_reg(context),
SI_reg(context), DI_reg(context),
diff --git a/dlls/winedos/int25.c b/dlls/winedos/int25.c
index 4b0107d..a0e5b10 100644
--- a/dlls/winedos/int25.c
+++ b/dlls/winedos/int25.c
@@ -43,8 +43,8 @@ BOOL DOSVM_RawRead(BYTE drive, DWORD beg
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;
diff --git a/dlls/winedos/int26.c b/dlls/winedos/int26.c
index 24e75d8..a203882 100644
--- a/dlls/winedos/int26.c
+++ b/dlls/winedos/int26.c
@@ -43,8 +43,8 @@ BOOL DOSVM_RawWrite(BYTE drive, DWORD be
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;
diff --git a/dlls/winedos/int2f.c b/dlls/winedos/int2f.c
index 43f3d79..dcb19c4 100644
--- a/dlls/winedos/int2f.c
+++ b/dlls/winedos/int2f.c
@@ -644,7 +644,7 @@ #endif
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 @@ #endif
* 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 @@ #endif
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 @@ #endif
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 @@ #endif
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 @@ #endif
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 @@ #endif
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* co
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 */
diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c
index 78f927d..a61044e 100644
--- a/dlls/winedos/int31.c
+++ b/dlls/winedos/int31.c
@@ -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,
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->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(
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(
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( CONTEXT8
{
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( CONTEXT8
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( CONTEXT8
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( CONTEXT8
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( CONTEXT8
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( CONTEXT8
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( CONTEXT8
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;
diff --git a/dlls/winedos/interrupts.c b/dlls/winedos/interrupts.c
index 09ddd5d..d704b0e 100644
--- a/dlls/winedos/interrupts.c
+++ b/dlls/winedos/interrupts.c
@@ -243,10 +243,10 @@ static void DOSVM_PushFlags( CONTEXT86 *
*/
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( CO
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( CO
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( CONTEXT8
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( CONTEXT8
{
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( CONTEXT8
*/
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( CO
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 int
*/
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;
}
diff --git a/dlls/winedos/ioports.c b/dlls/winedos/ioports.c
index 1e55f31..13079a7 100644
--- a/dlls/winedos/ioports.c
+++ b/dlls/winedos/ioports.c
@@ -500,7 +500,7 @@ #endif
*/
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();
diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c
index eb2de5e..e00b77e 100644
--- a/dlls/winedos/module.c
+++ b/dlls/winedos/module.c
@@ -277,7 +277,7 @@ static BOOL MZ_DoLoadImage( HANDLE hFile
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
}
/* 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
diff --git a/dlls/winedos/soundblaster.c b/dlls/winedos/soundblaster.c
index e5569b4..a69f0dc 100644
--- a/dlls/winedos/soundblaster.c
+++ b/dlls/winedos/soundblaster.c
@@ -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;
}
diff --git a/dlls/winedos/vxd.c b/dlls/winedos/vxd.c
index 019651c..9a4f1cd 100644
--- a/dlls/winedos/vxd.c
+++ b/dlls/winedos/vxd.c
@@ -221,7 +221,7 @@ void WINAPI VXD_VXDLoader( CONTEXT86 *co
break;
case 0x0001: /* load device */
- FIXME("load device %04lx:%04x (%s)\n",
+ FIXME("load device %04x:%04x (%s)\n",
context->SegDs, DX_reg(context),
debugstr_a(MapSL(MAKESEGPTR(context->SegDs, DX_reg(context)))));
SET_AX( context, 0x0000 );
@@ -231,7 +231,7 @@ void WINAPI VXD_VXDLoader( CONTEXT86 *co
break;
case 0x0002: /* unload device */
- FIXME("unload device (%08lx)\n", context->Ebx);
+ FIXME("unload device (%08x)\n", context->Ebx);
SET_AX( context, 0x0000 );
RESET_CFLAG(context);
break;
@@ -325,7 +325,7 @@ void WINAPI VXD_Shell( CONTEXT86 *contex
break;
case 0x0106: /* install timeout callback */
- TRACE("VxD Shell: ignoring shell callback (%ld sec.)\n", context->Ebx);
+ TRACE("VxD Shell: ignoring shell callback (%d sec.)\n", context->Ebx);
SET_CFLAG(context);
break;
@@ -693,7 +693,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
* Output: EAX: 0 if OK
*/
- TRACE("[0001] EBX=%lx ECX=%lx EDX=%lx ESI=%lx EDI=%lx\n",
+ TRACE("[0001] EBX=%x ECX=%x EDX=%x ESI=%x EDI=%x\n",
context->Ebx, context->Ecx, context->Edx,
context->Esi, context->Edi);
@@ -716,7 +716,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
* Output: EAX: Size of area changed
*/
- TRACE("[0002] EBX=%lx ECX=%lx EDX=%lx\n",
+ TRACE("[0002] EBX=%x ECX=%x EDX=%x\n",
context->Ebx, context->Ecx, context->Edx);
/* FIXME */
@@ -734,7 +734,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
* Bit 1: Read-Write if set, Read-Only if clear
*/
- TRACE("[0003] EDX=%lx\n", context->Edx);
+ TRACE("[0003] EDX=%x\n", context->Edx);
/* FIXME */
@@ -805,7 +805,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
LPBYTE addr = module->baseAddr + pe_seg->VirtualAddress;
TRACE("MapModule: "
- "Section %d at %08lx from %08lx len %08lx\n",
+ "Section %d at %08x from %08x len %08x\n",
i, (DWORD)addr, off, len);
if ( _llseek(image, off, SEEK_SET) != off
@@ -825,7 +825,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
IMAGE_BASE_RELOCATION *r = (IMAGE_BASE_RELOCATION *)
(dir->Size? module->baseAddr + dir->VirtualAddress : 0);
- TRACE("MapModule: Reloc delta %08lx\n", module->relocDelta);
+ TRACE("MapModule: Reloc delta %08x\n", module->relocDelta);
while (r && r->VirtualAddress)
{
@@ -833,7 +833,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
WORD *TypeOffset = (WORD *)(r + 1);
unsigned int count = (r->SizeOfBlock - sizeof(*r)) / sizeof(*TypeOffset);
- TRACE("MapModule: %d relocations for page %08lx\n",
+ TRACE("MapModule: %d relocations for page %08x\n",
count, (DWORD)page);
for(i = 0; i < count; i++)
@@ -876,7 +876,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
* Output: EAX: 1 if OK
*/
- TRACE("UnMapModule: %lx\n", (DWORD)W32S_APP2WINE(context->Edx));
+ TRACE("UnMapModule: %x\n", (DWORD)W32S_APP2WINE(context->Edx));
/* As we didn't map anything, there's nothing to unmap ... */
@@ -907,12 +907,12 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
DWORD prot = stack[4];
DWORD result;
- TRACE("VirtualAlloc(%lx, %lx, %lx, %lx, %lx)\n",
+ TRACE("VirtualAlloc(%x, %x, %x, %x, %x)\n",
(DWORD)retv, (DWORD)base, size, type, prot);
if (type & 0x80000000)
{
- WARN("VirtualAlloc: strange type %lx\n", type);
+ WARN("VirtualAlloc: strange type %x\n", type);
type &= 0x7fffffff;
}
@@ -955,7 +955,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
DWORD type = stack[3];
DWORD result;
- TRACE("VirtualFree(%lx, %lx, %lx, %lx)\n",
+ TRACE("VirtualFree(%x, %x, %x, %x)\n",
(DWORD)retv, (DWORD)base, size, type);
result = VirtualFree(base, size, type);
@@ -993,7 +993,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
DWORD *old_prot = (DWORD *)W32S_APP2WINE(stack[4]);
DWORD result;
- TRACE("VirtualProtect(%lx, %lx, %lx, %lx, %lx)\n",
+ TRACE("VirtualProtect(%x, %x, %x, %x, %x)\n",
(DWORD)retv, (DWORD)base, size, new_prot, (DWORD)old_prot);
result = VirtualProtect(base, size, new_prot, old_prot);
@@ -1030,7 +1030,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
DWORD len = stack[3];
DWORD result;
- TRACE("VirtualQuery(%lx, %lx, %lx, %lx)\n",
+ TRACE("VirtualQuery(%x, %x, %x, %x)\n",
(DWORD)retv, (DWORD)base, (DWORD)info, len);
result = VirtualQuery(base, info, len);
@@ -1050,7 +1050,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
* Output: EAX: NtStatus
*/
- TRACE("[000a] ECX=%lx EDX=%lx\n",
+ TRACE("[000a] ECX=%x EDX=%x\n",
context->Ecx, context->Edx);
/* FIXME */
@@ -1066,7 +1066,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
* Output: EAX: NtStatus
*/
- TRACE("[000b] ECX=%lx\n", context->Ecx);
+ TRACE("[000b] ECX=%x\n", context->Ecx);
/* FIXME */
@@ -1081,7 +1081,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
* Output: EDX: Previous Debug Flags
*/
- FIXME("[000c] EDX=%lx\n", context->Edx);
+ FIXME("[000c] EDX=%x\n", context->Edx);
/* FIXME */
@@ -1118,7 +1118,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
HANDLE result = INVALID_HANDLE_VALUE;
char name[128];
- TRACE("NtCreateSection(%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n",
+ TRACE("NtCreateSection(%x, %x, %x, %x, %x, %x, %x, %x)\n",
(DWORD)retv, flags1, atom, (DWORD)size, protect, flags2,
(DWORD)hFile, psp);
@@ -1135,7 +1135,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
if (result == INVALID_HANDLE_VALUE)
WARN("NtCreateSection: failed!\n");
else
- TRACE("NtCreateSection: returned %lx\n", (DWORD)result);
+ TRACE("NtCreateSection: returned %x\n", (DWORD)result);
if (result != INVALID_HANDLE_VALUE)
*retv = result,
@@ -1166,7 +1166,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
HANDLE result = INVALID_HANDLE_VALUE;
char name[128];
- TRACE("NtOpenSection(%lx, %lx, %lx)\n",
+ TRACE("NtOpenSection(%x, %x, %x)\n",
(DWORD)retv, protect, atom);
if (atom && GlobalGetAtomNameA(atom, name, sizeof(name)))
@@ -1179,7 +1179,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
if (result == INVALID_HANDLE_VALUE)
WARN("NtOpenSection: failed!\n");
else
- TRACE("NtOpenSection: returned %lx\n", (DWORD)result);
+ TRACE("NtOpenSection: returned %x\n", (DWORD)result);
if (result != INVALID_HANDLE_VALUE)
*retv = result,
@@ -1205,7 +1205,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
HANDLE handle = (HANDLE)stack[0];
DWORD *id = (DWORD *)W32S_APP2WINE(stack[1]);
- TRACE("NtCloseSection(%lx, %lx)\n", (DWORD)handle, (DWORD)id);
+ TRACE("NtCloseSection(%x, %x)\n", (DWORD)handle, (DWORD)id);
CloseHandle(handle);
if (id) *id = 0; /* FIXME */
@@ -1228,7 +1228,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
HANDLE handle = (HANDLE)stack[0];
HANDLE new_handle;
- TRACE("NtDupSection(%lx)\n", (DWORD)handle);
+ TRACE("NtDupSection(%x)\n", (DWORD)handle);
DuplicateHandle( GetCurrentProcess(), handle,
GetCurrentProcess(), &new_handle,
@@ -1284,12 +1284,12 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
}
TRACE("NtMapViewOfSection"
- "(%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n",
+ "(%x, %x, %x, %x, %x, %x, %x, %x, %x, %x)\n",
(DWORD)SectionHandle, ProcessHandle, (DWORD)BaseAddress,
ZeroBits, CommitSize, (DWORD)SectionOffset, (DWORD)ViewSize,
InheritDisposition, AllocationType, Protect);
TRACE("NtMapViewOfSection: "
- "base=%lx, offset=%lx, size=%lx, access=%lx\n",
+ "base=%x, offset=%x, size=%x, access=%x\n",
(DWORD)address, SectionOffset? SectionOffset->u.LowPart : 0,
ViewSize? *ViewSize : 0, access);
@@ -1298,7 +1298,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
SectionOffset? SectionOffset->u.LowPart : 0,
ViewSize? *ViewSize : 0, address);
- TRACE("NtMapViewOfSection: result=%lx\n", result);
+ TRACE("NtMapViewOfSection: result=%x\n", result);
if (W32S_WINE2APP(result))
{
@@ -1325,7 +1325,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
DWORD ProcessHandle = stack[0]; /* ignored */
LPBYTE BaseAddress = (LPBYTE)W32S_APP2WINE(stack[1]);
- TRACE("NtUnmapViewOfSection(%lx, %lx)\n",
+ TRACE("NtUnmapViewOfSection(%x, %x)\n",
ProcessHandle, (DWORD)BaseAddress);
UnmapViewOfFile(BaseAddress);
@@ -1356,10 +1356,10 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
LPBYTE address = (LPBYTE)(BaseAddress? W32S_APP2WINE(*BaseAddress) : 0);
DWORD size = ViewSize? *ViewSize : 0;
- TRACE("NtFlushVirtualMemory(%lx, %lx, %lx, %lx)\n",
+ TRACE("NtFlushVirtualMemory(%x, %x, %x, %x)\n",
ProcessHandle, (DWORD)BaseAddress, (DWORD)ViewSize,
(DWORD)unknown);
- TRACE("NtFlushVirtualMemory: base=%lx, size=%lx\n",
+ TRACE("NtFlushVirtualMemory: base=%x, size=%x\n",
(DWORD)address, size);
FlushViewOfFile(address, size);
@@ -1380,7 +1380,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
* Output: None
*/
- FIXME("[0014] ECX=%lx EDX=%lx\n",
+ FIXME("[0014] ECX=%x EDX=%x\n",
context->Ecx, context->Edx);
/* FIXME */
@@ -1394,7 +1394,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
* Output: None
*/
- TRACE("[0015] EDX=%lx\n", context->Edx);
+ TRACE("[0015] EDX=%x\n", context->Edx);
/* We don't care, as we always have a coprocessor anyway */
break;
@@ -1434,7 +1434,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
* Output: None
*/
- FIXME("[0017] EBX=%lx CX=%x\n",
+ FIXME("[0017] EBX=%x CX=%x\n",
context->Ebx, CX_reg(context));
/* FIXME */
@@ -1460,7 +1460,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
DWORD size = stack[2];
DWORD result;
- TRACE("VirtualLock(%lx, %lx, %lx)\n",
+ TRACE("VirtualLock(%x, %x, %x)\n",
(DWORD)retv, (DWORD)base, size);
result = VirtualLock(base, size);
@@ -1494,7 +1494,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
DWORD size = stack[2];
DWORD result;
- TRACE("VirtualUnlock(%lx, %lx, %lx)\n",
+ TRACE("VirtualUnlock(%x, %x, %x)\n",
(DWORD)retv, (DWORD)base, size);
result = VirtualUnlock(base, size);
@@ -1554,7 +1554,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
struct Win32sMemoryInfo *info =
(struct Win32sMemoryInfo *)W32S_APP2WINE(context->Esi);
- FIXME("KGlobalMemStat(%lx)\n", (DWORD)info);
+ FIXME("KGlobalMemStat(%x)\n", (DWORD)info);
/* FIXME */
}
@@ -1568,7 +1568,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
* Output: None
*/
- TRACE("[001c] ECX=%lx\n", context->Ecx);
+ TRACE("[001c] ECX=%x\n", context->Ecx);
/* FIXME */
break;
@@ -1594,12 +1594,12 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
DWORD prot = stack[3];
DWORD result;
- TRACE("VirtualAlloc16(%lx, %lx, %lx, %lx)\n",
+ TRACE("VirtualAlloc16(%x, %x, %x, %x)\n",
(DWORD)base, size, type, prot);
if (type & 0x80000000)
{
- WARN("VirtualAlloc16: strange type %lx\n", type);
+ WARN("VirtualAlloc16: strange type %x\n", type);
type &= 0x7fffffff;
}
@@ -1611,7 +1611,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
else
context->Edx = 0,
context->Eax = STATUS_NO_MEMORY; /* FIXME */
- TRACE("VirtualAlloc16: returning base %lx\n", context->Edx);
+ TRACE("VirtualAlloc16: returning base %x\n", context->Edx);
}
break;
@@ -1634,7 +1634,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
DWORD type = stack[2];
DWORD result;
- TRACE("VirtualFree16(%lx, %lx, %lx)\n",
+ TRACE("VirtualFree16(%x, %x, %x)\n",
(DWORD)base, size, type);
result = VirtualFree(base, size, type);
@@ -1662,7 +1662,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *conte
DWORD *ptr = (DWORD *)W32S_APP2WINE(context->Ecx);
BOOL set = context->Edx;
- TRACE("FWorkingSetSize(%lx, %lx)\n", (DWORD)ptr, (DWORD)set);
+ TRACE("FWorkingSetSize(%x, %x)\n", (DWORD)ptr, (DWORD)set);
if (set)
/* We do it differently ... */;
diff --git a/dlls/winedos/xms.c b/dlls/winedos/xms.c
index 6300652..89ab3d0 100644
--- a/dlls/winedos/xms.c
+++ b/dlls/winedos/xms.c
@@ -123,7 +123,7 @@ void WINAPI XMS_Handler( CONTEXT86 *cont
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;
--
1.4.2.1
--
Michael Stefaniuc Tel.: +49-711-96437-199
Sr. Network Engineer Fax.: +49-711-96437-111
Red Hat GmbH Email: mstefani at redhat.com
Hauptstaetterstr. 58 http://www.redhat.de/
D-70178 Stuttgart
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061003/cb385d4c/attachment-0001.pgp
More information about the wine-patches
mailing list