msvcrt: Move btowc implementation to mbcs.c file.
Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
44e135a7bd
commit
3073097d29
|
@ -1642,7 +1642,7 @@
|
|||
@ cdecl atol(str) MSVCRT_atol
|
||||
@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
|
||||
@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
|
||||
@ cdecl btowc(long) MSVCRT_btowc
|
||||
@ cdecl btowc(long)
|
||||
@ cdecl calloc(long long) MSVCRT_calloc
|
||||
@ cdecl ceil(double) MSVCRT_ceil
|
||||
@ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf
|
||||
|
|
|
@ -1999,7 +1999,7 @@
|
|||
@ cdecl atol(str) MSVCRT_atol
|
||||
@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
|
||||
@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
|
||||
@ cdecl btowc(long) MSVCRT_btowc
|
||||
@ cdecl btowc(long)
|
||||
@ cdecl calloc(long long) MSVCRT_calloc
|
||||
@ cdecl ceil(double) MSVCRT_ceil
|
||||
@ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf
|
||||
|
|
|
@ -2035,7 +2035,7 @@
|
|||
@ cdecl -ret64 atoll(str) MSVCRT_atoll
|
||||
@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
|
||||
@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
|
||||
@ cdecl btowc(long) MSVCRT_btowc
|
||||
@ cdecl btowc(long)
|
||||
@ stub cabs
|
||||
@ stub cabsf
|
||||
@ stub cabsl
|
||||
|
|
|
@ -1325,7 +1325,7 @@
|
|||
@ cdecl atol(str) MSVCRT_atol
|
||||
@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
|
||||
@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
|
||||
@ cdecl btowc(long) MSVCRT_btowc
|
||||
@ cdecl btowc(long)
|
||||
@ cdecl calloc(long long) MSVCRT_calloc
|
||||
@ cdecl ceil(double) MSVCRT_ceil
|
||||
@ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf
|
||||
|
|
|
@ -1297,7 +1297,7 @@
|
|||
@ cdecl atol(str) MSVCRT_atol
|
||||
@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
|
||||
@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
|
||||
@ cdecl btowc(long) MSVCRT_btowc
|
||||
@ cdecl btowc(long)
|
||||
@ cdecl calloc(long long) MSVCRT_calloc
|
||||
@ cdecl ceil(double) MSVCRT_ceil
|
||||
@ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf
|
||||
|
|
|
@ -988,25 +988,6 @@ int CDECL __crtGetLocaleInfoEx( const WCHAR *locale, LCTYPE type, MSVCRT_wchar_t
|
|||
}
|
||||
#endif
|
||||
|
||||
/*********************************************************************
|
||||
* btowc(MSVCRT.@)
|
||||
*/
|
||||
MSVCRT_wint_t CDECL MSVCRT_btowc(int c)
|
||||
{
|
||||
unsigned char letter = c;
|
||||
MSVCRT_wchar_t ret;
|
||||
|
||||
if(c == MSVCRT_EOF)
|
||||
return MSVCRT_WEOF;
|
||||
if(!get_locinfo()->lc_codepage)
|
||||
return c & 255;
|
||||
if(!MultiByteToWideChar(get_locinfo()->lc_codepage,
|
||||
MB_ERR_INVALID_CHARS, (LPCSTR)&letter, 1, &ret, 1))
|
||||
return MSVCRT_WEOF;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*********************************************************************
|
||||
* __crtGetStringTypeW(MSVCRT.@)
|
||||
*
|
||||
|
|
|
@ -2436,6 +2436,25 @@ int CDECL MSVCRT_mbtowc(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n)
|
|||
return MSVCRT_mbtowc_l(dst, str, n, NULL);
|
||||
}
|
||||
|
||||
/*********************************************************************
|
||||
* btowc(MSVCRT.@)
|
||||
*/
|
||||
MSVCRT_wint_t CDECL btowc(int c)
|
||||
{
|
||||
unsigned char letter = c;
|
||||
MSVCRT_wchar_t ret;
|
||||
|
||||
if(c == MSVCRT_EOF)
|
||||
return MSVCRT_WEOF;
|
||||
if(!get_locinfo()->lc_codepage)
|
||||
return c & 255;
|
||||
if(!MultiByteToWideChar(get_locinfo()->lc_codepage,
|
||||
MB_ERR_INVALID_CHARS, (LPCSTR)&letter, 1, &ret, 1))
|
||||
return MSVCRT_WEOF;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*********************************************************************
|
||||
* mbrtowc(MSVCRT.@)
|
||||
*/
|
||||
|
|
|
@ -1258,7 +1258,7 @@
|
|||
@ cdecl atol(str) MSVCRT_atol
|
||||
@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
|
||||
@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
|
||||
@ cdecl btowc(long) MSVCRT_btowc
|
||||
@ cdecl btowc(long)
|
||||
@ cdecl calloc(long long) MSVCRT_calloc
|
||||
@ cdecl ceil(double) MSVCRT_ceil
|
||||
@ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf
|
||||
|
|
|
@ -1582,7 +1582,7 @@
|
|||
@ cdecl -ret64 _o_atoll(str) MSVCRT_atoll
|
||||
@ cdecl _o_bsearch(ptr ptr long long ptr) MSVCRT_bsearch
|
||||
@ cdecl _o_bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
|
||||
@ cdecl _o_btowc(long) MSVCRT_btowc
|
||||
@ cdecl _o_btowc(long) btowc
|
||||
@ cdecl _o_calloc(long long) MSVCRT_calloc
|
||||
@ cdecl _o_cbrt(double) MSVCR120_cbrt
|
||||
@ cdecl _o_cbrtf(float) MSVCR120_cbrtf
|
||||
|
@ -2176,7 +2176,7 @@
|
|||
@ cdecl -ret64 atoll(str) MSVCRT_atoll
|
||||
@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
|
||||
@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
|
||||
@ cdecl btowc(long) MSVCRT_btowc
|
||||
@ cdecl btowc(long)
|
||||
@ stub c16rtomb
|
||||
@ stub c32rtomb
|
||||
@ stub cabs
|
||||
|
|
Loading…
Reference in New Issue