[PATCH v4 3/6] ddraw/tests: Add tests for preserving d3d scene state during primary surface creation.

[Connor McAdams]

From: Connor McAdams

Signed-off-by: Connor McAdams 
---
 dlls/ddraw/tests/ddraw2.c | 4 ++++
 dlls/ddraw/tests/ddraw4.c | 4 ++++
 dlls/ddraw/tests/ddraw7.c | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 48a49815c58..198e40bab55 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -16670,6 +16670,8 @@ static void test_d3d_state_reset(void)
     ok(hr == DD_OK, "got %#lx.\n", hr);
     hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZENABLE, TRUE);
     ok(hr == DD_OK, "got %#lx.\n", hr);
+    hr = IDirect3DDevice2_BeginScene(device);
+    ok(hr == DD_OK, "got %#lx.\n", hr);

memset(&param, 0, sizeof(param));
     hr = IDirectDraw2_EnumDisplayModes(ddraw, 0, NULL, &param, find_different_mode_callback);
@@ -16718,6 +16720,8 @@ static void test_d3d_state_reset(void)
     hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &state);
     ok(hr == DD_OK, "got %#lx.\n", hr);
     ok(state == TRUE, "got %#lx.\n", state);
+    hr = IDirect3DDevice2_BeginScene(device);
+    ok(hr == D3DERR_SCENE_IN_SCENE, "Unexpected hr %#lx.\n", hr);

hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL);
     ok(hr == DD_OK, "got %#lx.\n", hr);
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 8abd9cd44fd..7f7c563303f 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -19774,6 +19774,8 @@ static void test_d3d_state_reset(void)
     ok(hr == DD_OK, "got %#lx.\n", hr);
     hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ZENABLE, TRUE);
     ok(hr == DD_OK, "got %#lx.\n", hr);
+    hr = IDirect3DDevice3_BeginScene(device);
+    ok(hr == DD_OK, "got %#lx.\n", hr);

memset(&param, 0, sizeof(param));
     hr = IDirectDraw4_EnumDisplayModes(ddraw, 0, NULL, &param, find_different_mode_callback);
@@ -19822,6 +19824,8 @@ static void test_d3d_state_reset(void)
     hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &state);
     ok(hr == DD_OK, "got %#lx.\n", hr);
     ok(state == TRUE, "got %#lx.\n", state);
+    hr = IDirect3DDevice3_BeginScene(device);
+    ok(hr == D3DERR_SCENE_IN_SCENE, "Unexpected hr %#lx.\n", hr);

hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL);
     ok(hr == DD_OK, "got %#lx.\n", hr);
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 3e03d3e4dd6..76c52be0258 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -20229,6 +20229,8 @@ static void test_d3d_state_reset(void)
     ok(hr == DD_OK, "got %#lx.\n", hr);
     hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, TRUE);
     ok(hr == DD_OK, "got %#lx.\n", hr);
+    hr = IDirect3DDevice7_BeginScene(device);
+    ok(hr == DD_OK, "got %#lx.\n", hr);

hr = IDirect3DDevice7_GetViewport(device, &vp1);
     ok(hr == DD_OK, "got %#lx.\n", hr);
@@ -20269,6 +20271,8 @@ static void test_d3d_state_reset(void)
     hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &state);
     ok(hr == DD_OK, "got %#lx.\n", hr);
     ok(state == TRUE, "got %#lx.\n", state);
+    hr = IDirect3DDevice7_BeginScene(device);
+    ok(hr == D3DERR_SCENE_IN_SCENE, "Unexpected hr %#lx.\n", hr);

hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL);
     ok(hr == DD_OK, "got %#lx.\n", hr);