Piotr Caban : msvcrt: Added mbrlen tests.
Alexandre Julliard
julliard at winehq.org
Thu Nov 29 14:15:44 CST 2012
Module: wine
Branch: master
Commit: 00658a4a6383cf0e219440f8230a138eeb98cf6b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=00658a4a6383cf0e219440f8230a138eeb98cf6b
Author: Piotr Caban <piotr at codeweavers.com>
Date: Thu Nov 29 09:22:46 2012 +0000
msvcrt: Added mbrlen tests.
---
dlls/msvcrt/tests/string.c | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index 909077f..73e7414 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -23,6 +23,7 @@
#include "winnls.h"
#include <string.h>
#include <mbstring.h>
+#include <wchar.h>
#include <stdlib.h>
#include <stdio.h>
#include <mbctype.h>
@@ -84,6 +85,7 @@ static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements
static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements);
static int (__cdecl *p_wctob)(wint_t);
static int (__cdecl *p_tolower)(int);
+static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*);
#define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y)
#define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y)
@@ -304,6 +306,21 @@ static void test_mbcp(void)
expect_eq(_mbslen(mbsonlylead), 0, int, "%d"); /* lead + NUL not counted as character */
expect_eq(_mbslen(mbstring), 4, int, "%d"); /* lead + invalid trail counted */
+ /* mbrlen */
+ if(!setlocale(LC_ALL, ".936") || !p_mbrlen) {
+ win_skip("mbrlen tests\n");
+ }else {
+ mbstate_t state = 0;
+ expect_eq(p_mbrlen((const char*)mbstring, 2, NULL), 2, int, "%d");
+ expect_eq(p_mbrlen((const char*)&mbstring[2], 2, NULL), 2, int, "%d");
+ expect_eq(p_mbrlen((const char*)&mbstring[3], 2, NULL), 1, int, "%d");
+ expect_eq(p_mbrlen((const char*)mbstring, 1, NULL), -2, int, "%d");
+ expect_eq(p_mbrlen((const char*)mbstring, 1, &state), -2, int, "%d");
+ ok(state == mbstring[0], "incorrect state value (%x)\n", state);
+ expect_eq(p_mbrlen((const char*)&mbstring[1], 1, &state), 2, int, "%d");
+ }
+ setlocale(LC_ALL, "C");
+
/* _mbccpy/_mbsncpy */
memset(buf, 0xff, sizeof(buf));
_mbccpy(buf, mbstring);
@@ -2302,6 +2319,7 @@ START_TEST(string)
p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s");
p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob");
p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower");
+ p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen");
/* MSVCRT memcpy behaves like memmove for overlapping moves,
MFC42 CString::Insert seems to rely on that behaviour */
More information about the wine-cvs
mailing list