oleaut32: Cleanup of previous VarBstrCmp patch.

12e4aa21 · Charles Blacklock · Alexandre Julliard · 81c7c00b · 12e4aa21
Commit 12e4aa21 authored Dec 01, 2006 by Charles Blacklock Committed by Alexandre Julliard Dec 04, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

vartype.c dlls/oleaut32/vartype.c +5 -3

No files found.
--- a/dlls/oleaut32/vartype.c
+++ b/dlls/oleaut32/vartype.c
@@ -6652,14 +6652,16 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl

    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;
    }