Jacek Caban : jscript: Return BOOL instead of VARIANT_BOOL from jsdisp_is_own_prop.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Mon Sep 17 15:20:14 2012 +0200

jscript: Return BOOL instead of VARIANT_BOOL from jsdisp_is_own_prop.

---

 dlls/jscript/dispex.c  |    4 ++--
 dlls/jscript/jscript.h |    2 +-
 dlls/jscript/jsutils.c |    2 +-
 dlls/jscript/object.c  |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index 2da9661..ae369c2 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -1415,7 +1415,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx)
     return delete_prop(prop);
 }
 
-HRESULT jsdisp_is_own_prop(jsdisp_t *obj, BSTR name, VARIANT_BOOL *ret)
+HRESULT jsdisp_is_own_prop(jsdisp_t *obj, BSTR name, BOOL *ret)
 {
     dispex_prop_t *prop;
     HRESULT hres;
@@ -1424,6 +1424,6 @@ HRESULT jsdisp_is_own_prop(jsdisp_t *obj, BSTR name, VARIANT_BOOL *ret)
     if(FAILED(hres))
         return hres;
 
-    *ret = prop && (prop->type == PROP_JSVAL || prop->type == PROP_BUILTIN) ? VARIANT_TRUE : VARIANT_FALSE;
+    *ret = prop && (prop->type == PROP_JSVAL || prop->type == PROP_BUILTIN);
     return S_OK;
 }
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index 3562db6..8a80192 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -220,7 +220,7 @@ HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*,jsexcept_t*) DECLSPEC_HID
 HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*,jsexcept_t*) DECLSPEC_HIDDEN;
 HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN;
 HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN;
-HRESULT jsdisp_is_own_prop(jsdisp_t*,BSTR,VARIANT_BOOL*) DECLSPEC_HIDDEN;
+HRESULT jsdisp_is_own_prop(jsdisp_t*,BSTR,BOOL*) DECLSPEC_HIDDEN;
 
 HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD,
         jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN;
diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c
index 540d814..0b22a14 100644
--- a/dlls/jscript/jsutils.c
+++ b/dlls/jscript/jsutils.c
@@ -452,7 +452,7 @@ HRESULT to_boolean(jsval_t val, BOOL *ret)
     switch(val.type) {
     case JSV_UNDEFINED:
     case JSV_NULL:
-        *ret = VARIANT_FALSE;
+        *ret = FALSE;
         return S_OK;
     case JSV_OBJECT:
         *ret = get_object(val) != NULL;
diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c
index 99daf46..ae5c03a 100644
--- a/dlls/jscript/object.c
+++ b/dlls/jscript/object.c
@@ -123,7 +123,7 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl
         return hres;
 
     if(is_jsdisp(jsthis)) {
-        VARIANT_BOOL result;
+        BOOL result;
 
         hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name, &result);
         if(FAILED(hres))