January 2009 - Wine-commits

Alexandre Julliard : user32: Avoid a pointer cast in a trace.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 0128b10a3c0304a547d5340f64a750e3bbcf51c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0128b10a3c0304a547d5340f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:13:05 2009 +0100 user32: Avoid a pointer cast in a trace. --- dlls/user32/dialog16.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog16.c b/dlls/user32/dialog16.c index 4fcbef4..e529b2d 100644 --- a/dlls/user32/dialog16.c +++ b/dlls/user32/dialog16.c @@ -768,8 +768,8 @@ HWND16 WINAPI CreateDialogParam16( HINSTANCE16 hInst, LPCSTR dlgTemplate, HGLOBAL16 hmem; LPCVOID data; - TRACE("%04x,%s,%04x,%08x,%ld\n", - hInst, debugstr_a(dlgTemplate), owner, (DWORD)dlgProc, param ); + TRACE("%04x,%s,%04x,%p,%ld\n", + hInst, debugstr_a(dlgTemplate), owner, dlgProc, param ); if (!(hRsrc = FindResource16( hInst, dlgTemplate, (LPSTR)RT_DIALOG ))) return 0; if (!(hmem = LoadResource16( hInst, hRsrc ))) return 0;

1 0

Alexandre Julliard : imm32: Avoid pointer casts in traces.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 55d243d4153875b7f5cd14705b7f70d41d89f491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d243d4153875b7f5cd14705… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:12:55 2009 +0100 imm32: Avoid pointer casts in traces. --- dlls/imm32/imm.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 74d71d9..2299f20 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -108,7 +108,7 @@ static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I',' static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; -static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','x',0}; +static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; #define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) @@ -279,7 +279,7 @@ static ImmHkl *IMM_GetImmHkl(HKL hkl) ImmHkl *ptr; WCHAR filename[MAX_PATH]; - TRACE("Seeking ime for keyboard 0x%x\n",(unsigned)hkl); + TRACE("Seeking ime for keyboard %p\n",hkl); LIST_FOR_EACH_ENTRY(ptr, &ImmHklList, ImmHkl, entry) { @@ -658,7 +658,7 @@ HIMC WINAPI ImmCreateContext(void) } new_context->immKbd->uSelected++; - TRACE("Created context 0x%x\n",(UINT)new_context); + TRACE("Created context %p\n",new_context); return new_context; } @@ -1480,7 +1480,7 @@ BOOL WINAPI ImmGetConversionStatus( */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { - TRACE("Default is %x\n",(unsigned)IMM_GetThreadData()->hwndDefault); + TRACE("Default is %p\n",IMM_GetThreadData()->hwndDefault); return IMM_GetThreadData()->hwndDefault; } @@ -1597,7 +1597,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) DWORD rc; WCHAR regKey[sizeof(szImeRegFmt)/sizeof(WCHAR)+8]; - wsprintfW( regKey, szImeRegFmt, (unsigned)hKL ); + wsprintfW( regKey, szImeRegFmt, (ULONG_PTR)hKL ); rc = RegOpenKeyW( HKEY_LOCAL_MACHINE, regKey, &hkey); if (rc != ERROR_SUCCESS) { @@ -1819,8 +1819,8 @@ HKL WINAPI ImmInstallIMEW( { DWORD disposition = 0; - hkl = (HKL)(((0xe000|count)<<16) | lcid); - wsprintfW( regKey, szImeRegFmt, (unsigned)hkl); + hkl = (HKL)MAKELPARAM( lcid, 0xe000 | count ); + wsprintfW( regKey, szImeRegFmt, (ULONG_PTR)hkl); rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, regKey, 0, NULL, 0, KEY_WRITE, NULL, &hkey, &disposition); if (rc == ERROR_SUCCESS && disposition == REG_CREATED_NEW_KEY)

1 0

Alexandre Julliard : msvcrt: Avoid size_t in printf format.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: a494b13abefbe39ae05b685a68fbd6de3f6fcba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a494b13abefbe39ae05b685a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:12:24 2009 +0100 msvcrt: Avoid size_t in printf format. --- dlls/msvcrt/wcs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9506a80..37004cf 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -683,9 +683,9 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis flags.PadZero = 0; if( flags.Alternate ) - sprintf(pointer, "0X%0*lX", 2 * sizeof(ptr), (ULONG_PTR)ptr); + sprintf(pointer, "0X%0*lX", 2 * (int)sizeof(ptr), (ULONG_PTR)ptr); else - sprintf(pointer, "%0*lX", 2 * sizeof(ptr), (ULONG_PTR)ptr); + sprintf(pointer, "%0*lX", 2 * (int)sizeof(ptr), (ULONG_PTR)ptr); r = pf_output_format_A( out, pointer, -1, &flags ); }

1 0

Alexandre Julliard : dsound: Avoid a pointer cast in a trace.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: dedf5e49ba60ad16136fa0a6f51cac2c40ab02c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dedf5e49ba60ad16136fa0a6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:12:46 2009 +0100 dsound: Avoid a pointer cast in a trace. --- dlls/dsound/duplex.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 32002a8..1fe6bbc 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -676,9 +676,9 @@ IDirectSoundFullDuplexImpl_Initialize( IDirectSoundFullDuplexImpl *This = (IDirectSoundFullDuplexImpl *)iface; IDirectSoundBufferImpl * dsb; - TRACE("(%p,%s,%s,%p,%p,%x,%x,%p,%p)\n", This, + TRACE("(%p,%s,%s,%p,%p,%p,%x,%p,%p)\n", This, debugstr_guid(pCaptureGuid), debugstr_guid(pRendererGuid), - lpDscBufferDesc, lpDsBufferDesc, (DWORD)hWnd, dwLevel, + lpDscBufferDesc, lpDsBufferDesc, hWnd, dwLevel, lplpDirectSoundCaptureBuffer8, lplpDirectSoundBuffer8); if (This->renderer_device != NULL || This->capture_device != NULL) {

1 0

Alexandre Julliard : dinput: Avoid size_t in traces.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: f6eb03d6c6f0816cfa9c38b84477638682f1269c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6eb03d6c6f0816cfa9c38b84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:12:08 2009 +0100 dinput: Avoid size_t in traces. --- dlls/dinput/effect_linuxinput.c | 6 ++---- dlls/dinput/joystick_linux.c | 8 ++------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 3395a37..eb6a2b5 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -119,8 +119,7 @@ static void _dump_DIEFFECT_flags(DWORD dwFlags) static void _dump_DIENVELOPE(LPCDIENVELOPE env) { if (env->dwSize != sizeof(DIENVELOPE)) { - WARN("Non-standard DIENVELOPE structure size (%d instead of %d).\n", - env->dwSize, sizeof(DIENVELOPE)); + WARN("Non-standard DIENVELOPE structure size %d.\n", env->dwSize); } TRACE("Envelope has attack (level: %d time: %d), fade (level: %d time: %d)\n", env->dwAttackLevel, env->dwAttackTime, env->dwFadeLevel, env->dwFadeTime); @@ -175,8 +174,7 @@ static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid) TRACE("Dumping DIEFFECT structure:\n"); TRACE(" - dwSize: %d\n", eff->dwSize); if ((eff->dwSize != sizeof(DIEFFECT)) && (eff->dwSize != sizeof(DIEFFECT_DX5))) { - WARN("Non-standard DIEFFECT structure size (%d instead of %d or %d).\n", - eff->dwSize, sizeof(DIEFFECT), sizeof(DIEFFECT_DX5)); + WARN("Non-standard DIEFFECT structure size %d\n", eff->dwSize); } TRACE(" - dwFlags: %d\n", eff->dwFlags); TRACE(" "); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index faef24f..e9b6916 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -1026,9 +1026,7 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceInfo( if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3A)) && (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA))) { - WARN("invalid parameter: pdidi->dwSize = %d != %d or %d\n", - pdidi->dwSize, sizeof(DIDEVICEINSTANCE_DX3A), - sizeof(DIDEVICEINSTANCEA)); + WARN("invalid parameter: pdidi->dwSize = %d\n", pdidi->dwSize); return DIERR_INVALIDPARAM; } @@ -1061,9 +1059,7 @@ static HRESULT WINAPI JoystickWImpl_GetDeviceInfo( if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3W)) && (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW))) { - WARN("invalid parameter: pdidi->dwSize = %d != %d or %d\n", - pdidi->dwSize, sizeof(DIDEVICEINSTANCE_DX3W), - sizeof(DIDEVICEINSTANCEW)); + WARN("invalid parameter: pdidi->dwSize = %d\n", pdidi->dwSize); return DIERR_INVALIDPARAM; }

1 0

Alexandre Julliard : user32/tests: Fix some integer to pointer conversion warnings.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: a0abde333b85e20648aa093fe5a595f0066d04c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0abde333b85e20648aa093fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:11:49 2009 +0100 user32/tests: Fix some integer to pointer conversion warnings. --- dlls/user32/tests/wsprintf.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index c0ca1c6..29e74cb 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -59,12 +59,12 @@ static void wsprintfWTest(void) static void CharUpperTest(void) { - int i,out,failed; + INT_PTR i,out,failed; failed = 0; for (i=0;i<256;i++) { - out = (int) CharUpper((LPTSTR)i); + out = (INT_PTR)CharUpper((LPTSTR)i); /* printf("%0x ",out); */ if ((out >> 16) != 0) { @@ -72,17 +72,17 @@ static void CharUpperTest(void) break; } } - ok(!failed,"CharUpper failed - 16bit input (0x%0x) returned 32bit result (0x%0x)\n",i,out); + ok(!failed,"CharUpper failed - 16bit input (0x%0lx) returned 32bit result (0x%0lx)\n",i,out); } static void CharLowerTest(void) { - int i,out,failed; + INT_PTR i,out,failed; failed = 0; for (i=0;i<256;i++) { - out = (int) CharLower((LPTSTR)i); + out = (INT_PTR)CharLower((LPTSTR)i); /* printf("%0x ",out); */ if ((out >> 16) != 0) { @@ -90,7 +90,7 @@ static void CharLowerTest(void) break; } } - ok(!failed,"CharLower failed - 16bit input (0x%0x) returned 32bit result (0x%0x)\n",i,out); + ok(!failed,"CharLower failed - 16bit input (0x%0lx) returned 32bit result (0x%0lx)\n",i,out); }

1 0

Alexandre Julliard : ntdll/tests: Fix a long long format in a trace.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: d637a552c058cc0cacc8379663fffe3d826df853 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d637a552c058cc0cacc837966… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:05:38 2009 +0100 ntdll/tests: Fix a long long format in a trace. --- dlls/ntdll/tests/string.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 6f4d85b..16c1192 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -621,11 +621,13 @@ static void one_ui64toa_test(int test_num, const ulonglong2str_t *ulonglong2str) dest_str[LARGE_STRI_BUFFER_LENGTH] = '\0'; result = p_ui64toa(ulonglong2str->value, dest_str, ulonglong2str->base); ok(result == dest_str, - "(test %d): _ui64toa(%Lu, [out], %d) has result %p, expected: %p\n", - test_num, ulonglong2str->value, ulonglong2str->base, result, dest_str); + "(test %d): _ui64toa(%08x%08x, [out], %d) has result %p, expected: %p\n", + test_num, (DWORD)(ulonglong2str->value >> 32), (DWORD)ulonglong2str->value, + ulonglong2str->base, result, dest_str); ok(memcmp(dest_str, ulonglong2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0, - "(test %d): _ui64toa(%Lu, [out], %d) assigns string \"%s\", expected: \"%s\"\n", - test_num, ulonglong2str->value, ulonglong2str->base, dest_str, ulonglong2str->Buffer); + "(test %d): _ui64toa(%08x%08x, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + test_num, (DWORD)(ulonglong2str->value >> 32), (DWORD)ulonglong2str->value, + ulonglong2str->base, dest_str, ulonglong2str->Buffer); }

1 0

Alexandre Julliard : msi/tests: Use CreateFile instead of OpenFile to avoid handle casts.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 35811a9078b742de36f2618d783ece78cfd8e540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35811a9078b742de36f2618d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:05:27 2009 +0100 msi/tests: Use CreateFile instead of OpenFile to avoid handle casts. --- dlls/msi/tests/db.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 4037ac6..d04823e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -5742,14 +5742,13 @@ static void test_noquotes(void) static void read_file_data(LPCSTR filename, LPSTR buffer) { - OFSTRUCT ofs; - HFILE file; + HANDLE file; DWORD read; - file = OpenFile(filename, &ofs, OF_READ); + file = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ); ZeroMemory(buffer, MAX_PATH); - ReadFile((HANDLE)file, buffer, MAX_PATH, &read, NULL); - CloseHandle((HANDLE)file); + ReadFile(file, buffer, MAX_PATH, &read, NULL); + CloseHandle(file); } static void test_forcecodepage(void)

1 0

Alexandre Julliard : kernel32/tests: Use _lclose instead of CloseHandle to avoid handle casts.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 1f83e7d9fd3aeba3943d1448857b5ad034facabe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f83e7d9fd3aeba3943d14488… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:05:16 2009 +0100 kernel32/tests: Use _lclose instead of CloseHandle to avoid handle casts. --- dlls/kernel32/tests/file.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index b4a0b98..abbb413 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -364,7 +364,7 @@ static void test__llseek( void ) bytes_read = _hread( filehandle, buffer, 1); ok( 1 == bytes_read, "file read size error\n" ); ok( buffer[0] == sillytext[27], "_llseek error, it got lost seeking\n" ); - ok( _llseek( filehandle, -400 * strlen( sillytext ), FILE_END ) != -1, "should be able to seek\n" ); + ok( _llseek( filehandle, -400 * (LONG)strlen( sillytext ), FILE_END ) != -1, "should be able to seek\n" ); bytes_read = _hread( filehandle, buffer, 1); ok( 1 == bytes_read, "file read size error\n" ); @@ -1845,8 +1845,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ret = CloseHandle((HANDLE)hFile); - ok( ret == TRUE, "CloseHandle() returns %d\n", ret ); + ret = _lclose(hFile); + ok( !ret, "_lclose() returns %d\n", ret ); retval = GetFileAttributesA(filename); ok( retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %d\n", GetLastError() ); @@ -1863,8 +1863,8 @@ static void test_OpenFile(void) "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); ok( lstrcmpiA(ofs.szPathName, buff) == 0, "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); - ret = CloseHandle((HANDLE)hFile); - ok( ret == TRUE, "CloseHandle() returns %d\n", ret ); + ret = _lclose(hFile); + ok( !ret, "_lclose() returns %d\n", ret ); memset(&ofs, 0xA5, sizeof(ofs)); SetLastError(0xfaceabee); @@ -1878,8 +1878,8 @@ static void test_OpenFile(void) "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); ok( lstrcmpiA(ofs.szPathName, buff) == 0, "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); - ret = CloseHandle((HANDLE)hFile); - ok( ret == TRUE, "CloseHandle() returns %d\n", ret ); + ret = _lclose(hFile); + ok( !ret, "_lclose() returns %d\n", ret ); memset(&ofs, 0xA5, sizeof(ofs)); SetLastError(0xfaceabee); @@ -1893,8 +1893,8 @@ static void test_OpenFile(void) "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); ok( lstrcmpiA(ofs.szPathName, buff) == 0, "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); - ret = CloseHandle((HANDLE)hFile); - ok( ret == TRUE, "CloseHandle() returns %d\n", ret ); + ret = _lclose(hFile); + ok( !ret, "_lclose() returns %d\n", ret ); memset(&ofs, 0xA5, sizeof(ofs)); SetLastError(0xfaceabee);

1 0

Alexandre Julliard : ws2_32/tests: Avoid printing pointer differences in traces.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: bc9df953fcbdc91c2ac200ef16df803087226b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9df953fcbdc91c2ac200ef1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:02:54 2009 +0100 ws2_32/tests: Avoid printing pointer differences in traces. --- dlls/ws2_32/tests/sock.c | 44 ++++++++++++++++++++------------------------ 1 files changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5250ccc..0b5cb88 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -225,16 +225,16 @@ static void fill_buffer ( char *buf, int chunk_size, int n_chunks ) memset ( p, c, chunk_size ); } -static char* test_buffer ( char *buf, int chunk_size, int n_chunks ) +static int test_buffer ( char *buf, int chunk_size, int n_chunks ) { char c, *p; int i; for ( c = FIRST_CHAR, p = buf; c < FIRST_CHAR + n_chunks; c++, p += chunk_size ) { for ( i = 0; i < chunk_size; i++ ) - if ( p[i] != c ) return p + i; + if ( p[i] != c ) return i; } - return NULL; + return -1; } /* @@ -403,9 +403,8 @@ static VOID WINAPI simple_server ( server_params *par ) { test_params *gen = par->general; server_memory *mem; - int n_recvd, n_sent, n_expected = gen->n_chunks * gen->chunk_size, tmp, i, + int pos, n_recvd, n_sent, n_expected = gen->n_chunks * gen->chunk_size, tmp, i, id = GetCurrentThreadId(); - char *p; trace ( "simple_server (%x) starting\n", id ); @@ -435,8 +434,8 @@ static VOID WINAPI simple_server ( server_params *par ) n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); ok ( n_recvd == n_expected, "simple_server (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); - p = test_buffer ( mem->sock[0].buf, gen->chunk_size, gen->n_chunks ); - ok ( p == NULL, "simple_server (%x): test pattern error: %d\n", id, p - mem->sock[0].buf); + pos = test_buffer ( mem->sock[0].buf, gen->chunk_size, gen->n_chunks ); + ok ( pos == -1, "simple_server (%x): test pattern error: %d\n", id, pos); /* Echo data back */ n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); @@ -463,7 +462,6 @@ static VOID WINAPI select_server ( server_params *par ) int n_expected = gen->n_chunks * gen->chunk_size, tmp, i, id = GetCurrentThreadId(), n_connections = 0, n_sent, n_recvd, n_set, delta, n_ready; - char *p; struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ fd_set fds_recv, fds_send, fds_openrecv, fds_opensend; @@ -531,8 +529,8 @@ static VOID WINAPI select_server ( server_params *par ) mem->sock[i].n_recvd += n_recvd; if ( mem->sock[i].n_recvd == n_expected ) { - p = test_buffer ( mem->sock[i].buf, gen->chunk_size, gen->n_chunks ); - ok ( p == NULL, "select_server (%x): test pattern error: %d\n", id, p - mem->sock[i].buf ); + int pos = test_buffer ( mem->sock[i].buf, gen->chunk_size, gen->n_chunks ); + ok ( pos == -1, "select_server (%x): test pattern error: %d\n", id, pos ); FD_CLR ( mem->sock[i].s, &fds_openrecv ); } @@ -593,8 +591,7 @@ static VOID WINAPI simple_client ( client_params *par ) { test_params *gen = par->general; client_memory *mem; - int n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; - char *p; + int pos, n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; id = GetCurrentThreadId(); trace ( "simple_client (%x): starting\n", id ); @@ -628,8 +625,8 @@ static VOID WINAPI simple_client ( client_params *par ) "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); /* check data */ - p = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); - ok ( p == NULL, "simple_client (%x): test pattern error: %d\n", id, p - mem->recv_buf); + pos = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); + ok ( pos == -1, "simple_client (%x): test pattern error: %d\n", id, pos); /* cleanup */ read_zero_bytes ( mem->s ); @@ -644,8 +641,7 @@ static VOID WINAPI simple_mixed_client ( client_params *par ) { test_params *gen = par->general; client_memory *mem; - int n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; - char *p; + int pos, n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; socklen_t fromLen = sizeof(mem->addr); struct sockaddr test; @@ -698,8 +694,8 @@ static VOID WINAPI simple_mixed_client ( client_params *par ) "0.0.0.0"), "lpFrom shouldn't be updated on connection oriented sockets\n"); /* check data */ - p = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); - ok ( p == NULL, "simple_client (%x): test pattern error: %d\n", id, p - mem->recv_buf); + pos = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); + ok ( pos == -1, "simple_client (%x): test pattern error: %d\n", id, pos); /* cleanup */ read_zero_bytes ( mem->s ); @@ -821,14 +817,14 @@ static void WINAPI event_client ( client_params *par ) } } + n = send_p - mem->send_buf; ok ( send_p == send_last, - "simple_client (%x): sent less data than expected: %d of %d\n", - id, send_p - mem->send_buf, n_expected ); + "simple_client (%x): sent less data than expected: %d of %d\n", id, n, n_expected ); + n = recv_p - mem->recv_buf; ok ( recv_p == recv_last, - "simple_client (%x): received less data than expected: %d of %d\n", - id, recv_p - mem->recv_buf, n_expected ); - recv_p = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); - ok ( recv_p == NULL, "event_client (%x): test pattern error: %d\n", id, recv_p - mem->recv_buf); + "simple_client (%x): received less data than expected: %d of %d\n", id, n, n_expected ); + n = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); + ok ( n == -1, "event_client (%x): test pattern error: %d\n", id, n); out: WSACloseEvent ( event );

1 0