wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

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

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

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

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/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: 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: Remove the duplicated IDirectPlayLobby{2, 3}Impl structs.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: dffc8fc5d1b0d2b9679466818b6cd2cbf006edae URL: http://source.winehq.org/git/wine.git/?a=commit;h=dffc8fc5d1b0d2b9679466818… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 9 22:32:53 2013 +0200 dplayx: Remove the duplicated IDirectPlayLobby{2,3}Impl structs. --- dlls/dplayx/dplobby.c | 64 +++++++++++------------------------------------- 1 files changed, 15 insertions(+), 49 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 904fbcd..74b5c08 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -40,10 +40,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); */ typedef struct IDirectPlayLobbyImpl IDirectPlayLobbyAImpl; typedef struct IDirectPlayLobbyImpl IDirectPlayLobbyWImpl; -typedef struct IDirectPlayLobby2Impl IDirectPlayLobby2AImpl; -typedef struct IDirectPlayLobby2Impl IDirectPlayLobby2WImpl; -typedef struct IDirectPlayLobby3Impl IDirectPlayLobby3AImpl; -typedef struct IDirectPlayLobby3Impl IDirectPlayLobby3WImpl; +typedef struct IDirectPlayLobbyImpl IDirectPlayLobby2AImpl; +typedef struct IDirectPlayLobbyImpl IDirectPlayLobby2WImpl; +typedef struct IDirectPlayLobbyImpl IDirectPlayLobby3AImpl; +typedef struct IDirectPlayLobbyImpl IDirectPlayLobby3WImpl; /* Forward declarations for this module helper methods */ HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount, @@ -85,28 +85,13 @@ typedef struct tagDirectPlayLobbyData DPQ_HEAD( DPLMSG ) msgs; /* List of messages received */ } DirectPlayLobbyData; -#define DPL_IMPL_FIELDS \ - LONG ulInterfaceRef; \ - DirectPlayLobbyIUnknownData* unk; \ - DirectPlayLobbyData* dpl; - -struct IDirectPlayLobbyImpl -{ - const IDirectPlayLobbyVtbl *lpVtbl; - DPL_IMPL_FIELDS -}; - -struct IDirectPlayLobby2Impl +typedef struct IDirectPlayLobbyImpl { - const IDirectPlayLobby2Vtbl *lpVtbl; - DPL_IMPL_FIELDS -}; - -struct IDirectPlayLobby3Impl -{ - const IDirectPlayLobby3Vtbl *lpVtbl; - DPL_IMPL_FIELDS -}; + const void *lpVtbl; + LONG ulInterfaceRef; + DirectPlayLobbyIUnknownData* unk; + DirectPlayLobbyData* dpl; +} IDirectPlayLobbyImpl; /* Forward declarations of virtual tables */ static const IDirectPlayLobbyVtbl directPlayLobbyWVT; @@ -203,46 +188,26 @@ static BOOL DPL_DestroyLobby1( LPVOID lpDPL ) HRESULT DPL_CreateInterface ( REFIID riid, LPVOID* ppvObj ) { - TRACE( " for %s\n", debugstr_guid( riid ) ); + IDirectPlayLobbyImpl *This; - *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( IDirectPlayLobbyWImpl ) ); + TRACE( " for %s\n", debugstr_guid( riid ) ); - if( *ppvObj == NULL ) - { + This = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *This ) ); + if ( !This ) return DPERR_OUTOFMEMORY; - } if( 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 ) ) - { - IDirectPlayLobby3WImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby3WVT; - } else if( IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) - { - IDirectPlayLobby3AImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby3AVT; - } else { /* Unsupported interface */ @@ -253,6 +218,7 @@ HRESULT DPL_CreateInterface } /* Initialize it */ + *ppvObj = This; if ( DPL_CreateIUnknown( *ppvObj ) && DPL_CreateLobby1( *ppvObj ) )

1 0

Michael Stefaniuc : dplayx: Get rid of the unused DirectPlayLobby{2, 3}Data fields.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: d73231575f521e7de6af445c3e9426b7bf6dc69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73231575f521e7de6af445c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 9 22:31:20 2013 +0200 dplayx: Get rid of the unused DirectPlayLobby{2,3}Data fields. --- dlls/dplayx/dplobby.c | 66 +----------------------------------------------- 1 files changed, 2 insertions(+), 64 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 46a2168..904fbcd 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -85,22 +85,10 @@ typedef struct tagDirectPlayLobbyData DPQ_HEAD( DPLMSG ) msgs; /* List of messages received */ } DirectPlayLobbyData; -typedef struct tagDirectPlayLobby2Data -{ - BOOL dummy; -} DirectPlayLobby2Data; - -typedef struct tagDirectPlayLobby3Data -{ - BOOL dummy; -} DirectPlayLobby3Data; - #define DPL_IMPL_FIELDS \ LONG ulInterfaceRef; \ DirectPlayLobbyIUnknownData* unk; \ - DirectPlayLobbyData* dpl; \ - DirectPlayLobby2Data* dpl2; \ - DirectPlayLobby3Data* dpl3; + DirectPlayLobbyData* dpl; struct IDirectPlayLobbyImpl { @@ -188,50 +176,6 @@ static BOOL DPL_DestroyLobby1( LPVOID lpDPL ) return TRUE; } -static BOOL DPL_CreateLobby2( LPVOID lpDPL ) -{ - IDirectPlayLobby2AImpl *This = lpDPL; - - This->dpl2 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dpl2) ) ); - if ( This->dpl2 == NULL ) - { - return FALSE; - } - - return TRUE; -} - -static BOOL DPL_DestroyLobby2( LPVOID lpDPL ) -{ - IDirectPlayLobby2AImpl *This = lpDPL; - - HeapFree( GetProcessHeap(), 0, This->dpl2 ); - - return TRUE; -} - -static BOOL DPL_CreateLobby3( LPVOID lpDPL ) -{ - IDirectPlayLobby3AImpl *This = lpDPL; - - This->dpl3 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dpl3) ) ); - if ( This->dpl3 == NULL ) - { - return FALSE; - } - - return TRUE; -} - -static BOOL DPL_DestroyLobby3( LPVOID lpDPL ) -{ - IDirectPlayLobby3AImpl *This = lpDPL; - - HeapFree( GetProcessHeap(), 0, This->dpl3 ); - - return TRUE; -} - /* The COM interface for upversioning an interface * We've been given a GUID (riid) and we need to replace the present @@ -310,9 +254,7 @@ HRESULT DPL_CreateInterface /* Initialize it */ if ( DPL_CreateIUnknown( *ppvObj ) && - DPL_CreateLobby1( *ppvObj ) && - DPL_CreateLobby2( *ppvObj ) && - DPL_CreateLobby3( *ppvObj ) + DPL_CreateLobby1( *ppvObj ) ) { IDirectPlayLobby_AddRef( (LPDIRECTPLAYLOBBY)*ppvObj ); @@ -320,8 +262,6 @@ HRESULT DPL_CreateInterface } /* Initialize failed, destroy it */ - DPL_DestroyLobby3( *ppvObj ); - DPL_DestroyLobby2( *ppvObj ); DPL_DestroyLobby1( *ppvObj ); DPL_DestroyIUnknown( *ppvObj ); HeapFree( GetProcessHeap(), 0, *ppvObj ); @@ -432,8 +372,6 @@ static ULONG WINAPI DPL_Release /* Deallocate if this is the last reference to the object */ if( ulObjRefCount == 0 ) { - DPL_DestroyLobby3( This ); - DPL_DestroyLobby2( This ); DPL_DestroyLobby1( This ); DPL_DestroyIUnknown( This ); }

1 0

Alexandre Julliard : ddraw: De-duplicate display modes even when returning the refresh rate.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: 74f496d9bb00bd8c64b0de48528a0f2ed5b111a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f496d9bb00bd8c64b0de485… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 21:27:57 2013 +0200 ddraw: De-duplicate display modes even when returning the refresh rate. --- dlls/ddraw/ddraw.c | 73 +++++++++++++++++++-------------------------------- 1 files changed, 27 insertions(+), 46 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 266c779..a459e5f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2069,7 +2069,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, struct wined3d_display_mode mode; unsigned int modenum, fmt; DDSURFACEDESC2 callback_sd; - unsigned enum_mode_count = 0, enum_mode_array_size = 0; + unsigned enum_mode_count = 0, enum_mode_array_size = 16; DDPIXELFORMAT pixelformat; static const enum wined3d_format_id checkFormatList[] = @@ -2085,18 +2085,10 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, if (!cb) return DDERR_INVALIDPARAMS; + enum_modes = HeapAlloc(GetProcessHeap(), 0, sizeof(*enum_modes) * enum_mode_array_size); + if (!enum_modes) return DDERR_OUTOFMEMORY; + wined3d_mutex_lock(); - if(!(Flags & DDEDM_REFRESHRATES)) - { - enum_mode_array_size = 16; - enum_modes = HeapAlloc(GetProcessHeap(), 0, sizeof(*enum_modes) * enum_mode_array_size); - if (!enum_modes) - { - ERR("Out of memory\n"); - wined3d_mutex_unlock(); - return DDERR_OUTOFMEMORY; - } - } pixelformat.dwSize = sizeof(pixelformat); for(fmt = 0; fmt < (sizeof(checkFormatList) / sizeof(checkFormatList[0])); fmt++) @@ -2105,6 +2097,9 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, while (wined3d_enum_adapter_modes(ddraw->wined3d, WINED3DADAPTER_DEFAULT, checkFormatList[fmt], WINED3D_SCANLINE_ORDERING_UNKNOWN, modenum++, &mode) == WINED3D_OK) { + BOOL found = FALSE; + unsigned i; + PixelFormat_WineD3DtoDD(&pixelformat, mode.format_id); if (DDSD) { @@ -2119,27 +2114,18 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, continue; } - if(!(Flags & DDEDM_REFRESHRATES)) + /* DX docs state EnumDisplayMode should return only unique modes */ + for (i = 0; i < enum_mode_count; i++) { - /* DX docs state EnumDisplayMode should return only unique modes. If DDEDM_REFRESHRATES is not set, refresh - * rate doesn't matter when determining if the mode is unique. So modes only differing in refresh rate have - * to be reduced to a single unique result in such case. - */ - BOOL found = FALSE; - unsigned i; - - for (i = 0; i < enum_mode_count; i++) + if (enum_modes[i].width == mode.width && enum_modes[i].height == mode.height + && enum_modes[i].format_id == mode.format_id + && (enum_modes[i].refresh_rate == mode.refresh_rate || !(Flags & DDEDM_REFRESHRATES))) { - if (enum_modes[i].width == mode.width && enum_modes[i].height == mode.height - && enum_modes[i].format_id == mode.format_id) - { - found = TRUE; - break; - } + found = TRUE; + break; } - - if(found) continue; } + if(found) continue; memset(&callback_sd, 0, sizeof(callback_sd)); callback_sd.dwSize = sizeof(callback_sd); @@ -2169,28 +2155,23 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, return DD_OK; } - if(!(Flags & DDEDM_REFRESHRATES)) + if (enum_mode_count == enum_mode_array_size) { - if (enum_mode_count == enum_mode_array_size) + struct wined3d_display_mode *new_enum_modes; + + enum_mode_array_size *= 2; + new_enum_modes = HeapReAlloc(GetProcessHeap(), 0, enum_modes, + sizeof(*new_enum_modes) * enum_mode_array_size); + if (!new_enum_modes) { - struct wined3d_display_mode *new_enum_modes; - - enum_mode_array_size *= 2; - new_enum_modes = HeapReAlloc(GetProcessHeap(), 0, enum_modes, - sizeof(*new_enum_modes) * enum_mode_array_size); - if (!new_enum_modes) - { - ERR("Out of memory\n"); - HeapFree(GetProcessHeap(), 0, enum_modes); - wined3d_mutex_unlock(); - return DDERR_OUTOFMEMORY; - } - - enum_modes = new_enum_modes; + HeapFree(GetProcessHeap(), 0, enum_modes); + wined3d_mutex_unlock(); + return DDERR_OUTOFMEMORY; } - enum_modes[enum_mode_count++] = mode; + enum_modes = new_enum_modes; } + enum_modes[enum_mode_count++] = mode; } }

1 0

Stefan Dösinger : d3d9/tests: Test special fp values in local constants.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 6d06b7f5b8e83a3e6aea9d4b4d62397d4603d642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d06b7f5b8e83a3e6aea9d4b4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 2 14:54:03 2013 +0200 d3d9/tests: Test special fp values in local constants. The HLSL compiler refuses to use NaN and +/-Inf values in pre-SM4 shaders, claiming that those are unsupported in this shader model. However, vsa.exe happilly generates them, the required strings in the shader code are 1.#QNAN and 1.#INF. Native d3d9 happily loads such a shader. --- dlls/d3d9/tests/visual.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8ad249d..88c776a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1,6 +1,6 @@ /* * Copyright 2005, 2007-2008 Henri Verbeet - * Copyright (C) 2007-2008 Stefan Dösinger(for CodeWeavers) + * Copyright (C) 2007-2013 Stefan Dösinger(for CodeWeavers) * Copyright (C) 2008 Jason Green(for TransGaming) * * This library is free software; you can redistribute it and/or @@ -12336,10 +12336,12 @@ static void clip_planes_test(IDirect3DDevice9 *device) static void fp_special_test(IDirect3DDevice9 *device) { + /* Microsoft's assembler generates nan and inf with "1.#QNAN" and "1.#INF." respectively */ static const DWORD vs_header[] = { 0xfffe0200, /* vs_2_0 */ 0x05000051, 0xa00f0000, 0x00000000, 0x3f000000, 0x3f800000, 0x40000000, /* def c0, 0.0, 0.5, 1.0, 2.0 */ + 0x05000051, 0xa00f0001, 0x7fc00000, 0xff800000, 0x7f800000, 0x00000000, /* def c1, nan, -inf, inf, 0 */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000005, 0x900f0001, /* dcl_texcoord0 v1 */ }; @@ -12354,6 +12356,9 @@ static void fp_special_test(IDirect3DDevice9 *device) static const DWORD vs_rsq2[] = {0x02000007, 0x80010000, 0x91000001}; /* rsq r0.x, -v1.x */ static const DWORD vs_lit[] = {0x02000010, 0x800f0000, 0x90000001, /* lit r0, v1.xxxx */ 0x02000001, 0x80010000, 0x80aa0000}; /* mov r0.x, v0.z */ + static const DWORD vs_def1[] = {0x02000001, 0x80010000, 0xa0000001}; /* mov r0.x, c1.x */ + static const DWORD vs_def2[] = {0x02000001, 0x80010000, 0xa0550001}; /* mov r0.x, c1.y */ + static const DWORD vs_def3[] = {0x02000001, 0x80010000, 0xa0aa0001}; /* mov r0.x, c1.z */ static const DWORD vs_footer[] = { @@ -12406,6 +12411,9 @@ static void fp_special_test(IDirect3DDevice9 *device) {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, {"lit", vs_lit, sizeof(vs_lit), 0x00ff0000, 0x00ff0000, 0x00ff0000}, + {"def1", vs_def1, sizeof(vs_def1), 0x00007f00, 0x00007f00, 0x00007f00}, + {"def2", vs_def2, sizeof(vs_def2), 0x00ff7f00, 0x00ff7f00, 0x00ff7f00}, + {"def3", vs_def3, sizeof(vs_def3), 0x00ff7f00, 0x00ff7f00, 0x00ff7f00}, }; static const DWORD ps_code[] =

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
58
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2013