May 2012 - Wine-commits - list.winehq.org

Aric Stewart : quartz: Implement a Default Presenter in VMR9.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 38c31973d47c0711c1d32a71ab77fb1e906ac776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c31973d47c0711c1d32a71a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 21 07:53:44 2012 -0500 quartz: Implement a Default Presenter in VMR9. --- dlls/quartz/vmr9.c | 254 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 252 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 809ee0f..fc04269 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -123,6 +123,28 @@ static inline VMR9Impl *impl_from_IVMRSurfaceAllocatorNotify9( IVMRSurfaceAlloca return CONTAINING_RECORD(iface, VMR9Impl, IVMRSurfaceAllocatorNotify9_iface); } +typedef struct +{ + IVMRImagePresenter9 IVMRImagePresenter9_iface; + + LONG refCount; + + IDirect3DDevice9 *d3d9_dev; + IDirect3D9 *d3d9_ptr; + IDirect3DVertexBuffer9 *d3d9_vertex; + + VMR9AllocationInfo info; + + VMR9Impl* pVMR9; +} VMR9DefaultAllocatorPresenterImpl; + +static inline VMR9DefaultAllocatorPresenterImpl *impl_from_IVMRImagePresenter9( IVMRImagePresenter9 *iface) +{ + return CONTAINING_RECORD(iface, VMR9DefaultAllocatorPresenterImpl, IVMRImagePresenter9_iface); +} + +static HRESULT VMR9DefaultAllocatorPresenterImpl_create(VMR9Impl *parent, LPVOID * ppv); + static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pSample) { VMR9Impl *This = (VMR9Impl *)iface; @@ -886,10 +908,21 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface { case VMR9Mode_Windowed: case VMR9Mode_Windowless: - This->allocator = NULL; - This->presenter = NULL; This->allocator_is_ex = 0; This->cookie = ~0; + + hr = VMR9DefaultAllocatorPresenterImpl_create(This, (LPVOID*)&This->presenter); + if (SUCCEEDED(hr)) + hr = IVMRImagePresenter9_QueryInterface(This->presenter, &IID_IVMRSurfaceAllocatorEx9, (LPVOID*)&This->allocator); + if (FAILED(hr)) + { + ERR("Unable to find Presenter interface\n"); + IVMRSurfaceAllocatorEx9_Release(This->presenter); + This->allocator = NULL; + This->presenter = NULL; + } + else + hr = IVMRSurfaceAllocator9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); break; case VMR9Mode_Renderless: break; @@ -1262,3 +1295,220 @@ fail: CoTaskMemFree(pVMR9); return hr; } + + + +static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID riid, LPVOID * ppv) +{ + VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = (LPVOID)&(This->IVMRImagePresenter9_iface); + else if (IsEqualIID(riid, &IID_IVMRImagePresenter9)) + *ppv = &This->IVMRImagePresenter9_iface; + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } + + FIXME("No interface for %s\n", debugstr_guid(riid)); + + return E_NOINTERFACE; +} + +static ULONG WINAPI VMR9_ImagePresenter_AddRef(IVMRImagePresenter9 *iface) +{ + VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + ULONG refCount = InterlockedIncrement(&This->refCount); + + TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1); + + return refCount; +} + +static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) +{ + VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + ULONG refCount = InterlockedDecrement(&This->refCount); + + TRACE("(%p)->() Release from %d\n", iface, refCount + 1); + + if (!refCount) + { + TRACE("Destroying\n"); + IUnknown_Release(This->d3d9_ptr); + + if (This->d3d9_vertex) + { + IUnknown_Release(This->d3d9_vertex); + This->d3d9_vertex = NULL; + } + CoTaskMemFree(This); + return 0; + } + return refCount; +} + +static HRESULT WINAPI VMR9_ImagePresenter_StartPresenting(IVMRImagePresenter9 *iface, DWORD_PTR id) +{ + VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + + TRACE("(%p/%p/%p)->(...) stub\n", iface, This,This->pVMR9); + return S_OK; +} + +static HRESULT WINAPI VMR9_ImagePresenter_StopPresenting(IVMRImagePresenter9 *iface, DWORD_PTR id) +{ + VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + + TRACE("(%p/%p/%p)->(...) stub\n", iface, This,This->pVMR9); + return S_OK; +} + +#define USED_FVF (D3DFVF_XYZRHW | D3DFVF_TEX1) +struct VERTEX { float x, y, z, rhw, u, v; }; + +static HRESULT VMR9_ImagePresenter_PresentTexture(VMR9DefaultAllocatorPresenterImpl *This, IDirect3DSurface9 *surface) +{ + IDirect3DTexture9 *texture = NULL; + HRESULT hr; + + hr = IDirect3DDevice9_SetFVF(This->d3d9_dev, USED_FVF); + if (FAILED(hr)) + { + FIXME("SetFVF: %08x\n", hr); + return hr; + } + + hr = IDirect3DDevice9_SetStreamSource(This->d3d9_dev, 0, This->d3d9_vertex, 0, sizeof(struct VERTEX)); + if (FAILED(hr)) + { + FIXME("SetStreamSource: %08x\n", hr); + return hr; + } + + hr = IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DTexture9, (void **) &texture); + if (FAILED(hr)) + { + FIXME("IDirect3DSurface9_GetContainer failed\n"); + return hr; + } + hr = IDirect3DDevice9_SetTexture(This->d3d9_dev, 0, (IDirect3DBaseTexture9 *)texture); + IDirect3DTexture9_Release(texture); + if (FAILED(hr)) + { + FIXME("SetTexture: %08x\n", hr); + return hr; + } + + hr = IDirect3DDevice9_DrawPrimitive(This->d3d9_dev, D3DPT_TRIANGLESTRIP, 0, 2); + if (FAILED(hr)) + { + FIXME("DrawPrimitive: %08x\n", hr); + return hr; + } + + return S_OK; +} + +static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *iface, DWORD_PTR id, VMR9PresentationInfo *info) +{ + VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + HRESULT hr; + RECT output; + BOOL render = FALSE; + + TRACE("(%p/%p/%p)->(...) stub\n", iface, This, This->pVMR9); + GetWindowRect(This->pVMR9->baseControlWindow.baseWindow.hWnd, &output); + TRACE("Output rectangle: starting at %dx%d, up to point %dx%d\n", output.left, output.top, output.right, output.bottom); + + /* This might happen if we don't have active focus (eg on a different virtual desktop) */ + if (!This->d3d9_dev) + return S_OK; + + /* Display image here */ + hr = IDirect3DDevice9_Clear(This->d3d9_dev, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); + if (FAILED(hr)) + FIXME("hr: %08x\n", hr); + hr = IDirect3DDevice9_BeginScene(This->d3d9_dev); + if (SUCCEEDED(hr)) + { + if (This->d3d9_vertex) + hr = VMR9_ImagePresenter_PresentTexture(This, info->lpSurf); + else + hr = E_NOTIMPL; + render = SUCCEEDED(hr); + } + else + FIXME("BeginScene: %08x\n", hr); + hr = IDirect3DDevice9_EndScene(This->d3d9_dev); + if (render && SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_Present(This->d3d9_dev, NULL, NULL, This->pVMR9->baseControlWindow.baseWindow.hWnd, NULL); + if (FAILED(hr)) + FIXME("Presenting image: %08x\n", hr); + } + + return S_OK; +} + +static const IVMRImagePresenter9Vtbl VMR9_ImagePresenter = +{ + VMR9_ImagePresenter_QueryInterface, + VMR9_ImagePresenter_AddRef, + VMR9_ImagePresenter_Release, + VMR9_ImagePresenter_StartPresenting, + VMR9_ImagePresenter_StopPresenting, + VMR9_ImagePresenter_PresentImage +}; + +static HRESULT VMR9DefaultAllocatorPresenterImpl_create(VMR9Impl *parent, LPVOID * ppv) +{ + HRESULT hr = S_OK; + int i; + VMR9DefaultAllocatorPresenterImpl* This; + + This = CoTaskMemAlloc(sizeof(VMR9DefaultAllocatorPresenterImpl)); + if (!This) + return E_OUTOFMEMORY; + + This->d3d9_ptr = NULL; + if (!This->d3d9_ptr) + { + WARN("Could not initialize d3d9.dll\n"); + CoTaskMemFree(This); + return VFW_E_DDRAW_CAPS_NOT_SUITABLE; + } + + i = 0; + do + { + D3DDISPLAYMODE mode; + + hr = IDirect3D9_EnumAdapterModes(This->d3d9_ptr, i++, D3DFMT_X8R8G8B8, 0, &mode); + } while (FAILED(hr)); + if (FAILED(hr)) + ERR("HR: %08x\n", hr); + if (hr == D3DERR_NOTAVAILABLE) + { + ERR("Format not supported\n"); + IUnknown_Release(This->d3d9_ptr); + CoTaskMemFree(This); + return VFW_E_DDRAW_CAPS_NOT_SUITABLE; + } + + This->IVMRImagePresenter9_iface.lpVtbl = &VMR9_ImagePresenter; + + This->refCount = 1; + This->pVMR9 = parent; + This->d3d9_dev = NULL; + This->d3d9_vertex = NULL; + + *ppv = This; + return S_OK; +}

1 0

Aric Stewart : quartz: Add offscreen presentation to VMR9.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 0352a7fb88f603fcbacc904418a72b3dbf44011c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0352a7fb88f603fcbacc90441… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 21 07:53:52 2012 -0500 quartz: Add offscreen presentation to VMR9. --- dlls/quartz/vmr9.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index fc04269..efd14a1 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1416,6 +1416,36 @@ static HRESULT VMR9_ImagePresenter_PresentTexture(VMR9DefaultAllocatorPresenterI return S_OK; } +static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(VMR9DefaultAllocatorPresenterImpl *This, IDirect3DSurface9 *surface) +{ + HRESULT hr; + IDirect3DSurface9 *target = NULL; + RECT target_rect; + + hr = IDirect3DDevice9_GetBackBuffer(This->d3d9_dev, 0, 0, D3DBACKBUFFER_TYPE_MONO, &target); + if (FAILED(hr)) + { + ERR("IDirect3DDevice9_GetBackBuffer -- %08x\n", hr); + return hr; + } + + target_rect = This->pVMR9->target_rect; + target_rect.right -= target_rect.left; + target_rect.bottom -= target_rect.top; + target_rect.left = target_rect.top = 0; + + /* Flip */ + target_rect.top = target_rect.bottom; + target_rect.bottom = 0; + + hr = IDirect3DDevice9_StretchRect(This->d3d9_dev, surface, &This->pVMR9->source_rect, target, &target_rect, D3DTEXF_LINEAR); + if (FAILED(hr)) + ERR("IDirect3DDevice9_StretchRect -- %08x\n", hr); + IDirect3DSurface9_Release(target); + + return hr; +} + static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *iface, DWORD_PTR id, VMR9PresentationInfo *info) { VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); @@ -1441,7 +1471,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac if (This->d3d9_vertex) hr = VMR9_ImagePresenter_PresentTexture(This, info->lpSurf); else - hr = E_NOTIMPL; + hr = VMR9_ImagePresenter_PresentOffscreenSurface(This, info->lpSurf); render = SUCCEEDED(hr); } else

1 0

Aric Stewart : quartz: COM cleanup for WAVEParserImpl.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: dc53f0181019888f75d84f501ce9601459cc1ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc53f0181019888f75d84f501… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 21 08:21:13 2012 -0500 quartz: COM cleanup for WAVEParserImpl. --- dlls/quartz/waveparser.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index a7bce6f..9c84320 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -53,6 +53,11 @@ static inline WAVEParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) return CONTAINING_RECORD(iface, WAVEParserImpl, Parser.sourceSeeking.IMediaSeeking_iface); } +static inline WAVEParserImpl *impl_from_IBaseFilter( IBaseFilter *iface ) +{ + return CONTAINING_RECORD(iface, WAVEParserImpl, Parser.filter.IBaseFilter_iface); +} + static LONGLONG bytepos_to_duration(WAVEParserImpl *This, LONGLONG bytepos) { LONGLONG duration = BYTES_FROM_MEDIATIME(bytepos - This->StartOfFile); @@ -246,11 +251,11 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, LONGLONG pos = 0; /* in bytes */ PIN_INFO piOutput; AM_MEDIA_TYPE amt; - WAVEParserImpl * pWAVEParser = (WAVEParserImpl *)This->pin.pinInfo.pFilter; + WAVEParserImpl * pWAVEParser = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); LONGLONG length, avail; piOutput.dir = PINDIR_OUTPUT; - piOutput.pFilter = (IBaseFilter *)This; + piOutput.pFilter = &pWAVEParser->Parser.filter.IBaseFilter_iface; lstrcpynW(piOutput.achName, wcsOutputPinName, sizeof(piOutput.achName) / sizeof(piOutput.achName[0])); hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list);

1 0

Józef Kucia : d3dx9/tests: Remove d3d9 test from d3dx9 tests.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 5bd0070a1d4bdee5ee4ac1299082dc98664f1b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd0070a1d4bdee5ee4ac1299… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon May 21 23:10:44 2012 +0200 d3dx9/tests: Remove d3d9 test from d3dx9 tests. --- dlls/d3dx9_36/tests/texture.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 884d4e7..cade445 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1329,9 +1329,6 @@ static void test_D3DXCreateCubeTextureFromFileInMemory(IDirect3DDevice9 *device) ok(surface_desc.Width == 4, "Got width %u, expected 4\n", surface_desc.Width); ok(surface_desc.Height == 4, "Got height %u, expected 4\n", surface_desc.Height); - hr = IDirect3DCubeTexture9_GetLevelDesc(cube_texture, 3, &surface_desc); - todo_wine ok(hr == D3DERR_INVALIDCALL, "GetLevelDesc returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - ref = IDirect3DCubeTexture9_Release(cube_texture); ok(ref == 0, "Invalid reference count. Got %u, expected 0\n", ref); } else skip("Couldn't create cube texture\n");

1 0

Józef Kucia : d3d9: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture9:: GetLevelDesc is called with invalid level.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 5f6310ee45034fe126c3d30b16ce61bb5969b5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6310ee45034fe126c3d30b1… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon May 21 23:10:45 2012 +0200 d3d9: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture9::GetLevelDesc is called with invalid level. --- dlls/d3d9/texture.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index f453f90..0594c20 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -710,10 +710,18 @@ static HRESULT WINAPI d3d9_texture_cube_GetLevelDesc(IDirect3DCubeTexture9 *ifac struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); struct wined3d_resource *sub_resource; HRESULT hr = D3D_OK; + DWORD level_count; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); + level_count = wined3d_texture_get_level_count(texture->wined3d_texture); + if (level >= level_count) + { + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } + if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else

1 0

Józef Kucia : d3d9: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture9:: GetCubeMapSurface is called with invalid level.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: cd4b973d59f4d94c89b49805a73dbad4c807ca4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4b973d59f4d94c89b49805a… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon May 21 23:10:46 2012 +0200 d3d9: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture9::GetCubeMapSurface is called with invalid level. --- dlls/d3d9/texture.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 0594c20..3d07b1c 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -750,11 +750,19 @@ static HRESULT WINAPI d3d9_texture_cube_GetCubeMapSurface(IDirect3DCubeTexture9 struct wined3d_resource *sub_resource; IDirect3DSurface9Impl *surface_impl; UINT sub_resource_idx; + DWORD level_count; TRACE("iface %p, face %#x, level %u, surface %p.\n", iface, face, level, surface); wined3d_mutex_lock(); - sub_resource_idx = wined3d_texture_get_level_count(texture->wined3d_texture) * face + level; + level_count = wined3d_texture_get_level_count(texture->wined3d_texture); + if (level >= level_count) + { + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } + + sub_resource_idx = level_count * face + level; if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) { wined3d_mutex_unlock();

1 0

Józef Kucia : d3d9/tests: Add tests for IDirect3DCubeTexture9:: GetLevelDesc and IDirect3DCubeTexture9::GetCubeMapSurface.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: cafab890937e770bde947977c556d2d8fcd4de3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cafab890937e770bde947977c… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon May 21 23:10:47 2012 +0200 d3d9/tests: Add tests for IDirect3DCubeTexture9::GetLevelDesc and IDirect3DCubeTexture9::GetCubeMapSurface. --- dlls/d3d9/tests/texture.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index bf9673e..8e8f27b 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -152,6 +152,48 @@ static void test_cube_texture_mipmap_gen(IDirect3DDevice9 *device_ptr) texture_ptr = NULL; } +static void test_cube_texture_levels(IDirect3DDevice9 *device_ptr) +{ + IDirect3DCubeTexture9 *texture_ptr; + DWORD levels; + D3DSURFACE_DESC desc; + HRESULT hr; + IDirect3DSurface9 *surface; + + hr = IDirect3DDevice9_CreateCubeTexture(device_ptr, 64, 0, 0, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, &texture_ptr, NULL); + if (FAILED(hr)) + { + skip("Couldn't create cube texture\n"); + return; + } + + levels = IDirect3DCubeTexture9_GetLevelCount(texture_ptr); + ok(levels == 7, "Got %u levels, expected 7\n", levels); + + hr = IDirect3DCubeTexture9_GetLevelDesc(texture_ptr, levels - 1, &desc); + ok(hr == D3D_OK, "IDirect3DCubeTexture9_GetLevelDesc returned %#x\n", hr); + hr = IDirect3DCubeTexture9_GetLevelDesc(texture_ptr, levels, &desc); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DCubeTexture9_GetLevelDesc returned %#x\n", hr); + hr = IDirect3DCubeTexture9_GetLevelDesc(texture_ptr, levels + 1, &desc); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DCubeTexture9_GetLevelDesc returned %#x\n", hr); + + hr = IDirect3DCubeTexture9_GetCubeMapSurface(texture_ptr, D3DCUBEMAP_FACE_POSITIVE_X, + 0, &surface); + ok(hr == D3D_OK, "IDirect3DCubeTexture9_GetCubeMapSurface returned %#x\n", hr); + if (SUCCEEDED(hr)) IDirect3DSurface9_Release(surface); + hr = IDirect3DCubeTexture9_GetCubeMapSurface(texture_ptr, D3DCUBEMAP_FACE_NEGATIVE_Z + 1, + 0, &surface); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DCubeTexture9_GetCubeMapSurface returned %#x\n", hr); + if (SUCCEEDED(hr)) IDirect3DSurface9_Release(surface); + hr = IDirect3DCubeTexture9_GetCubeMapSurface(texture_ptr, D3DCUBEMAP_FACE_POSITIVE_X - 1, + 0, &surface); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DCubeTexture9_GetCubeMapSurface returned %#x\n", hr); + if (SUCCEEDED(hr)) IDirect3DSurface9_Release(surface); + + IDirect3DCubeTexture9_Release(texture_ptr); +} + static void test_cube_textures(IDirect3DDevice9 *device_ptr, DWORD caps) { test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_DEFAULT, TRUE); @@ -159,6 +201,7 @@ static void test_cube_textures(IDirect3DDevice9 *device_ptr, DWORD caps) test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_SYSTEMMEM, TRUE); test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_SCRATCH, FALSE); test_cube_texture_mipmap_gen(device_ptr); + test_cube_texture_levels(device_ptr); } static void test_mipmap_gen(IDirect3DDevice9 *device)

1 0

Austin English : uxtheme: plf is already a pointer.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: d7ccfef25b5a128705dbfc11a717c2f4153f02c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ccfef25b5a128705dbfc11a… Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 21 16:52:40 2012 -0700 uxtheme: plf is already a pointer. --- dlls/uxtheme/metric.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index c056f28..043f836 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -118,7 +118,7 @@ HRESULT WINAPI GetThemeSysFont(HTHEME hTheme, int iFontID, LOGFONTW *plf) } } if(iFontID == TMT_ICONTITLEFONT) { - if(!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(LOGFONTW), &plf, 0)) + if(!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(LOGFONTW), plf, 0)) return HRESULT_FROM_WIN32(GetLastError()); } else {

1 0

Henri Verbeet : wined3d: Get rid of SFLAG_LOCKED.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 5ec56c9bc488d1280e890f69197b2a00755f578e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec56c9bc488d1280e890f691… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 21 20:48:34 2012 +0200 wined3d: Get rid of SFLAG_LOCKED. --- dlls/wined3d/surface.c | 22 +++++++++++----------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 7 ++----- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 148c014..da31801 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -581,7 +581,7 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { - if (surface->flags & SFLAG_DONOTFREE) + if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE)) return; HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); @@ -1441,7 +1441,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC fx->ddckSrcColorkey.color_space_high_value); } - if ((dst_surface->flags & SFLAG_LOCKED) || (src_surface && (src_surface->flags & SFLAG_LOCKED))) + if (dst_surface->resource.map_count || (src_surface && src_surface->resource.map_count)) { WARN("Surface is busy, returning WINEDDERR_SURFACEBUSY.\n"); return WINEDDERR_SURFACEBUSY; @@ -2257,7 +2257,7 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi surface, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), src_pitch, wine_dbgstr_point(dst_point), srgb, data->buffer_object, data->addr); - if (surface->flags & SFLAG_LOCKED) + if (surface->resource.map_count) { WARN("Uploading a surface that is currently mapped, setting SFLAG_PIN_SYSMEM.\n"); surface->flags |= SFLAG_PIN_SYSMEM; @@ -3081,9 +3081,9 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem { TRACE("surface %p, mem %p.\n", surface, mem); - if (surface->flags & (SFLAG_LOCKED | SFLAG_DCINUSE)) + if (surface->resource.map_count || (surface->flags & SFLAG_DCINUSE)) { - WARN("Surface is locked or the DC is in use.\n"); + WARN("Surface is mapped or the DC is in use.\n"); return WINED3DERR_INVALIDCALL; } @@ -3673,12 +3673,12 @@ HRESULT CDECL wined3d_surface_unmap(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); - if (!(surface->flags & SFLAG_LOCKED)) + if (!surface->resource.map_count) { WARN("Trying to unmap unmapped surface.\n"); return WINEDDERR_NOTLOCKED; } - surface->flags &= ~SFLAG_LOCKED; + --surface->resource.map_count; surface->surface_ops->surface_unmap(surface); @@ -3693,7 +3693,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, TRACE("surface %p, map_desc %p, rect %s, flags %#x.\n", surface, map_desc, wine_dbgstr_rect(rect), flags); - if (surface->flags & SFLAG_LOCKED) + if (surface->resource.map_count) { WARN("Surface is already mapped.\n"); return WINED3DERR_INVALIDCALL; @@ -3717,7 +3717,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, } } - surface->flags |= SFLAG_LOCKED; + ++surface->resource.map_count; if (!(surface->flags & SFLAG_LOCKABLE)) WARN("Trying to lock unlockable surface.\n"); @@ -3797,7 +3797,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) return WINEDDERR_DCALREADYCREATED; /* Can't GetDC if the surface is locked. */ - if (surface->flags & SFLAG_LOCKED) + if (surface->resource.map_count) return WINED3DERR_INVALIDCALL; /* Create a DIB section if there isn't a dc yet. */ @@ -5486,7 +5486,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa fb_copy_to_texture_hwstretch(dst_surface, src_surface, src_rect, dst_rect, filter); } - if (!(dst_surface->flags & SFLAG_DONOTFREE)) + if (!dst_surface->resource.map_count && !(dst_surface->flags & SFLAG_DONOTFREE)) { HeapFree(GetProcessHeap(), 0, dst_surface->resource.heapMemory); dst_surface->resource.allocatedMemory = NULL; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a98ac9f..14796d2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -714,7 +714,7 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r if (!(front->resource.usage & WINED3DUSAGE_RENDERTARGET)) return; - if (front->flags & SFLAG_LOCKED) + if (front->resource.map_count) ERR("Trying to blit a mapped surface.\n"); TRACE("Copying surface %p to screen.\n", front); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6dad53d..0525471 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2140,7 +2140,7 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ #define SFLAG_LOCKABLE 0x00000010 /* Surface can be locked. */ #define SFLAG_DYNLOCK 0x00000020 /* Surface is often locked by the application. */ -#define SFLAG_LOCKED 0x00000040 /* Surface is currently locked. */ +#define SFLAG_PIN_SYSMEM 0x00000040 /* Keep the surface in sysmem, at the same address. */ #define SFLAG_DCINUSE 0x00000080 /* Set between GetDC and ReleaseDC calls. */ #define SFLAG_LOST 0x00000100 /* Surface lost flag for ddraw. */ #define SFLAG_GLCKEY 0x00000200 /* The GL texture was created with a color key. */ @@ -2157,20 +2157,17 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_INDRAWABLE 0x00100000 /* The GL drawable is current. */ #define SFLAG_INRB_MULTISAMPLE 0x00200000 /* The multisample renderbuffer is current. */ #define SFLAG_INRB_RESOLVED 0x00400000 /* The resolved renderbuffer is current. */ -#define SFLAG_PIN_SYSMEM 0x02000000 /* Keep the surface in sysmem, at the same address. */ -#define SFLAG_DISCARDED 0x04000000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_DISCARDED 0x00800000 /* Surface was discarded, allocating new location is enough. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long * SFLAG_DIBSECTION: The dib code manages the memory - * SFLAG_LOCKED: The app requires access to the surface data * SFLAG_DYNLOCK: Avoid freeing the data for performance * SFLAG_PBO: PBOs don't use 'normal' memory. It is either allocated by the driver or must be NULL. * SFLAG_CLIENT: OpenGL uses our memory as backup */ #define SFLAG_DONOTFREE (SFLAG_CONVERTED | \ SFLAG_DYNLOCK | \ - SFLAG_LOCKED | \ SFLAG_CLIENT | \ SFLAG_DIBSECTION | \ SFLAG_USERPTR | \

1 0

Henri Verbeet : wined3d: Don' t evict resources that are currently mapped in wined3d_device_evict_managed_resources ().
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 0d45d503420cbae1644cdc12697d86b3d84afbcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d45d503420cbae1644cdc126… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 21 20:48:35 2012 +0200 wined3d: Don't evict resources that are currently mapped in wined3d_device_evict_managed_resources(). --- dlls/wined3d/device.c | 2 +- dlls/wined3d/resource.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dc0957a..a575eec 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5096,7 +5096,7 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { TRACE("Checking resource %p for eviction.\n", resource); - if (resource->pool == WINED3D_POOL_MANAGED) + if (resource->pool == WINED3D_POOL_MANAGED && !resource->map_count) { TRACE("Evicting %p.\n", resource); resource->resource_ops->resource_unload(resource); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index da631d6..3e1914d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -171,6 +171,9 @@ void resource_cleanup(struct wined3d_resource *resource) void resource_unload(struct wined3d_resource *resource) { + if (resource->map_count) + ERR("Resource %p is being unloaded while mapped.\n", resource); + context_resource_unloaded(resource->device, resource, resource->type); }

1 0