June 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : widl: Add support for new-style interpreted stubs in the proc format strings.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: b724138bd9cad0ecb55186b20406ed7f66bf3d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b724138bd9cad0ecb55186b20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 14:54:14 2011 +0200 widl: Add support for new-style interpreted stubs in the proc format strings. --- tools/widl/typegen.c | 384 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 336 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b724138bd9cad0ecb5518…

1 0

Alexandre Julliard : widl: Add support for generating new-style interpreted stubs for clients.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: e95d5a8e3cafbe41f4585907cf20384166c53093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95d5a8e3cafbe41f4585907c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 14:54:14 2011 +0200 widl: Add support for generating new-style interpreted stubs for clients. --- tools/widl/client.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 452b883..ea0c2cc 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -107,8 +107,10 @@ static void write_function_stub( const type_t *iface, const var_t *func, fprintf(client, "{\n"); indent++; if (has_ret) print_client( "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); - print_client( "%sNdrClientCall( &%s_StubDesc, &__MIDL_ProcFormatString.Format[%u], ", - has_ret ? "_RetVal = " : "", iface->name, proc_offset ); + print_client( "%s%s( &%s_StubDesc, &__MIDL_ProcFormatString.Format[%u], ", + has_ret ? "_RetVal = " : "", + stub_mode == MODE_Oif ? "NdrClientCall2" : "NdrClientCall", + iface->name, proc_offset ); if (args) fprintf( client, "(unsigned char *)&%s );\n", LIST_ENTRY( list_head(args), const var_t, entry )->name ); @@ -383,7 +385,7 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) print_client("0,\n"); print_client("__MIDL_TypeFormatString.Format,\n"); print_client("1, /* -error bounds_check flag */\n"); - print_client("0x10001, /* Ndr library version */\n"); + print_client("0x%x, /* Ndr library version */\n", stub_mode == MODE_Oif ? 0x50002 : 0x10001); print_client("0,\n"); print_client("0x50100a4, /* MIDL Version 5.1.164 */\n"); print_client("0,\n");

1 0

Alexandre Julliard : widl: Add support for generating new-style interpreted stubs for servers.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 39b15066b052cc098eb8ec52056ee2b49d12b1a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b15066b052cc098eb8ec520… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 16:28:25 2011 +0200 widl: Add support for generating new-style interpreted stubs for servers. --- tools/widl/server.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 46bb771..1c1bc49 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -270,7 +270,7 @@ static void write_dispatchtable(type_t *iface) { var_t *func = stmt->u.var; if (is_interpreted_func( iface, func )) - print_server("NdrServerCall,\n"); + print_server("%s,\n", stub_mode == MODE_Oif ? "NdrServerCall2" : "NdrServerCall"); else print_server("%s_%s,\n", iface->name, get_name(func)); method_count++; @@ -354,7 +354,7 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) print_server("0,\n"); print_server("__MIDL_TypeFormatString.Format,\n"); print_server("1, /* -error bounds_check flag */\n"); - print_server("0x10001, /* Ndr library version */\n"); + print_server("0x%x, /* Ndr library version */\n", stub_mode == MODE_Oif ? 0x50002 : 0x10001); print_server("0,\n"); print_server("0x50100a4, /* MIDL Version 5.1.164 */\n"); print_server("0,\n");

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirectDrawSurface7() for application provided interfaces.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 28ce1c00a7dd1b453ca97e727090206a11f2d08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ce1c00a7dd1b453ca97e727… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Jun 6 12:30:23 2011 +0300 ddraw: Use unsafe_impl_from_IDirectDrawSurface7() for application provided interfaces. --- dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 24 ++++++++++++------------ dlls/ddraw/surface.c | 21 ++++++++++++++------- 4 files changed, 30 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28ce1c00a7dd1b453ca97…

1 0

Andrew Eikum : wineoss.drv: Partially implement IAudioSessionManager2.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: a63346aa40f2fab53db8bf2d96c2027c965edd35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63346aa40f2fab53db8bf2d9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 6 08:49:26 2011 -0500 wineoss.drv: Partially implement IAudioSessionManager2. --- dlls/wineoss.drv/mmdevdrv.c | 325 +++++++++++++++++++++++++++++-------- dlls/wineoss.drv/wineoss.drv.spec | 1 + 2 files changed, 259 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a63346aa40f2fab53db8b…

1 0

Andrew Eikum : winecoreaudio.drv: Partially implement IAudioSessionManager2 .
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 38d80c7310ccb3a86ad833c9e2d7a76c8252528b URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d80c7310ccb3a86ad833c9e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 6 08:49:34 2011 -0500 winecoreaudio.drv: Partially implement IAudioSessionManager2. --- dlls/winecoreaudio.drv/mmdevdrv.c | 323 +++++++++++++++++++------ dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 1 + 2 files changed, 255 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38d80c7310ccb3a86ad83…

1 0

Andrew Eikum : mmdevapi: Add support for IAudioSessionManager in IMMDevice: :Activate.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 4e7d039722fa8f9c99ba7637aed5c988da87452b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7d039722fa8f9c99ba7637a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 6 08:49:48 2011 -0500 mmdevapi: Add support for IAudioSessionManager in IMMDevice::Activate. --- dlls/mmdevapi/devenum.c | 2 +- dlls/mmdevapi/main.c | 1 + dlls/mmdevapi/mmdevapi.h | 2 + dlls/mmdevapi/tests/render.c | 105 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index d2a4620..7f94917 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -547,7 +547,7 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls else if (IsEqualIID(riid, &IID_IAudioSessionManager) || IsEqualIID(riid, &IID_IAudioSessionManager2)) { - FIXME("IID_IAudioSessionManager unsupported\n"); + hr = drvs.pGetAudioSessionManager(This->flow, (IAudioSessionManager2**)ppv); } else if (IsEqualIID(riid, &IID_IBaseFilter)) { diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index ed0039a..f65ea3a 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -75,6 +75,7 @@ static BOOL load_driver(const WCHAR *name) if(!drvs.p##n) { FreeLibrary(drvs.module); return FALSE; } } while(0) LDFC(GetEndpointIDs); LDFC(GetAudioEndpoint); + LDFC(GetAudioSessionManager); #undef LDFC TRACE("Successfully loaded %s\n", wine_dbgstr_w(driver_module)); diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 9740395..f3a26b9 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -37,6 +37,8 @@ typedef struct _DriverFuncs { void ***keys, UINT *num, UINT *default_index); HRESULT WINAPI (*pGetAudioEndpoint)(void *key, IMMDevice *dev, EDataFlow dataflow, IAudioClient **out); + HRESULT WINAPI (*pGetAudioSessionManager)(EDataFlow flow, + IAudioSessionManager2 **out); } DriverFuncs; extern DriverFuncs drvs DECLSPEC_HIDDEN; diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 1e54dab..c0507fe 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1213,6 +1213,110 @@ static void test_volume_dependence(void) IAudioClient_Release(ac); } +static void test_session_creation(void) +{ + IMMDevice *cap_dev; + IAudioClient *ac; + IAudioSessionManager *sesm; + ISimpleAudioVolume *sav; + GUID session_guid; + float vol; + HRESULT hr; + WAVEFORMATEX *fmt; + + CoCreateGuid(&session_guid); + + hr = IMMDevice_Activate(dev, &IID_IAudioSessionManager, + CLSCTX_INPROC_SERVER, NULL, (void**)&sesm); + ok(hr == S_OK, "Activate failed: %08x\n", hr); + + hr = IAudioSessionManager_GetSimpleAudioVolume(sesm, &session_guid, + FALSE, &sav); + ok(hr == S_OK, "GetSimpleAudioVolume failed: %08x\n", hr); + + hr = ISimpleAudioVolume_SetMasterVolume(sav, 0.6f, NULL); + ok(hr == S_OK, "SetMasterVolume failed: %08x\n", hr); + + /* Release completely to show session persistence */ + ISimpleAudioVolume_Release(sav); + IAudioSessionManager_Release(sesm); + + /* test if we can create a capture audioclient in the session we just + * created from a SessionManager derived from a render device */ + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eCapture, + eMultimedia, &cap_dev); + if(hr == S_OK){ + WAVEFORMATEX *cap_pwfx; + IAudioClient *cap_ac; + ISimpleAudioVolume *cap_sav; + IAudioSessionManager *cap_sesm; + + hr = IMMDevice_Activate(cap_dev, &IID_IAudioSessionManager, + CLSCTX_INPROC_SERVER, NULL, (void**)&cap_sesm); + ok(hr == S_OK, "Activate failed: %08x\n", hr); + + hr = IAudioSessionManager_GetSimpleAudioVolume(cap_sesm, &session_guid, + FALSE, &cap_sav); + ok(hr == S_OK, "GetSimpleAudioVolume failed: %08x\n", hr); + + vol = 0.5f; + hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); + ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(vol == 1.f, "Got wrong volume: %f\n", vol); + + ISimpleAudioVolume_Release(cap_sav); + IAudioSessionManager_Release(cap_sesm); + + hr = IMMDevice_Activate(cap_dev, &IID_IAudioClient, + CLSCTX_INPROC_SERVER, NULL, (void**)&cap_ac); + ok(hr == S_OK, "Activate failed: %08x\n", hr); + + hr = IAudioClient_GetMixFormat(cap_ac, &cap_pwfx); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + + hr = IAudioClient_Initialize(cap_ac, AUDCLNT_SHAREMODE_SHARED, + 0, 5000000, 0, cap_pwfx, &session_guid); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + hr = IAudioClient_GetService(cap_ac, &IID_ISimpleAudioVolume, + (void**)&cap_sav); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + + vol = 0.5f; + hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); + ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(vol == 1.f, "Got wrong volume: %f\n", vol); + + CoTaskMemFree(cap_pwfx); + ISimpleAudioVolume_Release(cap_sav); + IAudioClient_Release(cap_ac); + IMMDevice_Release(cap_dev); + } + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + + hr = IAudioClient_GetMixFormat(ac, &fmt); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, + AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session_guid); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + + vol = 0.5f; + hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); + ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(fabs(vol - 0.6f) < 0.05f, "Got wrong volume: %f\n", vol); + + CoTaskMemFree(fmt); + ISimpleAudioVolume_Release(sav); + IAudioClient_Release(ac); +} + START_TEST(render) { HRESULT hr; @@ -1246,6 +1350,7 @@ START_TEST(render) test_channelvolume(); test_simplevolume(); test_volume_dependence(); + test_session_creation(); IMMDevice_Release(dev);

1 0

Aric Stewart : usp10: Don' t return prematurely from Chaining Contextual Substitution.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 1e115d65e09e44300481d9431da97c14d67c8449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e115d65e09e44300481d9431… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 6 09:08:03 2011 -0500 usp10: Don't return prematurely from Chaining Contextual Substitution. --- dlls/usp10/shape.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 45492f7..5ee0b6d 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -969,12 +969,12 @@ static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSU if (GET_BE_WORD(ccsf1->SubstFormat) == 1) { FIXME(" TODO: subtype 1 (Simple context glyph substitution)\n"); - return -1; + continue; } else if (GET_BE_WORD(ccsf1->SubstFormat) == 2) { FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); - return -1; + continue; } else if (GET_BE_WORD(ccsf1->SubstFormat) == 3) { @@ -997,7 +997,7 @@ static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSU break; } if (k != GET_BE_WORD(ccsf3_1->BacktrackGlyphCount)) - return -1; + continue; TRACE("Matched Backtrack\n"); ccsf3_2 = (const GSUB_ChainContextSubstFormat3_2 *)(((LPBYTE)ccsf1)+sizeof(GSUB_ChainContextSubstFormat3_1) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_1->BacktrackGlyphCount)-1))); @@ -1010,7 +1010,7 @@ static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSU break; } if (k != indexGlyphs) - return -1; + continue; TRACE("Matched IndexGlyphs\n"); ccsf3_3 = (const GSUB_ChainContextSubstFormat3_3 *)(((LPBYTE)ccsf3_2)+sizeof(GSUB_ChainContextSubstFormat3_2) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_2->InputGlyphCount)-1))); @@ -1022,7 +1022,7 @@ static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSU break; } if (k != GET_BE_WORD(ccsf3_3->LookaheadGlyphCount)) - return -1; + continue; TRACE("Matched LookAhead\n"); ccsf3_4 = (const GSUB_ChainContextSubstFormat3_4 *)(((LPBYTE)ccsf3_3)+sizeof(GSUB_ChainContextSubstFormat3_3) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_3->LookaheadGlyphCount)-1))); @@ -1037,7 +1037,7 @@ static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSU if (newIndex == -1) { ERR("Chain failed to generate a glyph\n"); - return -1; + continue; } } return newIndex + 1;

1 0

Andrew Nguyen : d3d8: Increment the reference count of the IDirect3D8 parent when creating a device .
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 174b03cad867aa92210ff411d3e95bde10e3c75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=174b03cad867aa92210ff411d… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jun 3 07:23:21 2011 -0500 d3d8: Increment the reference count of the IDirect3D8 parent when creating a device. --- dlls/d3d8/d3d8_private.h | 5 +++-- dlls/d3d8/device.c | 29 ++++++++--------------------- dlls/d3d8/directx.c | 2 +- dlls/d3d8/tests/device.c | 12 ++++++++++++ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 914dec5..f98b334 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -177,7 +177,8 @@ struct IDirect3DDevice8Impl IDirect3DDevice8 IDirect3DDevice8_iface; struct wined3d_device_parent device_parent; LONG ref; - struct wined3d_device *wined3d_device; + struct wined3d_device *wined3d_device; + IDirect3D8 *d3d_parent; struct d3d8_handle_table handle_table; /* FVF management */ @@ -189,7 +190,7 @@ struct IDirect3DDevice8Impl BOOL lost; }; -HRESULT device_init(IDirect3DDevice8Impl *device, struct wined3d *wined3d, UINT adapter, +HRESULT device_init(IDirect3DDevice8Impl *device, IDirect3D8Impl *parent, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN; /* ---------------- */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index aa85c61..6266bfa 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -301,6 +301,7 @@ static ULONG WINAPI IDirect3DDevice8Impl_Release(IDirect3DDevice8 *iface) if (ref == 0) { unsigned i; + IDirect3D8 *parent = This->d3d_parent; TRACE("Releasing wined3d device %p.\n", This->wined3d_device); @@ -320,6 +321,8 @@ static ULONG WINAPI IDirect3DDevice8Impl_Release(IDirect3DDevice8 *iface) HeapFree(GetProcessHeap(), 0, This); wined3d_mutex_unlock(); + + IDirect3D8_Release(parent); } return ref; } @@ -373,8 +376,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ResourceManagerDiscardBytes(IDirect3D static HRESULT WINAPI IDirect3DDevice8Impl_GetDirect3D(IDirect3DDevice8 *iface, IDirect3D8 **ppD3D8) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - struct wined3d *wined3d; - HRESULT hr; TRACE("iface %p, d3d8 %p.\n", iface, ppD3D8); @@ -382,24 +383,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDirect3D(IDirect3DDevice8 *iface, return D3DERR_INVALIDCALL; } - wined3d_mutex_lock(); - hr = wined3d_device_get_wined3d(This->wined3d_device, &wined3d); - if (SUCCEEDED(hr) && wined3d) - { - *ppD3D8 = wined3d_get_parent(wined3d); - IDirect3D8_AddRef(*ppD3D8); - wined3d_decref(wined3d); - } - else - { - FIXME("Call to IWineD3DDevice_GetDirect3D failed\n"); - *ppD3D8 = NULL; - } - wined3d_mutex_unlock(); - - TRACE("(%p) returning %p\n",This , *ppD3D8); - - return hr; + return IDirect3D8_QueryInterface(This->d3d_parent, &IID_IDirect3D8, (void **)ppD3D8); } static HRESULT WINAPI IDirect3DDevice8Impl_GetDeviceCaps(IDirect3DDevice8 *iface, D3DCAPS8 *pCaps) @@ -3095,7 +3079,7 @@ static void setup_fpu(void) #endif } -HRESULT device_init(IDirect3DDevice8Impl *device, struct wined3d *wined3d, UINT adapter, +HRESULT device_init(IDirect3DDevice8Impl *device, IDirect3D8Impl *parent, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) { WINED3DPRESENT_PARAMETERS wined3d_parameters; @@ -3209,6 +3193,9 @@ HRESULT device_init(IDirect3DDevice8Impl *device, struct wined3d *wined3d, UINT goto err; } + device->d3d_parent = &parent->IDirect3D8_iface; + IDirect3D8_AddRef(device->d3d_parent); + return D3D_OK; err: diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 249399e..266b68e 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -368,7 +368,7 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(IDirect3D8 *iface, UINT adapte return E_OUTOFMEMORY; } - hr = device_init(object, This->WineD3D, adapter, device_type, focus_window, flags, parameters); + hr = device_init(object, This, This->WineD3D, adapter, device_type, focus_window, flags, parameters); if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 3bb70b7..9a4369b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -343,6 +343,7 @@ static void test_refcount(void) HRESULT hr; HWND hwnd = NULL; IDirect3D8 *pD3d = NULL; + IDirect3D8 *pD3d2 = NULL; IDirect3DDevice8 *pDevice = NULL; IDirect3DVertexBuffer8 *pVertexBuffer = NULL; IDirect3DIndexBuffer8 *pIndexBuffer = NULL; @@ -381,6 +382,8 @@ static void test_refcount(void) ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; + CHECK_REFCOUNT( pD3d, 1 ); + IDirect3D8_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); ZeroMemory( &d3dpp, sizeof(d3dpp) ); d3dpp.Windowed = TRUE; @@ -401,6 +404,15 @@ static void test_refcount(void) refcount = get_refcount( (IUnknown *)pDevice ); ok(refcount == 1, "Invalid device RefCount %d\n", refcount); + CHECK_REFCOUNT( pD3d, 2 ); + + hr = IDirect3DDevice8_GetDirect3D(pDevice, &pD3d2); + CHECK_CALL( hr, "GetDirect3D", pDevice, refcount ); + + ok(pD3d2 == pD3d, "Expected IDirect3D8 pointers to be equal\n"); + CHECK_REFCOUNT( pD3d, 3 ); + CHECK_RELEASE_REFCOUNT( pD3d, 2 ); + /** * Check refcount of implicit surfaces. Findings: * - the container is the device

1 0

Andrew Nguyen : d3d9: Increment the reference count of the IDirect3D9 parent when creating a device .
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 94785ab4d57ccc7cce08f77a2db7576197b9fd21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94785ab4d57ccc7cce08f77a2… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jun 3 07:23:27 2011 -0500 d3d9: Increment the reference count of the IDirect3D9 parent when creating a device. --- dlls/d3d9/d3d9_private.h | 3 ++- dlls/d3d9/device.c | 27 +++++++-------------------- dlls/d3d9/directx.c | 4 ++-- dlls/d3d9/tests/device.c | 12 ++++++++++++ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 23e7f00..87ff3fd 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -166,6 +166,7 @@ typedef struct IDirect3DDevice9Impl struct wined3d_device_parent device_parent; LONG ref; struct wined3d_device *wined3d_device; + IDirect3D9Ex *d3d_parent; /* Avoids recursion with nested ReleaseRef to 0 */ BOOL inDestruction; @@ -175,7 +176,7 @@ typedef struct IDirect3DDevice9Impl BOOL notreset; } IDirect3DDevice9Impl; -HRESULT device_init(IDirect3DDevice9Impl *device, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, +HRESULT device_init(IDirect3DDevice9Impl *device, IDirect3D9Impl *parent, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) DECLSPEC_HIDDEN; /***************************************************************************** diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a95fa16..2e4ca5d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -265,6 +265,8 @@ static ULONG WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Release(IDirect3DDevi wined3d_device_decref(This->wined3d_device); wined3d_mutex_unlock(); + IDirect3D9_Release(This->d3d_parent); + HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -317,8 +319,6 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(IDirect3DDevice9Ex *iface IDirect3D9 **ppD3D9) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - struct wined3d *wined3d; - HRESULT hr = D3D_OK; TRACE("iface %p, d3d9 %p.\n", iface, ppD3D9); @@ -326,23 +326,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(IDirect3DDevice9Ex *iface return D3DERR_INVALIDCALL; } - wined3d_mutex_lock(); - hr = wined3d_device_get_wined3d(This->wined3d_device, &wined3d); - if (hr == D3D_OK && wined3d) - { - *ppD3D9 = wined3d_get_parent(wined3d); - IDirect3D9_AddRef(*ppD3D9); - wined3d_decref(wined3d); - } - else - { - FIXME("Call to IWineD3DDevice_GetDirect3D failed\n"); - *ppD3D9 = NULL; - } - TRACE("(%p) returning %p\n", This, *ppD3D9); - wined3d_mutex_unlock(); - - return hr; + return IDirect3D9Ex_QueryInterface(This->d3d_parent, &IID_IDirect3D9, (void **)ppD3D9); } static HRESULT WINAPI IDirect3DDevice9Impl_GetDeviceCaps(IDirect3DDevice9Ex *iface, D3DCAPS9 *pCaps) @@ -3347,7 +3331,7 @@ static void setup_fpu(void) #endif } -HRESULT device_init(IDirect3DDevice9Impl *device, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, +HRESULT device_init(IDirect3DDevice9Impl *device, IDirect3D9Impl *parent, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) { WINED3DPRESENT_PARAMETERS *wined3d_parameters; @@ -3483,5 +3467,8 @@ HRESULT device_init(IDirect3DDevice9Impl *device, struct wined3d *wined3d, UINT return E_OUTOFMEMORY; } + device->d3d_parent = &parent->IDirect3D9Ex_iface; + IDirect3D9_AddRef(device->d3d_parent); + return D3D_OK; } diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 791d835..148b9b7 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -449,7 +449,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9Impl_CreateDevice(IDirect3D9Ex return E_OUTOFMEMORY; } - hr = device_init(object, This->WineD3D, adapter, device_type, focus_window, flags, parameters, NULL); + hr = device_init(object, This, This->WineD3D, adapter, device_type, focus_window, flags, parameters, NULL); if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); @@ -507,7 +507,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3 return E_OUTOFMEMORY; } - hr = device_init(object, d3d9->WineD3D, adapter, device_type, focus_window, flags, parameters, mode); + hr = device_init(object, d3d9, d3d9->WineD3D, adapter, device_type, focus_window, flags, parameters, mode); if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 1a74d6e..235b06f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -423,6 +423,7 @@ static void test_refcount(void) HRESULT hr; HWND hwnd = NULL; IDirect3D9 *pD3d = NULL; + IDirect3D9 *pD3d2 = NULL; IDirect3DDevice9 *pDevice = NULL; IDirect3DVertexBuffer9 *pVertexBuffer = NULL; IDirect3DIndexBuffer9 *pIndexBuffer = NULL; @@ -467,6 +468,8 @@ static void test_refcount(void) ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; + CHECK_REFCOUNT( pD3d, 1 ); + IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); ZeroMemory( &d3dpp, sizeof(d3dpp) ); d3dpp.Windowed = TRUE; @@ -484,6 +487,15 @@ static void test_refcount(void) refcount = get_refcount( (IUnknown *)pDevice ); ok(refcount == 1, "Invalid device RefCount %d\n", refcount); + CHECK_REFCOUNT( pD3d, 2 ); + + hr = IDirect3DDevice9_GetDirect3D(pDevice, &pD3d2); + CHECK_CALL( hr, "GetDirect3D", pDevice, refcount ); + + ok(pD3d2 == pD3d, "Expected IDirect3D9 pointers to be equal\n"); + CHECK_REFCOUNT( pD3d, 3 ); + CHECK_RELEASE_REFCOUNT( pD3d, 2 ); + /** * Check refcount of implicit surfaces and implicit swapchain. Findings: * - the container is the device OR swapchain

1 0