Akihiro Sagawa : msvcrt: Fix _mbcjistojms off by one error.
Alexandre Julliard
julliard at winehq.org
Mon Mar 26 12:29:33 CDT 2012
Module: wine
Branch: master
Commit: 7535b367dd4f5ae1b22fcb068eaaf4e2b428b98f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7535b367dd4f5ae1b22fcb068eaaf4e2b428b98f
Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date: Wed Mar 21 23:02:16 2012 +0900
msvcrt: Fix _mbcjistojms off by one error.
---
dlls/msvcrt/mbcs.c | 2 +-
dlls/msvcrt/tests/string.c | 5 -----
2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index c61311b..37b72a3 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -461,7 +461,7 @@ unsigned int CDECL _mbcjistojms(unsigned int c)
else
c += 0x7d;
- if(LOBYTE(c) > 0x7F)
+ if(LOBYTE(c) >= 0x7F)
c += 0x1;
c = (((HIBYTE(c) - 0x21)/2 + 0x81) << 8) | LOBYTE(c);
diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index 6f9ce0f..9f0d8be 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -877,11 +877,6 @@ static void test_mbcjisjms(void)
unsigned int ret, exp;
ret = _mbcjistojms(jisjms[j][0]);
exp = (cp[i] == 932) ? jisjms[j][1] : jisjms[j][0];
- if (LOBYTE(exp) == 0x80 && cp[i] == 932) {
- todo_wine ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n",
- exp, ret, jisjms[j][0], cp[i]);
- continue;
- }
ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n",
exp, ret, jisjms[j][0], cp[i]);
}
More information about the wine-cvs
mailing list