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

Signed-off-by: Jeff Smith <whydoubt@gmail.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3drm: Return ~0u from d3drm_viewport2_GetProjection() for uninitialised viewports.
5f9ceed1 · Jeff Smith · Alexandre Julliard · afb09525 · 5f9ceed1 · 5f9ceed1
Commit 5f9ceed1 authored Jan 28, 2020 by Jeff Smith Committed by Alexandre Julliard Jan 28, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

d3drm.c dlls/d3drm/tests/d3drm.c +2 -2

viewport.c dlls/d3drm/viewport.c +3 -0

No files found.
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -2152,7 +2152,7 @@ static void test_Viewport(void)
    back = IDirect3DRMViewport_GetBack(viewport);
    ok(back == -1.0f, "Got unexpected back %.8e\n", back);
    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);
    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
@@ -2345,7 +2345,7 @@ static void test_Viewport(void)
    back = IDirect3DRMViewport2_GetBack(viewport2);
    ok(back == -1.0f, "Got unexpected back %.8e\n", back);
    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);
    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);

--- a/dlls/d3drm/viewport.c
+++ b/dlls/d3drm/viewport.c
@@ -978,6 +978,9 @@ static D3DRMPROJECTIONTYPE WINAPI d3drm_viewport2_GetProjection(IDirect3DRMViewp

    TRACE("iface %p.\n", iface);

+    if (!viewport->d3d_viewport)
+        return ~0u;
+
    return viewport->projection;
 }