wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Nikolay Sivov : gdi32: Retry with hinting disabled if glyph load failed in hinted mode.
by Alexandre Julliard 05 Feb '20

05 Feb '20

Module: wine Branch: master Commit: dc9267dc1c73d297deffb5b80a305333cb26501c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc9267dc1c73d297deffb5b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 13:17:35 2020 +0300 gdi32: Retry with hinting disabled if glyph load failed in hinted mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 10127bb77a..03bd097af2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7620,9 +7620,15 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); + if (err && !(load_flags & FT_LOAD_NO_HINTING)) + { + WARN("Failed to load glyph %#x, retrying without hinting. Error %#x.\n", glyph_index, err); + load_flags |= FT_LOAD_NO_HINTING; + err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); + } if(err) { - WARN("FT_Load_Glyph on index %x returns %d\n", glyph_index, err); + WARN("Failed to load glyph %#x, error %#x.\n", glyph_index, err); return GDI_ERROR; }

1 0

Piotr Caban : msvcp90: Don't pass NULL as reference in runtime_error and logic_error constructors.
by Alexandre Julliard 05 Feb '20

05 Feb '20

Module: wine Branch: master Commit: daff3be7d2bfe890b3acce369cd21c92ea35a0ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=daff3be7d2bfe890b3acce36… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 5 13:08:55 2020 +0100 msvcp90: Don't pass NULL as reference in runtime_error and logic_error constructors. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48561 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index bf75949dbe..74529e9019 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -314,7 +314,7 @@ logic_error* __thiscall MSVCP_logic_error_ctor( logic_error *this, exception_nam #if _MSVCP_VER == 60 MSVCP_exception_ctor(&this->e, ""); #else - MSVCP_exception_ctor(&this->e, NULL); + MSVCP_exception_default_ctor(&this->e); #endif MSVCP_basic_string_char_ctor_cstr(&this->str, EXCEPTION_STR(name)); #else @@ -560,7 +560,7 @@ static runtime_error* MSVCP_runtime_error_ctor( runtime_error *this, exception_n #if _MSVCP_VER == 60 MSVCP_exception_ctor(&this->e, ""); #else - MSVCP_exception_ctor(&this->e, NULL); + MSVCP_exception_default_ctor(&this->e); #endif MSVCP_basic_string_char_ctor_cstr(&this->str, EXCEPTION_STR(name)); #else

1 0

Alexandre Julliard : libport: Move the collation table back to libwine and stop updating it.
by Alexandre Julliard 05 Feb '20

05 Feb '20

Module: wine Branch: master Commit: fd86c859180ef649351e96857daa89ac3ae232a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd86c859180ef649351e9685… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 5 09:00:47 2020 +0100 libport: Move the collation table back to libwine and stop updating it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 2 +- libs/{port => wine}/collation.c | 6 ++++++ tools/make_unicode | 1 - 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 260140a391..74b6dcfb61 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -75,7 +75,6 @@ C_SRCS = \ c_949.c \ c_950.c \ casemap.c \ - collation.c \ compose.c \ cptable.c \ decompose.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index d26f0c2589..5850f0299d 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,7 +1,7 @@ EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS) - C_SRCS = \ + collation.c \ config.c \ cpsymbol.c \ debug.c \ diff --git a/libs/port/collation.c b/libs/wine/collation.c similarity index 99% rename from libs/port/collation.c rename to libs/wine/collation.c index 22c35a4c21..10e89126a5 100644 --- a/libs/port/collation.c +++ b/libs/wine/collation.c @@ -2,6 +2,10 @@ /* generated from http://www.unicode.org/reports/tr10/allkeys.txt */ /* DO NOT EDIT!! */ +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "windef.h" const unsigned int DECLSPEC_HIDDEN collation_table[11044] = @@ -1391,3 +1395,5 @@ const unsigned int DECLSPEC_HIDDEN collation_table[11044] = 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x09bf0111, 0x09c00111, 0xffffffff, 0xffffffff }; + +#endif /* __ASM_OBSOLETE */ diff --git a/tools/make_unicode b/tools/make_unicode index cd2f406793..caafce76cb 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2727,7 +2727,6 @@ sub REPLACE_IN_FILE($@) chdir ".." if -f "./make_unicode"; load_data( $DEFAULTS ); dump_case_mappings( "libs/port/casemap.c" ); -dump_sortkeys( "libs/port/collation.c" ); dump_sortkeys( "dlls/kernelbase/collation.c" ); dump_compose_table( "libs/port/compose.c" ); dump_compose_table( "dlls/kernelbase/compose.c" );

1 0

Alexandre Julliard : libport: Move the digitmap table back to libwine and stop updating it.
by Alexandre Julliard 05 Feb '20

05 Feb '20

Module: wine Branch: master Commit: 599166bd3536513dc43bba1b4ec2058760200a42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=599166bd3536513dc43bba1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 5 09:00:40 2020 +0100 libport: Move the digitmap table back to libwine and stop updating it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 + libs/{port => wine}/digitmap.c | 6 ++++++ tools/make_unicode | 24 +++--------------------- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 6e3edcf719..260140a391 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -79,7 +79,6 @@ C_SRCS = \ compose.c \ cptable.c \ decompose.c \ - digitmap.c \ ffs.c \ fstatvfs.c \ getopt.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 9b2b8f643d..d26f0c2589 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -5,6 +5,7 @@ C_SRCS = \ config.c \ cpsymbol.c \ debug.c \ + digitmap.c \ fold.c \ ldt.c \ loader.c \ diff --git a/libs/port/digitmap.c b/libs/wine/digitmap.c similarity index 99% rename from libs/port/digitmap.c rename to libs/wine/digitmap.c index ea21fb0ab9..41689f4413 100644 --- a/libs/port/digitmap.c +++ b/libs/wine/digitmap.c @@ -2,6 +2,10 @@ /* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "windef.h" const unsigned short DECLSPEC_HIDDEN wine_digitmap[619] = @@ -287,3 +291,5 @@ const WCHAR DECLSPEC_HIDDEN wine_compatmap[1497] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; + +#endif /* __ASM_OBSOLETE */ diff --git a/tools/make_unicode b/tools/make_unicode index 3f1d3e55a9..cd2f406793 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -409,7 +409,6 @@ my @unicode_aliases = (); my @tolower_table = (); my @toupper_table = (); my @digitmap_table = (); -my @compatmap_table = (); my @category_table = (); my @joining_table = (); my @direction_table = (); @@ -582,11 +581,6 @@ sub load_data($) if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/) { # decomposition of the form "<foo> 1234" -> use char if type is known - if (($src >= 0xf900 && $src < 0xfb00) || ($src >= 0xfe30 && $src < 0xfffd)) - { - # Single char decomposition in the compatibility range - $compatmap_table[$src] = hex $2; - } if ($1 eq "isolated" || $1 eq "final" || $1 eq "initial" || $1 eq "medial") { ${joining_forms{$1}}[hex $2] = $src; @@ -623,12 +617,6 @@ sub load_data($) { # Single char decomposition $decomp_table[$src] = $decomp_compat_table[$src] = [ hex $1 ]; - - if (($src >= 0xf900 && $src < 0xfb00) || ($src >= 0xfe30 && $src < 0xfffd)) - { - # Single char decomposition in the compatibility range - $compatmap_table[$src] = hex $1; - } } } else @@ -1816,9 +1804,9 @@ sub dump_vertical($) ################################################################ # dump the digit folding tables -sub dump_digit_folding($$) +sub dump_digit_folding($) { - my ($filename, $compat) = @_; + my ($filename) = shift; open OUTPUT,">$filename.new" or die "Cannot create $filename"; print "Building $filename\n"; print OUTPUT "/* Unicode digit folding mappings */\n"; @@ -1827,11 +1815,6 @@ sub dump_digit_folding($$) print OUTPUT "#include \"windef.h\"\n\n"; dump_two_level_mapping( "wine_digitmap", 0, 16, @digitmap_table ); - if ($compat) - { - print OUTPUT "\n"; - dump_case_table( "DECLSPEC_HIDDEN wine_compatmap", @compatmap_table ); - } close OUTPUT; save_file($filename); } @@ -2755,8 +2738,7 @@ dump_bidi_dir_table( "dlls/gdi32/direction.c" ); dump_bidi_dir_table( "dlls/usp10/direction.c" ); dump_bidi_dir_table( "dlls/dwrite/direction.c" ); dump_string_type_table( "dlls/kernelbase/wctype.c" ); -dump_digit_folding( "libs/port/digitmap.c", 1 ); -dump_digit_folding( "dlls/kernelbase/digitmap.c", 0 ); +dump_digit_folding( "dlls/kernelbase/digitmap.c" ); dump_combining_class( "dlls/ntdll/combclass.c" ); dump_mirroring( "dlls/usp10/mirror.c" ); dump_mirroring( "dlls/dwrite/mirror.c" );

1 0

Alexandre Julliard : libport: Move wine_utf8 functions back to libwine and make them obsolete.
by Alexandre Julliard 05 Feb '20

05 Feb '20

Module: wine Branch: master Commit: 473914f6a5943c4abfc8d0e394c71f395063d89f URL: https://source.winehq.org/git/wine.git/?a=commit;h=473914f6a5943c4abfc8d0e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 5 09:00:30 2020 +0100 libport: Move wine_utf8 functions back to libwine and make them obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 2 -- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 3 ++- libs/wine/port.c | 2 -- libs/{port => wine}/utf8.c | 13 +++++++++++-- libs/wine/wine.map | 4 ++-- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 216e36b38d..f4bf717892 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -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_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 ); extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 ); extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ); diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index e4cd7c4f99..6e3edcf719 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -102,6 +102,5 @@ C_SRCS = \ stubs.c \ symlink.c \ usleep.c \ - utf8.c \ wctomb.c \ wctype.c diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 0b862455ac..9b2b8f643d 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -10,7 +10,8 @@ C_SRCS = \ loader.c \ mmap.c \ port.c \ - sortkey.c + sortkey.c \ + utf8.c EXTRA_OBJS = version.o diff --git a/libs/wine/port.c b/libs/wine/port.c index 7c91bfc2d0..1ee754b6b9 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -42,8 +42,6 @@ const void *libwine_port_functions[] = wine_cp_get_table, wine_cp_mbstowcs, wine_cp_wcstombs, - wine_utf8_mbstowcs, - wine_utf8_wcstombs }; /* no longer used, for backwards compatibility only */ diff --git a/libs/port/utf8.c b/libs/wine/utf8.c similarity index 96% rename from libs/port/utf8.c rename to libs/wine/utf8.c index f47561e4bf..27e05818c3 100644 --- a/libs/port/utf8.c +++ b/libs/wine/utf8.c @@ -20,6 +20,10 @@ #include <string.h> +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "wine/unicode.h" extern WCHAR wine_compose( const WCHAR *str ) DECLSPEC_HIDDEN; @@ -95,7 +99,7 @@ static inline int get_length_wcs_utf8( int flags, const WCHAR *src, unsigned int /* wide char to UTF-8 string conversion */ /* return -1 on dst buffer overflow, -2 on invalid input char */ -int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) +int wine_utf8_wcstombs_obsolete( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) { int len; @@ -301,7 +305,7 @@ static inline int get_length_mbs_utf8( int flags, const char *src, int srclen ) /* UTF-8 to wide char string conversion */ /* return -1 on dst buffer overflow, -2 on invalid input char */ -int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +int wine_utf8_mbstowcs_obsolete( int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) { unsigned int res; const char *srcend = src + srclen; @@ -336,3 +340,8 @@ int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int if (src < srcend) return -1; /* overflow */ return dstlen - (dstend - dst); } + +__ASM_OBSOLETE(wine_utf8_wcstombs); +__ASM_OBSOLETE(wine_utf8_mbstowcs); + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 9898e61820..f0c94a950f 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -53,8 +53,6 @@ WINE_1.0 wine_mmap_remove_reserved_area; wine_set_fs; wine_set_gs; - wine_utf8_mbstowcs; - wine_utf8_wcstombs; wine_wctype_table; /* the following functions are obsolete and only exported for backwards compatibility */ @@ -120,6 +118,8 @@ WINE_1.0 wine_pthread_get_functions; wine_pthread_set_functions; wine_switch_to_stack; + wine_utf8_mbstowcs; + wine_utf8_wcstombs; local: *; };

1 0

Alexandre Julliard : libport: Move wine_cpsymbol functions back to libwine and make them obsolete.
by Alexandre Julliard 05 Feb '20

05 Feb '20

Module: wine Branch: master Commit: f4b7260d296bfa4e508d5940cc01a11dd8864b30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4b7260d296bfa4e508d5940… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 5 09:00:22 2020 +0100 libport: Move wine_cpsymbol functions back to libwine and make them obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 2 -- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 + libs/{port => wine}/cpsymbol.c | 13 +++++++++++-- libs/wine/port.c | 2 -- libs/wine/wine.map | 4 ++-- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index b956fcff44..216e36b38d 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -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 ); diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index c70bd98099..e4cd7c4f99 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -77,7 +77,6 @@ C_SRCS = \ casemap.c \ collation.c \ compose.c \ - cpsymbol.c \ cptable.c \ decompose.c \ digitmap.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index eb4ba330b4..0b862455ac 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -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 \ diff --git a/libs/port/cpsymbol.c b/libs/wine/cpsymbol.c similarity index 82% rename from libs/port/cpsymbol.c rename to libs/wine/cpsymbol.c index e35a35992f..1883d55421 100644 --- a/libs/port/cpsymbol.c +++ b/libs/wine/cpsymbol.c @@ -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 */ diff --git a/libs/wine/port.c b/libs/wine/port.c index bccbf93c19..7c91bfc2d0 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -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 }; diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 9458cd89f3..9898e61820 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -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;

1 0

Alexandre Julliard : libport: Move wine_compare_string implementation back to libwine and make it obsolete.
by Alexandre Julliard 05 Feb '20

05 Feb '20

Module: wine Branch: master Commit: 5a1e897df7c883f86effd21354acdc37320949d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a1e897df7c883f86effd213… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 5 09:00:14 2020 +0100 libport: Move wine_compare_string implementation back to libwine and make it obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 3 --- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 3 ++- libs/wine/port.c | 1 - libs/{port => wine}/sortkey.c | 16 +++++++++++++--- libs/wine/wine.map | 4 ++-- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index d2b852fafb..b956fcff44 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -93,9 +93,6 @@ extern int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int 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 ); -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 strcmpiW( const WCHAR *str1, const WCHAR *str2 ); extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ); extern int memicmpW( const WCHAR *str1, const WCHAR *str2, int n ); diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 4e3f23cde9..c70bd98099 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -96,7 +96,6 @@ C_SRCS = \ pwrite.c \ readlink.c \ rint.c \ - sortkey.c \ spawn.c \ statvfs.c \ string.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index d0b2d1e7b6..eb4ba330b4 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -8,7 +8,8 @@ C_SRCS = \ ldt.c \ loader.c \ mmap.c \ - port.c + port.c \ + sortkey.c EXTRA_OBJS = version.o diff --git a/libs/wine/port.c b/libs/wine/port.c index 43355719c2..bccbf93c19 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -38,7 +38,6 @@ const void *libwine_port_functions[] = { strtolW, vsnprintfW, - wine_compare_string, wine_cp_enum_table, wine_cp_get_table, wine_cp_mbstowcs, diff --git a/libs/port/sortkey.c b/libs/wine/sortkey.c similarity index 96% rename from libs/port/sortkey.c rename to libs/wine/sortkey.c index 090aaf0b19..eb132e5361 100644 --- a/libs/port/sortkey.c +++ b/libs/wine/sortkey.c @@ -17,6 +17,11 @@ * 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 "wine/unicode.h" extern const unsigned int collation_table[]; @@ -38,7 +43,7 @@ static const WCHAR *get_decomposition( WCHAR ch, unsigned int *len ) * * FIXME: 'variable' flag not handled */ -int wine_get_sortkey(int flags, const WCHAR *src, int srclen, char *dst, int dstlen) +int wine_get_sortkey_obsolete(int flags, const WCHAR *src, int srclen, char *dst, int dstlen) { WCHAR dummy[4]; /* no decomposition is larger than 4 chars */ int key_len[4]; @@ -289,8 +294,8 @@ static inline int compare_weights(int flags, const WCHAR *str1, int len1, return len1 - len2; } -int wine_compare_string(int flags, const WCHAR *str1, int len1, - const WCHAR *str2, int len2) +int wine_compare_string_obsolete(int flags, const WCHAR *str1, int len1, + const WCHAR *str2, int len2) { int ret; @@ -304,3 +309,8 @@ int wine_compare_string(int flags, const WCHAR *str1, int len1, } return ret; } + +__ASM_OBSOLETE(wine_get_sortkey); +__ASM_OBSOLETE(wine_compare_string); + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 08de127cff..9458cd89f3 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -9,7 +9,6 @@ WINE_1.0 wine_anon_mmap; wine_casemap_lower; wine_casemap_upper; - wine_compare_string; wine_cp_enum_table; wine_cp_get_table; wine_cp_mbstowcs; @@ -32,7 +31,6 @@ WINE_1.0 wine_get_fs; wine_get_gs; wine_get_server_dir; - wine_get_sortkey; wine_get_ss; wine_get_user_name; wine_get_version; @@ -107,6 +105,7 @@ WINE_1.0 vsnprintfW; vsprintfW; wine_call_on_stack; + wine_compare_string; wine_dbg_log; wine_dbg_printf; wine_dbg_sprintf; @@ -117,6 +116,7 @@ WINE_1.0 wine_dll_load_main_exe; wine_dll_unload; wine_fold_string; + wine_get_sortkey; wine_pthread_get_functions; wine_pthread_set_functions; wine_switch_to_stack;

1 0

Alexandre Julliard : libport: Move wine_fold_string implementation back to libwine and make it obsolete.
by Alexandre Julliard 05 Feb '20

05 Feb '20

Module: wine Branch: master Commit: afd681ebd920f54300601ab842399723b9af3e2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=afd681ebd920f54300601ab8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 5 09:00:04 2020 +0100 libport: Move wine_fold_string implementation back to libwine and make it obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 1 - libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 + libs/{port => wine}/fold.c | 10 +++++++++- libs/wine/port.c | 1 - libs/wine/wine.map | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 5210b72498..d2b852fafb 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -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 ); diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 3b70f82d6f..4e3f23cde9 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -82,7 +82,6 @@ C_SRCS = \ decompose.c \ digitmap.c \ ffs.c \ - fold.c \ fstatvfs.c \ getopt.c \ interlocked.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index f7dd34b058..d0b2d1e7b6 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -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 \ diff --git a/libs/port/fold.c b/libs/wine/fold.c similarity index 96% rename from libs/port/fold.c rename to libs/wine/fold.c index 00046f15a3..ef4e88c81c 100644 --- a/libs/port/fold.c +++ b/libs/wine/fold.c @@ -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 */ diff --git a/libs/wine/port.c b/libs/wine/port.c index e5cfcf41ab..43355719c2 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -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 }; diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 17c91fd162..08de127cff 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -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;

1 0

Derek Lesho : mfplat: Make functionality of GetMediaTypeHandler more clear.
by Alexandre Julliard 05 Feb '20

05 Feb '20

Module: wine Branch: master Commit: 7929583bb633c82ddfe3b57e59337cdb76f777ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=7929583bb633c82ddfe3b57e… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Feb 4 11:17:13 2020 -0600 mfplat: Make functionality of GetMediaTypeHandler more clear. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index aace04fe84..893eb3e778 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -967,7 +967,7 @@ static HRESULT WINAPI stream_descriptor_GetMediaTypeHandler(IMFStreamDescriptor TRACE("%p, %p.\n", iface, handler); *handler = &stream_desc->IMFMediaTypeHandler_iface; - IMFStreamDescriptor_AddRef(iface); + IMFMediaTypeHandler_AddRef(*handler); return S_OK; }

1 0

Nikolay Sivov : mfplat: Forward async queue functionality to rtworkq.
by Alexandre Julliard 05 Feb '20

05 Feb '20

Module: wine Branch: master Commit: 7b87278dcf64f37da343e44f244c518273af4e81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b87278dcf64f37da343e44f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 08:44:13 2020 +0300 mfplat: Forward async queue functionality to rtworkq. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 44 +- dlls/mfplat/mfplat.spec | 18 +- dlls/mfplat/mfplat_private.h | 4 - dlls/mfplat/queue.c | 1041 +----------------------------------------- 5 files changed, 37 insertions(+), 1072 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b87278dcf64f37da343…

1 0

← Newer
1
...
70
71
72
73
74
75
76
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2020