Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetBool().

Alexandre Julliard julliard at winehq.org
Fri May 6 13:44:09 CDT 2011


Module: wine
Branch: master
Commit: 7f3ce799deac51ae329a88b0d5cfeafdc2f72a46
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7f3ce799deac51ae329a88b0d5cfeafdc2f72a46

Author: Rico Schüller <kgbricola at web.de>
Date:   Fri May  6 11:45:29 2011 +0200

d3dx9: Implement ID3DXBaseEffect::GetBool().

---

 dlls/d3dx9_36/effect.c |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 3875517..a0e699d 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -462,6 +462,11 @@ static void free_effect_compiler(struct ID3DXEffectCompilerImpl *compiler)
     }
 }
 
+static inline BOOL get_bool(void *data)
+{
+    return (*(DWORD *)data) ? TRUE : FALSE;
+}
+
 static struct d3dx_parameter *get_parameter_element_by_name(struct ID3DXBaseEffectImpl *base,
         struct d3dx_parameter *parameter, LPCSTR name)
 {
@@ -1181,10 +1186,22 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetBool(ID3DXBaseEffect *iface, D3DXHA
 static HRESULT WINAPI ID3DXBaseEffectImpl_GetBool(ID3DXBaseEffect *iface, D3DXHANDLE parameter, BOOL *b)
 {
     struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface);
+    struct d3dx_parameter *param = is_valid_parameter(This, parameter);
 
-    FIXME("iface %p, parameter %p, b %p stub\n", This, parameter, b);
+    TRACE("iface %p, parameter %p, b %p\n", This, parameter, b);
 
-    return E_NOTIMPL;
+    if (!param) param = get_parameter_by_name(This, NULL, parameter);
+
+    if (b && param && !param->element_count && param->class == D3DXPC_SCALAR)
+    {
+        *b = get_bool(param->data);
+        TRACE("Returning %s\n", *b ? "TRUE" : "FALSE");
+        return D3D_OK;
+    }
+
+    WARN("Invalid argument specified\n");
+
+    return D3DERR_INVALIDCALL;
 }
 
 static HRESULT WINAPI ID3DXBaseEffectImpl_SetBoolArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST BOOL *b, UINT count)




More information about the wine-cvs mailing list