d3drm: Return error if setting viewport field-of-view to zero or negative value.
Signed-off-by: Jeff Smith <whydoubt@gmail.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
d2d64ced53
commit
643e6379a9
|
@ -2157,6 +2157,10 @@ static void test_Viewport(void)
|
|||
ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
|
||||
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, NULL);
|
||||
ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
|
||||
hr = IDirect3DRMViewport_SetField(viewport, 0.0f);
|
||||
ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
|
||||
hr = IDirect3DRMViewport_SetField(viewport, -1.0f);
|
||||
ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
|
||||
|
||||
IDirect3DRMViewport_Release(viewport);
|
||||
ref4 = get_refcount((IUnknown *)d3drm1);
|
||||
|
@ -2249,6 +2253,10 @@ static void test_Viewport(void)
|
|||
ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
|
||||
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, NULL);
|
||||
ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
|
||||
hr = IDirect3DRMViewport2_SetField(viewport2, 0.0f);
|
||||
ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
|
||||
hr = IDirect3DRMViewport2_SetField(viewport2, -1.0f);
|
||||
ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
|
||||
|
||||
IDirect3DRMViewport2_Release(viewport2);
|
||||
ref4 = get_refcount((IUnknown *)d3drm1);
|
||||
|
|
|
@ -523,6 +523,9 @@ static HRESULT WINAPI d3drm_viewport2_SetField(IDirect3DRMViewport2 *iface, D3DV
|
|||
|
||||
TRACE("iface %p, field %.8e.\n", iface, field);
|
||||
|
||||
if (field <= 0.0f)
|
||||
return D3DRMERR_BADVALUE;
|
||||
|
||||
viewport->field = field;
|
||||
|
||||
return D3DRM_OK;
|
||||
|
|
Loading…
Reference in New Issue