ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Aaryaman Vasishta 2016-05-21 02:37:42 +05:30 committed by Alexandre Julliard
parent 07d0804603
commit c4aaf35d2b
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/d3drm/tests/d3drm.c
View File

@ -1884,8 +1884,8 @@ static void test_Texture(void)
ok(!strcmp(cname, "test"), "Expected cname to be \"test\", but got \"%s\"\n", cname); ok(!strcmp(cname, "test"), "Expected cname to be \"test\", but got \"%s\"\n", cname);
d3drm_img = IDirect3DRMTexture_GetImage(texture1); d3drm_img = IDirect3DRMTexture_GetImage(texture1);
todo_wine ok(!!d3drm_img, "Failed to get image.\n"); 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 == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
size = sizeof(cname); size = sizeof(cname);
hr = IDirect3DRMTexture_GetClassName(texture1, &size, cname); hr = IDirect3DRMTexture_GetClassName(texture1, &size, cname);
@ -1908,8 +1908,8 @@ static void test_Texture(void)
d3drm_img = NULL; d3drm_img = NULL;
d3drm_img = IDirect3DRMTexture2_GetImage(texture2); d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
todo_wine ok(!!d3drm_img, "Failed to get image.\n"); 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 == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
size = sizeof(cname); size = sizeof(cname);
hr = IDirect3DRMTexture2_GetClassName(texture2, &size, cname); hr = IDirect3DRMTexture2_GetClassName(texture2, &size, cname);
@ -1932,8 +1932,8 @@ static void test_Texture(void)
d3drm_img = NULL; d3drm_img = NULL;
d3drm_img = IDirect3DRMTexture3_GetImage(texture3); d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
todo_wine ok(!!d3drm_img, "Failed to get image.\n"); 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 == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
size = sizeof(cname); size = sizeof(cname);
hr = IDirect3DRMTexture3_GetClassName(texture3, &size, cname); hr = IDirect3DRMTexture3_GetClassName(texture3, &size, cname);
@ -2053,8 +2053,8 @@ static void test_Texture(void)
IDirect3DRM_Release(d3drm1); IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture2_GetImage(texture2); d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
todo_wine ok(!!d3drm_img, "Failed to get image.\n"); 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 == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
IDirect3DRMTexture2_Release(texture2); IDirect3DRMTexture2_Release(texture2);
ref2 = get_refcount((IUnknown *)d3drm1); ref2 = get_refcount((IUnknown *)d3drm1);
ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2); 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); IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture3_GetImage(texture3); d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
todo_wine ok(!!d3drm_img, "Failed to get image.\n"); 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 == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
IDirect3DRMTexture3_Release(texture3); IDirect3DRMTexture3_Release(texture3);
ref2 = get_refcount((IUnknown *)d3drm1); ref2 = get_refcount((IUnknown *)d3drm1);
ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2); ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);

6
dlls/d3drm/texture.c
View File

@ -924,9 +924,11 @@ static HRESULT WINAPI d3drm_texture3_GetDecalOrigin(IDirect3DRMTexture3 *iface,
static D3DRMIMAGE * WINAPI d3drm_texture3_GetImage(IDirect3DRMTexture3 *iface) static D3DRMIMAGE * WINAPI d3drm_texture3_GetImage(IDirect3DRMTexture3 *iface)
{ {
FIXME("iface %p stub!\n", iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface);
return NULL; TRACE("iface %p.\n", iface);
return texture->image;
} }
static DWORD WINAPI d3drm_texture3_GetShades(IDirect3DRMTexture3 *iface) static DWORD WINAPI d3drm_texture3_GetShades(IDirect3DRMTexture3 *iface)