https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02ca94672b0146f2f16fc…
commit 02ca94672b0146f2f16fc4dd8a288c8dd1f92d5c
Author: winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 23:03:24 2020 +0200
Commit: Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:05 2021 +0100
[WINESYNC] d3dx9_36/tests: Fix some constant conversion warnings.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 863da013a216bb50b925bbb9e3987b21206fb782 by Alexandre Julliard
<julliard(a)winehq.org>
---
modules/rostests/winetests/d3dx9_36/mesh.c | 6 +++---
sdk/tools/winesync/d3dx9.cfg | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c
b/modules/rostests/winetests/d3dx9_36/mesh.c
index 35d5be61b1f..e93bf0a51f2 100644
--- a/modules/rostests/winetests/d3dx9_36/mesh.c
+++ b/modules/rostests/winetests/d3dx9_36/mesh.c
@@ -7503,9 +7503,9 @@ static void test_weld_vertices(void)
{{ 2.0f, 3.0f, 0.f}, {0, 0, 0, 0}},
{{ 0.0f, 0.0f, 0.f}, {0, 0, 0, 0}},
- {{ 3.0f, 3.0f, 0.f}, {65535, 65535, 65535, 65535}},
+ {{ 3.0f, 3.0f, 0.f}, {-1, -1, -1, -1}},
{{ 3.0f, 0.0f, 0.f}, {0, 0, 0, 0}},
- {{ 1.0f, 0.0f, 0.f}, {65534, 65534, 65534, 65534}},
+ {{ 1.0f, 0.0f, 0.f}, {-2, -2, -2, -2}},
};
const DWORD indices22[] = {0, 1, 2, 3, 4, 5};
const DWORD attributes22[] = {0, 0};
@@ -7520,7 +7520,7 @@ static void test_weld_vertices(void)
{{ 2.0f, 3.0f, 0.f}, {0, 0, 0, 0}},
{{ 0.0f, 0.0f, 0.f}, {0, 0, 0, 0}},
- {{ 2.0f, 3.0f, 0.f}, {65535, 65535, 65535, 65535}},
+ {{ 2.0f, 3.0f, 0.f}, {-1, -1, -1, -1}},
{{ 3.0f, 0.0f, 0.f}, {0, 0, 0, 0}},
};
const DWORD exp_indices22[] = {0, 1, 2, 3, 4, 2};
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 0007a3dc91e..e10538c7044 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h:
sdk/inc
include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h:
sdk/include/dxsdk/d3dx9of.h,
include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h:
sdk/include/dxsdk/d3dx9shape.h,
include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h:
sdk/include/dxsdk/d3dx9xof.h}
-tags: {wine: 5d7fcf52106bbb11544e8dbc5777150c8f55d726}
+tags: {wine: 863da013a216bb50b925bbb9e3987b21206fb782}