Module: wine Branch: master Commit: c4aaf35d2bc1020e0aa2845ab8d2e7780892b013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4aaf35d2bc1020e0aa2845ab8...
Author: Aaryaman Vasishta jem456.vasishta@gmail.com Date: Sat May 21 02:55:42 2016 +0530
d3drm: Implement IDirect3DRMTexture*_GetImage.
Signed-off-by: Aaryaman Vasishta jem456.vasishta@gmail.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3drm/tests/d3drm.c | 20 ++++++++++---------- dlls/d3drm/texture.c | 6 ++++-- 2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1123cd2..f279314 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1884,8 +1884,8 @@ static void test_Texture(void) ok(!strcmp(cname, "test"), "Expected cname to be "test", but got "%s"\n", cname);
d3drm_img = IDirect3DRMTexture_GetImage(texture1); - todo_wine ok(!!d3drm_img, "Failed to get image.\n"); - todo_wine ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
size = sizeof(cname); hr = IDirect3DRMTexture_GetClassName(texture1, &size, cname); @@ -1908,8 +1908,8 @@ static void test_Texture(void)
d3drm_img = NULL; d3drm_img = IDirect3DRMTexture2_GetImage(texture2); - todo_wine ok(!!d3drm_img, "Failed to get image.\n"); - todo_wine ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
size = sizeof(cname); hr = IDirect3DRMTexture2_GetClassName(texture2, &size, cname); @@ -1932,8 +1932,8 @@ static void test_Texture(void)
d3drm_img = NULL; d3drm_img = IDirect3DRMTexture3_GetImage(texture3); - todo_wine ok(!!d3drm_img, "Failed to get image.\n"); - todo_wine ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
size = sizeof(cname); hr = IDirect3DRMTexture3_GetClassName(texture3, &size, cname); @@ -2053,8 +2053,8 @@ static void test_Texture(void) IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture2_GetImage(texture2); - todo_wine ok(!!d3drm_img, "Failed to get image.\n"); - todo_wine ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); IDirect3DRMTexture2_Release(texture2); ref2 = get_refcount((IUnknown *)d3drm1); ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2); @@ -2078,8 +2078,8 @@ static void test_Texture(void) IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture3_GetImage(texture3); - todo_wine ok(!!d3drm_img, "Failed to get image.\n"); - todo_wine ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); IDirect3DRMTexture3_Release(texture3); ref2 = get_refcount((IUnknown *)d3drm1); ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 873d727..c2bbdb5 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -924,9 +924,11 @@ static HRESULT WINAPI d3drm_texture3_GetDecalOrigin(IDirect3DRMTexture3 *iface,
static D3DRMIMAGE * WINAPI d3drm_texture3_GetImage(IDirect3DRMTexture3 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); + + TRACE("iface %p.\n", iface);
- return NULL; + return texture->image; }
static DWORD WINAPI d3drm_texture3_GetShades(IDirect3DRMTexture3 *iface)