Charles Blacklock : oleaut32: Cleanup of previous VarBstrCmp patch.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Dec 4 07:17:04 CST 2006
Module: wine
Branch: master
Commit: 12e4aa21650447f6e9ee3afa8cd0a03534abcd4b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e4aa21650447f6e9ee3afa8cd0a03534abcd4b
Author: Charles Blacklock <charles at diagnos.co.uk>
Date: Fri Dec 1 16:49:46 2006 +0000
oleaut32: Cleanup of previous VarBstrCmp patch.
---
dlls/oleaut32/vartype.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c
index 353a845..9754e8c 100644
--- a/dlls/oleaut32/vartype.c
+++ b/dlls/oleaut32/vartype.c
@@ -6652,14 +6652,16 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft
if (lcid == 0)
{
- ret = memcmp(pbstrLeft, pbstrRight, min(SysStringByteLen(pbstrLeft), SysStringByteLen(pbstrRight)));
+ unsigned int lenLeft = SysStringByteLen(pbstrLeft);
+ unsigned int lenRight = SysStringByteLen(pbstrRight);
+ ret = memcmp(pbstrLeft, pbstrRight, min(lenLeft, lenRight));
if (ret < 0)
return VARCMP_LT;
if (ret > 0)
return VARCMP_GT;
- if (SysStringByteLen(pbstrLeft) < SysStringByteLen(pbstrRight))
+ if (lenLeft < lenRight)
return VARCMP_LT;
- if (SysStringByteLen(pbstrLeft) > SysStringByteLen(pbstrRight))
+ if (lenLeft > lenRight)
return VARCMP_GT;
return VARCMP_EQ;
}
More information about the wine-cvs
mailing list