Module: wine Branch: master Commit: 72e64f53b148a84f2d9e195ac409b60d1e9ba54a URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e64f53b148a84f2d9e195ac4...
Author: Michael Stefaniuc mstefani@redhat.de Date: Fri Oct 6 23:02:14 2006 +0200
wnaspi32: Win64 printf format warning fixes.
---
dlls/wnaspi32/Makefile.in | 1 - dlls/wnaspi32/aspi.c | 10 +++++----- dlls/wnaspi32/winaspi16.c | 10 +++++----- dlls/wnaspi32/winaspi32.c | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in index 3c07663..8cef4d0 100644 --- a/dlls/wnaspi32/Makefile.in +++ b/dlls/wnaspi32/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = wnaspi32.dll IMPORTLIB = libwnaspi32.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \ aspi.c \ diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index 4e621e1..e0a011c 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -142,7 +142,7 @@ int ASPI_GetNumControllers() }
RegCloseKey(hkeyScsi); - TRACE("Returning %ld host adapters\n", num_ha ); + TRACE("Returning %d host adapters\n", num_ha ); return num_ha; }
@@ -301,11 +301,11 @@ SCSI_LinuxDeviceIo( int fd, { set_last_error(); save_error = GetLastError(); - WARN("Not enough bytes written to scsi device. bytes=%ld .. %ld\n", cbInBuffer, dwBytes ); + WARN("Not enough bytes written to scsi device. bytes=%d .. %d\n", cbInBuffer, dwBytes ); /* FIXME: set_last_error() never sets error to ERROR_NOT_ENOUGH_MEMORY... */ if( save_error == ERROR_NOT_ENOUGH_MEMORY ) MESSAGE("Your Linux kernel was not able to handle the amount of data sent to the scsi device. Try recompiling with a larger SG_BIG_BUFF value (kernel 2.0.x sg.h)"); - WARN("error= %ld\n", save_error ); + WARN("error= %d\n", save_error ); *lpcbBytesReturned = 0; return FALSE; } @@ -316,8 +316,8 @@ SCSI_LinuxDeviceIo( int fd, { set_last_error(); save_error = GetLastError(); - WARN("Not enough bytes read from scsi device. bytes=%ld .. %ld\n", cbOutBuffer, *lpcbBytesReturned); - WARN("error= %ld\n", save_error ); + WARN("Not enough bytes read from scsi device. bytes=%d .. %d\n", cbOutBuffer, *lpcbBytesReturned); + WARN("error= %d\n", save_error ); return FALSE; } return TRUE; diff --git a/dlls/wnaspi32/winaspi16.c b/dlls/wnaspi32/winaspi16.c index f34bf04..c9adb51 100644 --- a/dlls/wnaspi32/winaspi16.c +++ b/dlls/wnaspi32/winaspi16.c @@ -166,12 +166,12 @@ ASPI_DebugPrintCmd(SRB_ExecSCSICmd16 *pr TRACE("\tPosting %s\n", prb->SRB_Flags & 0x1 ? "enabled" : "disabled"); TRACE("Target: %d\n", prb->SRB_Target); TRACE("Lun: %d\n", prb->SRB_Lun); - TRACE("BufLen: %ld\n", prb->SRB_BufLen); + TRACE("BufLen: %d\n", prb->SRB_BufLen); TRACE("SenseLen: %d\n", prb->SRB_SenseLen); - TRACE("BufPtr: %lx (%p)\n", prb->SRB_BufPointer, lpBuf); - TRACE("LinkPointer %lx\n", prb->SRB_Rsvd1); + TRACE("BufPtr: %x (%p)\n", prb->SRB_BufPointer, lpBuf); + TRACE("LinkPointer %x\n", prb->SRB_Rsvd1); TRACE("CDB Length: %d\n", prb->SRB_CDBLen); - TRACE("POST Proc: %lx\n", (DWORD) prb->SRB_PostProc); + TRACE("POST Proc: %x\n", (DWORD) prb->SRB_PostProc); cdb = &prb->CDBByte[0]; cmd = prb->CDBByte[0]; if (TRACE_ON(aspi)) @@ -328,7 +328,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mo /* now do posting */
if (ASPI_POSTING(lpPRB) && lpPRB->SRB_PostProc) { - TRACE("Post Routine (%lx) called\n", (DWORD) lpPRB->SRB_PostProc); + TRACE("Post Routine (%x) called\n", (DWORD) lpPRB->SRB_PostProc); switch (mode) { case ASPI_DOS: diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 6920920..e06bb9b 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -179,7 +179,7 @@ ASPI_DebugPrintCmd(SRB_ExecSCSICmd *prb) TRACE("\tPosting %s\n", prb->SRB_Flags & 0x1 ? "enabled" : "disabled"); TRACE("Target: %d\n", prb->SRB_Target); TRACE("Lun: %d\n", prb->SRB_Lun); - TRACE("BufLen: %ld\n", prb->SRB_BufLen); + TRACE("BufLen: %d\n", prb->SRB_BufLen); TRACE("SenseLen: %d\n", prb->SRB_SenseLen); TRACE("BufPtr: %p\n", prb->SRB_BufPointer); TRACE("CDB Length: %d\n", prb->SRB_CDBLen); @@ -338,7 +338,7 @@ #define MAKE_HOST_TO_TARGET(lpPRB) \ ((lpPRB->SRB_Flags & 0x18) == 0x18) ) && lpPRB->SRB_BufLen ) { - FIXME("command 0x%02x, no data transfer specified, but buflen is %ld!!!\n",lpPRB->CDBByte[0],lpPRB->SRB_BufLen); + FIXME("command 0x%02x, no data transfer specified, but buflen is %d!!!\n",lpPRB->CDBByte[0],lpPRB->SRB_BufLen); } break; }
-
Alexandre Julliard