April 2013 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Remove the unused idx_data parameter from draw_primitive.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: 822bcfdf744f3f1853ce65363216a2ee7cad7258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=822bcfdf744f3f1853ce65363… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 10 13:39:46 2013 +0200 wined3d: Remove the unused idx_data parameter from draw_primitive. --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/drawprim.c | 3 ++- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6b5c9dc..34a58aa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4027,7 +4027,7 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT /* Account for the loading offset due to index buffers. Instead of * reloading all sources correct it with the startvertex parameter. */ - draw_primitive(device, start_vertex, vertex_count, 0, 0, FALSE, NULL); + draw_primitive(device, start_vertex, vertex_count, 0, 0, FALSE); return WINED3D_OK; } @@ -4060,7 +4060,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic device_invalidate_state(device, STATE_BASEVERTEXINDEX); } - draw_primitive(device, start_idx, index_count, 0, 0, TRUE, NULL); + draw_primitive(device, start_idx, index_count, 0, 0, TRUE); return WINED3D_OK; } @@ -4070,7 +4070,7 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device { TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - draw_primitive(device, start_idx, index_count, start_instance, instance_count, TRUE, NULL); + draw_primitive(device, start_idx, index_count, start_instance, instance_count, TRUE); } /* This is a helper function for UpdateTexture, there is no UpdateVolume method in D3D. */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 5fe1ac5..14cb18f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -577,7 +577,7 @@ static void remove_vbos(const struct wined3d_gl_info *gl_info, /* Routine common to the draw primitive and draw indexed primitive routines */ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count, - UINT start_instance, UINT instance_count, BOOL indexed, const void *idx_data) + UINT start_instance, UINT instance_count, BOOL indexed) { const struct wined3d_state *state = &device->stateBlock->state; const struct wined3d_stream_info *stream_info; @@ -586,6 +586,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL emulation = FALSE; + const void *idx_data = NULL; UINT idx_size = 0; unsigned int i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bdba525..9ca2b10 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -925,7 +925,7 @@ struct wined3d_stream_info }; void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count, - UINT start_instance, UINT instance_count, BOOL indexed, const void *idx_data) DECLSPEC_HIDDEN; + UINT start_instance, UINT instance_count, BOOL indexed) DECLSPEC_HIDDEN; DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; typedef void (WINE_GLAPI *glAttribFunc)(const void *data);

1 0

Ken Thomases : libwine: Make [v]snprintW() always null-terminate the buffer , even if it's short.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: 71377c5652a2125b46ea7ad8651f73c1852a0083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71377c5652a2125b46ea7ad86… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 10 08:40:02 2013 -0500 libwine: Make [v]snprintW() always null-terminate the buffer, even if it's short. --- libs/wine/string.c | 67 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 39 insertions(+), 28 deletions(-) diff --git a/libs/wine/string.c b/libs/wine/string.c index 0b42ea8..f2a9bd3 100644 --- a/libs/wine/string.c +++ b/libs/wine/string.c @@ -300,7 +300,7 @@ noconv: /* format a WCHAR string according to a printf format; helper for vsnprintfW */ -static int format_string( WCHAR *buffer, size_t len, const char *format, const WCHAR *str, int str_len ) +static size_t format_string( WCHAR *buffer, size_t len, const char *format, const WCHAR *str, int str_len ) { size_t count = 0; int i, left_align = 0, width = 0, max = 0; @@ -331,18 +331,25 @@ static int format_string( WCHAR *buffer, size_t len, const char *format, const W if (!left_align && width > max) { - if ((count += width - max) >= len) return -1; - for (i = 0; i < width - max; i++) *buffer++ = ' '; + for (i = 0; i < width - max; i++) + { + if (count++ < len) + *buffer++ = ' '; + } } - if ((count += max) >= len) return -1; - memcpy( buffer, str, max * sizeof(WCHAR) ); + if (count < len) + memcpy( buffer, str, min( max, len - count ) * sizeof(WCHAR) ); + count += max; buffer += max; if (left_align && width > max) { - if ((count += width - max) >= len) return -1; - for (i = 0; i < width - max; i++) *buffer++ = ' '; + for (i = 0; i < width - max; i++) + { + if (count++ < len) + *buffer++ = ' '; + } } return count; } @@ -357,17 +364,16 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) { while (*iter && *iter != '%') { - if (written++ >= len) - return -1; - *str++ = *iter++; + if (written++ < len) + *str++ = *iter; + iter++; } if (*iter == '%') { if (iter[1] == '%') { - if (written++ >= len) - return -1; - *str++ = '%'; /* "%%"->'%' */ + if (written++ < len) + *str++ = '%'; /* "%%"->'%' */ iter += 2; continue; } @@ -422,13 +428,13 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) { static const WCHAR none[] = { '(','n','u','l','l',')',0 }; const WCHAR *wstr = va_arg(valist, const WCHAR *); - int count; + size_t remaining = written < len ? len - written : 0; + size_t count; *fmta++ = 's'; *fmta = 0; - count = format_string( str, len - written, fmtbufa, wstr ? wstr : none, -1 ); - if (count == -1) return -1; - str += count; + count = format_string( str, remaining, fmtbufa, wstr ? wstr : none, -1 ); + str += min( count, remaining ); written += count; iter++; break; @@ -437,14 +443,14 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) case 'c': { WCHAR wstr; - int count; + size_t remaining = written < len ? len - written : 0; + size_t count; wstr = va_arg(valist, int); *fmta++ = 's'; *fmta = 0; - count = format_string( str, len - written, fmtbufa, &wstr, 1 ); - if (count == -1) return -1; - str += count; + count = format_string( str, remaining, fmtbufa, &wstr, 1 ); + str += min( count, remaining ); written += count; iter++; break; @@ -475,9 +481,9 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) } while (*bufaiter) { - if (written++ >= len) - return -1; - *str++ = *bufaiter++; + if (written++ < len) + *str++ = *bufaiter; + bufaiter++; } iter++; break; @@ -485,10 +491,15 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) } } } - if (written >= len) - return -1; - *str++ = 0; - return (int)written; + if (len) + { + if (written >= len) + str--; + *str++ = 0; + } + + /* FIXME: POSIX [v]snprintf() returns the equivalent of written, not -1, on short buffer. */ + return written < len ? (int)written : -1; } int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist )

1 0

Alexandre Julliard : icinfo: Fix vsnprintfW usage.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: b3b498b5cc3a7f97e923c3144a6a3608350f679c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b498b5cc3a7f97e923c3144… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 16:16:35 2013 +0200 icinfo: Fix vsnprintfW usage. --- programs/icinfo/icinfo.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 1801d09..bfbef6b 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -29,33 +29,26 @@ static int mywprintf(const WCHAR *format, ...) static WCHAR output_bufW[sizeof(output_bufA) / sizeof(WCHAR)]; va_list parms; DWORD nOut; - int len; BOOL res = FALSE; HANDLE hout = GetStdHandle(STD_OUTPUT_HANDLE); va_start(parms, format); - len = vsnprintfW(output_bufW, sizeof(output_bufW), format, parms); + vsnprintfW(output_bufW, sizeof(output_bufW), format, parms); va_end(parms); - if (len < 0) - { - /* String too long */ - return 0; - } /* Try to write as unicode whenever we think it's a console */ if (((DWORD_PTR)hout & 3) == 3) { - res = WriteConsoleW(hout, output_bufW, len, &nOut, NULL); + res = WriteConsoleW(hout, output_bufW, strlenW(output_bufW), &nOut, NULL); } else { - BOOL usedDefaultChar = FALSE; DWORD convertedChars; /* Convert to OEM, then output */ - convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, len, + convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, -1, output_bufA, sizeof(output_bufA), - "?", &usedDefaultChar); + NULL, NULL); res = WriteFile(hout, output_bufA, convertedChars, &nOut, FALSE); }

1 0

Francois Gouget : wininet: Make urlcache_{entry_create, get_entry_info}() static.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: cabbc4d983aa167076fa9b6ebaaa93485ef541bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cabbc4d983aa167076fa9b6eb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 10 16:50:21 2013 +0200 wininet: Make urlcache_{entry_create,get_entry_info}() static. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ce74577..7f58a69 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1780,7 +1780,7 @@ static BOOL urlcache_hash_entry_is_locked(struct hash_entry *hash_entry, entry_u return TRUE; } -BOOL urlcache_get_entry_info(const char *url, void *entry_info, +static BOOL urlcache_get_entry_info(const char *url, void *entry_info, DWORD *size, DWORD flags, BOOL unicode) { urlcache_header *header; @@ -2622,7 +2622,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileW(LPCWSTR lpszUrlName, DWORD dwReserved) return ret; } -BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_path) +static BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_path) { cache_container *container; urlcache_header *header;

1 0

Michael Stefaniuc : dplayx: Have the decency to support IUnknown in DirectPlayLobby.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: b669664c4cd193c36db35ff789a2eb6b374eb136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b669664c4cd193c36db35ff78… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 9 22:34:49 2013 +0200 dplayx: Have the decency to support IUnknown in DirectPlayLobby. --- dlls/dplayx/dplobby.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 74b5c08..9e53a30 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -196,7 +196,7 @@ HRESULT DPL_CreateInterface if ( !This ) return DPERR_OUTOFMEMORY; - if( IsEqualGUID( &IID_IDirectPlayLobby, riid ) ) + if ( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlayLobby, riid ) ) This->lpVtbl = &directPlayLobbyWVT; else if( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) ) This->lpVtbl = &directPlayLobbyAVT; @@ -255,7 +255,7 @@ static HRESULT WINAPI DPL_QueryInterface CopyMemory( *ppvObj, This, sizeof( *This ) ); (*(IDirectPlayLobbyAImpl**)ppvObj)->ulInterfaceRef = 0; - if( IsEqualGUID( &IID_IDirectPlayLobby, riid ) ) + if( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlayLobby, riid ) ) { IDirectPlayLobbyWImpl *This = *ppvObj; This->lpVtbl = &directPlayLobbyWVT;

1 0

Michael Stefaniuc : dplayx/tests: Add DirectPlayLobby COM tests.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: f65c6af3b49f9dcca555331605e556dc28ac5be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65c6af3b49f9dcca55533160… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 9 22:35:51 2013 +0200 dplayx/tests: Add DirectPlayLobby COM tests. --- dlls/dplayx/tests/dplayx.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 0e7aafb..1b871d0 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6453,12 +6453,91 @@ static void test_COM(void) ok(refcount == 0, "refcount == %u, expected 0\n", refcount); } +static void test_COM_dplobby(void) +{ + IDirectPlayLobby *dpl = (IDirectPlayLobby*)0xdeadbeef; + IDirectPlayLobbyA *dplA; + IDirectPlayLobby2A *dpl2A; + IDirectPlayLobby2 *dpl2; + IDirectPlayLobby3A *dpl3A; + IDirectPlayLobby3 *dpl3; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectPlayLobby, (IUnknown*)&dpl, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dpl); + ok(hr == CLASS_E_NOAGGREGATION || broken(hr == E_INVALIDARG), + "DirectPlayLobby create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dpl || dpl == (IDirectPlayLobby*)0xdeadbeef, "dp4 = %p\n", dpl); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectPlayLobby, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay, + (void**)&dpl); + ok(hr == E_NOINTERFACE, "DirectPlayLobby create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Different refcount for all DirectPlayLobby Interfaces */ + hr = CoCreateInstance(&CLSID_DirectPlayLobby, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayLobby, + (void**)&dpl); + ok(hr == S_OK, "DirectPlayLobby create failed: %08x, expected S_OK\n", hr); + refcount = IDirectPlayLobby_AddRef(dpl); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectPlayLobby_QueryInterface(dpl, &IID_IDirectPlayLobbyA, (void**)&dplA); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlayLobbyA failed: %08x\n", hr); + refcount = IDirectPlayLobby_AddRef(dplA); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlayLobby_Release(dplA); + + hr = IDirectPlayLobby_QueryInterface(dpl, &IID_IDirectPlayLobby2, (void**)&dpl2); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlayLobby2 failed: %08x\n", hr); + refcount = IDirectPlayLobby_AddRef(dpl2); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlayLobby_Release(dpl2); + + hr = IDirectPlayLobby_QueryInterface(dpl, &IID_IDirectPlayLobby2A, (void**)&dpl2A); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlayLobby2A failed: %08x\n", hr); + refcount = IDirectPlayLobby_AddRef(dpl2A); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlayLobby_Release(dpl2A); + + hr = IDirectPlayLobby_QueryInterface(dpl, &IID_IDirectPlayLobby3, (void**)&dpl3); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlayLobby3 failed: %08x\n", hr); + refcount = IDirectPlayLobby_AddRef(dpl3); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlayLobby_Release(dpl3); + + hr = IDirectPlayLobby_QueryInterface(dpl, &IID_IDirectPlayLobby3A, (void**)&dpl3A); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlayLobby3A failed: %08x\n", hr); + refcount = IDirectPlayLobby_AddRef(dpl3A); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlayLobby_Release(dpl3A); + + /* IDirectPlayLobby and IUnknown share a refcount */ + hr = IDirectPlayX_QueryInterface(dpl, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IDirectPlayLobby_AddRef(unk); + todo_wine ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + IDirectPlayLobby_Release(unk); + + IUnknown_Release(unk); + IDirectPlayLobby_Release(dpl3); + IDirectPlayLobby_Release(dpl3A); + IDirectPlayLobby_Release(dpl2); + IDirectPlayLobby_Release(dpl2A); + IDirectPlayLobby_Release(dpl); + refcount = IDirectPlayLobby_Release(dpl); + ok(refcount == 0, "refcount == %u, expected 0\n", refcount); +} + START_TEST(dplayx) { CoInitialize( NULL ); test_COM(); + test_COM_dplobby(); if (!winetest_interactive) {

1 0

Michael Stefaniuc : dplayx: Get rid of the useless IDirectPlayLobby{, 2} vtables.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: 779cbdbe62bda1b72eee569bfea8fb9223139f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=779cbdbe62bda1b72eee569bf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 9 22:36:47 2013 +0200 dplayx: Get rid of the useless IDirectPlayLobby{,2} vtables. --- dlls/dplayx/dplobby.c | 169 +++---------------------------------------------- 1 files changed, 8 insertions(+), 161 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 9e53a30..b9e126f 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -94,12 +94,7 @@ typedef struct IDirectPlayLobbyImpl } IDirectPlayLobbyImpl; /* Forward declarations of virtual tables */ -static const IDirectPlayLobbyVtbl directPlayLobbyWVT; -static const IDirectPlayLobby2Vtbl directPlayLobby2WVT; static const IDirectPlayLobby3Vtbl directPlayLobby3WVT; - -static const IDirectPlayLobbyVtbl directPlayLobbyAVT; -static const IDirectPlayLobby2Vtbl directPlayLobby2AVT; static const IDirectPlayLobby3Vtbl directPlayLobby3AVT; static BOOL DPL_CreateIUnknown( LPVOID lpDPL ) @@ -196,17 +191,11 @@ HRESULT DPL_CreateInterface if ( !This ) return DPERR_OUTOFMEMORY; - if ( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlayLobby, riid ) ) - This->lpVtbl = &directPlayLobbyWVT; - else if( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) ) - This->lpVtbl = &directPlayLobbyAVT; - else if( IsEqualGUID( &IID_IDirectPlayLobby2, riid ) ) - This->lpVtbl = &directPlayLobby2WVT; - else if( IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) ) - This->lpVtbl = &directPlayLobby2AVT; - else if( IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) + if ( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlayLobby, riid ) || + IsEqualGUID( &IID_IDirectPlayLobby2, riid ) || IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) This->lpVtbl = &directPlayLobby3WVT; - else if( IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) + else if ( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) || + IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) || IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) This->lpVtbl = &directPlayLobby3AVT; else { @@ -255,32 +244,14 @@ static HRESULT WINAPI DPL_QueryInterface CopyMemory( *ppvObj, This, sizeof( *This ) ); (*(IDirectPlayLobbyAImpl**)ppvObj)->ulInterfaceRef = 0; - if( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlayLobby, riid ) ) - { - IDirectPlayLobbyWImpl *This = *ppvObj; - This->lpVtbl = &directPlayLobbyWVT; - } - else if( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) ) - { - IDirectPlayLobbyAImpl *This = *ppvObj; - This->lpVtbl = &directPlayLobbyAVT; - } - else if( IsEqualGUID( &IID_IDirectPlayLobby2, riid ) ) - { - IDirectPlayLobby2WImpl *This = *ppvObj; - This->lpVtbl = &directPlayLobby2WVT; - } - else if( IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) ) - { - IDirectPlayLobby2AImpl *This = *ppvObj; - This->lpVtbl = &directPlayLobby2AVT; - } - else if( IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) + if ( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlayLobby, riid ) || + IsEqualGUID( &IID_IDirectPlayLobby2, riid ) || IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) { IDirectPlayLobby3WImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby3WVT; } - else if( IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) + else if ( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) || + IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) || IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) { IDirectPlayLobby3AImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby3AVT; @@ -1624,130 +1595,6 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings } -/* Virtual Table definitions for DPL{1,2,3}{A,W} */ - -/* Note: Hack so we can reuse the old functions without compiler warnings */ -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlayLobbyAVT.fun)) -#else -# define XCAST(fun) (void*) -#endif - -/* Direct Play Lobby 1 (ascii) Virtual Table for methods */ -/* All lobby 1 methods are exactly the same except QueryInterface */ -static const IDirectPlayLobbyVtbl directPlayLobbyAVT = -{ - - XCAST(QueryInterface)DPL_QueryInterface, - XCAST(AddRef)DPL_AddRef, - XCAST(Release)DPL_Release, - - IDirectPlayLobbyAImpl_Connect, - IDirectPlayLobbyAImpl_CreateAddress, - IDirectPlayLobbyAImpl_EnumAddress, - IDirectPlayLobbyAImpl_EnumAddressTypes, - IDirectPlayLobbyAImpl_EnumLocalApplications, - IDirectPlayLobbyAImpl_GetConnectionSettings, - IDirectPlayLobbyAImpl_ReceiveLobbyMessage, - IDirectPlayLobbyAImpl_RunApplication, - IDirectPlayLobbyAImpl_SendLobbyMessage, - IDirectPlayLobbyAImpl_SetConnectionSettings, - IDirectPlayLobbyAImpl_SetLobbyMessageEvent -}; -#undef XCAST - - -/* Note: Hack so we can reuse the old functions without compiler warnings */ -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlayLobbyWVT.fun)) -#else -# define XCAST(fun) (void*) -#endif - -/* Direct Play Lobby 1 (unicode) Virtual Table for methods */ -static const IDirectPlayLobbyVtbl directPlayLobbyWVT = -{ - - XCAST(QueryInterface)DPL_QueryInterface, - XCAST(AddRef)DPL_AddRef, - XCAST(Release)DPL_Release, - - IDirectPlayLobbyWImpl_Connect, - IDirectPlayLobbyWImpl_CreateAddress, - IDirectPlayLobbyWImpl_EnumAddress, - IDirectPlayLobbyWImpl_EnumAddressTypes, - IDirectPlayLobbyWImpl_EnumLocalApplications, - IDirectPlayLobbyWImpl_GetConnectionSettings, - IDirectPlayLobbyWImpl_ReceiveLobbyMessage, - IDirectPlayLobbyWImpl_RunApplication, - IDirectPlayLobbyWImpl_SendLobbyMessage, - IDirectPlayLobbyWImpl_SetConnectionSettings, - IDirectPlayLobbyWImpl_SetLobbyMessageEvent -}; -#undef XCAST - -/* Note: Hack so we can reuse the old functions without compiler warnings */ -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlayLobby2AVT.fun)) -#else -# define XCAST(fun) (void*) -#endif - -/* Direct Play Lobby 2 (ascii) Virtual Table for methods */ -static const IDirectPlayLobby2Vtbl directPlayLobby2AVT = -{ - - XCAST(QueryInterface)DPL_QueryInterface, - XCAST(AddRef)DPL_AddRef, - XCAST(Release)DPL_Release, - - XCAST(Connect)IDirectPlayLobbyAImpl_Connect, - XCAST(CreateAddress)IDirectPlayLobbyAImpl_CreateAddress, - XCAST(EnumAddress)IDirectPlayLobbyAImpl_EnumAddress, - XCAST(EnumAddressTypes)IDirectPlayLobbyAImpl_EnumAddressTypes, - XCAST(EnumLocalApplications)IDirectPlayLobbyAImpl_EnumLocalApplications, - XCAST(GetConnectionSettings)IDirectPlayLobbyAImpl_GetConnectionSettings, - XCAST(ReceiveLobbyMessage)IDirectPlayLobbyAImpl_ReceiveLobbyMessage, - XCAST(RunApplication)IDirectPlayLobbyAImpl_RunApplication, - XCAST(SendLobbyMessage)IDirectPlayLobbyAImpl_SendLobbyMessage, - XCAST(SetConnectionSettings)IDirectPlayLobbyAImpl_SetConnectionSettings, - XCAST(SetLobbyMessageEvent)IDirectPlayLobbyAImpl_SetLobbyMessageEvent, - - IDirectPlayLobby2AImpl_CreateCompoundAddress -}; -#undef XCAST - -/* Note: Hack so we can reuse the old functions without compiler warnings */ -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlayLobby2WVT.fun)) -#else -# define XCAST(fun) (void*) -#endif - -/* Direct Play Lobby 2 (unicode) Virtual Table for methods */ -static const IDirectPlayLobby2Vtbl directPlayLobby2WVT = -{ - - XCAST(QueryInterface)DPL_QueryInterface, - XCAST(AddRef)DPL_AddRef, - XCAST(Release)DPL_Release, - - XCAST(Connect)IDirectPlayLobbyWImpl_Connect, - XCAST(CreateAddress)IDirectPlayLobbyWImpl_CreateAddress, - XCAST(EnumAddress)IDirectPlayLobbyWImpl_EnumAddress, - XCAST(EnumAddressTypes)IDirectPlayLobbyWImpl_EnumAddressTypes, - XCAST(EnumLocalApplications)IDirectPlayLobbyWImpl_EnumLocalApplications, - XCAST(GetConnectionSettings)IDirectPlayLobbyWImpl_GetConnectionSettings, - XCAST(ReceiveLobbyMessage)IDirectPlayLobbyWImpl_ReceiveLobbyMessage, - XCAST(RunApplication)IDirectPlayLobbyWImpl_RunApplication, - XCAST(SendLobbyMessage)IDirectPlayLobbyWImpl_SendLobbyMessage, - XCAST(SetConnectionSettings)IDirectPlayLobbyWImpl_SetConnectionSettings, - XCAST(SetLobbyMessageEvent)IDirectPlayLobbyWImpl_SetLobbyMessageEvent, - - IDirectPlayLobby2WImpl_CreateCompoundAddress -}; -#undef XCAST - /* Direct Play Lobby 3 (ascii) Virtual Table for methods */ /* Note: Hack so we can reuse the old functions without compiler warnings */

1 0

Michael Stefaniuc : dplayx: Forward IDirectPlayLobby::Connect to :: ConnectEx.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: f27358416ccbe78be67f16ce1dbe2ce6822bb2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27358416ccbe78be67f16ce1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 9 22:38:44 2013 +0200 dplayx: Forward IDirectPlayLobby::Connect to ::ConnectEx. --- dlls/dplayx/dplobby.c | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index b9e126f..e09d6c8 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -412,26 +412,16 @@ static HRESULT DPL_ConnectEx return hr; } -static HRESULT WINAPI IDirectPlayLobbyAImpl_Connect -( LPDIRECTPLAYLOBBYA iface, - DWORD dwFlags, - LPDIRECTPLAY2A* lplpDP, - IUnknown* pUnk) +static HRESULT WINAPI IDirectPlayLobby3AImpl_Connect( IDirectPlayLobby3A *iface, DWORD flags, + IDirectPlay2A **dp, IUnknown *unk) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; - return DPL_ConnectEx( This, dwFlags, &IID_IDirectPlay2A, - (LPVOID)lplpDP, pUnk ); + return IDirectPlayLobby_ConnectEx( iface, flags, &IID_IDirectPlay2A, (void**)dp, unk ); } -static HRESULT WINAPI IDirectPlayLobbyWImpl_Connect -( LPDIRECTPLAYLOBBY iface, - DWORD dwFlags, - LPDIRECTPLAY2* lplpDP, - IUnknown* pUnk) +static HRESULT WINAPI IDirectPlayLobby3Impl_Connect( IDirectPlayLobby3 *iface, DWORD flags, + IDirectPlay2 **dp, IUnknown *unk) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; /* Yes cast to A */ - return DPL_ConnectEx( This, dwFlags, &IID_IDirectPlay2, - (LPVOID)lplpDP, pUnk ); + return IDirectPlayLobby_ConnectEx( iface, flags, &IID_IDirectPlay2A, (void**)dp, unk ); } /******************************************************************** @@ -1610,7 +1600,7 @@ static const IDirectPlayLobby3Vtbl directPlayLobby3AVT = XCAST(AddRef)DPL_AddRef, XCAST(Release)DPL_Release, - XCAST(Connect)IDirectPlayLobbyAImpl_Connect, + IDirectPlayLobby3AImpl_Connect, XCAST(CreateAddress)IDirectPlayLobbyAImpl_CreateAddress, XCAST(EnumAddress)IDirectPlayLobbyAImpl_EnumAddress, XCAST(EnumAddressTypes)IDirectPlayLobbyAImpl_EnumAddressTypes, @@ -1646,7 +1636,7 @@ static const IDirectPlayLobby3Vtbl directPlayLobby3WVT = XCAST(AddRef)DPL_AddRef, XCAST(Release)DPL_Release, - XCAST(Connect)IDirectPlayLobbyWImpl_Connect, + IDirectPlayLobby3Impl_Connect, XCAST(CreateAddress)IDirectPlayLobbyWImpl_CreateAddress, XCAST(EnumAddress)IDirectPlayLobbyWImpl_EnumAddress, XCAST(EnumAddressTypes)IDirectPlayLobbyWImpl_EnumAddressTypes,

1 0

Matteo Bruni : d3dx9/tests: Raise admitted error a bit in D3DXSHEvalSphericalLight tests.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: 7802ab15ce2a5d3b735f8fdfaa1b2f04f3235153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7802ab15ce2a5d3b735f8fdfa… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 10 01:22:58 2013 +0200 d3dx9/tests: Raise admitted error a bit in D3DXSHEvalSphericalLight tests. --- dlls/d3dx9_36/tests/math.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index af44957..8677825 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3014,7 +3014,7 @@ static void test_D3DXSHEvalSphericalLight(void) expected = j + test[l].roffset; else expected = test[l].red_expected[j]; - ok(relative_error(expected, test[l].red_received[j]) < admitted_error, + ok(relative_error(expected, test[l].red_received[j]) < 0.0005f, "Red: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, test[l].red_received[j]); if (test[l].green_received) @@ -3023,7 +3023,7 @@ static void test_D3DXSHEvalSphericalLight(void) expected = j + test[l].goffset; else expected = test[l].green_expected[j]; - ok(relative_error(expected, test[l].green_received[j]) < admitted_error, + ok(relative_error(expected, test[l].green_received[j]) < 0.0005f, "Green: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, test[l].green_received[j]); } @@ -3033,7 +3033,7 @@ static void test_D3DXSHEvalSphericalLight(void) expected = j + test[l].boffset; else expected = test[l].blue_expected[j]; - ok(relative_error(expected, test[l].blue_received[j]) < admitted_error, + ok(relative_error(expected, test[l].blue_received[j]) < 0.0005f, "Blue: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, test[l].blue_received[j]); } }

1 0

Matteo Bruni : d3dx9/tests: Don' t use an arbitrary number in relative_error macro.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: 3fd07694c41418ce7e6cb1642357d708be897194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd07694c41418ce7e6cb1642… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 10 01:22:59 2013 +0200 d3dx9/tests: Don't use an arbitrary number in relative_error macro. --- dlls/d3dx9_36/tests/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 8677825..9d90662 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -27,7 +27,7 @@ #define admitted_error 0.0001f -#define relative_error(exp, out) (fabsf(exp) < 0.01f ? fabsf(exp - out) : fabsf(1.0f - (out) / (exp))) +#define relative_error(exp, out) (fabsf(exp) < 1e-38f ? fabsf(exp - out) : fabsf(1.0f - (out) / (exp))) #define expect_color(expectedcolor,gotcolor) ok((relative_error(expectedcolor.r, gotcolor.r)<admitted_error)&&(relative_error(expectedcolor.g, gotcolor.g)<admitted_error)&&(relative_error(expectedcolor.b, gotcolor.b)<admitted_error)&&(relative_error(expectedcolor.a, gotcolor.a)<admitted_error),"Expected Color= (%f, %f, %f, %f)\n , Got Color= (%f, %f, %f, %f)\n", expectedcolor.r, expectedcolor.g, expectedcolor.b, expectedcolor.a, gotcolor.r, gotcolor.g, gotcolor.b, gotcolor.a);

1 0