ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libport: Move wine_cp_mbstowcs implementation back to libwine and make it obsolete. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-02-12 09:06:19 +01:00
parent c47910ec47
commit 23a50fb0bd
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wine/unicode.h
View File

@ -82,9 +82,6 @@ union cptable
extern const union cptable *wine_cp_get_table( unsigned int codepage ); extern const union cptable *wine_cp_get_table( unsigned int codepage );
extern const union cptable *wine_cp_enum_table( unsigned int index ); extern const union cptable *wine_cp_enum_table( unsigned int index );
extern int wine_cp_mbstowcs( const union cptable *table, int flags,
const char *src, int srclen,
WCHAR *dst, int dstlen );
extern int wine_cp_wcstombs( const union cptable *table, int flags, extern int wine_cp_wcstombs( const union cptable *table, int flags,
const WCHAR *src, int srclen, const WCHAR *src, int srclen,
char *dst, int dstlen, const char *defchar, int *used ); char *dst, int dstlen, const char *defchar, int *used );

1
libs/port/Makefile.in
View File

@ -78,7 +78,6 @@ C_SRCS = \
isinf.c \ isinf.c \
isnan.c \ isnan.c \
lstat.c \ lstat.c \
mbtowc.c \
mkstemps.c \ mkstemps.c \
poll.c \ poll.c \
pread.c \ pread.c \

1
libs/wine/Makefile.in
View File

@ -9,6 +9,7 @@ C_SRCS = \
fold.c \ fold.c \
ldt.c \ ldt.c \
loader.c \ loader.c \
mbtowc.c \
mmap.c \ mmap.c \
port.c \ port.c \
sortkey.c \ sortkey.c \

13
libs/port/mbtowc.c → libs/wine/mbtowc.c
View File

@ -20,6 +20,10 @@
#include <string.h> #include <string.h>
#include "wine/asm.h"
#ifdef __ASM_OBSOLETE
#include "wine/unicode.h" #include "wine/unicode.h"
extern const unsigned short nfd_table[] DECLSPEC_HIDDEN; extern const unsigned short nfd_table[] DECLSPEC_HIDDEN;
@ -279,9 +283,8 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table,
/* return -1 on dst buffer overflow, -2 on invalid input char */ /* return -1 on dst buffer overflow, -2 on invalid input char */
int wine_cp_mbstowcs( const union cptable *table, int flags, int wine_cp_mbstowcs_obsolete( const union cptable *table, int flags,
const char *s, int srclen, const char *s, int srclen, WCHAR *dst, int dstlen )
WCHAR *dst, int dstlen )
{ {
const unsigned char *src = (const unsigned char*) s; const unsigned char *src = (const unsigned char*) s;
@ -310,3 +313,7 @@ int wine_cp_mbstowcs( const union cptable *table, int flags,
return mbstowcs_dbcs_decompose( &table->dbcs, src, srclen, dst, dstlen ); return mbstowcs_dbcs_decompose( &table->dbcs, src, srclen, dst, dstlen );
} }
} }
__ASM_OBSOLETE(wine_cp_mbstowcs);
#endif /* __ASM_OBSOLETE */

1
libs/wine/port.c
View File

@ -40,7 +40,6 @@ const void *libwine_port_functions[] =
vsnprintfW, vsnprintfW,
wine_cp_enum_table, wine_cp_enum_table,
wine_cp_get_table, wine_cp_get_table,
wine_cp_mbstowcs,
wine_cp_wcstombs, wine_cp_wcstombs,
}; };

2
libs/wine/wine.map
View File

@ -11,7 +11,6 @@ WINE_1.0
wine_casemap_upper; wine_casemap_upper;
wine_cp_enum_table; wine_cp_enum_table;
wine_cp_get_table; wine_cp_get_table;
wine_cp_mbstowcs;
wine_cp_wcstombs; wine_cp_wcstombs;
wine_dlclose; wine_dlclose;
wine_dll_enum_load_path; wine_dll_enum_load_path;
@ -102,6 +101,7 @@ WINE_1.0
vsprintfW; vsprintfW;
wine_call_on_stack; wine_call_on_stack;
wine_compare_string; wine_compare_string;
wine_cp_mbstowcs;
wine_cpsymbol_mbstowcs; wine_cpsymbol_mbstowcs;
wine_cpsymbol_wcstombs; wine_cpsymbol_wcstombs;
wine_dbg_log; wine_dbg_log;