Jacek Caban : mshtml: Introduce variant_bool helper.
Alexandre Julliard
julliard at winehq.org
Thu Nov 2 17:28:50 CDT 2017
Module: wine
Branch: master
Commit: 0bff85cd44854ffc0c9dfad3d6e696ad62457fb3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bff85cd44854ffc0c9dfad3d6e696ad62457fb3
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Nov 2 16:47:45 2017 +0100
mshtml: Introduce variant_bool helper.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmlinput.c | 11 ++++++-----
dlls/mshtml/mshtml_private.h | 5 +++++
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c
index b0380a2..0dea8cb 100644
--- a/dlls/mshtml/htmlinput.c
+++ b/dlls/mshtml/htmlinput.c
@@ -275,7 +275,7 @@ static HRESULT WINAPI HTMLInputElement_get_disabled(IHTMLInputElement *iface, VA
nsIDOMHTMLInputElement_GetDisabled(This->nsinput, &disabled);
- *p = disabled ? VARIANT_TRUE : VARIANT_FALSE;
+ *p = variant_bool(disabled);
return S_OK;
}
@@ -474,7 +474,8 @@ static HRESULT WINAPI HTMLInputElement_get_readOnly(IHTMLInputElement *iface, VA
ERR("Get ReadOnly Failed: %08x\n", nsres);
return E_FAIL;
}
- *p = b ? VARIANT_TRUE : VARIANT_FALSE;
+
+ *p = variant_bool(b);
return S_OK;
}
@@ -529,7 +530,7 @@ static HRESULT WINAPI HTMLInputElement_get_defaultChecked(IHTMLInputElement *ifa
return E_FAIL;
}
- *p = default_checked ? VARIANT_TRUE : VARIANT_FALSE;
+ *p = variant_bool(default_checked);
return S_OK;
}
@@ -563,7 +564,7 @@ static HRESULT WINAPI HTMLInputElement_get_checked(IHTMLInputElement *iface, VAR
return E_FAIL;
}
- *p = checked ? VARIANT_TRUE : VARIANT_FALSE;
+ *p = variant_bool(checked);
TRACE("checked=%x\n", *p);
return S_OK;
}
@@ -1891,7 +1892,7 @@ static HRESULT WINAPI HTMLButtonElement_get_disabled(IHTMLButtonElement *iface,
return E_FAIL;
}
- *p = disabled ? VARIANT_TRUE : VARIANT_FALSE;
+ *p = variant_bool(disabled);
return S_OK;
}
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 98daa65..8965d46 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -1333,6 +1333,11 @@ static inline void windowref_release(windowref_t *ref)
heap_free(ref);
}
+static inline VARIANT_BOOL variant_bool(BOOL b)
+{
+ return b ? VARIANT_TRUE : VARIANT_FALSE;
+}
+
UINT cp_from_charset_string(BSTR) DECLSPEC_HIDDEN;
BSTR charset_string_from_cp(UINT) DECLSPEC_HIDDEN;
HDC get_display_dc(void) DECLSPEC_HIDDEN;
More information about the wine-cvs
mailing list