Piotr Caban : msvcrt: Add _mbscpy_s implementation.
Alexandre Julliard
julliard at winehq.org
Mon May 19 15:09:59 CDT 2014
Module: wine
Branch: master
Commit: 9f17544bc9109a992a7b4bdbb5477d210f508a71
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f17544bc9109a992a7b4bdbb5477d210f508a71
Author: Piotr Caban <piotr at codeweavers.com>
Date: Mon May 19 11:43:05 2014 +0200
msvcrt: Add _mbscpy_s implementation.
---
dlls/msvcr100/msvcr100.spec | 4 ++--
dlls/msvcr110/msvcr110.spec | 4 ++--
dlls/msvcr80/msvcr80.spec | 4 ++--
dlls/msvcr90/msvcr90.spec | 4 ++--
dlls/msvcrt/mbcs.c | 17 +++++++++++++++++
dlls/msvcrt/msvcrt.spec | 4 ++--
dlls/msvcrt/tests/string.c | 39 +++++++++++++++++++++++++++++++++++++++
7 files changed, 66 insertions(+), 10 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 4d577e7..581ff17 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1101,8 +1101,8 @@
@ stub _mbscmp_l
@ cdecl _mbscoll(str str)
@ cdecl _mbscoll_l(str str ptr)
-@ stub _mbscpy_s
-@ stub _mbscpy_s_l
+@ cdecl _mbscpy_s(ptr long str)
+@ cdecl _mbscpy_s_l(ptr long str ptr)
@ cdecl _mbscspn(str str)
@ stub _mbscspn_l
@ cdecl _mbsdec(ptr ptr)
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index b2141d6..9973aa0 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1459,8 +1459,8 @@
@ stub _mbscmp_l
@ cdecl _mbscoll(str str)
@ cdecl _mbscoll_l(str str ptr)
-@ stub _mbscpy_s
-@ stub _mbscpy_s_l
+@ cdecl _mbscpy_s(ptr long str)
+@ cdecl _mbscpy_s_l(ptr long str ptr)
@ cdecl _mbscspn(str str)
@ stub _mbscspn_l
@ cdecl _mbsdec(ptr ptr)
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index b510e76..c76465b 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -773,8 +773,8 @@
@ stub _mbscmp_l
@ cdecl _mbscoll(str str)
@ cdecl _mbscoll_l(str str ptr)
-@ stub _mbscpy_s
-@ stub _mbscpy_s_l
+@ cdecl _mbscpy_s(ptr long str)
+@ cdecl _mbscpy_s_l(ptr long str ptr)
@ cdecl _mbscspn(str str)
@ stub _mbscspn_l
@ cdecl _mbsdec(ptr ptr)
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 345afe9..622b9f4 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -751,8 +751,8 @@
@ stub _mbscmp_l
@ cdecl _mbscoll(str str)
@ cdecl _mbscoll_l(str str ptr)
-@ stub _mbscpy_s
-@ stub _mbscpy_s_l
+@ cdecl _mbscpy_s(ptr long str)
+@ cdecl _mbscpy_s_l(ptr long str ptr)
@ cdecl _mbscspn(str str)
@ stub _mbscspn_l
@ cdecl _mbsdec(ptr ptr)
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index 3f4590e..d2c12d3 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -712,6 +712,23 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha
}
/*********************************************************************
+ * _mbscpy_s_l(MSVCRT.@)
+ */
+int CDECL _mbscpy_s_l(unsigned char *dst, MSVCRT_size_t size,
+ const unsigned char *src, MSVCRT__locale_t locale)
+{
+ return _mbsnbcpy_s_l(dst, size, src, -1, locale);
+}
+
+/*********************************************************************
+ * _mbscpy_s(MSVCRT.@)
+ */
+int CDECL _mbscpy_s(unsigned char *dst, MSVCRT_size_t size, const unsigned char *src)
+{
+ return _mbscpy_s_l(dst, size, src, NULL);
+}
+
+/*********************************************************************
* _mbsnbcpy(MSVCRT.@)
* REMARKS
* Like strncpy this function doesn't enforce the string to be
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 086bd82..cd7a39b 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -722,8 +722,8 @@
@ cdecl _mbscoll(str str)
@ cdecl _mbscoll_l(str str ptr)
@ cdecl _mbscpy(ptr str)
-# stub _mbscpy_s(ptr long str)
-# stub _mbscpy_s_l(ptr long str ptr)
+@ cdecl _mbscpy_s(ptr long str)
+@ cdecl _mbscpy_s_l(ptr long str ptr)
@ cdecl _mbscspn(str str)
# stub _mbscspn_l(str str ptr)
@ cdecl _mbsdec(ptr ptr)
diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index 11b5f44..822c952 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -60,6 +60,7 @@ static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src);
static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src);
static int (__cdecl *p_mbsnbcat_s)(unsigned char *dst, size_t size, const unsigned char *src, size_t count);
static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count);
+static int (__cdecl *p__mbscpy_s)(unsigned char*, size_t, const unsigned char*);
static int (__cdecl *p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc);
static int (__cdecl *p_wcsncpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc, size_t count);
static int (__cdecl *p_wcsncat_s)(wchar_t *dst, size_t elem, const wchar_t *src, size_t count);
@@ -774,6 +775,42 @@ static void test__mbsnbcpy_s(void)
dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
}
+static void test__mbscpy_s(void)
+{
+ const unsigned char src[] = "source string";
+ unsigned char dest[16];
+ int ret;
+
+ if(!p__mbscpy_s)
+ {
+ win_skip("_mbscpy_s not found\n");
+ return;
+ }
+
+ ret = p__mbscpy_s(NULL, 0, src);
+ ok(ret == EINVAL, "got %d\n", ret);
+ ret = p__mbscpy_s(NULL, sizeof(dest), src);
+ ok(ret == EINVAL, "got %d\n", ret);
+ ret = p__mbscpy_s(dest, 0, src);
+ ok(ret == EINVAL, "got %d\n", ret);
+ dest[0] = 'x';
+ ret = p__mbscpy_s(dest, sizeof(dest), NULL);
+ ok(ret == EINVAL, "got %d\n", ret);
+ ok(!dest[0], "dest buffer was not modified on invalid argument\n");
+
+ memset(dest, 'X', sizeof(dest));
+ ret = p__mbscpy_s(dest, sizeof(dest), src);
+ ok(!ret, "got %d\n", ret);
+ ok(!memcmp(dest, src, sizeof(src)), "dest = %s\n", dest);
+ ok(dest[sizeof(src)] == 'X', "unused part of buffer was modified\n");
+
+ memset(dest, 'X', sizeof(dest));
+ ret = p__mbscpy_s(dest, 4, src);
+ ok(ret == ERANGE, "got %d\n", ret);
+ ok(!dest[0], "incorrect dest buffer (%d)\n", dest[0]);
+ ok(dest[1] == src[1], "incorrect dest buffer (%d)\n", dest[1]);
+}
+
static void test_wcscpy_s(void)
{
static const WCHAR szLongText[] = { 'T','h','i','s','A','L','o','n','g','s','t','r','i','n','g',0 };
@@ -2632,6 +2669,7 @@ START_TEST(string)
pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" );
p_mbsnbcat_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcat_s" );
p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" );
+ p__mbscpy_s = (void *)GetProcAddress( hMsvcrt,"_mbscpy_s" );
p_wcscpy_s = (void *)GetProcAddress( hMsvcrt,"wcscpy_s" );
p_wcsncpy_s = (void *)GetProcAddress( hMsvcrt,"wcsncpy_s" );
p_wcsncat_s = (void *)GetProcAddress( hMsvcrt,"wcsncat_s" );
@@ -2679,6 +2717,7 @@ START_TEST(string)
test_memmove_s();
test_strcat_s();
test__mbsnbcpy_s();
+ test__mbscpy_s();
test_mbcjisjms();
test_mbcjmsjis();
test_mbbtombc();
More information about the wine-cvs
mailing list