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

ddraw: Fix conversion of v2 viewport from v1 in d3d_viewport_GetViewport2(). 

Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Paul Gofman 2019-11-26 21:19:49 +03:00 committed by Alexandre Julliard
parent cabaeea58d
commit 2334aa93a3
3 changed files with 66 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/ddraw/tests/d3d.c
View File

@ -1050,25 +1050,29 @@ static void ViewportTest(void)
ret_vp2_data.dwSize = sizeof(vp2_data); ret_vp2_data.dwSize = sizeof(vp2_data);
hr = IDirect3DViewport2_GetViewport2(Viewport2, &ret_vp2_data); hr = IDirect3DViewport2_GetViewport2(Viewport2, &ret_vp2_data);
ok(hr == D3D_OK, "IDirect3DViewport2_GetViewport2 returned %08x\n", hr); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
ok(ret_vp2_data.dwX == vp1_data.dwX, "dwX is %u, expected %u\n", ret_vp2_data.dwX, vp1_data.dwX); ok(ret_vp2_data.dwX == vp1_data.dwX, "dwX is %u, expected %u.\n", ret_vp2_data.dwX, vp1_data.dwX);
ok(ret_vp2_data.dwY == vp1_data.dwY, "dwY is %u, expected %u\n", ret_vp2_data.dwY, vp1_data.dwY); ok(ret_vp2_data.dwY == vp1_data.dwY, "dwY is %u, expected %u.\n", ret_vp2_data.dwY, vp1_data.dwY);
ok(ret_vp2_data.dwWidth == vp1_data.dwWidth, "dwWidth is %u, expected %u\n", ret_vp2_data.dwWidth, vp1_data.dwWidth); ok(ret_vp2_data.dwWidth == vp1_data.dwWidth, "dwWidth is %u, expected %u.\n",
ok(ret_vp2_data.dwHeight == vp1_data.dwHeight, "dwHeight is %u, expected %u\n", ret_vp2_data.dwHeight, vp1_data.dwHeight); ret_vp2_data.dwWidth, vp1_data.dwWidth);
ok(ret_vp2_data.dvClipX == vp2_data.dvClipX, "dvClipX is %f, expected %f\n", ret_vp2_data.dvClipX, vp2_data.dvClipX); ok(ret_vp2_data.dwHeight == vp1_data.dwHeight, "dwHeight is %u, expected %u.\n",
ok(ret_vp2_data.dvClipY == vp2_data.dvClipY, "dvClipY is %f, expected %f\n", ret_vp2_data.dvClipY, vp2_data.dvClipY); ret_vp2_data.dwHeight, vp1_data.dwHeight);
ok(ret_vp2_data.dvClipWidth == vp2_data.dvClipWidth, "dvClipWidth is %f, expected %f\n", todo_wine ok(ret_vp2_data.dvClipX == vp2_data.dvClipX, "dvClipX is %f, expected %f.\n",
ret_vp2_data.dvClipX, vp2_data.dvClipX);
todo_wine ok(ret_vp2_data.dvClipY == vp2_data.dvClipY, "dvClipY is %f, expected %f.\n",
ret_vp2_data.dvClipY, vp2_data.dvClipY);
todo_wine ok(ret_vp2_data.dvClipWidth == vp2_data.dvClipWidth, "dvClipWidth is %f, expected %f.\n",
ret_vp2_data.dvClipWidth, vp2_data.dvClipWidth); ret_vp2_data.dvClipWidth, vp2_data.dvClipWidth);
ok(ret_vp2_data.dvClipHeight == vp2_data.dvClipHeight, "dvClipHeight is %f, expected %f\n", todo_wine ok(ret_vp2_data.dvClipHeight == vp2_data.dvClipHeight, "dvClipHeight is %f, expected %f.\n",
ret_vp2_data.dvClipHeight, vp2_data.dvClipHeight); ret_vp2_data.dvClipHeight, vp2_data.dvClipHeight);
ok(ret_vp2_data.dvMinZ == 0.0, "dvMinZ is %f, expected 0.0\n", ret_vp2_data.dvMinZ); ok(ret_vp2_data.dvMinZ == 0.0, "dvMinZ is %f, expected 0.0.\n", ret_vp2_data.dvMinZ);
ok(ret_vp2_data.dvMaxZ == 1.0, "dvMaxZ is %f, expected 1.0\n", ret_vp2_data.dvMaxZ); ok(ret_vp2_data.dvMaxZ == 1.0, "dvMaxZ is %f, expected 1.0.\n", ret_vp2_data.dvMaxZ);
IDirect3DViewport2_Release(Viewport2); IDirect3DViewport2_Release(Viewport2);
hr = IDirect3DDevice_DeleteViewport(Direct3DDevice1, Viewport); hr = IDirect3DDevice_DeleteViewport(Direct3DDevice1, Viewport);
ok(hr == D3D_OK, "IDirect3DDevice_DeleteViewport returned %08x\n", hr); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
} }
static void Direct3D1Test(void) static void Direct3D1Test(void)

43
dlls/ddraw/tests/ddraw4.c
View File

@ -1837,11 +1837,54 @@ static void test_viewport_object(void)
"Got unexpected values %g, %g, %g, %g, %g, %g.\n", "Got unexpected values %g, %g, %g, %g, %g, %g.\n",
vp.dvMaxX, vp.dvMaxY, vp.dvScaleX, vp.dvScaleY, vp.dvMinZ, vp.dvMaxZ); vp.dvMaxX, vp.dvMaxY, vp.dvScaleX, vp.dvScaleY, vp.dvMinZ, vp.dvMaxZ);
vp.dwSize = sizeof(vp);
vp.dvMinZ = 0.5f;
vp.dvMaxZ = 2.0f;
hr = IDirect3DViewport3_SetViewport(viewport3, &vp);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
memset(&vp2, 0xff, sizeof(vp2));
vp2.dwSize = sizeof(vp2);
hr = IDirect3DViewport3_GetViewport2(viewport3, &vp2);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
ok(vp2.dvClipX == 0.75f && vp2.dvClipY == 1.0f && vp2.dvClipWidth == -1.5f
&& vp2.dvClipHeight == 2.0f && vp2.dvMinZ == 0.0f && vp2.dvMaxZ == 1.0f,
"Got unexpected values %g, %g, %g, %g, %g, %g.\n",
vp2.dvClipX, vp2.dvClipY, vp2.dvClipWidth, vp2.dvClipHeight, vp2.dvMinZ, vp2.dvMaxZ);
vp.dvMaxX = 4.5f;
vp.dvMaxY = -1.75f;
vp.dvScaleX = 192.0f;
vp.dvScaleY = -240.0f;
vp.dvMinZ = 2.0f;
vp.dvMaxZ = 0.5f;
hr = IDirect3DViewport3_SetViewport(viewport3, &vp);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
memset(&vp2, 0xff, sizeof(vp2));
vp2.dwSize = sizeof(vp2);
hr = IDirect3DViewport3_GetViewport2(viewport3, &vp2);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
ok(vp2.dvClipX == -1.25f && vp2.dvClipY == -0.75f && vp2.dvClipWidth == 2.5f
&& vp2.dvClipHeight == -1.5f && vp2.dvMinZ == 0.0f && vp2.dvMaxZ == 1.0f,
"Got unexpected values %g, %g, %g, %g, %g, %g.\n",
vp2.dvClipX, vp2.dvClipY, vp2.dvClipWidth, vp2.dvClipHeight, vp2.dvMinZ, vp2.dvMaxZ);
/* Destroying the device removes the viewport and releases the reference */ /* Destroying the device removes the viewport and releases the reference */
IDirect3DDevice3_Release(device); IDirect3DDevice3_Release(device);
ref = get_refcount((IUnknown *) viewport3); ref = get_refcount((IUnknown *) viewport3);
ok(ref == 1, "Got unexpected refcount %u.\n", ref); ok(ref == 1, "Got unexpected refcount %u.\n", ref);
memset(&vp2, 0xff, sizeof(vp2));
vp2.dwSize = sizeof(vp2);
hr = IDirect3DViewport3_GetViewport2(viewport3, &vp2);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
ok(vp2.dvClipX == -1.25f && vp2.dvClipY == -0.75f && vp2.dvClipWidth == 2.5f
&& vp2.dvClipHeight == -1.5f && vp2.dvMinZ == 0.0f && vp2.dvMaxZ == 1.0f,
"Got unexpected values %g, %g, %g, %g, %g, %g.\n",
vp2.dvClipX, vp2.dvClipY, vp2.dvClipWidth, vp2.dvClipHeight, vp2.dvMinZ, vp2.dvMaxZ);
vp.dwSize = sizeof(vp); vp.dwSize = sizeof(vp);
hr = IDirect3DViewport3_SetViewport(viewport3, &vp); hr = IDirect3DViewport3_SetViewport(viewport3, &vp);
ok(hr == D3DERR_VIEWPORTHASNODEVICE, "Got unexpected hr %#x.\n", hr); ok(hr == D3DERR_VIEWPORTHASNODEVICE, "Got unexpected hr %#x.\n", hr);

13
dlls/ddraw/viewport.c
View File

@ -983,12 +983,13 @@ static HRESULT WINAPI d3d_viewport_GetViewport2(IDirect3DViewport3 *iface, D3DVI
vp2.dwY = viewport->viewports.vp1.dwY; vp2.dwY = viewport->viewports.vp1.dwY;
vp2.dwWidth = viewport->viewports.vp1.dwWidth; vp2.dwWidth = viewport->viewports.vp1.dwWidth;
vp2.dwHeight = viewport->viewports.vp1.dwHeight; vp2.dwHeight = viewport->viewports.vp1.dwHeight;
vp2.dvClipX = 0.0f;
vp2.dvClipY = 0.0f; vp2.dvClipWidth = viewport->viewports.vp1.dwWidth / viewport->viewports.vp1.dvScaleX;
vp2.dvClipWidth = 0.0f; vp2.dvClipHeight = viewport->viewports.vp1.dwHeight / viewport->viewports.vp1.dvScaleY;
vp2.dvClipHeight = 0.0f; vp2.dvClipX = -vp2.dvClipWidth / 2.0f;
vp2.dvMinZ = viewport->viewports.vp1.dvMinZ; vp2.dvClipY = vp2.dvClipHeight / 2.0f;
vp2.dvMaxZ = viewport->viewports.vp1.dvMaxZ; vp2.dvMinZ = 0.0f;
vp2.dvMaxZ = 1.0f;
memcpy(vp, &vp2, size); memcpy(vp, &vp2, size);
} }