wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Jörg Höhle : wineoss: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: f68a36c87b475a53f3dcc5080a12e87d40399308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f68a36c87b475a53f3dcc5080… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jun 5 10:32:10 2011 +0200 wineoss: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat. --- dlls/wineoss.drv/mmdevdrv.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index b372b64..7e354fe 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1025,12 +1025,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(!pwfx) return E_POINTER; - - *pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEXTENSIBLE)); - if(!*pwfx) - return E_OUTOFMEMORY; - - fmt = (WAVEFORMATEXTENSIBLE*)*pwfx; + *pwfx = NULL; if(This->dataflow == eRender) formats = This->ai.oformats; @@ -1039,6 +1034,10 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, else return E_UNEXPECTED; + fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); + if(!fmt) + return E_OUTOFMEMORY; + fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; if(formats & AFMT_S16_LE){ fmt->Format.wBitsPerSample = 16; @@ -1059,6 +1058,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; }else{ ERR("Didn't recognize any available OSS formats: %x\n", formats); + CoTaskMemFree(fmt); return E_FAIL; } @@ -1074,6 +1074,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->Samples.wValidBitsPerSample = fmt->Format.wBitsPerSample; fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + *pwfx = (WAVEFORMATEX*)fmt; dump_fmt(*pwfx); return S_OK;

1 0

Jörg Höhle : winecoreaudio: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 8337ffb727265c38bbbd81cf9d3da7b61832507a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8337ffb727265c38bbbd81cf9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jun 5 10:26:57 2011 +0200 winecoreaudio: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat. --- dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 9075aa8..2819ca7 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1155,13 +1155,12 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(!pwfx) return E_POINTER; + *pwfx = NULL; - *pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEXTENSIBLE)); - if(!*pwfx) + fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); + if(!fmt) return E_OUTOFMEMORY; - fmt = (WAVEFORMATEXTENSIBLE*)*pwfx; - fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; addr.mScope = This->scope; @@ -1170,21 +1169,21 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, &size); if(sc != noErr){ - HeapFree(GetProcessHeap(), 0, fmt); + CoTaskMemFree(fmt); WARN("Unable to get size for _StreamConfiguration property: %lx\n", sc); return E_FAIL; } buffers = HeapAlloc(GetProcessHeap(), 0, size); if(!buffers){ - HeapFree(GetProcessHeap(), 0, fmt); + CoTaskMemFree(fmt); return E_OUTOFMEMORY; } sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, buffers); if(sc != noErr){ - HeapFree(GetProcessHeap(), 0, fmt); + CoTaskMemFree(fmt); HeapFree(GetProcessHeap(), 0, buffers); WARN("Unable to get _StreamConfiguration property: %lx\n", sc); return E_FAIL; @@ -1202,7 +1201,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, size = sizeof(Float64); sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, &rate); if(sc != noErr){ - HeapFree(GetProcessHeap(), 0, fmt); + CoTaskMemFree(fmt); WARN("Unable to get _NominalSampleRate property: %lx\n", sc); return E_FAIL; } @@ -1221,6 +1220,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->Samples.wValidBitsPerSample = fmt->Format.wBitsPerSample; fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + *pwfx = (WAVEFORMATEX*)fmt; dump_fmt(*pwfx); return S_OK;

1 0

Jörg Höhle : winealsa: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: d726cf881941afa61d6e5f976d0880be01d06919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d726cf881941afa61d6e5f976… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jun 4 11:55:06 2011 +0200 winealsa: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat. --- dlls/winealsa.drv/mmdevdrv.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 1a6d58f..f49df77 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1217,16 +1217,15 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(!pwfx) return E_POINTER; + *pwfx = NULL; - *pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEXTENSIBLE)); - if(!*pwfx) + fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); + if(!fmt) return E_OUTOFMEMORY; - fmt = (WAVEFORMATEXTENSIBLE*)*pwfx; - formats = HeapAlloc(GetProcessHeap(), 0, snd_pcm_format_mask_sizeof()); if(!formats){ - HeapFree(GetProcessHeap(), 0, *pwfx); + CoTaskMemFree(fmt); return E_OUTOFMEMORY; } @@ -1310,11 +1309,12 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); dump_fmt((WAVEFORMATEX*)fmt); + *pwfx = (WAVEFORMATEX*)fmt; exit: LeaveCriticalSection(&This->lock); if(FAILED(hr)) - HeapFree(GetProcessHeap(), 0, *pwfx); + CoTaskMemFree(fmt); HeapFree(GetProcessHeap(), 0, formats); return hr;

1 0

Jörg Höhle : mmdevapi/tests: Fix wrong buffer unit and memory leaks.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: c192041204436ebab5f3b20542f225920fa1de5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c192041204436ebab5f3b2054… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Jun 3 19:48:57 2011 +0200 mmdevapi/tests: Fix wrong buffer unit and memory leaks. --- dlls/mmdevapi/tests/render.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index c0507fe..b0d0c6c 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -371,6 +371,8 @@ static void test_references(void) 0, pwfx, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); + CoTaskMemFree(pwfx); + hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); ok(hr == S_OK, "GetService failed: %08x\n", hr); @@ -467,7 +469,7 @@ static void test_padding(void) hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); ok(hr == S_OK, "GetService failed: %08x\n", hr); - psize = (defp / 10000000.) * pwfx->nSamplesPerSec * pwfx->nBlockAlign; + psize = (defp / 10000000.) * pwfx->nSamplesPerSec * 10; written = 0; hr = IAudioClient_GetCurrentPadding(ac, &pad); @@ -487,7 +489,7 @@ static void test_padding(void) ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written); - psize = (minp / 10000000.) * pwfx->nSamplesPerSec * pwfx->nBlockAlign; + psize = (minp / 10000000.) * pwfx->nSamplesPerSec * 10; hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); @@ -645,6 +647,8 @@ static void test_clock(void) ok(hr == S_OK, "GetPosition failed: %08x\n", hr); ok(pos >= last, "Position should have been further along...\n"); + CoTaskMemFree(pwfx); + IAudioClock_Release(acl); IAudioClient_Release(ac); }

1 0

Detlef Riekenberg : shdocvw: Add support for IOleInPlaceSiteEx.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: d49b23d6efd6b9171210d9832fec25a16356a9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49b23d6efd6b9171210d9832… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 6 00:02:02 2011 +0200 shdocvw: Add support for IOleInPlaceSiteEx. --- dlls/shdocvw/client.c | 134 ++++++++++++++++++++++++++++++++--------------- dlls/shdocvw/shdocvw.h | 4 +- 2 files changed, 93 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d49b23d6efd6b9171210d…

1 0

André Hentschel : include: Add PF_XSAVE_ENABLED.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 2680548086c6dd29aaebc27999d883dc0a0820b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2680548086c6dd29aaebc2799… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 4 18:41:04 2011 +0200 include: Add PF_XSAVE_ENABLED. --- include/winnt.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index b4aa5a0..11f1ea2 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -777,6 +777,7 @@ typedef enum _HEAP_INFORMATION_CLASS { #define PF_COMPARE_EXCHANGE128 14 #define PF_COMPARE64_EXCHANGE128 15 #define PF_CHANNELS_ENABLED 16 +#define PF_XSAVE_ENABLED 17 /* Execution state flags */

1 0

André Hentschel : mscoree/tests: Test more IStream Functions on a ConfigStream.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 2061c61c4e8a00d7ea11c9a4961fb738efe0e58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2061c61c4e8a00d7ea11c9a49… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 4 18:35:09 2011 +0200 mscoree/tests: Test more IStream Functions on a ConfigStream. --- dlls/mscoree/tests/mscoree.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 3ef9bd8..3731f6f 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -274,7 +274,6 @@ static void test_createconfigstream(void) WCHAR nonexistent[] = {'n', 'o', 'n', 'e', 'x', 'i', 's', 't', '.', 'x', 'm', 'l', 0}; WCHAR path[MAX_PATH]; HRESULT hr; - ULONG ret; char buffer[256] = {0}; if (!pCreateConfigStream) @@ -308,14 +307,37 @@ static void test_createconfigstream(void) if (stream) { DWORD count; + LARGE_INTEGER pos; + ULARGE_INTEGER size; + IStream *stream2 = NULL; - hr = IStream_Read(stream, &buffer, strlen(xmldata), &count); + hr = IStream_Read(stream, buffer, strlen(xmldata), &count); ok(hr == S_OK, "IStream_Read failed, hr=%x\n", hr); ok(count == strlen(xmldata), "wrong count: %u\n", count); ok(!strcmp(buffer, xmldata), "Strings do not match\n"); - ret = IStream_Release(stream); - ok(!ret, "ret=%d\n", ret); + hr = IStream_Write(stream, xmldata, strlen(xmldata), &count); + ok(hr == E_FAIL, "IStream_Write returned hr=%x\n", hr); + + pos.QuadPart = strlen(xmldata); + hr = IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + ok(hr == E_NOTIMPL, "IStream_Seek returned hr=%x\n", hr); + + size.QuadPart = strlen(xmldata); + hr = IStream_SetSize(stream, size); + ok(hr == E_NOTIMPL, "IStream_SetSize returned hr=%x\n", hr); + + hr = IStream_Clone(stream, &stream2); + ok(hr == E_NOTIMPL, "IStream_Clone returned hr=%x\n", hr); + + hr = IStream_Commit(stream, STGC_DEFAULT); + ok(hr == E_NOTIMPL, "IStream_Commit returned hr=%x\n", hr); + + hr = IStream_Revert(stream); + ok(hr == E_NOTIMPL, "IStream_Revert returned hr=%x\n", hr); + + hr = IStream_Release(stream); + ok(hr == S_OK, "IStream_Release returned hr=%x\n", hr); } DeleteFileW(file); }

1 0

André Hentschel : mscoree/tests: Broken return value is a HRESULT_FROM_WIN32.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 79a51533661e4a65d63002c9953a247d760b7f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a51533661e4a65d63002c99… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 4 18:35:00 2011 +0200 mscoree/tests: Broken return value is a HRESULT_FROM_WIN32. --- dlls/mscoree/tests/mscoree.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 308db41..3ef9bd8 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -287,7 +287,8 @@ static void test_createconfigstream(void) GetFullPathNameW(file, MAX_PATH, path, NULL); hr = pCreateConfigStream(NULL, &stream); - todo_wine ok(hr == E_FAIL || broken(hr == ERROR_PROC_NOT_FOUND), /* some WinXP, Win2K3 and Win7 */ + todo_wine ok(hr == E_FAIL || + broken(hr == HRESULT_FROM_WIN32(ERROR_PROC_NOT_FOUND)), /* some WinXP, Win2K3 and Win7 */ "CreateConfigStream returned %x\n", hr); hr = pCreateConfigStream(path, NULL);

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in rebar tests.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 909794a2cb2ebd61e1ea51c20e0a155fd9c0db20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=909794a2cb2ebd61e1ea51c20… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Fri Jun 3 16:23:32 2011 +0200 comctl32/tests: Removed sign comparison warning in rebar tests. --- dlls/comctl32/tests/rebar.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index d9ceb71..5efe940 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -194,7 +194,7 @@ static int string_width(const CHAR *s) { typedef struct { RECT rc; DWORD fStyle; - INT cx; + UINT cx; } rbband_result_t; typedef struct { @@ -225,7 +225,7 @@ static void rbsize_add_row(rbsize_result_t *rbsr, int rowHeight) { rbsr->nRows++; } -static void rbsize_add_band(rbsize_result_t *rbsr, int left, int top, int right, int bottom, DWORD fStyle, INT cx) +static void rbsize_add_band(rbsize_result_t *rbsr, int left, int top, int right, int bottom, DWORD fStyle, UINT cx) { SetRect(&(rbsr->bands[rbsr->nBands].rc), left, top, right, bottom); rbsr->bands[rbsr->nBands].fStyle = fStyle; @@ -810,7 +810,7 @@ static const rbresize_test_result_t resize_results[] = { {{-2, 0, 674, 24}, 0, FALSE}, }; -static int resize_numtests = 0; +static DWORD resize_numtests = 0; #define comment(fmt, arg1) #define check_client() { \ @@ -894,7 +894,7 @@ static void expect_band_content_(int line, HWND hRebar, UINT uBand, INT fStyle, COLORREF clrBack, LPCSTR lpText, int iImage, HWND hwndChild, INT cxMinChild, INT cyMinChild, INT cx, HBITMAP hbmBack, INT wID, INT cyChild, INT cyMaxChild, INT cyIntegral, INT cxIdeal, LPARAM lParam, - INT cxHeader, INT cxHeader_broken) + UINT cxHeader, UINT cxHeader_broken) { CHAR buf[MAX_PATH] = "abc"; REBARBANDINFOA rb;

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

← Newer
1
...
65
66
67
68
69
70
71
...
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