Rob Shearman : oleaut32: Don' t store result of CompareStringW in HRESULT in OLEFontImpl_IsEqual.
Alexandre Julliard
julliard at winehq.org
Thu Feb 28 06:21:17 CST 2008
Module: wine
Branch: master
Commit: ab8302d88f0a483c94c26a32814172f15001e56f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8302d88f0a483c94c26a32814172f15001e56f
Author: Rob Shearman <rob at codeweavers.com>
Date: Wed Feb 27 16:48:00 2008 +0000
oleaut32: Don't store result of CompareStringW in HRESULT in OLEFontImpl_IsEqual.
It returns an INT, which is quite different to an HRESULT.
---
dlls/oleaut32/olefont.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c
index fe787a7..9a76992 100644
--- a/dlls/oleaut32/olefont.c
+++ b/dlls/oleaut32/olefont.c
@@ -941,7 +941,7 @@ static HRESULT WINAPI OLEFontImpl_IsEqual(
{
OLEFontImpl *left = (OLEFontImpl *)iface;
OLEFontImpl *right = (OLEFontImpl *)pFontOther;
- HRESULT hres;
+ INT ret;
INT left_len,right_len;
if((iface == NULL) || (pFontOther == NULL))
@@ -964,9 +964,9 @@ static HRESULT WINAPI OLEFontImpl_IsEqual(
/* Check from string */
left_len = strlenW(left->description.lpstrName);
right_len = strlenW(right->description.lpstrName);
- hres = CompareStringW(0,0,left->description.lpstrName, left_len,
+ ret = CompareStringW(0,0,left->description.lpstrName, left_len,
right->description.lpstrName, right_len);
- if (hres != CSTR_EQUAL)
+ if (ret != CSTR_EQUAL)
return S_FALSE;
return S_OK;
More information about the wine-cvs
mailing list