[ros-diffs] [reactos] 45/74: [WINESYNC] d3dx9/tests: Actually test the return of the effect SetInt() call.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2fcf99a2c337961ab6a9a…

commit 2fcf99a2c337961ab6a9a83cfc44c085e52f180e
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sat Feb 1 17:57:25 2020 +0100
Commit:     Jérôme Gardou <zefklop(a)users.noreply.github.com>
CommitDate: Wed Feb 26 18:19:18 2020 +0100

    [WINESYNC] d3dx9/tests: Actually test the return of the effect SetInt() call.
    
    Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 7e01ec6018c062d11b29ba2b9a2056d98e8bc406 by Michael Stefaniuc
<mstefani(a)winehq.org>
---
 modules/rostests/winetests/d3dx9_36/effect.c | 18 ++++++++++--------
 sdk/tools/winesync/d3dx9.cfg                 |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/modules/rostests/winetests/d3dx9_36/effect.c
b/modules/rostests/winetests/d3dx9_36/effect.c
index efede15f076..fcfb82a5aca 100644
--- a/modules/rostests/winetests/d3dx9_36/effect.c
+++ b/modules/rostests/winetests/d3dx9_36/effect.c
@@ -7197,11 +7197,12 @@ static void test_effect_unsupported_shader(void)
 
     hr = effect->lpVtbl->ValidateTechnique(effect, "tech1");
     ok(hr == D3D_OK, "Got result %#x.\n", hr);
-    effect->lpVtbl->SetInt(effect, "i", 1);
+    hr = effect->lpVtbl->SetInt(effect, "i", 1);
     ok(hr == D3D_OK, "Got result %#x.\n", hr);
     hr = effect->lpVtbl->ValidateTechnique(effect, "tech1");
     ok(hr == E_FAIL, "Got result %#x.\n", hr);
-    effect->lpVtbl->SetInt(effect, "i", 0);
+    hr = effect->lpVtbl->SetInt(effect, "i", 0);
+    ok(hr == D3D_OK, "Got result %#x.\n", hr);
     hr = effect->lpVtbl->ValidateTechnique(effect, "tech1");
     ok(hr == D3D_OK, "Got result %#x.\n", hr);
 
@@ -7244,7 +7245,7 @@ static void test_effect_unsupported_shader(void)
     HeapFree(GetProcessHeap(), 0, byte_code);
     IDirect3DVertexShader9_Release(vshader);
 
-    effect->lpVtbl->SetInt(effect, "i", 1);
+    hr = effect->lpVtbl->SetInt(effect, "i", 1);
     ok(hr == D3D_OK, "Got result %#x.\n", hr);
     hr = effect->lpVtbl->CommitChanges(effect);
     ok(hr == D3D_OK, "Got result %#x.\n", hr);
@@ -7336,16 +7337,16 @@ static void test_effect_null_shader(void)
 
     hr = effect->lpVtbl->ValidateTechnique(effect, "tech0");
     ok(hr == D3D_OK, "Got result %#x.\n", hr);
-    effect->lpVtbl->SetInt(effect, "i", 0);
+    hr = effect->lpVtbl->SetInt(effect, "i", 0);
     ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr);
     hr = effect->lpVtbl->ValidateTechnique(effect, "tech1");
     ok(hr == D3D_OK, "Got result %#x.\n", hr);
-    effect->lpVtbl->SetInt(effect, "i", 1);
+    hr = effect->lpVtbl->SetInt(effect, "i", 1);
     ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr);
     hr = effect->lpVtbl->ValidateTechnique(effect, "tech1");
     ok(hr == D3D_OK, "Got result %#x.\n", hr);
 
-    effect->lpVtbl->SetInt(effect, "i", 2);
+    hr = effect->lpVtbl->SetInt(effect, "i", 2);
     ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr);
     hr = effect->lpVtbl->ValidateTechnique(effect, "tech1");
     ok(hr == E_FAIL, "Got result %#x.\n", hr);
@@ -7953,7 +7954,7 @@ static void test_effect_find_next_valid_technique(void)
     ok(hr == D3D_OK, "Got result %#x.\n", hr);
     ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n",
desc.Name);
 
-    effect->lpVtbl->SetInt(effect, "i", 1);
+    hr = effect->lpVtbl->SetInt(effect, "i", 1);
     ok(hr == D3D_OK, "Got result %#x.\n", hr);
 
     tech = (D3DXHANDLE)0xdeadbeef;
@@ -7966,7 +7967,8 @@ static void test_effect_find_next_valid_technique(void)
     hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech);
     ok(hr == S_FALSE, "Got result %#x.\n", hr);
 
-    effect->lpVtbl->SetInt(effect, "i", 0);
+    hr = effect->lpVtbl->SetInt(effect, "i", 0);
+    ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
 
     hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech);
     ok(hr == D3D_OK, "Got result %#x.\n", hr);
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 4ec5b15c894..d349c3239bf 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -33,4 +33,4 @@ files:
   include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h
   include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h
 tags:
-  wine: wine-4.1
+  wine: 7e01ec6018c062d11b29ba2b9a2056d98e8bc406