[ros-diffs] [reactos] 142/218: [WINESYNC] d3dx9: Turn unimplemented interface ERR into a WARN.

[winesync]

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

commit c7dd2e86e06704b0a28987437dacbe948245f61e
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 23:01:48 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:04 2021 +0100

    [WINESYNC] d3dx9: Turn unimplemented interface ERR into a WARN.
    
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 5b66442bc95e42bcef2ca385168fc3d594182e4a by Matteo Bruni
<mbruni(a)codeweavers.com>
---
 dll/directx/wine/d3dx9_36/effect.c | 26 ++++++++++++++------------
 sdk/tools/winesync/d3dx9.cfg       |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 0d7a79a02bc..403c9d09989 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -4218,41 +4218,43 @@ static HRESULT WINAPI
ID3DXEffectCompilerImpl_QueryInterface(ID3DXEffectCompiler
 {
     TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid),
object);
 
-    if (IsEqualGUID(riid, &IID_IUnknown) ||
-        IsEqualGUID(riid, &IID_ID3DXEffectCompiler))
+    if (IsEqualGUID(riid, &IID_IUnknown)
+            || IsEqualGUID(riid, &IID_ID3DXEffectCompiler))
     {
         iface->lpVtbl->AddRef(iface);
         *object = iface;
         return S_OK;
     }
 
-    ERR("Interface %s not found\n", debugstr_guid(riid));
+    WARN("%s not implemented, returning E_NOINTERFACE.\n",
debugstr_guid(riid));
 
+    *object = NULL;
     return E_NOINTERFACE;
 }
 
 static ULONG WINAPI ID3DXEffectCompilerImpl_AddRef(ID3DXEffectCompiler *iface)
 {
-    struct ID3DXEffectCompilerImpl *This = impl_from_ID3DXEffectCompiler(iface);
+    struct ID3DXEffectCompilerImpl *compiler = impl_from_ID3DXEffectCompiler(iface);
+    ULONG refcount = InterlockedIncrement(&compiler->ref);
 
-    TRACE("iface %p: AddRef from %u\n", iface, This->ref);
+    TRACE("%p increasing refcount to %u.\n", iface, refcount);
 
-    return InterlockedIncrement(&This->ref);
+    return refcount;
 }
 
 static ULONG WINAPI ID3DXEffectCompilerImpl_Release(ID3DXEffectCompiler *iface)
 {
-    struct ID3DXEffectCompilerImpl *This = impl_from_ID3DXEffectCompiler(iface);
-    ULONG ref = InterlockedDecrement(&This->ref);
+    struct ID3DXEffectCompilerImpl *compiler = impl_from_ID3DXEffectCompiler(iface);
+    ULONG refcount = InterlockedDecrement(&compiler->ref);
 
-    TRACE("iface %p: Release from %u\n", iface, ref + 1);
+    TRACE("%p decreasing refcount to %u.\n", iface, refcount);
 
-    if (!ref)
+    if (!refcount)
     {
-        HeapFree(GetProcessHeap(), 0, This);
+        heap_free(compiler);
     }
 
-    return ref;
+    return refcount;
 }
 
 /*** ID3DXBaseEffect methods ***/
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index cb1a169051a..d5d29603838 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: 29c02234eb2be9c8fa48cfc021d0d6f84de58add}
+tags: {wine: 5b66442bc95e42bcef2ca385168fc3d594182e4a}