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

Dmitry Timoshkov : server: Make sure that region and rectangle have the same origin before calling rect_in_region ().
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 94c817e311e4ae1915461d27b17e8394f9ee9433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c817e311e4ae1915461d27b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 6 14:47:45 2012 +0900 server: Make sure that region and rectangle have the same origin before calling rect_in_region(). --- server/window.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/server/window.c b/server/window.c index 329fdb6..3456e1a 100644 --- a/server/window.c +++ b/server/window.c @@ -2457,7 +2457,12 @@ DECL_HANDLER(update_window_zorder) if (!(ptr->style & WS_VISIBLE)) continue; if (ptr->ex_style & WS_EX_TRANSPARENT) continue; if (!intersect_rect( &tmp, &ptr->visible_rect, &rect )) continue; - if (ptr->win_region && !rect_in_region( ptr->win_region, &rect )) continue; + if (ptr->win_region) + { + tmp = rect; + offset_rect( &tmp, -ptr->window_rect.left, -ptr->window_rect.top ); + if (!rect_in_region( ptr->win_region, &tmp )) continue; + } /* found a window obscuring the rectangle, now move win above this one */ /* making sure to not violate the topmost rule */ if (!(ptr->ex_style & WS_EX_TOPMOST) || (win->ex_style & WS_EX_TOPMOST))

1 0

Christian Costa : d3drm: Implement IDirect3DRMMesh_SetGroupTexture.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: db6b10e22d9e1c0f039746b392a7ce0468763312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6b10e22d9e1c0f039746b39… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 5 22:45:09 2012 +0200 d3drm: Implement IDirect3DRMMesh_SetGroupTexture. --- dlls/d3drm/meshbuilder.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index f3f00c1..836412e 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2692,13 +2692,25 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupMaterial(IDirect3DRMMesh* ifac } static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupTexture(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, LPDIRECT3DRMTEXTURE value) + D3DRMGROUPINDEX id, LPDIRECT3DRMTEXTURE texture) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%p): stub\n", This, id, value); + TRACE("(%p)->(%u,%p)\n", This, id, texture); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + if (This->groups[id].texture) + IDirect3DRMTexture3_Release(This->groups[id].texture); + + if (!texture) + { + This->groups[id].texture = NULL; + return D3DRM_OK; + } + + return IDirect3DRMTexture3_QueryInterface(texture, &IID_IDirect3DRMTexture, (LPVOID*)&This->groups[id].texture); } static DWORD WINAPI IDirect3DRMMeshImpl_GetGroupCount(IDirect3DRMMesh* iface)

1 0

Alexandre Julliard : mountmgr.sys: Don't try to close the dbus connection.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 6157f4a9f4fc15c313500302c153e3f455ceb8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6157f4a9f4fc15c313500302c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 6 11:46:38 2012 +0200 mountmgr.sys: Don't try to close the dbus connection. --- dlls/mountmgr.sys/dbus.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index ab7d912..608efd0 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -50,7 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); DO_FUNC(dbus_bus_get); \ DO_FUNC(dbus_bus_remove_match); \ DO_FUNC(dbus_connection_add_filter); \ - DO_FUNC(dbus_connection_close); \ DO_FUNC(dbus_connection_read_write_dispatch); \ DO_FUNC(dbus_connection_remove_filter); \ DO_FUNC(dbus_connection_send_with_reply_and_block); \ @@ -526,7 +525,6 @@ static DWORD WINAPI dbus_thread( void *arg ) #ifdef SONAME_LIBHAL if (!hal_enumerate_devices()) { - p_dbus_connection_close( connection ); p_dbus_error_free( &error ); return 1; } @@ -544,7 +542,6 @@ static DWORD WINAPI dbus_thread( void *arg ) } __ENDTRY; - p_dbus_connection_close( connection ); return 0; }

1 0

André Hentschel : ntdll: Add stub for NtQuerySystemEnvironmentValueEx.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 04201096a26dc85d4ef4b70c8df20e30790d9761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04201096a26dc85d4ef4b70c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 5 19:32:37 2012 +0200 ntdll: Add stub for NtQuerySystemEnvironmentValueEx. --- dlls/ntdll/env.c | 12 +++++++++++- dlls/ntdll/ntdll.spec | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 91ad6bc..a5bdf0f 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -42,7 +42,17 @@ NTSYSAPI NTSTATUS WINAPI NtQuerySystemEnvironmentValue(PUNICODE_STRING VariableN ULONG ValueBufferLength, PULONG RequiredLength) { - FIXME("stub!\n"); + FIXME("(%s, %p, %u, %p), stub\n", debugstr_us(VariableName), Value, ValueBufferLength, RequiredLength); + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * NtQuerySystemEnvironmentValueEx [NTDLL.@] + */ +NTSYSAPI NTSTATUS WINAPI NtQuerySystemEnvironmentValueEx(PUNICODE_STRING name, LPGUID vendor, + PVOID value, PULONG retlength, PULONG attrib) +{ + FIXME("(%s, %s, %p, %p, %p), stub\n", debugstr_us(name), debugstr_guid(vendor), value, retlength, attrib); return STATUS_NOT_IMPLEMENTED; } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 65fd405..8de353f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -266,7 +266,7 @@ @ stdcall NtQuerySemaphore (long long ptr long ptr) @ stdcall NtQuerySymbolicLinkObject(long ptr ptr) @ stdcall NtQuerySystemEnvironmentValue(ptr ptr long ptr) -# @ stub NtQuerySystemEnvironmentValueEx +@ stdcall NtQuerySystemEnvironmentValueEx(ptr ptr ptr ptr ptr) @ stdcall NtQuerySystemInformation(long long long long) @ stdcall NtQuerySystemTime(ptr) @ stdcall NtQueryTimer(ptr long ptr long ptr)

1 0

Józef Kucia : d3dx9/tests: Add tests for loading surfaces from non-lockable render targets.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 6fe841edde1afc0c9238321805f85ddef7567422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe841edde1afc0c923832180… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 5 12:05:39 2012 +0200 d3dx9/tests: Add tests for loading surfaces from non-lockable render targets. --- dlls/d3dx9_36/tests/surface.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 3b8ed6e..4b3b511 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -715,6 +715,24 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) IDirect3DTexture9_Release(tex); } else skip("Failed to create texture\n"); + /* non-lockable render target */ + hr = IDirect3DDevice9_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &newsurf, NULL); + if (SUCCEEDED(hr)) { + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK); + + IDirect3DSurface9_Release(newsurf); + } else skip("Failed to create render target surface\n"); + + /* non-lockable multisampled render target */ + hr = IDirect3DDevice9_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, 0, FALSE, &newsurf, NULL); + if (SUCCEEDED(hr)) { + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK); + + IDirect3DSurface9_Release(newsurf); + } else skip("Failed to create multisampled render target\n"); + check_release((IUnknown*)surf, 0);

1 0

Józef Kucia : d3dx9/tests: Fix indentation.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 6953865e8dad98469ca01547a1987b8a076596e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6953865e8dad98469ca01547a… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 5 12:05:40 2012 +0200 d3dx9/tests: Fix indentation. --- dlls/d3dx9_36/tests/core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index e6e641c..b7965d4 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -460,7 +460,7 @@ START_TEST(core) skip("Couldn't create application window\n"); return; } - if (!d3d) { + if (!d3d) { skip("Couldn't create IDirect3D9 object\n"); DestroyWindow(wnd); return;

1 0

Józef Kucia : d3dx9: Add stub for D3DXCreateRenderToSurface.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: ad5a00b7f869e35f3fef0384785eaeac5b6d227a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad5a00b7f869e35f3fef03847… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 5 12:05:41 2012 +0200 d3dx9: Add stub for D3DXCreateRenderToSurface. --- dlls/d3dx9_36/Makefile.in | 1 + dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/render.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index a9bbf50..7bd96a9 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ line.c \ math.c \ mesh.c \ + render.c \ shader.c \ skin.c \ sprite.c \ diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index aec2a5c..8d7143e 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -82,7 +82,7 @@ @ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) @ stub D3DXCreateRenderToEnvMap(ptr long long long long long ptr) -@ stub D3DXCreateRenderToSurface(ptr long long long long long ptr) +@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c new file mode 100644 index 0000000..0e8ed7a --- /dev/null +++ b/dlls/d3dx9_36/render.c @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2012 Józef Kucia + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "wine/debug.h" +#include "d3dx9_36_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, + UINT width, + UINT height, + D3DFORMAT format, + BOOL depth_stencil, + D3DFORMAT depth_stencil_format, + ID3DXRenderToSurface **out) +{ + FIXME("(%p, %u, %u, %#x, %d, %#x, %p): stub\n", device, width, height, format, + depth_stencil, depth_stencil_format, out); + + if (!device || !out) return D3DERR_INVALIDCALL; + + return E_NOTIMPL; +}

1 0

Józef Kucia : d3dx9/tests: Add basic tests for D3DXCreateRenderToSurface.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 4200198355efe169eb68bfa61e17b9769f2a4fd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4200198355efe169eb68bfa61… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 5 12:05:42 2012 +0200 d3dx9/tests: Add basic tests for D3DXCreateRenderToSurface. --- dlls/d3dx9_36/tests/core.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index b7965d4..2ba56b5 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -446,6 +446,44 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) } else skip("Failed to create a ID3DXFont object\n"); } +void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) +{ + HRESULT hr; + ULONG ref_count; + ID3DXRenderToSurface *render = (void *)0xdeadbeef; + + hr = D3DXCreateRenderToSurface(NULL /* device */, 256, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, &render); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + ok(render == (void *)0xdeadbeef, "Got %p, expected %p\n", render, (void *)0xdeadbeef); + + hr = D3DXCreateRenderToSurface(device, 256, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, NULL /* out */); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + todo_wine { + hr = D3DXCreateRenderToSurface(device, 0 /* width */, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, &render); + ok(hr == D3D_OK, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) ID3DXRenderToSurface_Release(render); + + hr = D3DXCreateRenderToSurface(device, 256, 0 /* height */, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, &render); + ok(hr == D3D_OK, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) ID3DXRenderToSurface_Release(render); + + hr = D3DXCreateRenderToSurface(device, 256, 256, D3DFMT_UNKNOWN /* format */, FALSE, D3DFMT_UNKNOWN, &render); + ok(hr == D3D_OK, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) ID3DXRenderToSurface_Release(render); + + hr = D3DXCreateRenderToSurface(device, 0, 0, D3DFMT_UNKNOWN, FALSE, D3DFMT_UNKNOWN, &render); + ok(hr == D3D_OK, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) ID3DXRenderToSurface_Release(render); + + /* check device ref count */ + ref_count = get_ref((IUnknown *)device); + hr = D3DXCreateRenderToSurface(device, 0, 0, D3DFMT_UNKNOWN, FALSE, D3DFMT_UNKNOWN, &render); + check_ref((IUnknown *)device, ref_count + 1); + if (SUCCEEDED(hr)) ID3DXRenderToSurface_Release(render); + } +} + START_TEST(core) { HWND wnd; @@ -480,6 +518,7 @@ START_TEST(core) test_ID3DXBuffer(); test_ID3DXSprite(device); test_ID3DXFont(device); + test_D3DXCreateRenderToSurface(device); check_release((IUnknown*)device, 0); check_release((IUnknown*)d3d, 0);

1 0

Józef Kucia : d3dx9: Add ID3DXRenderToSurface interface stub.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 5c6438e834c90001d41e1b71ca6aea5415ee17d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c6438e834c90001d41e1b71c… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 5 12:05:43 2012 +0200 d3dx9: Add ID3DXRenderToSurface interface stub. --- dlls/d3dx9_36/render.c | 131 +++++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/core.c | 2 - 2 files changed, 129 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c index 0e8ed7a..4e4adfb 100644 --- a/dlls/d3dx9_36/render.c +++ b/dlls/d3dx9_36/render.c @@ -22,6 +22,121 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +struct render_to_surface +{ + ID3DXRenderToSurface ID3DXRenderToSurface_iface; + LONG ref; + + IDirect3DDevice9 *device; +}; + +static inline struct render_to_surface *impl_from_ID3DXRenderToSurface(ID3DXRenderToSurface *iface) +{ + return CONTAINING_RECORD(iface, struct render_to_surface, ID3DXRenderToSurface_iface); +} + +static HRESULT WINAPI D3DXRenderToSurface_QueryInterface(ID3DXRenderToSurface *iface, + REFIID riid, + void **out) +{ + TRACE("iface %p, riid %s, out %p\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID3DXRenderToSurface) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI D3DXRenderToSurface_AddRef(ID3DXRenderToSurface *iface) +{ + struct render_to_surface *render = impl_from_ID3DXRenderToSurface(iface); + ULONG ref = InterlockedIncrement(&render->ref); + + TRACE("%p increasing refcount to %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI D3DXRenderToSurface_Release(ID3DXRenderToSurface *iface) +{ + struct render_to_surface *render = impl_from_ID3DXRenderToSurface(iface); + ULONG ref = InterlockedDecrement(&render->ref); + + TRACE("%p decreasing refcount to %u\n", iface, ref); + + if (!ref) + { + IDirect3DDevice9_Release(render->device); + HeapFree(GetProcessHeap(), 0, render); + } + + return ref; +} + +static HRESULT WINAPI D3DXRenderToSurface_GetDevice(ID3DXRenderToSurface *iface, + IDirect3DDevice9 **device) +{ + FIXME("(%p)->(%p): stub\n", iface, device); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DXRenderToSurface_GetDesc(ID3DXRenderToSurface *iface, + D3DXRTS_DESC *desc) +{ + FIXME("(%p)->(%p): stub\n", iface, desc); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DXRenderToSurface_BeginScene(ID3DXRenderToSurface *iface, + IDirect3DSurface9 *surface, + const D3DVIEWPORT9 *viewport) +{ + FIXME("(%p)->(%p, %p): stub\n", iface, surface, viewport); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DXRenderToSurface_EndScene(ID3DXRenderToSurface *iface, + DWORD mip_filter) +{ + FIXME("(%p)->(%#x): stub\n", iface, mip_filter); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DXRenderToSurface_OnLostDevice(ID3DXRenderToSurface *iface) +{ + FIXME("(%p)->(): stub\n", iface); + return D3D_OK; +} + +static HRESULT WINAPI D3DXRenderToSurface_OnResetDevice(ID3DXRenderToSurface *iface) +{ + FIXME("(%p)->(): stub\n", iface); + return D3D_OK; +} + +static const ID3DXRenderToSurfaceVtbl d3dx_render_to_surface_vtbl = +{ + /* IUnknown methods */ + D3DXRenderToSurface_QueryInterface, + D3DXRenderToSurface_AddRef, + D3DXRenderToSurface_Release, + /* ID3DXRenderToSurface methods */ + D3DXRenderToSurface_GetDevice, + D3DXRenderToSurface_GetDesc, + D3DXRenderToSurface_BeginScene, + D3DXRenderToSurface_EndScene, + D3DXRenderToSurface_OnLostDevice, + D3DXRenderToSurface_OnResetDevice +}; + HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, UINT width, UINT height, @@ -30,10 +145,22 @@ HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, D3DFORMAT depth_stencil_format, ID3DXRenderToSurface **out) { - FIXME("(%p, %u, %u, %#x, %d, %#x, %p): stub\n", device, width, height, format, + struct render_to_surface *render; + + FIXME("(%p, %u, %u, %#x, %d, %#x, %p): semi-stub\n", device, width, height, format, depth_stencil, depth_stencil_format, out); if (!device || !out) return D3DERR_INVALIDCALL; - return E_NOTIMPL; + render = HeapAlloc(GetProcessHeap(), 0, sizeof(struct render_to_surface)); + if (!render) return E_OUTOFMEMORY; + + render->ID3DXRenderToSurface_iface.lpVtbl = &d3dx_render_to_surface_vtbl; + render->ref = 1; + + IDirect3DDevice9_AddRef(device); + render->device = device; + + *out = &render->ID3DXRenderToSurface_iface; + return D3D_OK; } diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 2ba56b5..ae60080 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -459,7 +459,6 @@ void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) hr = D3DXCreateRenderToSurface(device, 256, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, NULL /* out */); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - todo_wine { hr = D3DXCreateRenderToSurface(device, 0 /* width */, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, &render); ok(hr == D3D_OK, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) ID3DXRenderToSurface_Release(render); @@ -481,7 +480,6 @@ void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) hr = D3DXCreateRenderToSurface(device, 0, 0, D3DFMT_UNKNOWN, FALSE, D3DFMT_UNKNOWN, &render); check_ref((IUnknown *)device, ref_count + 1); if (SUCCEEDED(hr)) ID3DXRenderToSurface_Release(render); - } } START_TEST(core)

1 0

Józef Kucia : d3dx9: Implement ID3DXRenderToSurface:: GetDesc.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 0ed3eb0120d420e98e4352889a207d81b1ee78aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed3eb0120d420e98e4352889… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 5 12:05:44 2012 +0200 d3dx9: Implement ID3DXRenderToSurface::GetDesc. --- dlls/d3dx9_36/render.c | 19 ++++++++++++++-- dlls/d3dx9_36/tests/core.c | 48 ++++++++++++++++++++++++++++++------------- 2 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c index 4e4adfb..99cee8d 100644 --- a/dlls/d3dx9_36/render.c +++ b/dlls/d3dx9_36/render.c @@ -28,6 +28,7 @@ struct render_to_surface LONG ref; IDirect3DDevice9 *device; + D3DXRTS_DESC desc; }; static inline struct render_to_surface *impl_from_ID3DXRenderToSurface(ID3DXRenderToSurface *iface) @@ -91,8 +92,14 @@ static HRESULT WINAPI D3DXRenderToSurface_GetDevice(ID3DXRenderToSurface *iface, static HRESULT WINAPI D3DXRenderToSurface_GetDesc(ID3DXRenderToSurface *iface, D3DXRTS_DESC *desc) { - FIXME("(%p)->(%p): stub\n", iface, desc); - return E_NOTIMPL; + struct render_to_surface *render = impl_from_ID3DXRenderToSurface(iface); + + TRACE("(%p)->(%p)\n", iface, desc); + + if (!desc) return D3DERR_INVALIDCALL; + + *desc = render->desc; + return D3D_OK; } static HRESULT WINAPI D3DXRenderToSurface_BeginScene(ID3DXRenderToSurface *iface, @@ -147,7 +154,7 @@ HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, { struct render_to_surface *render; - FIXME("(%p, %u, %u, %#x, %d, %#x, %p): semi-stub\n", device, width, height, format, + TRACE("(%p, %u, %u, %#x, %d, %#x, %p)\n", device, width, height, format, depth_stencil, depth_stencil_format, out); if (!device || !out) return D3DERR_INVALIDCALL; @@ -161,6 +168,12 @@ HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, IDirect3DDevice9_AddRef(device); render->device = device; + render->desc.Width = width; + render->desc.Height = height; + render->desc.Format = format; + render->desc.DepthStencil = depth_stencil; + render->desc.DepthStencilFormat = depth_stencil_format; + *out = &render->ID3DXRenderToSurface_iface; return D3D_OK; } diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index ae60080..5b0ebc7 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -448,9 +448,20 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) { + int i; HRESULT hr; ULONG ref_count; + D3DXRTS_DESC desc; ID3DXRenderToSurface *render = (void *)0xdeadbeef; + static const D3DXRTS_DESC tests[] = + { + { 0, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN }, + { 256, 0, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN }, + { 256, 0, D3DFMT_A8R8G8B8, FALSE, D3DFMT_D24S8 }, + { 256, 256, D3DFMT_UNKNOWN, FALSE, D3DFMT_R8G8B8 }, + { 0, 0, D3DFMT_UNKNOWN, FALSE, D3DFMT_UNKNOWN }, + { -1, -1, MAKEFOURCC('B','A','D','F'), TRUE, MAKEFOURCC('B','A','D','F') } + }; hr = D3DXCreateRenderToSurface(NULL /* device */, 256, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, &render); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -459,21 +470,28 @@ void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) hr = D3DXCreateRenderToSurface(device, 256, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, NULL /* out */); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateRenderToSurface(device, 0 /* width */, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, &render); - ok(hr == D3D_OK, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3D_OK); - if (SUCCEEDED(hr)) ID3DXRenderToSurface_Release(render); - - hr = D3DXCreateRenderToSurface(device, 256, 0 /* height */, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, &render); - ok(hr == D3D_OK, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3D_OK); - if (SUCCEEDED(hr)) ID3DXRenderToSurface_Release(render); - - hr = D3DXCreateRenderToSurface(device, 256, 256, D3DFMT_UNKNOWN /* format */, FALSE, D3DFMT_UNKNOWN, &render); - ok(hr == D3D_OK, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3D_OK); - if (SUCCEEDED(hr)) ID3DXRenderToSurface_Release(render); - - hr = D3DXCreateRenderToSurface(device, 0, 0, D3DFMT_UNKNOWN, FALSE, D3DFMT_UNKNOWN, &render); - ok(hr == D3D_OK, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3D_OK); - if (SUCCEEDED(hr)) ID3DXRenderToSurface_Release(render); + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + hr = D3DXCreateRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, + tests[i].DepthStencilFormat, &render); + ok(hr == D3D_OK, "%d: D3DXCreateRenderToSurface returned %#x, expected %#x\n", i, hr, D3D_OK); + if (SUCCEEDED(hr)) + { + hr = ID3DXRenderToSurface_GetDesc(render, &desc); + ok(hr == D3D_OK, "%d: GetDesc failed %#x\n", i, hr); + if (SUCCEEDED(hr)) + { + ok(desc.Width == tests[i].Width, "%d: Got width %u, expected %u\n", i, desc.Width, tests[i].Width); + ok(desc.Height == tests[i].Height, "%d: Got height %u, expected %u\n", i, desc.Height, tests[i].Height); + ok(desc.Format == tests[i].Format, "%d: Got format %#x, expected %#x\n", i, desc.Format, tests[i].Format); + ok(desc.DepthStencil == tests[i].DepthStencil, "%d: Got depth stencil %d, expected %d\n", + i, desc.DepthStencil, tests[i].DepthStencil); + ok(desc.DepthStencilFormat == tests[i].DepthStencilFormat, "%d: Got depth stencil format %#x, expected %#x\n", + i, desc.DepthStencilFormat, tests[i].DepthStencilFormat); + } + ID3DXRenderToSurface_Release(render); + } + } /* check device ref count */ ref_count = get_ref((IUnknown *)device);

1 0