wine/dlls/msvcrt msvcrt.spec mbcs.c

[Alexandre Julliard]

ChangeSet ID:	21369
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	[e-mail]	2005/11/21 07:34:29

Modified files:
    dlls/msvcrt    : msvcrt.spec mbcs.c

Log message:
    Rein Klazes 
    Do not forward _mbccpy to strcpy.
    Remove the error message in _mbccpy, it is not an error.

Patch: http://cvs.winehq.org/patch.py?id=21369

Old revision  New revision  Changes     Path
 1.108         1.109         +1 -1       wine/dlls/msvcrt/msvcrt.spec
 1.35          1.36          +2 -4       wine/dlls/msvcrt/mbcs.c

Index: wine/dlls/msvcrt/msvcrt.spec
diff -u -p wine/dlls/msvcrt/msvcrt.spec:1.108 wine/dlls/msvcrt/msvcrt.spec:1.109
--- wine/dlls/msvcrt/msvcrt.spec:1.108	21 Nov 2005 13:34:29 -0000
+++ wine/dlls/msvcrt/msvcrt.spec	21 Nov 2005 13:34:29 -0000
@@ -335,7 +335,7 @@
 @ cdecl _mbbtombc(long)
 @ stub _mbbtype #(long long)
 # extern _mbcasemap
-@ cdecl _mbccpy (str str) strcpy
+@ cdecl _mbccpy (str str)
 @ stub _mbcjistojms #(long)
 @ stub _mbcjmstojis #(long)
 @ cdecl _mbclen(ptr)
Index: wine/dlls/msvcrt/mbcs.c
diff -u -p wine/dlls/msvcrt/mbcs.c:1.35 wine/dlls/msvcrt/mbcs.c:1.36
--- wine/dlls/msvcrt/mbcs.c:1.35	21 Nov 2005 13:34:29 -0000
+++ wine/dlls/msvcrt/mbcs.c	21 Nov 2005 13:34:29 -0000
@@ -281,11 +281,9 @@ MSVCRT_size_t _mbstrlen(const char* str)
  */
 void _mbccpy(unsigned char* dest, const unsigned char* src)
 {
-  *dest++ = *src;
+  *dest = *src;
   if(MSVCRT___mb_cur_max > 1 && MSVCRT_isleadbyte(*src))
-    *dest = *++src; /* MB char */
-  else
-    ERR("failure.. is this ok?\n");
+    *++dest = *++src; /* MB char */
 }

/*********************************************************************