marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Alexandre Julliard 2020-02-12 09:06:25 +01:00
parent 23a50fb0bd
commit d81f96a8fc
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wine/unicode.h
View File

@ -82,10 +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_wcstombs( const union cptable *table, int flags,
const WCHAR *src, int srclen,
char *dst, int dstlen, const char *defchar, int *used );
extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 ); extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 );
extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ); extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n );
extern int memicmpW( const WCHAR *str1, const WCHAR *str2, int n ); extern int memicmpW( const WCHAR *str1, const WCHAR *str2, int n );

1
libs/port/Makefile.in
View File

@ -91,5 +91,4 @@ C_SRCS = \
stubs.c \ stubs.c \
symlink.c \ symlink.c \
usleep.c \ usleep.c \
wctomb.c \
wctype.c wctype.c

3
libs/wine/Makefile.in
View File

@ -13,7 +13,8 @@ C_SRCS = \
mmap.c \ mmap.c \
port.c \ port.c \
sortkey.c \ sortkey.c \
utf8.c utf8.c \
wctomb.c
EXTRA_OBJS = version.o EXTRA_OBJS = version.o

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_wcstombs,
}; };
/* no longer used, for backwards compatibility only */ /* no longer used, for backwards compatibility only */

10
libs/port/wctomb.c → libs/wine/wctomb.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 WCHAR wine_compose( const WCHAR *str ) DECLSPEC_HIDDEN; extern WCHAR wine_compose( const WCHAR *str ) DECLSPEC_HIDDEN;
@ -408,7 +412,7 @@ static int wcstombs_dbcs_slow( const struct dbcs_table *table, int flags,
/* wide char to multi byte string conversion */ /* wide char to multi byte string conversion */
/* return -1 on dst buffer overflow */ /* return -1 on dst buffer overflow */
int wine_cp_wcstombs( const union cptable *table, int flags, int wine_cp_wcstombs_obsolete( 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 )
{ {
@ -432,3 +436,7 @@ int wine_cp_wcstombs( const union cptable *table, int flags,
return wcstombs_dbcs( &table->dbcs, src, srclen, dst, dstlen ); return wcstombs_dbcs( &table->dbcs, src, srclen, dst, dstlen );
} }
} }
__ASM_OBSOLETE(wine_cp_wcstombs);
#endif /* __ASM_OBSOLETE */

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_wcstombs;
wine_dlclose; wine_dlclose;
wine_dll_enum_load_path; wine_dll_enum_load_path;
wine_dll_set_callback; wine_dll_set_callback;
@ -102,6 +101,7 @@ WINE_1.0
wine_call_on_stack; wine_call_on_stack;
wine_compare_string; wine_compare_string;
wine_cp_mbstowcs; wine_cp_mbstowcs;
wine_cp_wcstombs;
wine_cpsymbol_mbstowcs; wine_cpsymbol_mbstowcs;
wine_cpsymbol_wcstombs; wine_cpsymbol_wcstombs;
wine_dbg_log; wine_dbg_log;