wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

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

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 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

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 : 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 : winealsa.drv: Partially implement IAudioSessionManager2.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 6dac4d713ce9b3530d9d663bac753bcd5b200381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dac4d713ce9b3530d9d663ba… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 6 08:49:13 2011 -0500 winealsa.drv: Partially implement IAudioSessionManager2. --- dlls/winealsa.drv/mmdevdrv.c | 308 ++++++++++++++++++++++++++++------ dlls/winealsa.drv/winealsa.drv.spec | 1 + 2 files changed, 254 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6dac4d713ce9b3530d9d6…

1 0

Aric Stewart : gdi32: Fall back on uniscribe for complex scripts.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 0a29308e87780a7f0f6c5504ad80768443166cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a29308e87780a7f0f6c5504a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 6 07:43:07 2011 -0500 gdi32: Fall back on uniscribe for complex scripts. --- dlls/gdi32/bidi.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 297ce86..9b8f758 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -359,6 +359,7 @@ BOOL BIDI_Reorder( WORD *chartype; BYTE *levels; unsigned i, done, glyph_i; + BOOL is_complex; int maxItems; int nItems; @@ -404,11 +405,20 @@ BOOL BIDI_Reorder( if (lpOutString) memcpy(lpOutString, lpString, uCount * sizeof(WCHAR)); + is_complex = FALSE; + for (i = 0; i < uCount && !is_complex; i++) + { + if ((lpString[i] >= 0x900 && lpString[i] <= 0xfff) || + (lpString[i] >= 0x1cd0 && lpString[i] <= 0x1cff) || + (lpString[i] >= 0xa840 && lpString[i] <= 0xa8ff)) + is_complex = TRUE; + } + /* Verify reordering will be required */ if ((WINE_GCPW_FORCE_RTL == (dwWineGCP_Flags&WINE_GCPW_DIR_MASK)) || ((dwWineGCP_Flags&WINE_GCPW_DIR_MASK) == WINE_GCPW_LOOSE_RTL)) State.uBidiLevel = 1; - else + else if (!is_complex) { done = 1; classify(lpString, chartype, uCount);

1 0

Aric Stewart : usp10: Correct indic vowel marker name.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 7ab744d3c76ba72b05d181524775a2428a6e7a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab744d3c76ba72b05d181524… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 6 07:28:54 2011 -0500 usp10: Correct indic vowel marker name. --- dlls/usp10/indic.c | 20 +++--- dlls/usp10/shape.c | 152 +++++++++++++++++++++--------------------- dlls/usp10/usp10_internal.h | 2 +- 3 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ab744d3c76ba72b05d18…

1 0

Michael Stefaniuc : dxgi: COM cleanup in the IDXGISwapChain iface.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 61f51eb47ecde08f9d1f6e60b1261e52f029a67e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f51eb47ecde08f9d1f6e60b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 6 10:25:49 2011 +0200 dxgi: COM cleanup in the IDXGISwapChain iface. --- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/swapchain.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 741e3e3..98fdea8 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -124,7 +124,7 @@ HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IWineDXGIFactory *parent /* IDXGISwapChain */ struct dxgi_swapchain { - const struct IDXGISwapChainVtbl *vtbl; + IDXGISwapChain IDXGISwapChain_iface; LONG refcount; struct wined3d_swapchain *wined3d_swapchain; }; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e4f7433..373403c 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -24,6 +24,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static inline struct dxgi_swapchain *impl_from_IDXGISwapChain(IDXGISwapChain *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_swapchain, IDXGISwapChain_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_QueryInterface(IDXGISwapChain *iface, REFIID riid, void **object) @@ -48,7 +53,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_QueryInterface(IDXGISwapChain *i static ULONG STDMETHODCALLTYPE dxgi_swapchain_AddRef(IDXGISwapChain *iface) { - struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; + struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -61,7 +66,7 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_AddRef(IDXGISwapChain *iface) static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) { - struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; + struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -130,7 +135,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDevice(IDXGISwapChain *iface, static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present(IDXGISwapChain *iface, UINT sync_interval, UINT flags) { - struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; + struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface); TRACE("iface %p, sync_interval %u, flags %#x\n", iface, sync_interval, flags); @@ -143,7 +148,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present(IDXGISwapChain *iface, U static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, UINT buffer_idx, REFIID riid, void **surface) { - struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; + struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface); struct wined3d_surface *backbuffer; IUnknown *parent; HRESULT hr; @@ -271,7 +276,7 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device { HRESULT hr; - swapchain->vtbl = &dxgi_swapchain_vtbl; + swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl; swapchain->refcount = 1; hr = wined3d_swapchain_create(device->wined3d_device, present_parameters,

1 0

Michael Stefaniuc : dxgi: COM cleanup for the IDXGIOutput iface.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 125b949545e19725740eed41390a092c6ca21d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=125b949545e19725740eed413… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 6 10:21:49 2011 +0200 dxgi: COM cleanup for the IDXGIOutput iface. --- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/output.c | 15 ++++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 7cd808f..d4f757b 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -228,7 +228,7 @@ HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IWineDXGIFactory *parent return E_OUTOFMEMORY; } dxgi_output_init(output, adapter); - adapter->output = (IDXGIOutput *)output; + adapter->output = &output->IDXGIOutput_iface; return S_OK; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index cb472f3..741e3e3 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -102,7 +102,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l /* IDXGIOutput */ struct dxgi_output { - const struct IDXGIOutputVtbl *vtbl; + IDXGIOutput IDXGIOutput_iface; LONG refcount; struct dxgi_adapter *adapter; }; diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 5ab7992..acc9f25 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -23,6 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static inline struct dxgi_output *impl_from_IDXGIOutput(IDXGIOutput *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput *iface, REFIID riid, void **object) @@ -46,7 +51,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput *iface, static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput *iface) { - struct dxgi_output *This = (struct dxgi_output *)iface; + struct dxgi_output *This = impl_from_IDXGIOutput(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -56,7 +61,7 @@ static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput *iface) static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput *iface) { - struct dxgi_output *This = (struct dxgi_output *)iface; + struct dxgi_output *This = impl_from_IDXGIOutput(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u.\n", This, refcount); @@ -98,7 +103,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput *iface, static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput *iface, REFIID riid, void **parent) { - struct dxgi_output *This = (struct dxgi_output *)iface; + struct dxgi_output *This = impl_from_IDXGIOutput(iface); TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); @@ -117,7 +122,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput *iface, DXGI_OU static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *desc) { - struct dxgi_output *This = (struct dxgi_output *)iface; + struct dxgi_output *This = impl_from_IDXGIOutput(iface); enum wined3d_format_id wined3d_format; struct wined3d *wined3d; UINT i; @@ -279,7 +284,7 @@ static const struct IDXGIOutputVtbl dxgi_output_vtbl = void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) { - output->vtbl = &dxgi_output_vtbl; + output->IDXGIOutput_iface.lpVtbl = &dxgi_output_vtbl; output->refcount = 1; output->adapter = adapter; }

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
81
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 June 2011