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

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

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Alexandre Julliard 2020-02-05 09:00:04 +01:00
parent 7929583bb6
commit afd681ebd9
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wine/unicode.h
View File

@ -95,7 +95,6 @@ extern int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *ds
extern int wine_compare_string( int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2 );
extern int wine_get_sortkey( int flags, const WCHAR *src, int srclen, char *dst, int dstlen );
extern int wine_fold_string( int flags, const WCHAR *src, int srclen , WCHAR *dst, int dstlen );
extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 );
extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n );

1
libs/port/Makefile.in
View File

@ -82,7 +82,6 @@ C_SRCS = \
decompose.c \
digitmap.c \
ffs.c \
fold.c \
fstatvfs.c \
getopt.c \
interlocked.c \

1
libs/wine/Makefile.in
View File

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

10
libs/port/fold.c → libs/wine/fold.c
View File

@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "wine/asm.h"
#ifdef __ASM_OBSOLETE
#include "wine/unicode.h"
static inline WCHAR to_unicode_digit( WCHAR ch )
@ -116,7 +120,7 @@ static inline const WCHAR* get_ligature( WCHAR wc )
}
/* fold a unicode string */
int wine_fold_string( int flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen )
int wine_fold_string_obsolete( int flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen )
{
WCHAR *dstbase = dst;
const WCHAR *expand;
@ -197,3 +201,7 @@ int wine_fold_string( int flags, const WCHAR *src, int srclen, WCHAR *dst, int d
}
return dst - dstbase;
}
__ASM_OBSOLETE(wine_fold_string);
#endif /* __ASM_OBSOLETE */

1
libs/wine/port.c
View File

@ -45,7 +45,6 @@ const void *libwine_port_functions[] =
wine_cp_wcstombs,
wine_cpsymbol_mbstowcs,
wine_cpsymbol_wcstombs,
wine_fold_string,
wine_utf8_mbstowcs,
wine_utf8_wcstombs
};

2
libs/wine/wine.map
View File

@ -22,7 +22,6 @@ WINE_1.0
wine_dlopen;
wine_dlsym;
wine_exec_wine_binary;
wine_fold_string;
wine_get_build_dir;
wine_get_build_id;
wine_get_config_dir;
@ -117,6 +116,7 @@ WINE_1.0
wine_dll_load;
wine_dll_load_main_exe;
wine_dll_unload;
wine_fold_string;
wine_pthread_get_functions;
wine_pthread_set_functions;
wine_switch_to_stack;