January 2009 - Wine-Commits

Alexandre Julliard : ws2_32/tests: Avoid printing pointer differences in traces.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

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

Alexandre Julliard : shlwapi/tests: Avoid printing pointer differences in traces.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: ffdf21af0b6825204c637745d2f4a428d61ac9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffdf21af0b6825204c637745d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:02:46 2009 +0100 shlwapi/tests: Avoid printing pointer differences in traces. --- dlls/shlwapi/tests/string.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 34ab7ba..df9398a 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -203,9 +203,8 @@ static void test_StrChrA(void) for (count = 32; count < 128; count++) { LPSTR result = StrChrA(string+32, count); - ok(result - string == count, - "found char '%c' in wrong place: got %d, expected %d\n", - count, result - string, count); + INT pos = result - string; + ok(pos == count, "found char '%c' in wrong place: got %d, expected %d\n", count, pos, count); } for (count = 32; count < 128; count++) @@ -340,9 +339,8 @@ static void test_StrRChrW(void) for (count = 32; count < 128; count++) { LPWSTR result = StrRChrW(string+32, NULL, count); - ok(result - string == count, - "found char %d in wrong place: got %d, expected %d\n", - count, result - string, count); + INT pos = result - string; + ok(pos == count, "found char %d in wrong place: got %d, expected %d\n", count, pos, count); } for (count = 32; count < 128; count++)

1 0

Alexandre Julliard : rpcrt4/tests: Avoid printing pointer differences in traces.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: 1639f1e507fb5807ed640fc07ea30259bfe845ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1639f1e507fb5807ed640fc07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:02:40 2009 +0100 rpcrt4/tests: Avoid printing pointer differences in traces. --- dlls/rpcrt4/tests/ndr_marshall.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 418c6ee..de49848 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -538,6 +538,7 @@ static void test_nontrivial_pointer_types(void) RPC_MESSAGE RpcMessage; MIDL_STUB_MESSAGE StubMsg; MIDL_STUB_DESC StubDesc; + DWORD size; void *ptr; char **p1; char *p2; @@ -580,8 +581,8 @@ static void test_nontrivial_pointer_types(void) ptr = NdrPointerMarshall( &StubMsg, (unsigned char *)p1, &fmtstr_ref_unique_out[4] ); ok(ptr == NULL, "ret %p\n", ptr); - ok(StubMsg.Buffer - StubMsg.BufferStart == 5, "Buffer %p Start %p len %d\n", - StubMsg.Buffer, StubMsg.BufferStart, StubMsg.Buffer - StubMsg.BufferStart); + size = StubMsg.Buffer - StubMsg.BufferStart; + ok(size == 5, "Buffer %p Start %p len %d\n", StubMsg.Buffer, StubMsg.BufferStart, size); ok(*(unsigned int *)StubMsg.BufferStart != 0, "pointer ID marshalled incorrectly\n"); ok(*(unsigned char *)(StubMsg.BufferStart + 4) == 0x22, "char data marshalled incorrectly: 0x%x\n", *(unsigned char *)(StubMsg.BufferStart + 4)); @@ -1549,6 +1550,7 @@ static void test_conformant_string(void) RPC_MESSAGE RpcMessage; MIDL_STUB_MESSAGE StubMsg; MIDL_STUB_DESC StubDesc; + DWORD size; void *ptr; unsigned char *mem, *mem_orig; char memsrc[] = "This is a test string"; @@ -1581,8 +1583,9 @@ static void test_conformant_string(void) ptr = NdrPointerMarshall( &StubMsg, (unsigned char *)memsrc, fmtstr_conf_str ); ok(ptr == NULL, "ret %p\n", ptr); - ok(StubMsg.Buffer - StubMsg.BufferStart == sizeof(memsrc) + 12, "Buffer %p Start %p len %d\n", - StubMsg.Buffer, StubMsg.BufferStart, StubMsg.Buffer - StubMsg.BufferStart); + size = StubMsg.Buffer - StubMsg.BufferStart; + ok(size == sizeof(memsrc) + 12, "Buffer %p Start %p len %d\n", + StubMsg.Buffer, StubMsg.BufferStart, size); ok(!memcmp(StubMsg.BufferStart + 12, memsrc, sizeof(memsrc)), "incorrectly marshaled\n"); StubMsg.Buffer = StubMsg.BufferStart; @@ -1665,6 +1668,7 @@ static void test_nonconformant_string(void) RPC_MESSAGE RpcMessage; MIDL_STUB_MESSAGE StubMsg; MIDL_STUB_DESC StubDesc; + DWORD size; void *ptr; unsigned char *mem, *mem_orig; unsigned char memsrc[10] = "This is"; @@ -1700,8 +1704,9 @@ static void test_nonconformant_string(void) ptr = NdrNonConformantStringMarshall( &StubMsg, (unsigned char *)memsrc, fmtstr_nonconf_str ); ok(ptr == NULL, "ret %p\n", ptr); - ok(StubMsg.Buffer - StubMsg.BufferStart == strlen((char *)memsrc) + 1 + 8, "Buffer %p Start %p len %d\n", - StubMsg.Buffer, StubMsg.BufferStart, StubMsg.Buffer - StubMsg.BufferStart); + size = StubMsg.Buffer - StubMsg.BufferStart; + ok(size == strlen((char *)memsrc) + 1 + 8, "Buffer %p Start %p len %d\n", + StubMsg.Buffer, StubMsg.BufferStart, size); ok(!memcmp(StubMsg.BufferStart + 8, memsrc, strlen((char *)memsrc) + 1), "incorrectly marshaled\n"); StubMsg.Buffer = StubMsg.BufferStart; @@ -1774,8 +1779,9 @@ static void test_nonconformant_string(void) ptr = NdrNonConformantStringMarshall( &StubMsg, (unsigned char *)memsrc2, fmtstr_nonconf_str ); ok(ptr == NULL, "ret %p\n", ptr); - ok(StubMsg.Buffer - StubMsg.BufferStart == strlen((char *)memsrc2) + 1 + 8, "Buffer %p Start %p len %d\n", - StubMsg.Buffer, StubMsg.BufferStart, StubMsg.Buffer - StubMsg.BufferStart); + size = StubMsg.Buffer - StubMsg.BufferStart; + ok(size == strlen((char *)memsrc2) + 1 + 8, "Buffer %p Start %p len %d\n", + StubMsg.Buffer, StubMsg.BufferStart, size); ok(!memcmp(StubMsg.BufferStart + 8, memsrc2, strlen((char *)memsrc2) + 1), "incorrectly marshaled\n"); StubMsg.Buffer = StubMsg.BufferStart; @@ -1909,8 +1915,8 @@ static void test_conf_complex_struct(void) ptr = NdrComplexStructMarshall( &StubMsg, (unsigned char *)memsrc, &fmtstr_complex_struct[30] ); ok(ptr == NULL, "ret %p\n", ptr); - ok(*(unsigned int *)StubMsg.BufferStart == 20, "Conformance should have been 20 instead of %d\n", (unsigned int)StubMsg.BufferStart); - ok(*(unsigned int *)(StubMsg.BufferStart + 4) == 20, "conf_complex.size should have been 20 instead of %d\n", (unsigned int)(StubMsg.BufferStart + 4)); + ok(*(unsigned int *)StubMsg.BufferStart == 20, "Conformance should have been 20 instead of %d\n", *(unsigned int *)StubMsg.BufferStart); + ok(*(unsigned int *)(StubMsg.BufferStart + 4) == 20, "conf_complex.size should have been 20 instead of %d\n", *(unsigned int *)(StubMsg.BufferStart + 4)); for (i = 0; i < 20; i++) ok(*(unsigned int *)(StubMsg.BufferStart + 8 + i * 4) == 0, "pointer id for conf_complex.array[%d] should have been 0 instead of 0x%x\n", i, *(unsigned int *)(StubMsg.BufferStart + 8 + i * 4));

1 0

Alexandre Julliard : oleaut32/tests: Avoid printing pointer differences in traces.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: 6f3184829fbcfd69654eab0aa6668380fc49ae4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3184829fbcfd69654eab0aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:02:32 2009 +0100 oleaut32/tests: Avoid printing pointer differences in traces. --- dlls/oleaut32/tests/safearray.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 0a03141..4fc615e 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -275,7 +275,7 @@ static struct { static void test_safearray(void) { SAFEARRAY *a, b, *c; - unsigned int i; + unsigned int i, diff; LONG indices[2]; HRESULT hres; SAFEARRAYBOUND bound, bounds[2]; @@ -434,19 +434,22 @@ static void test_safearray(void) indices[1] = 23; hres = SafeArrayPtrOfIndex(a, indices, (void**)&ptr2); ok(S_OK == hres,"SAPOI failed [1,23], hres 0x%x\n",hres); - ok(ptr2 - ptr1 == 8,"ptr difference is not 8, but %d (%p vs %p)\n", ptr2-ptr1, ptr2, ptr1); + diff = ptr2 - ptr1; + ok(diff == 8,"ptr difference is not 8, but %d (%p vs %p)\n", diff, ptr2, ptr1); indices[0] = 3; indices[1] = 24; hres = SafeArrayPtrOfIndex(a, indices, (void**)&ptr2); ok(S_OK == hres,"SAPOI failed [5,24], hres 0x%x\n",hres); - ok(ptr2 - ptr1 == 176,"ptr difference is not 176, but %d (%p vs %p)\n", ptr2-ptr1, ptr2, ptr1); + diff = ptr2 - ptr1; + ok(diff == 176,"ptr difference is not 176, but %d (%p vs %p)\n", diff, ptr2, ptr1); indices[0] = 20; indices[1] = 23; hres = SafeArrayPtrOfIndex(a, indices, (void**)&ptr2); ok(S_OK == hres,"SAPOI failed [20,23], hres 0x%x\n",hres); - ok(ptr2 - ptr1 == 76,"ptr difference is not 76, but %d (%p vs %p)\n", ptr2-ptr1, ptr2, ptr1); + diff = ptr2 - ptr1; + ok(diff == 76,"ptr difference is not 76, but %d (%p vs %p)\n", diff, ptr2, ptr1); hres = SafeArrayUnaccessData(a); ok(S_OK == hres, "SAUAD failed with 0x%x\n", hres);

1 0

Alexandre Julliard : ntdll/tests: Avoid printing pointer differences in traces.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: 6500bb0e50b00c70afa7e37904fcc9ea00248827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6500bb0e50b00c70afa7e3790… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:02:23 2009 +0100 ntdll/tests: Avoid printing pointer differences in traces. --- dlls/ntdll/tests/env.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 92f654e..8289841 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -86,11 +86,12 @@ static void testQuery(void) WCHAR bv[257]; UNICODE_STRING name; UNICODE_STRING value; - const struct test* test; NTSTATUS nts; + unsigned int i; - for (test = tests; test->var; test++) + for (i = 0; tests[i].var; i++) { + const struct test *test = &tests[i]; name.Length = strlen(test->var) * 2; name.MaximumLength = name.Length + 2; name.Buffer = bn; @@ -103,7 +104,7 @@ static void testQuery(void) nts = pRtlQueryEnvironmentVariable_U(small_env, &name, &value); ok( nts == test->status || (test->alt && nts == test->alt), "[%d]: Wrong status for '%s', expecting %x got %x\n", - test - tests, test->var, test->status, nts ); + i, test->var, test->status, nts ); if (nts == test->status) switch (nts) { case STATUS_SUCCESS:

1 0

Alexandre Julliard : msvcrt/tests: Avoid printing pointer differences in traces.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: 2335a44ed6d597aafb74bbcf4b3bb45918928dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2335a44ed6d597aafb74bbcf4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:02:17 2009 +0100 msvcrt/tests: Avoid printing pointer differences in traces. --- dlls/msvcrt/tests/heap.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index e094992..6e6b544 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -48,8 +48,7 @@ static void test_aligned_malloc(unsigned int size, unsigned int alignment) { void *saved; saved = *(void **)((DWORD_PTR)((char *)mem - sizeof(void *)) & ~(sizeof(void *) - 1)); - trace("_aligned_malloc(%3d, %3d) returns %p, saved = %p, diff = %d\n", - size, alignment, mem, saved, (char *)saved - (char *)mem); + trace("_aligned_malloc(%3d, %3d) returns %p, saved = %p\n", size, alignment, mem, saved ); } p_aligned_free(mem); } @@ -79,8 +78,8 @@ static void test_aligned_offset_malloc(unsigned int size, unsigned int alignment { void *saved; saved = *(void **)((DWORD_PTR)((char *)mem - sizeof(void *)) & ~(sizeof(void *) - 1)); - trace("_aligned_offset_malloc(%3d, %3d, %3d) returns %p, saved = %p, diff = %d\n", - size, alignment, offset, mem, saved, (char *)saved - (char *)mem); + trace("_aligned_offset_malloc(%3d, %3d, %3d) returns %p, saved = %p\n", + size, alignment, offset, mem, saved); } p_aligned_free(mem); } @@ -116,8 +115,7 @@ static void test_aligned_realloc(unsigned int size1, unsigned int size2, unsigne { void *saved; saved = *(void **)((DWORD_PTR)((char *)mem - sizeof(void *)) & ~(sizeof(void *) - 1)); - trace("_aligned_malloc(%3d, %3d) returns %p, saved = %p, diff = %d\n", - size1, alignment, mem, saved, (char *)saved - (char *)mem); + trace("_aligned_malloc(%3d, %3d) returns %p, saved = %p\n", size1, alignment, mem, saved); } mem2 = p_aligned_realloc(mem, size2, alignment); @@ -132,8 +130,8 @@ static void test_aligned_realloc(unsigned int size1, unsigned int size2, unsigne { void *saved; saved = *(void **)((DWORD_PTR)((char *)mem2 - sizeof(void *)) & ~(sizeof(void *) - 1)); - trace("_aligned_realloc(%p, %3d, %3d) returns %p, saved = %p, diff = %d\n", - mem, size2, alignment, mem2, saved, (char *)saved - (char *)mem2); + trace("_aligned_realloc(%p, %3d, %3d) returns %p, saved = %p\n", + mem, size2, alignment, mem2, saved); } if (mem1) { @@ -189,8 +187,8 @@ static void test_aligned_offset_realloc(unsigned int size1, unsigned int size2, { void *saved; saved = *(void **)((DWORD_PTR)((char *)mem - sizeof(void *)) & ~(sizeof(void *) - 1)); - trace("_aligned_offset_malloc(%3d, %3d, %3d) returns %p, saved = %p, diff = %d\n", - size1, alignment, offset, mem, saved, (char *)saved - (char *)mem); + trace("_aligned_offset_malloc(%3d, %3d, %3d) returns %p, saved = %p\n", + size1, alignment, offset, mem, saved); } mem2 = p_aligned_offset_realloc(mem, size2, alignment, offset); @@ -205,8 +203,8 @@ static void test_aligned_offset_realloc(unsigned int size1, unsigned int size2, { void *saved; saved = *(void **)((DWORD_PTR)((char *)mem2 - sizeof(void *)) & ~(sizeof(void *) - 1)); - trace("_aligned_offset_realloc(%p, %3d, %3d, %3d) returns %p, saved = %p, diff = %d\n", - mem, size2, alignment, offset, mem2, saved, (char *)saved - (char *)mem2); + trace("_aligned_offset_realloc(%p, %3d, %3d, %3d) returns %p, saved = %p\n", + mem, size2, alignment, offset, mem2, saved); } if (mem1) {

1 0

Nikolay Sivov : oleaut32/tests: Fix copy/paste typo in test output.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: 39507526828b86895bac4ef72d6efe24007a961a URL: http://source.winehq.org/git/wine.git/?a=commit;h=39507526828b86895bac4ef72… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 8 12:00:00 2009 +0300 oleaut32/tests: Fix copy/paste typo in test output. --- dlls/oleaut32/tests/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index e2db519..6e3136d 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5060,7 +5060,7 @@ static void test_SysStringByteLen(void) BSTR str = GetBSTR(&bstr); bstr.dwLen = 0; - ok (SysStringByteLen(str) == 0, "Expected dwLen 0, got %d\n", SysStringLen(str)); + ok (SysStringByteLen(str) == 0, "Expected dwLen 0, got %d\n", SysStringByteLen(str)); bstr.dwLen = 2; ok (SysStringByteLen(str) == 2, "Expected dwLen 2, got %d\n", SysStringByteLen(str)); }

1 0

Vitaliy Margolen : dinput: Copy device data up to maximum available bytes.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: f6f52021f844664e2b10d97d9f3068956ed4db05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6f52021f844664e2b10d97d9… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Jan 7 22:43:27 2009 -0700 dinput: Copy device data up to maximum available bytes. --- dlls/dinput/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 91449f8..8e226cc 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -274,7 +274,7 @@ void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df memset(out, 0, size); if (df->dt == NULL) { /* This means that the app uses Wine's internal data format */ - memcpy(out, in, df->internal_format_size); + memcpy(out, in, min(size, df->internal_format_size)); } else { for (i = 0; i < df->size; i++) { if (df->dt[i].offset_in >= 0) {

1 0

Michael Stefaniuc : mapi32: Remove superfluous casts.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: 120584d5c5e3efe8414e6b9029db55623f8cb9c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120584d5c5e3efe8414e6b902… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 00:36:51 2009 +0100 mapi32: Remove superfluous casts. --- dlls/mapi32/imalloc.c | 2 +- dlls/mapi32/tests/imalloc.c | 3 +-- dlls/mapi32/tests/prop.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index c5b4570..a913eee 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -78,7 +78,7 @@ static HRESULT WINAPI IMAPIMalloc_fnQueryInterface(LPMALLOC iface, REFIID refiid if (IsEqualIID(refiid, &IID_IUnknown) || IsEqualIID(refiid, &IID_IMalloc)) { - *ppvObj = (LPMALLOC) &MAPI_IMalloc; + *ppvObj = &MAPI_IMalloc; TRACE("Returning IMalloc (%p)\n", *ppvObj); return S_OK; } diff --git a/dlls/mapi32/tests/imalloc.c b/dlls/mapi32/tests/imalloc.c index 63c66f2..5e3a060 100644 --- a/dlls/mapi32/tests/imalloc.c +++ b/dlls/mapi32/tests/imalloc.c @@ -64,8 +64,7 @@ static void test_IMalloc(void) /* Prove that native mapi uses LocalAlloc/LocalFree */ lpMem = IMalloc_Alloc(lpMalloc, 61); - ok (lpMem && IMalloc_GetSize(lpMalloc, lpMem) == - LocalSize((HANDLE)lpMem), + ok (lpMem && IMalloc_GetSize(lpMalloc, lpMem) == LocalSize(lpMem), "Expected non-null, same size, got %p, %s size\n", lpMem, lpMem ? "different" : "same"); diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index a2b9289..0e979d1 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -93,11 +93,11 @@ static void test_PropCopyMore(void) if (!pPropCopyMore) return; - scode = pMAPIAllocateBuffer(sizeof(LPSPropValue), (LPVOID *)lpDest); + scode = pMAPIAllocateBuffer(sizeof(LPSPropValue), lpDest); if (FAILED(scode)) return; - scode = pMAPIAllocateMore(sizeof(LPSPropValue), lpDest, (LPVOID *)lpSrc); + scode = pMAPIAllocateMore(sizeof(LPSPropValue), lpDest, lpSrc); if (FAILED(scode)) return;

1 0

Michael Stefaniuc : winecfg: Remove superfluous casts.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: 68d5d8e9214d00d1d2e86c72db9db6a8e256fbd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d5d8e9214d00d1d2e86c72d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 00:37:36 2009 +0100 winecfg: Remove superfluous casts. --- programs/winecfg/theme.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index d87aba0..6b67b4e 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -116,7 +116,7 @@ static void color_or_size_dsa_add (WrappedDsa* wdsa, const WCHAR* name, static int CALLBACK dsa_destroy_callback (LPVOID p, LPVOID pData) { - ThemeColorOrSize* item = (ThemeColorOrSize*)p; + ThemeColorOrSize* item = p; HeapFree (GetProcessHeap(), 0, item->name); HeapFree (GetProcessHeap(), 0, item->fancyName); return 1; @@ -135,7 +135,7 @@ static void create_color_or_size_dsa (WrappedDsa* wdsa) static ThemeColorOrSize* color_or_size_dsa_get (WrappedDsa* wdsa, int index) { - return (ThemeColorOrSize*)DSA_GetItemPtr (wdsa->dsa, index); + return DSA_GetItemPtr (wdsa->dsa, index); } static int color_or_size_dsa_find (WrappedDsa* wdsa, const WCHAR* name) @@ -163,7 +163,7 @@ static int themeFilesCount = 0; static int CALLBACK theme_dsa_destroy_callback (LPVOID p, LPVOID pData) { - ThemeFile* item = (ThemeFile*)p; + ThemeFile* item = p; HeapFree (GetProcessHeap(), 0, item->themeFileName); HeapFree (GetProcessHeap(), 0, item->fancyName); free_color_or_size_dsa (&item->colors);

1 0