libwine: Remove obsolete library.

configure

@@ -737,11 +737,8 @@ FAUDIO_PE_LIBS
 FAUDIO_PE_CFLAGS
 MINGW_PKG_CONFIG
 PE_ARCHS
-LIBWINE_DEPENDS
 PRELINK
 WINELOADER_DEPENDS
-LIBWINE_LDFLAGS
-LIBWINE_SHAREDLIB
 ac_ct_OBJC
 OBJCFLAGS
 OBJC
@@ -1580,7 +1577,6 @@ enable_tiff
 enable_uuid
 enable_vkd3d
 enable_wbemuuid
-enable_wine
 enable_wmcodecdspuuid
 enable_xml2
 enable_xslt
@@ -9397,8 +9393,6 @@ $ac_links:
     for f in $ac_links; do as_fn_append CONFIGURE_TARGETS " $f"; done
 }
 
-libwine_soversion=`expr $libwine_version : '\([0-9]*\)\..*'`
-
 case $host_os in
   cygwin*|mingw32*)
     LIBEXT="dll"
@@ -9915,13 +9909,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
     UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/"
-    LIBWINE_SHAREDLIB="libwine.$libwine_version.dylib"
-
-    LIBWINE_LDFLAGS="-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"
-
     WINELOADER_DEPENDS="wine_info.plist"
 
-    TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.$libwine_version.dylib libs/wine/libwine.$libwine_soversion.dylib"
     ;;
 
   linux-android*)
@@ -10154,38 +10143,6 @@ fi
         DLLFLAGS="$DLLFLAGS -fPIC"
         LDDLLFLAGS="-fPIC" ;;
     esac
-    LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so.$libwine_soversion"
-
-    echo '{ global: *; };' >conftest.map
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -shared -Wl,--version-script=conftest.map" >&5
-printf %s "checking whether the compiler supports -shared -Wl,--version-script=conftest.map... " >&6; }
-if test ${ac_cv_cflags__shared__Wl___version_script_conftest_map+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -shared -Wl,--version-script=conftest.map"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int main(int argc, char **argv) { return 0; }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  ac_cv_cflags__shared__Wl___version_script_conftest_map=yes
-else $as_nop
-  ac_cv_cflags__shared__Wl___version_script_conftest_map=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-CFLAGS=$ac_wine_try_cflags_saved
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__shared__Wl___version_script_conftest_map" >&5
-printf "%s\n" "$ac_cv_cflags__shared__Wl___version_script_conftest_map" >&6; }
-if test "x$ac_cv_cflags__shared__Wl___version_script_conftest_map" = xyes
-then :
-  LIBWINE_LDFLAGS="$LIBWINE_LDFLAGS -Wl,--version-script=\$(srcdir)/wine.map"
-fi
-    rm -f conftest.map
 
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-z,defs" >&5
 printf %s "checking whether the compiler supports -Wl,-z,defs... " >&6; }
@@ -10390,11 +10347,6 @@ then :
 fi
         ;;
     esac
-    LIBWINE_SHAREDLIB="libwine.so.$libwine_version"
-
-    LIBWINE_DEPENDS="wine.map"
-
-    TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version libs/wine/libwine.so.$libwine_soversion"
     ;;
 esac
 
@@ -21985,7 +21937,6 @@ wine_fn_config_makefile libs/tiff enable_tiff
 wine_fn_config_makefile libs/uuid enable_uuid
 wine_fn_config_makefile libs/vkd3d enable_vkd3d
 wine_fn_config_makefile libs/wbemuuid enable_wbemuuid
-wine_fn_config_makefile libs/wine enable_wine
 wine_fn_config_makefile libs/wmcodecdspuuid enable_wmcodecdspuuid
 wine_fn_config_makefile libs/xml2 enable_xml2
 wine_fn_config_makefile libs/xslt enable_xslt
@@ -23113,11 +23064,8 @@ OPENCL_LIBS = $OPENCL_LIBS
 OBJC = $OBJC
 OBJCFLAGS = $OBJCFLAGS
 ac_ct_OBJC = $ac_ct_OBJC
-LIBWINE_SHAREDLIB = $LIBWINE_SHAREDLIB
-LIBWINE_LDFLAGS = $LIBWINE_LDFLAGS
 WINELOADER_DEPENDS = $WINELOADER_DEPENDS
 PRELINK = $PRELINK
-LIBWINE_DEPENDS = $LIBWINE_DEPENDS
 PE_ARCHS = $PE_ARCHS
 MINGW_PKG_CONFIG = $MINGW_PKG_CONFIG
 FAUDIO_PE_CFLAGS = $FAUDIO_PE_CFLAGS

configure.ac

@@ -646,8 +646,6 @@ LIBEXT="so"
 WINE_PATH_SONAME_TOOLS
 WINE_CONFIG_HELPERS
 
-libwine_soversion=`expr $libwine_version : '\([[0-9]]*\)\..*'`
-
 case $host_os in
   cygwin*|mingw32*)
     LIBEXT="dll"
@@ -725,10 +723,7 @@ case $host_os in
     AC_LANG_POP([Objective C])
 
     UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/"
-    AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib")
-    AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"])
     AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist")
-    TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.$libwine_version.dylib libs/wine/libwine.$libwine_soversion.dylib"
     ;;
 
   linux-android*)
@@ -768,12 +763,6 @@ case $host_os in
         DLLFLAGS="$DLLFLAGS -fPIC"
         LDDLLFLAGS="-fPIC" ;;
     esac
-    LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so.$libwine_soversion"
-
-    echo '{ global: *; };' >conftest.map
-    WINE_TRY_CFLAGS([-shared -Wl,--version-script=conftest.map],
-                    [LIBWINE_LDFLAGS="$LIBWINE_LDFLAGS -Wl,--version-script=\$(srcdir)/wine.map"])
-    rm -f conftest.map
 
     WINE_TRY_CFLAGS([-Wl,-z,defs],[UNIXLDFLAGS="$UNIXLDFLAGS -Wl,-z,defs"])
     WINE_TRY_CFLAGS([-Wl,--export-dynamic],[WINELOADER_LDFLAGS="-Wl,--export-dynamic"])
@@ -800,9 +789,6 @@ case $host_os in
                         [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"])
         ;;
     esac
-    AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
-    AC_SUBST(LIBWINE_DEPENDS,"wine.map")
-    TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version libs/wine/libwine.so.$libwine_soversion"
     ;;
 esac
 
@@ -3298,7 +3284,6 @@ WINE_CONFIG_MAKEFILE(libs/tiff)
 WINE_CONFIG_MAKEFILE(libs/uuid)
 WINE_CONFIG_MAKEFILE(libs/vkd3d)
 WINE_CONFIG_MAKEFILE(libs/wbemuuid)
-WINE_CONFIG_MAKEFILE(libs/wine)
 WINE_CONFIG_MAKEFILE(libs/wmcodecdspuuid)
 WINE_CONFIG_MAKEFILE(libs/xml2)
 WINE_CONFIG_MAKEFILE(libs/xslt)

libs/wine/Makefile.in

-UNIX_LIBS = $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS)
-
-C_SRCS = \
-	c_037.c \
-	c_10000.c \
-	c_10001.c \
-	c_10002.c \
-	c_10003.c \
-	c_10004.c \
-	c_10005.c \
-	c_10006.c \
-	c_10007.c \
-	c_10008.c \
-	c_10010.c \
-	c_10017.c \
-	c_10021.c \
-	c_10029.c \
-	c_10079.c \
-	c_10081.c \
-	c_10082.c \
-	c_1026.c \
-	c_1250.c \
-	c_1251.c \
-	c_1252.c \
-	c_1253.c \
-	c_1254.c \
-	c_1255.c \
-	c_1256.c \
-	c_1257.c \
-	c_1258.c \
-	c_1361.c \
-	c_20127.c \
-	c_20866.c \
-	c_20932.c \
-	c_21866.c \
-	c_28591.c \
-	c_28592.c \
-	c_28593.c \
-	c_28594.c \
-	c_28595.c \
-	c_28596.c \
-	c_28597.c \
-	c_28598.c \
-	c_28599.c \
-	c_28603.c \
-	c_28605.c \
-	c_437.c \
-	c_500.c \
-	c_737.c \
-	c_775.c \
-	c_850.c \
-	c_852.c \
-	c_855.c \
-	c_857.c \
-	c_860.c \
-	c_861.c \
-	c_862.c \
-	c_863.c \
-	c_864.c \
-	c_865.c \
-	c_866.c \
-	c_869.c \
-	c_874.c \
-	c_875.c \
-	c_932.c \
-	c_936.c \
-	c_949.c \
-	c_950.c \
-	casemap.c \
-	collation.c \
-	compose.c \
-	config.c \
-	cpsymbol.c \
-	cptable.c \
-	debug.c \
-	decompose.c \
-	digitmap.c \
-	fold.c \
-	ldt.c \
-	loader.c \
-	mbtowc.c \
-	mmap.c \
-	port.c \
-	sortkey.c \
-	string.c \
-	utf8.c \
-	wctomb.c \
-	wctype.c
-
-config_EXTRADEFS = \
-	-DBINDIR='"${bindir}"' \
-	-DDLLDIR='"${dlldir}"' \
-	-DLIB_TO_BINDIR=\"`${MAKEDEP} -R ${libdir} ${bindir}`\" \
-	-DLIB_TO_DLLDIR=\"`${MAKEDEP} -R ${libdir} ${dlldir}`\" \
-	-DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" \
-	-DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\"
-
-SHAREDLIB = $(LIBWINE_SHAREDLIB)
-
-libwine_LDFLAGS = $(LIBWINE_LDFLAGS)
-libwine_DEPS = $(LIBWINE_DEPENDS)

libs/wine/cpsymbol.c

-/*
- * CP_SYMBOL support
- *
- * Copyright 2000 Alexandre Julliard
- * Copyright 2004 Rein Klazes
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "wine/asm.h"
-
-#ifdef __ASM_OBSOLETE
-
-#include "unicode.h"
-
-/* return -1 on dst buffer overflow */
-int wine_cpsymbol_mbstowcs_obsolete( const char *src, int srclen, WCHAR *dst, int dstlen)
-{
-    int len, i;
-
-    if (dstlen == 0) return srclen;
-    len = dstlen > srclen ? srclen : dstlen;
-    for (i = 0; i < len; i++)
-    {
-        unsigned char c = src[i];
-        dst[i] = (c < 0x20) ? c : c + 0xf000;
-    }
-    if (srclen > len) return -1;
-    return len;
-}
-
-/* return -1 on dst buffer overflow, -2 on invalid character */
-int wine_cpsymbol_wcstombs_obsolete( const WCHAR *src, int srclen, char *dst, int dstlen)
-{
-    int len, i;
-
-    if (dstlen == 0) return srclen;
-    len = dstlen > srclen ? srclen : dstlen;
-    for (i = 0; i < len; i++)
-    {
-        if (src[i] < 0x20)
-            dst[i] = src[i];
-        else if (src[i] >= 0xf020 && src[i] < 0xf100)
-            dst[i] = src[i] - 0xf000;
-        else
-            return -2;
-    }
-    if (srclen > len) return -1;
-    return len;
-}
-
-__ASM_OBSOLETE(wine_cpsymbol_mbstowcs);
-__ASM_OBSOLETE(wine_cpsymbol_wcstombs);
-
-#endif /* __ASM_OBSOLETE */

libs/wine/cptable.c

-/*
- * Codepage tables
- *
- * Copyright 2000 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <stdlib.h>
-
-#include "wine/asm.h"
-
-#ifdef __ASM_OBSOLETE
-
-#include "unicode.h"
-
-/* Everything below this line is generated automatically by make_unicode */
-/* ### cpmap begin ### */
-extern union cptable cptable_037;
-extern union cptable cptable_437;
-extern union cptable cptable_500;
-extern union cptable cptable_737;
-extern union cptable cptable_775;
-extern union cptable cptable_850;
-extern union cptable cptable_852;
-extern union cptable cptable_855;
-extern union cptable cptable_857;
-extern union cptable cptable_860;
-extern union cptable cptable_861;
-extern union cptable cptable_862;
-extern union cptable cptable_863;
-extern union cptable cptable_864;
-extern union cptable cptable_865;
-extern union cptable cptable_866;
-extern union cptable cptable_869;
-extern union cptable cptable_874;
-extern union cptable cptable_875;
-extern union cptable cptable_932;
-extern union cptable cptable_936;
-extern union cptable cptable_949;
-extern union cptable cptable_950;
-extern union cptable cptable_1026;
-extern union cptable cptable_1250;
-extern union cptable cptable_1251;
-extern union cptable cptable_1252;
-extern union cptable cptable_1253;
-extern union cptable cptable_1254;
-extern union cptable cptable_1255;
-extern union cptable cptable_1256;
-extern union cptable cptable_1257;
-extern union cptable cptable_1258;
-extern union cptable cptable_1361;
-extern union cptable cptable_10000;
-extern union cptable cptable_10001;
-extern union cptable cptable_10002;
-extern union cptable cptable_10003;
-extern union cptable cptable_10004;
-extern union cptable cptable_10005;
-extern union cptable cptable_10006;
-extern union cptable cptable_10007;
-extern union cptable cptable_10008;
-extern union cptable cptable_10010;
-extern union cptable cptable_10017;
-extern union cptable cptable_10021;
-extern union cptable cptable_10029;
-extern union cptable cptable_10079;
-extern union cptable cptable_10081;
-extern union cptable cptable_10082;
-extern union cptable cptable_20127;
-extern union cptable cptable_20866;
-extern union cptable cptable_20932;
-extern union cptable cptable_21866;
-extern union cptable cptable_28591;
-extern union cptable cptable_28592;
-extern union cptable cptable_28593;
-extern union cptable cptable_28594;
-extern union cptable cptable_28595;
-extern union cptable cptable_28596;
-extern union cptable cptable_28597;
-extern union cptable cptable_28598;
-extern union cptable cptable_28599;
-extern union cptable cptable_28603;
-extern union cptable cptable_28605;
-
-static const union cptable * const cptables[65] =
-{
-    &cptable_037,
-    &cptable_437,
-    &cptable_500,
-    &cptable_737,
-    &cptable_775,
-    &cptable_850,
-    &cptable_852,
-    &cptable_855,
-    &cptable_857,
-    &cptable_860,
-    &cptable_861,
-    &cptable_862,
-    &cptable_863,
-    &cptable_864,
-    &cptable_865,
-    &cptable_866,
-    &cptable_869,
-    &cptable_874,
-    &cptable_875,
-    &cptable_932,
-    &cptable_936,
-    &cptable_949,
-    &cptable_950,
-    &cptable_1026,
-    &cptable_1250,
-    &cptable_1251,
-    &cptable_1252,
-    &cptable_1253,
-    &cptable_1254,
-    &cptable_1255,
-    &cptable_1256,
-    &cptable_1257,
-    &cptable_1258,
-    &cptable_1361,
-    &cptable_10000,
-    &cptable_10001,
-    &cptable_10002,
-    &cptable_10003,
-    &cptable_10004,
-    &cptable_10005,
-    &cptable_10006,
-    &cptable_10007,
-    &cptable_10008,
-    &cptable_10010,
-    &cptable_10017,
-    &cptable_10021,
-    &cptable_10029,
-    &cptable_10079,
-    &cptable_10081,
-    &cptable_10082,
-    &cptable_20127,
-    &cptable_20866,
-    &cptable_20932,
-    &cptable_21866,
-    &cptable_28591,
-    &cptable_28592,
-    &cptable_28593,
-    &cptable_28594,
-    &cptable_28595,
-    &cptable_28596,
-    &cptable_28597,
-    &cptable_28598,
-    &cptable_28599,
-    &cptable_28603,
-    &cptable_28605,
-};
-/* ### cpmap end ### */
-/* Everything above this line is generated automatically by make_unicode */
-
-
-static int cmp_codepage( const void *codepage, const void *entry )
-{
-    return *(const unsigned int *)codepage - (*(const union cptable *const *)entry)->info.codepage;
-}
-
-
-/* get the table of a given code page */
-const union cptable *wine_cp_get_table_obsolete( unsigned int codepage )
-{
-    const union cptable **res;
-
-    if (!(res = bsearch( &codepage, cptables, ARRAY_SIZE( cptables ),
-                         sizeof(cptables[0]), cmp_codepage ))) return NULL;
-    return *res;
-}
-
-
-/* enum valid codepages */
-const union cptable *wine_cp_enum_table_obsolete( unsigned int index )
-{
-    if (index >= ARRAY_SIZE( cptables )) return NULL;
-    return cptables[index];
-}
-
-int wine_is_dbcs_leadbyte_obsolete( const union cptable *table, unsigned char ch )
-{
-    return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]);
-}
-
-__ASM_OBSOLETE(wine_cp_get_table);
-__ASM_OBSOLETE(wine_cp_enum_table);
-__ASM_OBSOLETE(wine_is_dbcs_leadbyte);
-
-#endif /* __ASM_OBSOLETE */

libs/wine/fold.c

-/*
- * String folding
- *
- * Copyright 2003 Jon Griffiths
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "wine/asm.h"
-
-#ifdef __ASM_OBSOLETE
-
-#include "unicode.h"
-
-static inline WCHAR to_unicode_digit( WCHAR ch )
-{
-    extern const WCHAR wine_digitmap[] DECLSPEC_HIDDEN;
-    WCHAR ret = wine_digitmap[wine_digitmap[wine_digitmap[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)];
-    return ret ? ret : ch;
-}
-
-static inline WCHAR to_unicode_native( WCHAR ch )
-{
-    extern const WCHAR wine_compatmap[] DECLSPEC_HIDDEN;
-    return ch + wine_compatmap[wine_compatmap[ch >> 8] + (ch & 0xff)];
-}
-
-static const WCHAR wine_ligatures[] =
-{
-    0x00c6, 0x00de, 0x00df, 0x00e6, 0x00fe, 0x0132, 0x0133, 0x0152,
-    0x0153, 0x01c4, 0x01c5, 0x01c6, 0x01c7, 0x01c8, 0x01c9, 0x01ca,
-    0x01cb, 0x01cc, 0x01e2, 0x01e3, 0x01f1, 0x01f2, 0x01f3, 0x01fc,
-    0x01fd, 0x05f0, 0x05f1, 0x05f2, 0xfb00, 0xfb01, 0xfb02, 0xfb03,
-    0xfb04, 0xfb05, 0xfb06
-};
-
-/* Unicode expanded ligatures */
-static const WCHAR wine_expanded_ligatures[][4] =
-{
-    { 'A','E','\0',1 },
-    { 'T','H','\0',1 },
-    { 's','s','\0',1 },
-    { 'a','e','\0',1 },
-    { 't','h','\0',1 },
-    { 'I','J','\0',1 },
-    { 'i','j','\0',1 },
-    { 'O','E','\0',1 },
-    { 'o','e','\0',1 },
-    { 'D',0x017d,'\0',1 },
-    { 'D',0x017e,'\0',1 },
-    { 'd',0x017e,'\0',1 },
-    { 'L','J','\0',1 },
-    { 'L','j','\0',1 },
-    { 'l','j','\0',1 },
-    { 'N','J','\0',1 },
-    { 'N','j','\0',1 },
-    { 'n','j','\0',1 },
-    { 0x0100,0x0112,'\0',1 },
-    { 0x0101,0x0113,'\0',1 },
-    { 'D','Z','\0',1 },
-    { 'D','z','\0',1 },
-    { 'd','z','\0',1 },
-    { 0x00c1,0x00c9,'\0',1 },
-    { 0x00e1,0x00e9,'\0',1 },
-    { 0x05d5,0x05d5,'\0',1 },
-    { 0x05d5,0x05d9,'\0',1 },
-    { 0x05d9,0x05d9,'\0',1 },
-    { 'f','f','\0',1 },
-    { 'f','i','\0',1 },
-    { 'f','l','\0',1 },
-    { 'f','f','i',2 },
-    { 'f','f','l',2 },
-    { 0x017f,'t','\0',1 },
-    { 's','t','\0',1 }
-};
-
-static inline int get_ligature_len( WCHAR wc )
-{
-    int low = 0, high = sizeof(wine_ligatures)/sizeof(WCHAR) -1;
-    while (low <= high)
-    {
-        int pos = (low + high) / 2;
-        if (wine_ligatures[pos] < wc)
-            low = pos + 1;
-        else if (wine_ligatures[pos] > wc)
-            high = pos - 1;
-        else
-            return wine_expanded_ligatures[pos][3];
-    }
-    return 0;
-}
-
-static inline const WCHAR* get_ligature( WCHAR wc )
-{
-    static const WCHAR empty_ligature[] = { '\0','\0','\0', 0 };
-    int low = 0, high = sizeof(wine_ligatures)/sizeof(WCHAR) -1;
-    while (low <= high)
-    {
-        int pos = (low + high) / 2;
-        if (wine_ligatures[pos] < wc)
-            low = pos + 1;
-        else if (wine_ligatures[pos] > wc)
-            high = pos - 1;
-        else
-            return wine_expanded_ligatures[pos];
-    }
-    return empty_ligature;
-}
-
-/* fold a unicode string */
-int wine_fold_string_obsolete( int flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen )
-{
-    WCHAR *dstbase = dst;
-    const WCHAR *expand;
-    int i;
-
-    if (srclen == -1)
-        srclen = strlenW(src) + 1; /* Include terminating NUL in count */
-
-    if (!dstlen)
-    {
-        /* Calculate the required size for dst */
-        dstlen = srclen;
-
-        if (flags & MAP_EXPAND_LIGATURES)
-        {
-            while (srclen--)
-            {
-                dstlen += get_ligature_len(*src);
-                src++;
-            }
-        }
-        else if (flags & MAP_COMPOSITE)
-        {
-            /* FIXME */
-        }
-        else if (flags & MAP_PRECOMPOSED)
-        {
-            /* FIXME */
-        }
-        return dstlen;
-    }
-
-    if (srclen > dstlen)
-        return 0;
-
-    dstlen -= srclen;
-
-    /* Actually perform the mapping(s) specified */
-    for (i = 0; i < srclen; i++)
-    {
-        WCHAR ch = *src;
-
-        if (flags & MAP_EXPAND_LIGATURES)
-        {
-            expand = get_ligature(ch);
-            if (expand[0])
-            {
-                if (!dstlen--)
-                    return 0;
-                dst[0] = expand[0];
-                if (expand[2])
-                {
-                    if (!dstlen--)
-                        return 0;
-                    *++dst = expand[1];
-                    ch = expand[2];
-                }
-                else
-                    ch = expand[1];
-                dst++;
-            }
-        }
-        else if (flags & MAP_COMPOSITE)
-        {
-            /* FIXME */
-        }
-        else if (flags & MAP_PRECOMPOSED)
-        {
-            /* FIXME */
-        }
-        if (flags & MAP_FOLDDIGITS)
-            ch = to_unicode_digit(ch);
-        if (flags & MAP_FOLDCZONE)
-            ch = to_unicode_native(ch);
-
-        *dst++ = ch;
-        src++;
-    }
-    return dst - dstbase;
-}
-
-__ASM_OBSOLETE(wine_fold_string);
-
-#endif  /* __ASM_OBSOLETE */

libs/wine/port.c

-/*
- * Wine portability routines
- *
- * Copyright 2000 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "config.h"
-#include "wine/asm.h"
-
-#ifdef __ASM_OBSOLETE
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <stdarg.h>
-#include <windef.h>
-
-/* no longer used, for backwards compatibility only */
-struct wine_pthread_functions;
-static void *pthread_functions[8];
-
-/***********************************************************************
- *           wine_pthread_get_functions
- */
-void wine_pthread_get_functions_obsolete( struct wine_pthread_functions *functions, size_t size )
-{
-    memcpy( functions, &pthread_functions, min( size, sizeof(pthread_functions) ));
-}
-
-
-/***********************************************************************
- *           wine_pthread_set_functions
- */
-void wine_pthread_set_functions_obsolete( const struct wine_pthread_functions *functions, size_t size )
-{
-    memcpy( &pthread_functions, functions, min( size, sizeof(pthread_functions) ));
-}
-
-
-/***********************************************************************
- *           wine_call_on_stack
- *
- * Switch to the specified stack to call the function and return.
- */
-
-extern int wine_call_on_stack_obsolete( int (*func)(void *), void *arg, void *stack );
-#if defined(__i386__) && defined(__GNUC__)
-__ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete,
-                   "pushl %ebp\n\t"
-                   __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
-                   __ASM_CFI(".cfi_rel_offset %ebp,0\n\t")
-                   "pushl %esi\n\t"
-                   __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
-                   __ASM_CFI(".cfi_rel_offset %esi,0\n\t")
-                   "movl %esp,%esi\n\t"
-                   __ASM_CFI(".cfi_def_cfa_register %esi\n\t")
-                   "movl 12(%esp),%ecx\n\t"  /* func */
-                   "movl 16(%esp),%edx\n\t"  /* arg */
-                   "movl 20(%esp),%eax\n\t"  /* stack */
-                   "andl $~15,%eax\n\t"
-                   "subl $12,%eax\n\t"
-                   "movl %eax,%esp\n\t"
-                   "pushl %edx\n\t"
-                   "xorl %ebp,%ebp\n\t"
-                   "call *%ecx\n\t"
-                   "movl %esi,%esp\n\t"
-                   "popl %esi\n\t"
-                   __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t")
-                   __ASM_CFI(".cfi_same_value %esi\n\t")
-                   "popl %ebp\n\t"
-                   __ASM_CFI(".cfi_def_cfa %esp,4\n\t")
-                   __ASM_CFI(".cfi_same_value %ebp\n\t")
-                   "ret" )
-#elif defined(__x86_64__) && defined(__GNUC__)
-__ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete,
-                   "pushq %rbp\n\t"
-                   __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t")
-                   __ASM_CFI(".cfi_rel_offset %rbp,0\n\t")
-                   "movq %rsp,%rbp\n\t"
-                   __ASM_CFI(".cfi_def_cfa_register %rbp\n\t")
-                   "movq %rdi,%rax\n\t" /* func */
-                   "movq %rsi,%rdi\n\t" /* arg */
-                   "andq $~15,%rdx\n\t" /* stack */
-                   "movq %rdx,%rsp\n\t"
-                   "callq *%rax\n\t"    /* call func */
-                   "movq %rbp,%rsp\n\t"
-                   __ASM_CFI(".cfi_def_cfa_register %rsp\n\t")
-                   "popq %rbp\n\t"
-                   __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t")
-                   __ASM_CFI(".cfi_same_value %rbp\n\t")
-                   "ret")
-#endif
-
-/***********************************************************************
- *           wine_switch_to_stack
- *
- * Switch to the specified stack and call the function.
- */
-void DECLSPEC_NORETURN wine_switch_to_stack_obsolete( void (*func)(void *), void *arg, void *stack )
-{
-    wine_call_on_stack_obsolete( (int (*)(void *))func, arg, stack );
-    abort();
-}
-
-__ASM_OBSOLETE(wine_pthread_get_functions);
-__ASM_OBSOLETE(wine_pthread_set_functions);
-__ASM_OBSOLETE(wine_call_on_stack);
-__ASM_OBSOLETE(wine_switch_to_stack);
-
-#endif  /* __ASM_OBSOLETE */

libs/wine/unicode.h

-/*
- * Wine internal Unicode definitions
- *
- * Copyright 2000 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __WINE_UNICODE_H
-#define __WINE_UNICODE_H
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-
-/* code page info common to SBCS and DBCS */
-struct cp_info
-{
-    unsigned int          codepage;          /* codepage id */
-    unsigned int          char_size;         /* char size (1 or 2 bytes) */
-    WCHAR                 def_char;          /* default char value (can be double-byte) */
-    WCHAR                 def_unicode_char;  /* default Unicode char value */
-    const char           *name;              /* code page name */
-};
-
-struct sbcs_table
-{
-    struct cp_info        info;
-    const WCHAR          *cp2uni;            /* code page -> Unicode map */
-    const WCHAR          *cp2uni_glyphs;     /* code page -> Unicode map with glyph chars */
-    const unsigned char  *uni2cp_low;        /* Unicode -> code page map */
-    const unsigned short *uni2cp_high;
-};
-
-struct dbcs_table
-{
-    struct cp_info        info;
-    const WCHAR          *cp2uni;            /* code page -> Unicode map */
-    const unsigned char  *cp2uni_leadbytes;
-    const unsigned short *uni2cp_low;        /* Unicode -> code page map */
-    const unsigned short *uni2cp_high;
-    unsigned char         lead_bytes[12];    /* lead bytes ranges */
-};
-
-union cptable
-{
-    struct cp_info    info;
-    struct sbcs_table sbcs;
-    struct dbcs_table dbcs;
-};
-
-static inline unsigned int strlenW( const WCHAR *str )
-{
-    const WCHAR *s = str;
-    while (*s) s++;
-    return s - str;
-}
-
-static inline unsigned short get_char_typeW( WCHAR ch )
-{
-    extern const unsigned short wine_wctype_table[];
-    return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)];
-}
-
-static inline WCHAR tolowerW( WCHAR ch )
-{
-    extern const WCHAR wine_casemap_lower[];
-    return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)];
-}
-
-#endif  /* __WINE_UNICODE_H */

libs/wine/wine.map

-WINE_1.0
-{
-  global:
-    __wine_dll_register;
-    __wine_main_argc;
-    __wine_main_argv;
-    __wine_main_environ;
-    __wine_main_wargv;
-    wine_anon_mmap;
-    wine_dll_set_callback;
-
-    /* the following functions are obsolete and only exported for backwards compatibility */
-
-    __wine_dbg_get_channel_flags;
-    __wine_dbg_set_channel_flags;
-    __wine_dbg_set_functions;
-    atoiW;
-    atolW;
-    get_char_typeW;
-    isalnumW;
-    isalphaW;
-    iscntrlW;
-    isdigitW;
-    isgraphW;
-    islowerW;
-    isprintW;
-    ispunctW;
-    isspaceW;
-    isupperW;
-    isxdigitW;
-    memchrW;
-    memicmpW;
-    memrchrW;
-    snprintfW;
-    sprintfW;
-    strcatW;
-    strchrW;
-    strcmpW;
-    strcmpiW;
-    strcpyW;
-    strcspnW;
-    strlenW;
-    strlwrW;
-    strncmpW;
-    strncmpiW;
-    strpbrkW;
-    strrchrW;
-    strspnW;
-    strstrW;
-    strtolW;
-    strtoulW;
-    struprW;
-    tolowerW;
-    toupperW;
-    vsnprintfW;
-    vsprintfW;
-    wine_call_on_stack;
-    wine_casemap_lower;
-    wine_casemap_upper;
-    wine_compare_string;
-    wine_cp_enum_table;
-    wine_cp_get_table;
-    wine_cp_mbstowcs;
-    wine_cp_wcstombs;
-    wine_cpsymbol_mbstowcs;
-    wine_cpsymbol_wcstombs;
-    wine_dbg_log;
-    wine_dbg_printf;
-    wine_dbg_sprintf;
-    wine_dbgstr_an;
-    wine_dbgstr_wn;
-    wine_dlclose;
-    wine_dll_enum_load_path;
-    wine_dll_get_owner;
-    wine_dll_load;
-    wine_dll_load_main_exe;
-    wine_dll_unload;
-    wine_dlopen;
-    wine_dlsym;
-    wine_exec_wine_binary;
-    wine_fold_string;
-    wine_get_build_dir;
-    wine_get_build_id;
-    wine_get_config_dir;
-    wine_get_cs;
-    wine_get_data_dir;
-    wine_get_ds;
-    wine_get_es;
-    wine_get_fs;
-    wine_get_gs;
-    wine_get_server_dir;
-    wine_get_sortkey;
-    wine_get_ss;
-    wine_get_user_name;
-    wine_get_version;
-    wine_init;
-    wine_init_argv0_path;
-    wine_is_dbcs_leadbyte;
-    wine_ldt_alloc_entries;
-    wine_ldt_alloc_fs;
-    wine_ldt_copy;
-    wine_ldt_free_entries;
-    wine_ldt_free_fs;
-    wine_ldt_get_entry;
-    wine_ldt_get_ptr;
-    wine_ldt_init_fs;
-    wine_ldt_init_locking;
-    wine_ldt_is_system;
-    wine_ldt_realloc_entries;
-    wine_ldt_set_entry;
-    wine_mmap_add_reserved_area;
-    wine_mmap_enum_reserved_areas;
-    wine_mmap_is_in_reserved_area;
-    wine_mmap_remove_reserved_area;
-    wine_pthread_get_functions;
-    wine_pthread_set_functions;
-    wine_set_fs;
-    wine_set_gs;
-    wine_switch_to_stack;
-    wine_utf8_mbstowcs;
-    wine_utf8_wcstombs;
-    wine_wctype_table;
-
-  local: *;
-};

tools/winewrapper

@@ -69,19 +69,11 @@ if [ "`uname -s`" = "Darwin" ]
 then
   if [ -n "$DYLD_LIBRARY_PATH" ]
   then
-    DYLD_LIBRARY_PATH="$topdir/libs/wine:$topdir/dlls/ntdll:$topdir/dlls/win32u:$DYLD_LIBRARY_PATH"
+    DYLD_LIBRARY_PATH="$topdir/dlls/ntdll:$topdir/dlls/win32u:$DYLD_LIBRARY_PATH"
   else
-    DYLD_LIBRARY_PATH="$topdir/libs/wine:$topdir/dlls/ntdll:$topdir/dlls/win32u"
+    DYLD_LIBRARY_PATH="$topdir/dlls/ntdll:$topdir/dlls/win32u"
   fi
   export DYLD_LIBRARY_PATH
-else
-  if [ -n "$LD_LIBRARY_PATH" ]
-  then
-    LD_LIBRARY_PATH="$topdir/libs/wine:$LD_LIBRARY_PATH"
-  else
-    LD_LIBRARY_PATH="$topdir/libs/wine"
-  fi
-  export LD_LIBRARY_PATH
 fi
 
 if [ -x "$topdir/loader/$name" ]