https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cecd21f9a8dd58a2bdf67...
commit 4cecd21f9a8dd58a2bdf67b37f8dad9f1218d83d Author: winesync ros-dev@reactos.org AuthorDate: Sat Jan 4 01:48:04 2020 +0100 Commit: Jérôme Gardou zefklop@users.noreply.github.com CommitDate: Wed Feb 26 18:19:18 2020 +0100
[WINESYNC]d3dx9/tests: Fix a couple of ok() messages.
Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id 5a5beba6c4e3bc53790e3a31916d0aaf57dc19b8 by Matteo Bruni mbruni@codeweavers.com --- modules/rostests/winetests/d3dx9_36/effect.c | 4 ++-- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/rostests/winetests/d3dx9_36/effect.c b/modules/rostests/winetests/d3dx9_36/effect.c index 423d3b8d5c6..efede15f076 100644 --- a/modules/rostests/winetests/d3dx9_36/effect.c +++ b/modules/rostests/winetests/d3dx9_36/effect.c @@ -343,7 +343,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device)
hr = pool->lpVtbl->QueryInterface(pool, &IID_ID3DXEffectPool, (void **)&pool2); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - ok(pool == pool2, "Release failed, got %p, expected %p\n", pool2, pool); + ok(pool == pool2, "Got effect pool %p, expected %p.\n", pool2, pool);
count = pool2->lpVtbl->Release(pool2); ok(count == 1, "Release failed, got %u, expected 1\n", count); @@ -359,7 +359,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device)
hr = effect->lpVtbl->GetPool(effect, &pool); ok(hr == D3D_OK, "GetPool failed, got %x, expected 0 (D3D_OK)\n", hr); - ok(pool == pool2, "GetPool failed, got %p, expected %p\n", pool2, pool); + ok(pool == pool2, "Got effect pool %p, expected %p.\n", pool2, pool);
count = pool2->lpVtbl->Release(pool2); ok(count == 2, "Release failed, got %u, expected 2\n", count); diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index a71df076c17..a4992d55f94 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: 64b6bb4d4a54642434594f0df2afcd2e90b2a0a8 + wine: 5a5beba6c4e3bc53790e3a31916d0aaf57dc19b8
-
winesync