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

Alexandre Julliard : dplayx: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 9f37cd55bc0ede48fa6b2399b6beb885bfe3b9eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f37cd55bc0ede48fa6b239… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:10:21 2006 +0200 dplayx: Don't use sizeof in traces to avoid printf format warnings. --- dlls/dplayx/dplayx_global.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index c55680c..942578d 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -867,8 +867,7 @@ ( DWORD dwFlags, /* Store information */ if( lpConn->dwSize != sizeof(DPLCONNECTION) ) { - ERR(": old/new DPLCONNECTION type? Size=%08lx vs. expected=%ul bytes\n", - lpConn->dwSize, sizeof( DPLCONNECTION ) ); + ERR(": old/new DPLCONNECTION type? Size=%08lx\n", lpConn->dwSize ); return DPERR_INVALIDPARAMS; } @@ -888,8 +887,7 @@ ( DWORD dwFlags, { DPLAYX_ReleaseSemaphore(); - ERR("DPSESSIONDESC passed in? Size=%lu vs. expected=%u bytes\n", - lpConn->lpSessionDesc->dwSize, sizeof( DPSESSIONDESC2 ) ); + ERR("DPSESSIONDESC passed in? Size=%lu\n", lpConn->lpSessionDesc->dwSize ); return DPERR_INVALIDPARAMS; } @@ -931,8 +929,7 @@ ( DWORD dwFlags, /* Store information */ if( lpConn->dwSize != sizeof(DPLCONNECTION) ) { - ERR(": old/new DPLCONNECTION type? Size=%lu vs. expected=%u bytes\n", - lpConn->dwSize, sizeof( DPLCONNECTION ) ); + ERR(": old/new DPLCONNECTION type? Size=%lu\n", lpConn->dwSize ); return DPERR_INVALIDPARAMS; }

1 0

Alexandre Julliard : dmstyle: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 1b469c2482eec0a84574a6d02f977d075d40d14c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1b469c2482eec0a84574a6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:10:12 2006 +0200 dmstyle: Don't use sizeof in traces to avoid printf format warnings. --- dlls/dmstyle/commandtrack.c | 2 +- dlls/dmstyle/style.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 9e0ecc4..de7913f 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -264,7 +264,7 @@ static HRESULT WINAPI IDirectMusicComman TRACE_(dmfile)(": command track chunk\n"); IStream_Read (pStm, &dwSizeOfStruct, sizeof(DWORD), NULL); if (dwSizeOfStruct != sizeof(DMUS_IO_COMMAND)) { - TRACE_(dmfile)(": declared size of struct (=%ld) != actual size (=%i); indicates older direct music version\n", dwSizeOfStruct, sizeof(DMUS_IO_COMMAND)); + TRACE_(dmfile)(": declared size of struct (=%ld) != actual size; indicates older direct music version\n", dwSizeOfStruct); } chunkSize -= sizeof(DWORD); /* now chunk size is one DWORD shorter */ nrCommands = chunkSize/dwSizeOfStruct; /* and this is the number of commands */ diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index dd3fdc5..9987e0d 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -588,13 +588,13 @@ static HRESULT IDirectMusicStyle8Impl_IP TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_PART_CHUNK: { - TRACE_(dmfile)(": Part chunk (skipping for now) (sizeof %u)\n", sizeof(DMUS_IO_STYLEPART)); + TRACE_(dmfile)(": Part chunk (skipping for now)\n" ); liMove.QuadPart = Chunk.dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } case DMUS_FOURCC_NOTE_CHUNK: { - TRACE_(dmfile)(": Note chunk (skipping for now) (sizeof %u)\n", sizeof(DMUS_IO_STYLENOTE)); + TRACE_(dmfile)(": Note chunk (skipping for now)\n"); IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); @@ -610,7 +610,7 @@ static HRESULT IDirectMusicStyle8Impl_IP break; } case DMUS_FOURCC_CURVE_CHUNK: { - TRACE_(dmfile)(": Curve chunk (skipping for now) (sizeof %u)\n", sizeof(DMUS_IO_STYLECURVE)); + TRACE_(dmfile)(": Curve chunk (skipping for now)\n"); IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); TRACE_(dmfile)(" - dwSize: %lu\n", dwSize);

1 0

Alexandre Julliard : dinput: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 7ad5f9eca048647ad007fea22bf2ea01a31982dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ad5f9eca048647ad007fea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:09:55 2006 +0200 dinput: Don't use sizeof in traces to avoid printf format warnings. --- dlls/dinput/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 5211782..d8924d3 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -189,11 +189,11 @@ void _dump_DIDATAFORMAT(const DIDATAFORM TRACE("Dumping DIDATAFORMAT structure:\n"); TRACE(" - dwSize: %ld\n", df->dwSize); if (df->dwSize != sizeof(DIDATAFORMAT)) { - WARN("Non-standard DIDATAFORMAT structure size (%ld instead of %d).\n", df->dwSize, sizeof(DIDATAFORMAT)); + WARN("Non-standard DIDATAFORMAT structure size %ld\n", df->dwSize); } TRACE(" - dwObjsize: %ld\n", df->dwObjSize); if (df->dwObjSize != sizeof(DIOBJECTDATAFORMAT)) { - WARN("Non-standard DIOBJECTDATAFORMAT structure size (%ld instead of %d).\n", df->dwObjSize, sizeof(DIOBJECTDATAFORMAT)); + WARN("Non-standard DIOBJECTDATAFORMAT structure size %ld\n", df->dwObjSize); } TRACE(" - dwFlags: 0x%08lx (", df->dwFlags); switch (df->dwFlags) {

1 0

Alexandre Julliard : d3d9: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 43743282713b66a0f91813889218f8f0b0d61f16 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=43743282713b66a0f918138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:09:46 2006 +0200 d3d9: Don't use sizeof in traces to avoid printf format warnings. --- dlls/d3d9/stateblock.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 5877b76..15400dd 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -106,10 +106,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Crea TRACE("(%p) Relay\n", This); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DStateBlock9Impl)); - if (NULL == object) { - FIXME("(%p) Failed to allocate %d bytes\n", This, sizeof(IDirect3DStateBlock9Impl)); - return E_OUTOFMEMORY; - } + if (NULL == object) return E_OUTOFMEMORY; object->lpVtbl = &Direct3DStateBlock9_Vtbl; object->ref = 1; @@ -151,10 +148,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_En } /* allocate a new IDirectD3DStateBlock */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY ,sizeof(IDirect3DStateBlock9Impl)); - if (!object) { - FIXME("(%p) Failed to allocate %d bytes\n", This, sizeof(IDirect3DStateBlock9Impl)); - return E_OUTOFMEMORY; - } + if (!object) return E_OUTOFMEMORY; object->ref = 1; object->lpVtbl = &Direct3DStateBlock9_Vtbl; object->wineD3DStateBlock = wineD3DStateBlock;

1 0

Alexandre Julliard : d3d8: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 7bf49faf23baa4efb7472abdaa5af5bc81b99e70 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7bf49faf23baa4efb7472ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:09:36 2006 +0200 d3d8: Don't use sizeof in traces to avoid printf format warnings. --- dlls/d3d8/device.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 708d9bf..92cd874 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -825,7 +825,6 @@ static HRESULT WINAPI IDirect3DDevice8Im object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DStateBlock8Impl)); if (NULL == object) { - FIXME("(%p) Failed to allocate %d bytes\n", This, sizeof(IDirect3DStateBlock8Impl)); *pToken = 0; return E_OUTOFMEMORY; }

1 0

Alexandre Julliard : comdlg32: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: aeae92e9f9fccbef479c5d84ef8d084700342f48 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aeae92e9f9fccbef479c5d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:09:24 2006 +0200 comdlg32: Don't use sizeof in traces to avoid printf format warnings. --- dlls/comdlg32/printdlg16.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/printdlg16.c b/dlls/comdlg32/printdlg16.c index fc55bd7..9d5f9dc 100644 --- a/dlls/comdlg32/printdlg16.c +++ b/dlls/comdlg32/printdlg16.c @@ -363,7 +363,7 @@ BOOL16 WINAPI PrintDlg16( } if(lppd->lStructSize != sizeof(PRINTDLG16)) { - ERR("structure size (%ld/%d)\n",lppd->lStructSize,sizeof(PRINTDLG16)); + ERR("structure size %ld\n",lppd->lStructSize); COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE); return FALSE; }

1 0

Alexandre Julliard : comctl32: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 03e2b335c491a1f601f4a919977a66fb2d99f82e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03e2b335c491a1f601f4a91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:09:16 2006 +0200 comctl32: Don't use sizeof in traces to avoid printf format warnings. --- dlls/comctl32/propsheet.c | 7 ++++--- dlls/comctl32/tests/mru.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 66f88cc..f21852c 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1248,6 +1248,7 @@ static UINT GetTemplateSize(DLGTEMPLATE* const WORD* p = (const WORD *)pTemplate; BOOL istemplateex = (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF); WORD nrofitems; + UINT ret; if (istemplateex) { @@ -1363,9 +1364,9 @@ static UINT GetTemplateSize(DLGTEMPLATE* --nrofitems; } - TRACE("%p %p size 0x%08x\n",p, (WORD*)pTemplate,sizeof(WORD)*(p - (WORD*)pTemplate)); - return (p - (WORD*)pTemplate)*sizeof(WORD); - + ret = (p - (WORD*)pTemplate) * sizeof(WORD); + TRACE("%p %p size 0x%08x\n", p, pTemplate, ret); + return ret; } /****************************************************************************** diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index c8776d6..5b51736 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -100,7 +100,7 @@ static void check_reg_entries(const char char buff[128]; HKEY hKey = NULL; DWORD type, size, ret; - size_t i; + unsigned int i; ok(!RegOpenKeyA(HKEY_CURRENT_USER, REG_TEST_FULLKEY, &hKey), "Couldn't open test key \"%s\"\n", REG_TEST_FULLKEY);

1 0

Alexandre Julliard : advapi32: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 553bb2591f2f0a61e310967b5903bc2dfea5a0c6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=553bb2591f2f0a61e310967… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:09:02 2006 +0200 advapi32: Don't use sizeof in traces to avoid printf format warnings. --- dlls/advapi32/service.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index cd12416..08adf89 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -511,7 +511,7 @@ static BOOL service_get_status(HANDLE pi r = ReadFile( pipe, status, sizeof *status, &count, NULL ); if (!r || count != sizeof *status) ERR("service protocol error - failed to read pipe " - "r = %d count = %ld/%d!\n", r, count, sizeof *status); + "r = %d count = %ld!\n", r, count); return r; } @@ -534,7 +534,7 @@ static BOOL service_send_control(HANDLE r = ReadFile(pipe, result, sizeof *result, &count, NULL); if (!r || count != sizeof *result) ERR("service protocol error - failed to read pipe " - "r = %d count = %ld/%d!\n", r, count, sizeof *result); + "r = %d count = %ld!\n", r, count); return r; }

1 0

Alexandre Julliard : winmm/tests: Don't use sizeof in ok() to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 82a404a077c190c4a1a072420c8142778ccc3280 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=82a404a077c190c4a1a0724… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:04:07 2006 +0200 winmm/tests: Don't use sizeof in ok() to avoid printf format warnings. --- dlls/winmm/tests/capture.c | 3 +-- dlls/winmm/tests/wave.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index e3d3044..c0e18d0 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -375,8 +375,7 @@ #endif ok(rc==MMSYSERR_NOERROR,"waveInMessage(%s): failed to get interface " "name: rc=%s\n",dev_name(device),wave_in_error(rc)); ok(lstrlenW(nameW)+1==size/sizeof(WCHAR), - "got an incorrect size: %ld instead of %d\n", - size,(lstrlenW(nameW)+1)*sizeof(WCHAR)); + "got an incorrect size %ld\n", size); if (rc==MMSYSERR_NOERROR) { nameA = malloc(size/sizeof(WCHAR)); WideCharToMultiByte(CP_ACP, 0, nameW, size/sizeof(WCHAR), diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 3019472..3c447d2 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -873,8 +873,7 @@ #endif (DWORD_PTR)nameW, size); ok(rc==MMSYSERR_NOERROR,"waveOutMessage(%s): failed to get interface " "name, rc=%s\n",dev_name(device),wave_out_error(rc)); - ok(lstrlenW(nameW)+1==size/sizeof(WCHAR),"got an incorrect size: " - "%ld instead of %d\n",size,(lstrlenW(nameW)+1)*sizeof(WCHAR)); + ok(lstrlenW(nameW)+1==size/sizeof(WCHAR),"got an incorrect size %ld\n",size); if (rc==MMSYSERR_NOERROR) { nameA = malloc(size/sizeof(WCHAR)); WideCharToMultiByte(CP_ACP, 0, nameW, size/sizeof(WCHAR), nameA,

1 0

Alexandre Julliard : version/tests: Don't use sizeof in ok() to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 55d9045804f1ea53942fd0d3c1425e4d231b5f76 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=55d9045804f1ea53942fd0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:03:59 2006 +0200 version/tests: Don't use sizeof in ok() to avoid printf format warnings. --- dlls/version/tests/info.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index 8043ec8..b857b1d 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -350,15 +350,13 @@ #endif retA = VerQueryValueA( pVersionInfoA, rootA, (LPVOID *)&pBufA, &uiLengthA ); ok (retA, "VerQueryValueA failed: GetLastError = 0x%08lx\n", GetLastError()); - ok ( uiLengthA == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct (%d)\n", - uiLengthA, sizeof(VS_FIXEDFILEINFO)); + ok ( uiLengthA == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthA); if (is_unicode_enabled) { retW = VerQueryValueW( pVersionInfoW, rootW, (LPVOID *)&pBufW, &uiLengthW ); ok (retW, "VerQueryValueW failed: GetLastError = 0x%08lx\n", GetLastError()); - ok ( uiLengthA == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct (%d)\n", - uiLengthA, sizeof(VS_FIXEDFILEINFO)); + ok ( uiLengthA == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthA); ok( uiLengthA == uiLengthW, "The size of VS_FIXEDFILEINFO should be the same for both A/W calls, it is (%d) vs. (%d)\n", uiLengthA, uiLengthW);

1 0