Commit 5f9ceed1 authored by Jeff Smith's avatar Jeff Smith Committed by Alexandre Julliard

d3drm: Return ~0u from d3drm_viewport2_GetProjection() for uninitialised viewports.

parent afb09525
...@@ -2152,7 +2152,7 @@ static void test_Viewport(void) ...@@ -2152,7 +2152,7 @@ static void test_Viewport(void)
back = IDirect3DRMViewport_GetBack(viewport); back = IDirect3DRMViewport_GetBack(viewport);
ok(back == -1.0f, "Got unexpected back %.8e\n", back); ok(back == -1.0f, "Got unexpected back %.8e\n", back);
projection = IDirect3DRMViewport_GetProjection(viewport); projection = IDirect3DRMViewport_GetProjection(viewport);
todo_wine ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection); ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport_SetCamera(viewport, frame); hr = IDirect3DRMViewport_SetCamera(viewport, frame);
ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
...@@ -2345,7 +2345,7 @@ static void test_Viewport(void) ...@@ -2345,7 +2345,7 @@ static void test_Viewport(void)
back = IDirect3DRMViewport2_GetBack(viewport2); back = IDirect3DRMViewport2_GetBack(viewport2);
ok(back == -1.0f, "Got unexpected back %.8e\n", back); ok(back == -1.0f, "Got unexpected back %.8e\n", back);
projection = IDirect3DRMViewport2_GetProjection(viewport2); projection = IDirect3DRMViewport2_GetProjection(viewport2);
todo_wine ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection); ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport2_SetCamera(viewport2, frame3); hr = IDirect3DRMViewport2_SetCamera(viewport2, frame3);
ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
......
...@@ -978,6 +978,9 @@ static D3DRMPROJECTIONTYPE WINAPI d3drm_viewport2_GetProjection(IDirect3DRMViewp ...@@ -978,6 +978,9 @@ static D3DRMPROJECTIONTYPE WINAPI d3drm_viewport2_GetProjection(IDirect3DRMViewp
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
if (!viewport->d3d_viewport)
return ~0u;
return viewport->projection; return viewport->projection;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment