https://git.reactos.org/?p=reactos.git;a=commitdiff;h=296900e6977ac5a7f2424564122ed4804151d601
commit 296900e6977ac5a7f2424564122ed4804151d601 Author: winesync <[email protected]> AuthorDate: Sat Jan 4 01:48:04 2020 +0100 Commit: Jérôme Gardou <[email protected]> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9/tests: Avoid some 64-bit test failures. Signed-off-by: Matteo Bruni <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 699eb8cdba8fe236f038550e2bd68a4cd2cab055 by Matteo Bruni <[email protected]> --- modules/rostests/winetests/d3dx9_36/math.c | 6 +++--- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rostests/winetests/d3dx9_36/math.c b/modules/rostests/winetests/d3dx9_36/math.c index 5ce5b2b58a9..cbdd581d231 100644 --- a/modules/rostests/winetests/d3dx9_36/math.c +++ b/modules/rostests/winetests/d3dx9_36/math.c @@ -1093,16 +1093,16 @@ static void D3DXQuaternionTest(void) expectedquat.x = 7.121285f; expectedquat.y = 2.159964f; expectedquat.z = -3.855094f; expectedquat.w = 5.362844f; expect_quaternion(&expectedquat, &gotquat, 2); expectedquat.x = -1113.492920f; expectedquat.y = 82.679260f; expectedquat.z = -6.696645f; expectedquat.w = -4.090050f; - expect_quaternion(&expectedquat, &Nq, 2); + expect_quaternion(&expectedquat, &Nq, 4); expectedquat.x = -1111.0f; expectedquat.y = 111.0f; expectedquat.z = -11.0f; expectedquat.w = 1.0f; expect_quaternion(&expectedquat, &Nq1, 0); gotquat = s; D3DXQuaternionSquadSetup(&gotquat, &Nq, &Nq1, &r, &gotquat, &t, &u); expectedquat.x = -1113.492920f; expectedquat.y = 82.679260f; expectedquat.z = -6.696645f; expectedquat.w = -4.090050f; - expect_quaternion(&expectedquat, &Nq, 2); + expect_quaternion(&expectedquat, &Nq, 4); Nq1 = u; D3DXQuaternionSquadSetup(&gotquat, &Nq, &Nq1, &r, &s, &t, &Nq1); - expect_quaternion(&expectedquat, &Nq, 2); + expect_quaternion(&expectedquat, &Nq, 4); r.x = 0.2f; r.y = 0.3f; r.z = 1.3f; r.w = -0.6f; s.x = -3.0f; s.y =-2.0f; s.z = 4.0f; s.w = 0.2f; t.x = 0.4f; t.y = 8.3f; t.z = -3.1f; t.w = -2.7f; diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index 34d2d1bb4c0..c2b8a4cc5f5 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: dba1304bdde9639b01fa7b1e93cce1a298999b72 + wine: 699eb8cdba8fe236f038550e2bd68a4cd2cab055
