system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-04 17:56:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

libport: Move wine_cpsymbol functions back to libwine and make them obsolete.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-02-05 09:00:22 +01:00
parent 5a1e897df7
commit f4b7260d29
6 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/wine/unicode.h
View file

@ -88,8 +88,6 @@ extern int wine_cp_mbstowcs( const union cptable *table, int flags,
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 wine_cpsymbol_mbstowcs( const char *src, int srclen, WCHAR *dst, int dstlen );
extern int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen );
extern int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int dstlen );
extern int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int dstlen );

1
libs/port/Makefile.in
View file

@ -77,7 +77,6 @@ C_SRCS = \
casemap.c \
collation.c \
compose.c \
cpsymbol.c \
cptable.c \
decompose.c \
digitmap.c \

1
libs/wine/Makefile.in
View file

@ -3,6 +3,7 @@ EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS)
C_SRCS = \
config.c \
cpsymbol.c \
debug.c \
fold.c \
ldt.c \

13
libs/port/cpsymbol.c → libs/wine/cpsymbol.c
View file

@ -19,10 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "wine/asm.h"
#ifdef __ASM_OBSOLETE
#include "wine/unicode.h"
/* return -1 on dst buffer overflow */
int wine_cpsymbol_mbstowcs( const char *src, int srclen, WCHAR *dst, int dstlen)
int wine_cpsymbol_mbstowcs_obsolete( const char *src, int srclen, WCHAR *dst, int dstlen)
{
int len, i;
@ -38,7 +42,7 @@ int wine_cpsymbol_mbstowcs( const char *src, int srclen, WCHAR *dst, int dstlen)
}
/* return -1 on dst buffer overflow, -2 on invalid character */
int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen)
int wine_cpsymbol_wcstombs_obsolete( const WCHAR *src, int srclen, char *dst, int dstlen)
{
int len, i;
@ -56,3 +60,8 @@ int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen)
if (srclen > len) return -1;
return len;
}
__ASM_OBSOLETE(wine_cpsymbol_mbstowcs);
__ASM_OBSOLETE(wine_cpsymbol_wcstombs);
#endif /* __ASM_OBSOLETE */

2
libs/wine/port.c
View file

@ -42,8 +42,6 @@ const void *libwine_port_functions[] =
wine_cp_get_table,
wine_cp_mbstowcs,
wine_cp_wcstombs,
wine_cpsymbol_mbstowcs,
wine_cpsymbol_wcstombs,
wine_utf8_mbstowcs,
wine_utf8_wcstombs
};

4
libs/wine/wine.map
View file

@ -13,8 +13,6 @@ WINE_1.0
wine_cp_get_table;
wine_cp_mbstowcs;
wine_cp_wcstombs;
wine_cpsymbol_mbstowcs;
wine_cpsymbol_wcstombs;
wine_dlclose;
wine_dll_enum_load_path;
wine_dll_set_callback;
@ -106,6 +104,8 @@ WINE_1.0
vsprintfW;
wine_call_on_stack;
wine_compare_string;
wine_cpsymbol_mbstowcs;
wine_cpsymbol_wcstombs;
wine_dbg_log;
wine_dbg_printf;
wine_dbg_sprintf;