June 2006 - Wine-commits - list.winehq.org

Alexandre Julliard : rpcss: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 46a5f91357b7c2133ed970021ab1767cbdb685c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46a5f91357b7c2133ed9700… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:11:58 2006 +0200 rpcss: Don't use sizeof in traces to avoid printf format warnings. --- programs/rpcss/np_server.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/rpcss/np_server.c b/programs/rpcss/np_server.c index 5b50898..47fa348 100644 --- a/programs/rpcss/np_server.c +++ b/programs/rpcss/np_server.c @@ -204,8 +204,8 @@ static VOID HandlerThread(LPVOID lpvPipe ); if ( (!success) || (bytesread != sizeof(RPCSS_NP_MESSAGE)) || (vardata_payload_msg.message_type != RPCSS_NP_MESSAGE_TYPEID_VARDATAPAYLOADMSG) ) { - WINE_ERR("vardata payload read failure! (s=%s,br=%ld,exp_br=%d,mt=%u,mt_exp=%u\n", - success ? "TRUE" : "FALSE", bytesread, sizeof(RPCSS_NP_MESSAGE), + WINE_ERR("vardata payload read failure! (s=%s,br=%ld,mt=%u,mt_exp=%u\n", + success ? "TRUE" : "FALSE", bytesread, vardata_payload_msg.message_type, RPCSS_NP_MESSAGE_TYPEID_VARDATAPAYLOADMSG); success = FALSE; break; @@ -237,8 +237,7 @@ static VOID HandlerThread(LPVOID lpvPipe ); if ( (!success) || (written != sizeof(RPCSS_NP_REPLY)) ) - WINE_WARN("Message reply failed. (successs=%s, br=%ld, exp_br=%d)\n", - success ? "TRUE" : "FALSE", written, sizeof(RPCSS_NP_REPLY)); + WINE_WARN("Message reply failed. (success=%d, br=%ld)\n", success, written); else WINE_TRACE("Reply sent successfully.\n"); } else @@ -426,7 +425,7 @@ static BOOL RPCSS_SendReceiveNPMsg(HANDL } if (count != sizeof(RPCSS_NP_REPLY)) { - WINE_ERR("read count mismatch. got %ld, expected %u.\n", count, sizeof(RPCSS_NP_REPLY)); + WINE_ERR("read count mismatch, got %ld.\n", count); return FALSE; }

1 0

Alexandre Julliard : wineps.drv: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 1f39252d27172ff8d8c1746897701b0a6b37be97 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f39252d27172ff8d8c1746… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:11:48 2006 +0200 wineps.drv: Don't use sizeof in traces to avoid printf format warnings. --- dlls/wineps.drv/glyphlist.c | 15 ++------------- dlls/wineps.drv/ppd.c | 6 +----- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/wineps.drv/glyphlist.c b/dlls/wineps.drv/glyphlist.c index c108868..c166947 100644 --- a/dlls/wineps.drv/glyphlist.c +++ b/dlls/wineps.drv/glyphlist.c @@ -58,11 +58,7 @@ INT PSDRV_GlyphListInit() TRACE("glyphList will initially hold %i glyph names\n", i); glyphList = HeapAlloc(PSDRV_Heap, 0, i * sizeof(GLYPHNAME *)); - if (glyphList == NULL) - { - ERR("Failed to allocate %i bytes of memory\n", i * sizeof(GLYPHNAME *)); - return 1; - } + if (glyphList == NULL) return 1; for (i = 0; i < glyphListSize; ++i) glyphList[i] = PSDRV_AGLGlyphNames + i; @@ -82,12 +78,7 @@ inline static INT GlyphListInsert(LPCSTR GLYPHNAME *g; g = HeapAlloc(PSDRV_Heap, 0, sizeof(GLYPHNAME) + strlen(szName) + 1); - if (g == NULL) - { - ERR("Failed to allocate %i bytes of memory\n", - sizeof(GLYPHNAME) + strlen(szName) + 1); - return -1; - } + if (g == NULL) return -1; g->index = -1; g->sz = (LPSTR)(g + 1); @@ -101,8 +92,6 @@ inline static INT GlyphListInsert(LPCSTR (glyphListSize + GLYPHLIST_ALLOCSIZE) * sizeof(GLYPHNAME *)); if (newGlyphList == NULL) { - ERR("Failed to allocate %i bytes of memory\n", (glyphListSize + - GLYPHLIST_ALLOCSIZE) * sizeof (GLYPHNAME *)); HeapFree(PSDRV_Heap, 0, g); return -1; } diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 08ab4b5..8fd40a2 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -535,11 +535,7 @@ static INT PSDRV_AddSlot(PPD *ppd, LPSTR insert = &((*insert)->next); slot = *insert = HeapAlloc(PSDRV_Heap, HEAP_ZERO_MEMORY, sizeof(INPUTSLOT)); - if (!slot) - { - ERR("Failed to allocate %i bytes of memory\n", sizeof(INPUTSLOT)); - return 1; - } + if (!slot) return 1; slot->Name = szName; slot->FullName = szFullName;

1 0

Alexandre Julliard : user32: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 2864377793f04ae5608e59d29d40314dbe15873d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2864377793f04ae5608e59d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:11:36 2006 +0200 user32: Don't use sizeof in traces to avoid printf format warnings. --- dlls/user/dde_misc.c | 2 +- dlls/user/message.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/user/dde_misc.c b/dlls/user/dde_misc.c index f5c9d91..57721c2 100644 --- a/dlls/user/dde_misc.c +++ b/dlls/user/dde_misc.c @@ -1529,7 +1529,7 @@ HDDEDATA WDML_Global2DataHandle(H } else { - ERR("Wrong count: %lu / %d\n", size, sizeof(BITMAP) + count); + ERR("Wrong count: %lu / %d\n", size, count); } } else ERR("No bitmap header\n"); break; diff --git a/dlls/user/message.c b/dlls/user/message.c index d2af2bd..fde5fba 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -1450,7 +1450,6 @@ static BOOL unpack_dde_message( HWND hwn case WM_DDE_POKE: if ((!buffer || !*buffer) && message != WM_DDE_DATA) return FALSE; uiHi = *lparam; - TRACE( "recv ddepack %u %x\n", size, uiHi ); if (size) { if (!(hMem = GlobalAlloc( GMEM_MOVEABLE|GMEM_DDESHARE, size ))) @@ -2032,9 +2031,6 @@ static BOOL peek_message( MSG *msg, HWND if (!unpack_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, &info.msg.lParam, &buffer, size )) { - ERR( "invalid packed message %x (%s) hwnd %p wp %x lp %lx size %d\n", - info.msg.message, SPY_GetMsgName(info.msg.message, info.msg.hwnd), info.msg.hwnd, - info.msg.wParam, info.msg.lParam, size ); /* ignore it */ reply_message( &info, 0, TRUE ); goto next; @@ -2055,12 +2051,7 @@ static BOOL peek_message( MSG *msg, HWND { if (!unpack_dde_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, &info.msg.lParam, &buffer, size )) - { - ERR( "invalid packed dde-message %x (%s) hwnd %p wp %x lp %lx size %d\n", - info.msg.message, SPY_GetMsgName(info.msg.message, info.msg.hwnd), - info.msg.hwnd, info.msg.wParam, info.msg.lParam, size ); goto next; /* ignore it */ - } } *msg = info.msg; HeapFree( GetProcessHeap(), 0, buffer ); @@ -2246,7 +2237,7 @@ static LRESULT retrieve_reply( const str { if (!(reply_data = HeapAlloc( GetProcessHeap(), 0, reply_size ))) { - WARN( "no memory for reply %d bytes, will be truncated\n", reply_size ); + WARN( "no memory for reply, will be truncated\n" ); reply_size = 0; } }

1 0

Alexandre Julliard : rpcrt4: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 2a91838f0cb7fd40968aeb72e660f1af3e0a4490 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a91838f0cb7fd40968aeb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:11:28 2006 +0200 rpcrt4: Don't use sizeof in traces to avoid printf format warnings. --- dlls/rpcrt4/rpc_message.c | 2 +- dlls/rpcrt4/rpc_transport.c | 6 +++--- dlls/rpcrt4/rpcss_np_client.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index bd4b824..06b17d3 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -485,7 +485,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection /* read packet common header */ dwRead = rpcrt4_conn_read(Connection, &common_hdr, sizeof(common_hdr)); if (dwRead != sizeof(common_hdr)) { - WARN("Short read of header, %ld/%d bytes\n", dwRead, sizeof(common_hdr)); + WARN("Short read of header, %ld bytes\n", dwRead); status = RPC_S_PROTOCOL_ERROR; goto fail; } diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index e32e8c2..6247362 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -317,7 +317,7 @@ static RPC_STATUS rpcrt4_ncacn_np_parse_ const twr_empty_floor_t *smb_floor = (const twr_empty_floor_t *)tower_data; const twr_empty_floor_t *nb_floor; - TRACE("(%p, %d, %p, %p)\n", tower_data, tower_size, networkaddr, endpoint); + TRACE("(%p, %d, %p, %p)\n", tower_data, (int)tower_size, networkaddr, endpoint); if (tower_size < sizeof(*smb_floor)) return EPT_S_NOT_REGISTERED; @@ -408,7 +408,7 @@ static RPC_STATUS rpcrt4_ncalrpc_parse_t { const twr_empty_floor_t *pipe_floor = (const twr_empty_floor_t *)tower_data; - TRACE("(%p, %d, %p, %p)\n", tower_data, tower_size, networkaddr, endpoint); + TRACE("(%p, %d, %p, %p)\n", tower_data, (int)tower_size, networkaddr, endpoint); *networkaddr = NULL; *endpoint = NULL; @@ -642,7 +642,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_pa const twr_ipv4_floor_t *ipv4_floor; struct in_addr in_addr; - TRACE("(%p, %d, %p, %p)\n", tower_data, tower_size, networkaddr, endpoint); + TRACE("(%p, %d, %p, %p)\n", tower_data, (int)tower_size, networkaddr, endpoint); if (tower_size < sizeof(*tcp_floor)) return EPT_S_NOT_REGISTERED; diff --git a/dlls/rpcrt4/rpcss_np_client.c b/dlls/rpcrt4/rpcss_np_client.c index 86d0be5..cace57c 100644 --- a/dlls/rpcrt4/rpcss_np_client.c +++ b/dlls/rpcrt4/rpcss_np_client.c @@ -145,7 +145,7 @@ BOOL RPCRT4_SendReceiveNPMsg(HANDLE np, } if (count != sizeof(RPCSS_NP_REPLY)) { - ERR("read count mismatch. got %ld, expected %u.\n", count, sizeof(RPCSS_NP_REPLY)); + ERR("read count mismatch. got %ld.\n", count); return FALSE; }

1 0

Alexandre Julliard : ole32: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 96ad688174cfe06c979176b657c8b16c62da4c63 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=96ad688174cfe06c979176b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:11:15 2006 +0200 ole32: Don't use sizeof in traces to avoid printf format warnings. --- dlls/ole32/oleproxy.c | 2 +- dlls/ole32/stg_prop.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 4e2ebb9..fddbf54 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -159,7 +159,7 @@ CFStub_Invoke( ULONG res; if (msg->cbBuffer < sizeof(IID)) { - FIXME("Not enough bytes in buffer (%ld instead of %d)?\n",msg->cbBuffer,sizeof(IID)); + FIXME("Not enough bytes in buffer (%ld)?\n",msg->cbBuffer); return E_FAIL; } memcpy(&iid,msg->Buffer,sizeof(iid)); diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 1933f83..ac4a6b6 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1159,7 +1159,7 @@ static HRESULT PropertyStorage_ReadHeade { if (count != sizeof(buf)) { - WARN("read %ld, expected %d\n", count, sizeof(buf)); + WARN("read only %ld\n", count); hr = STG_E_INVALIDHEADER; } else @@ -1194,7 +1194,7 @@ static HRESULT PropertyStorage_ReadFmtId { if (count != sizeof(buf)) { - WARN("read %ld, expected %d\n", count, sizeof(buf)); + WARN("read only %ld\n", count); hr = STG_E_INVALIDHEADER; } else @@ -1223,7 +1223,7 @@ static HRESULT PropertyStorage_ReadSecti { if (count != sizeof(buf)) { - WARN("read %ld, expected %d\n", count, sizeof(buf)); + WARN("read only %ld\n", count); hr = STG_E_INVALIDHEADER; } else @@ -1325,8 +1325,7 @@ static HRESULT PropertyStorage_ReadFromS /* The section size includes the section header, so check it */ if (sectionHdr.cbSection < sizeof(PROPERTYSECTIONHEADER)) { - WARN("section header too small, got %ld, expected at least %d\n", - sectionHdr.cbSection, sizeof(PROPERTYSECTIONHEADER)); + WARN("section header too small, got %ld\n", sectionHdr.cbSection); hr = STG_E_INVALIDHEADER; goto end; }

1 0

Alexandre Julliard : netapi32: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: a62dca587417502cfd2a799143fba0c058a90068 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a62dca587417502cfd2a799… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:11:04 2006 +0200 netapi32: Don't use sizeof in traces to avoid printf format warnings. --- dlls/netapi32/netbios.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c index 1dd0f01..71b7105 100644 --- a/dlls/netapi32/netbios.c +++ b/dlls/netapi32/netbios.c @@ -135,8 +135,7 @@ BOOL NetBIOSRegisterTransport(ULONG id, ret = FALSE; else if (gNumTransports >= sizeof(gTransports) / sizeof(gTransports[0])) { - FIXME("You tried to add %d transports, but I only have space for %d\n", - gNumTransports + 1, sizeof(gTransports) / sizeof(gTransports[0])); + FIXME("Too many transports %d\n", gNumTransports + 1); ret = FALSE; } else

1 0

Alexandre Julliard : msvfw32: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 348fd746d929257ce4656334bf4be26b71d5e081 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=348fd746d929257ce465633… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:10:57 2006 +0200 msvfw32: Don't use sizeof in traces to avoid printf format warnings. --- dlls/msvfw32/msvideo_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 5aa050a..a6d90ff 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1374,7 +1374,7 @@ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVA if (pc->cbState != sizeof(ICCOMPRESS)) { - ERR("Invalid cbState (%li should be %i)\n", pc->cbState, sizeof(ICCOMPRESS)); + ERR("Invalid cbState %li\n", pc->cbState); return NULL; }

1 0

Alexandre Julliard : mciseq: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 5784ca9bcafddb39135c69e16f2c900c09003ae6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5784ca9bcafddb39135c69e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:10:47 2006 +0200 mciseq: Don't use sizeof in traces to avoid printf format warnings. --- dlls/mciseq/mcimidi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index fcf30e8..e7c215c 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -400,7 +400,7 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMI len = mmt->wEventLength - HIWORD(mmt->dwEventData); if (len >= sizeof(buf)) { - WARN("Buffer for text is too small (%d bytes, when %u are needed)\n", sizeof(buf) - 1, len); + WARN("Buffer for text is too small (%u are needed)\n", len); len = sizeof(buf) - 1; } if (mmioRead(wmm->hFile, (HPSTR)buf, len) == len) { @@ -1049,7 +1049,7 @@ static DWORD MIDI_mciPlay(UINT wDevID, D WORD idx = HIBYTE(LOWORD(mmt->dwEventData)); if (len >= sizeof(buf)) { - WARN("Buffer for text is too small (%d bytes, when %u are needed)\n", sizeof(buf) - 1, len); + WARN("Buffer for text is too small (%u are needed)\n", len); len = sizeof(buf) - 1; } if (mmioRead(wmm->hFile, (HPSTR)buf, len) == len) {

1 0

Alexandre Julliard : dsound: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: bc99ac09d3c0d87ba95f7163737898a18dd5624a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc99ac09d3c0d87ba95f716… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:10:32 2006 +0200 dsound: Don't use sizeof in traces to avoid printf format warnings. --- dlls/dsound/buffer.c | 2 +- dlls/dsound/capture.c | 6 ++---- dlls/dsound/dsound.c | 3 +-- dlls/dsound/primary.c | 2 +- dlls/dsound/sound3d.c | 7 +++---- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 0fa98b2..13b6b33 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -873,7 +873,7 @@ static HRESULT WINAPI IDirectSoundBuffer } if (caps->dwSize < sizeof(*caps)) { - WARN("invalid parameter: caps->dwSize = %ld < %d\n",caps->dwSize, sizeof(*caps)); + WARN("invalid parameter: caps->dwSize = %ld\n",caps->dwSize); return DSERR_INVALIDPARAM; } diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index b1cef59..8a46a18 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -508,8 +508,7 @@ HRESULT WINAPI IDirectSoundCaptureImpl_G } if (lpDSCCaps->dwSize < sizeof(*lpDSCCaps)) { - WARN("invalid parameter: lpDSCCaps->dwSize = %ld < %d\n", - lpDSCCaps->dwSize, sizeof(*lpDSCCaps)); + WARN("invalid parameter: lpDSCCaps->dwSize = %ld\n", lpDSCCaps->dwSize); return DSERR_INVALIDPARAM; } @@ -816,8 +815,7 @@ IDirectSoundCaptureBufferImpl_GetCaps( } if (lpDSCBCaps->dwSize < sizeof(DSCBCAPS)) { - WARN("invalid parameter: lpDSCBCaps->dwSize = %ld < %d\n", - lpDSCBCaps->dwSize, sizeof(DSCBCAPS)); + WARN("invalid parameter: lpDSCBCaps->dwSize = %ld\n", lpDSCBCaps->dwSize); return DSERR_INVALIDPARAM; } diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 25715dd..52faf5d 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1239,8 +1239,7 @@ HRESULT DirectSoundDevice_GetCaps( /* check if there is enough room */ if (lpDSCaps->dwSize < sizeof(*lpDSCaps)) { - WARN("invalid parameter: lpDSCaps->dwSize = %ld < %d\n", - lpDSCaps->dwSize, sizeof(*lpDSCaps)); + WARN("invalid parameter: lpDSCaps->dwSize = %ld\n", lpDSCaps->dwSize); return DSERR_INVALIDPARAM; } diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 8faa38c..5a91bea 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -938,7 +938,7 @@ static HRESULT WINAPI PrimaryBufferImpl_ } if (caps->dwSize < sizeof(*caps)) { - WARN("invalid parameter: caps->dwSize = %ld: < %d\n", caps->dwSize, sizeof(*caps)); + WARN("invalid parameter: caps->dwSize = %ld\n", caps->dwSize); return DSERR_INVALIDPARAM; } diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index f0c2483..72fbc59 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -400,7 +400,7 @@ static HRESULT WINAPI IDirectSound3DBuff } if (lpDs3dBuffer->dwSize < sizeof(*lpDs3dBuffer)) { - WARN("invalid parameter: lpDs3dBuffer->dwSize = %ld < %d\n",lpDs3dBuffer->dwSize, sizeof(*lpDs3dBuffer)); + WARN("invalid parameter: lpDs3dBuffer->dwSize = %ld\n",lpDs3dBuffer->dwSize); return DSERR_INVALIDPARAM; } @@ -516,8 +516,7 @@ static HRESULT WINAPI IDirectSound3DBuff } if (lpcDs3dBuffer->dwSize != sizeof(DS3DBUFFER)) { - WARN("invalid parameter: lpcDs3dBuffer->dwSize = %ld != %d\n", - lpcDs3dBuffer->dwSize, sizeof(DS3DBUFFER)); + WARN("invalid parameter: lpcDs3dBuffer->dwSize = %ld\n", lpcDs3dBuffer->dwSize); return status; } @@ -835,7 +834,7 @@ static HRESULT WINAPI IDirectSound3DList } if (lpDS3DL->dwSize < sizeof(*lpDS3DL)) { - WARN("invalid parameter: lpDS3DL->dwSize = %ld < %d\n",lpDS3DL->dwSize, sizeof(*lpDS3DL)); + WARN("invalid parameter: lpDS3DL->dwSize = %ld\n",lpDS3DL->dwSize); return DSERR_INVALIDPARAM; }

1 0

Alexandre Julliard : kernel32: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 1c66c611a118c1cfec5ee278ee117c5a6ddb27be URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1c66c611a118c1cfec5ee27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:10:39 2006 +0200 kernel32: Don't use sizeof in traces to avoid printf format warnings. --- dlls/kernel/format_msg.c | 10 ++++------ dlls/kernel/toolhelp.c | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/kernel/format_msg.c b/dlls/kernel/format_msg.c index 375c5da..26ffcec 100644 --- a/dlls/kernel/format_msg.c +++ b/dlls/kernel/format_msg.c @@ -138,6 +138,7 @@ DWORD WINAPI FormatMessageA( va_list* _args ) { LPDWORD args=(LPDWORD)_args; + DWORD ret = 0; #if defined(__i386__) || defined(__sparc__) /* This implementation is completely dependent on the format of the va_list on x86 CPUs */ LPSTR target,t; @@ -331,13 +332,10 @@ #define ADD_TO_T(c) do { \ } HeapFree(GetProcessHeap(),0,target); HeapFree(GetProcessHeap(),0,from); - TRACE("-- returning %d\n", (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? strlen(*(LPSTR*)lpBuffer):strlen(lpBuffer)); - return (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? - strlen(*(LPSTR*)lpBuffer): - strlen(lpBuffer); -#else - return 0; + ret = (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? strlen(*(LPSTR*)lpBuffer) : strlen(lpBuffer); #endif /* __i386__ */ + TRACE("-- returning %ld\n", ret); + return ret; } #undef ADD_TO_T diff --git a/dlls/kernel/toolhelp.c b/dlls/kernel/toolhelp.c index 47b63a3..2a3cba2 100644 --- a/dlls/kernel/toolhelp.c +++ b/dlls/kernel/toolhelp.c @@ -501,7 +501,7 @@ static BOOL module_nextW( HANDLE hSnapSh if (lpme->dwSize < sizeof (MODULEENTRY32W)) { SetLastError( ERROR_INSUFFICIENT_BUFFER ); - WARN("Result buffer too small (req: %d, was: %ld)\n", sizeof(MODULEENTRY32W), lpme->dwSize); + WARN("Result buffer too small (was: %ld)\n", lpme->dwSize); return FALSE; } if ((snap = MapViewOfFile( hSnapShot, FILE_MAP_ALL_ACCESS, 0, 0, 0 ))) @@ -553,7 +553,7 @@ static BOOL module_nextA( HANDLE handle, if (lpme->dwSize < sizeof(MODULEENTRY32)) { SetLastError( ERROR_INSUFFICIENT_BUFFER ); - WARN("Result buffer too small (req: %d, was: %ld)\n", sizeof(MODULEENTRY32), lpme->dwSize); + WARN("Result buffer too small (was: %ld)\n", lpme->dwSize); return FALSE; }

1 0