March 2019 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Move style zoom property implementation to IHTMLCSSStyleDeclaration.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 15db389d4b0b8829132d42954515dfa50e3e6d66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15db389d4b0b8829132d4295… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:14:25 2019 +0100 mshtml: Move style zoom property implementation to IHTMLCSSStyleDeclaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 60 ++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7d807eb..d4dfa7f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -4193,46 +4193,22 @@ static HRESULT WINAPI HTMLStyle3_get_layoutFlow(IHTMLStyle3 *iface, BSTR *p) return E_NOTIMPL; } -static const WCHAR zoomW[] = {'z','o','o','m',0}; - static HRESULT WINAPI HTMLStyle3_put_zoom(IHTMLStyle3 *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle3(iface); - VARIANT *var; - HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - /* zoom property is IE CSS extension that is mostly used as a hack to workaround IE bugs. - * The value is set to 1 then. We can safely ignore setting zoom to 1. */ - if(V_VT(&v) != VT_I4 || V_I4(&v) != 1) - WARN("stub for %s\n", debugstr_variant(&v)); - - hres = dispex_get_dprop_ref(&This->css_style.dispex, zoomW, TRUE, &var); - if(FAILED(hres)) - return hres; - - return VariantChangeType(var, &v, 0, VT_BSTR); + return IHTMLCSSStyleDeclaration_put_zoom(&This->IHTMLCSSStyleDeclaration_iface, v); } static HRESULT WINAPI HTMLStyle3_get_zoom(IHTMLStyle3 *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle3(iface); - VARIANT *var; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - hres = dispex_get_dprop_ref(&This->css_style.dispex, zoomW, FALSE, &var); - if(hres == DISP_E_UNKNOWNNAME) { - V_VT(p) = VT_BSTR; - V_BSTR(p) = NULL; - return S_OK; - } - if(FAILED(hres)) - return hres; - - return VariantCopy(p, var); + return IHTMLCSSStyleDeclaration_get_zoom(&This->IHTMLCSSStyleDeclaration_iface, p); } static HRESULT WINAPI HTMLStyle3_put_wordWrap(IHTMLStyle3 *iface, BSTR v) @@ -6674,18 +6650,46 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_layoutFlow(IHTMLCSSStyleDeclar return E_NOTIMPL; } +static const WCHAR zoomW[] = {'z','o','o','m',0}; + static HRESULT WINAPI HTMLCSSStyleDeclaration_put_zoom(IHTMLCSSStyleDeclaration *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); + VARIANT *var; + HRESULT hres; + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - return IHTMLStyle3_put_zoom(&This->IHTMLStyle3_iface, v); + + /* zoom property is IE CSS extension that is mostly used as a hack to workaround IE bugs. + * The value is set to 1 then. We can safely ignore setting zoom to 1. */ + if(V_VT(&v) != VT_I4 || V_I4(&v) != 1) + WARN("stub for %s\n", debugstr_variant(&v)); + + hres = dispex_get_dprop_ref(&This->css_style.dispex, zoomW, TRUE, &var); + if(FAILED(hres)) + return hres; + + return VariantChangeType(var, &v, 0, VT_BSTR); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_zoom(IHTMLCSSStyleDeclaration *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); + VARIANT *var; + HRESULT hres; + TRACE("(%p)->(%p)\n", This, p); - return IHTMLStyle3_get_zoom(&This->IHTMLStyle3_iface, p); + + hres = dispex_get_dprop_ref(&This->css_style.dispex, zoomW, FALSE, &var); + if(hres == DISP_E_UNKNOWNNAME) { + V_VT(p) = VT_BSTR; + V_BSTR(p) = NULL; + return S_OK; + } + if(FAILED(hres)) + return hres; + + return VariantCopy(p, var); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_wordWrap(IHTMLCSSStyleDeclaration *iface, BSTR v)

1 0

Jacek Caban : mshtml: Move backgroundPosition[XY] properties implementation to IHTMLCSSStyleDeclaration.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 844547026671ebe2bc7aa862f94f60dd01bc559d URL: https://source.winehq.org/git/wine.git/?a=commit;h=844547026671ebe2bc7aa862… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:14:36 2019 +0100 mshtml: Move backgroundPosition[XY] properties implementation to IHTMLCSSStyleDeclaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 328 ++++++++++++++++++++++++------------------------ 1 file changed, 164 insertions(+), 164 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=844547026671ebe2bc7a…

1 0

Jacek Caban : mshtml: Move IHTMLCSSStyleDeclaration implementation to CSSStyle.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 12ec83f75b479299c39afc1cd95b33a27b4e10c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12ec83f75b479299c39afc1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:14:50 2019 +0100 mshtml: Move IHTMLCSSStyleDeclaration implementation to CSSStyle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 1239 ++++++++++++++++++++++++----------------------- dlls/mshtml/htmlstyle.h | 15 +- 2 files changed, 637 insertions(+), 617 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12ec83f75b479299c39a…

1 0

Jacek Caban : mshtml: Move IHTMLCSSStyleDeclaration2 implementation to CSSStyle object.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: f4cceb1fb041fdccd236e52ac195cdfc260d0157 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4cceb1fb041fdccd236e52a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:15:10 2019 +0100 mshtml: Move IHTMLCSSStyleDeclaration2 implementation to CSSStyle object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 494 ++++++++++++++++++++++++------------------------ dlls/mshtml/htmlstyle.h | 2 +- 2 files changed, 248 insertions(+), 248 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f4cceb1fb041fdccd236…

1 0

Gabriel Ivăncescu : include/commctrl: Add style definitions for split buttons.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: e5bde584112e57c319c8471fa58259f31bcf00be URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5bde584112e57c319c8471f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 25 14:20:59 2019 +0200 include/commctrl: Add style definitions for split buttons. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 9b86bdb..4706946 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1096,6 +1096,16 @@ typedef struct tagNMBCHOTITEM #define BS_COMMANDLINK 0x0000000E #define BS_DEFCOMMANDLINK 0x0000000F +#define BCSIF_GLYPH 0x00000001 +#define BCSIF_IMAGE 0x00000002 +#define BCSIF_STYLE 0x00000004 +#define BCSIF_SIZE 0x00000008 + +#define BCSS_NOSPLIT 0x00000001 +#define BCSS_STRETCH 0x00000002 +#define BCSS_ALIGNLEFT 0x00000004 +#define BCSS_IMAGE 0x00000008 + /* Button macros */ #define Button_SetNote(button, note) \ (BOOL)SNDMSG(button, BCM_SETNOTE, 0, (LPARAM)(note))

1 0

Alexandre Julliard : libwine: Move wctype tables to libwine_port.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: a67dca1bc814900189912bda837d9ea881d7474e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a67dca1bc814900189912bda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 23 13:35:33 2019 +0100 libwine: Move wctype tables to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 2 +- libs/port/Makefile.in | 3 ++- libs/{wine => port}/wctype.c | 2 +- libs/wine/Makefile.in | 3 +-- tools/make_unicode | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index a4b483a..de3ac56 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -138,7 +138,7 @@ WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ) /* and the C2_* type in the high 4 bits */ WINE_UNICODE_INLINE unsigned short get_char_typeW( WCHAR ch ) { - extern WINE_UNICODE_API const unsigned short wine_wctype_table[]; + extern const unsigned short wine_wctype_table[]; return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; } diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 86b9022..45ce182 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -102,4 +102,5 @@ C_SRCS = \ symlink.c \ usleep.c \ utf8.c \ - wctomb.c + wctomb.c \ + wctype.c diff --git a/libs/wine/wctype.c b/libs/port/wctype.c similarity index 99% rename from libs/wine/wctype.c rename to libs/port/wctype.c index 4153cb8..bb0eab5 100644 --- a/libs/wine/wctype.c +++ b/libs/port/wctype.c @@ -3,7 +3,7 @@ #include "wine/unicode.h" -const unsigned short wine_wctype_table[17152] = +const unsigned short DECLSPEC_HIDDEN wine_wctype_table[17152] = { /* offsets */ 0x0100, 0x0200, 0x0300, 0x0400, 0x0500, 0x0600, 0x0700, 0x0800, diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 4833eb5..e544d99 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -11,8 +11,7 @@ C_SRCS = \ mmap.c \ port.c \ sortkey.c \ - string.c \ - wctype.c + string.c EXTRA_OBJS = version.o diff --git a/tools/make_unicode b/tools/make_unicode index bbd26e4..d674570 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1891,7 +1891,7 @@ sub dump_simple_mapping($$@) my $def = shift; my @array = compress_array( 256, $def, @_[0..65535] ); - printf OUTPUT "const unsigned short %s[%d] =\n{\n", $name, $#array+1; + printf OUTPUT "const unsigned short DECLSPEC_HIDDEN %s[%d] =\n{\n", $name, $#array+1; printf OUTPUT " /* offsets */\n%s,\n", DUMP_ARRAY( "0x%04x", 0, @array[0..255] ); printf OUTPUT " /* values */\n%s\n};\n", DUMP_ARRAY( "0x%04x", 0, @array[256..$#array] ); } @@ -2178,7 +2178,7 @@ sub dump_nameprep($) ################################################################ # dump the ctype tables -sub DUMP_CTYPE_TABLES($) +sub dump_ctype_tables($) { my $filename = shift; open OUTPUT,">$filename.new" or die "Cannot create $filename"; @@ -2770,7 +2770,7 @@ DUMP_CASE_MAPPINGS( "libs/wine/casemap.c" ); DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() ); dump_compose_table( "libs/port/compose.c" ); dump_decompose_table( "libs/port/decompose.c" ); -DUMP_CTYPE_TABLES( "libs/wine/wctype.c" ); +dump_ctype_tables( "libs/port/wctype.c" ); dump_digit_folding( "libs/port/digitmap.c" ); dump_combining_class( "libs/port/combclass.c" ); dump_mirroring( "dlls/usp10/mirror.c" );

1 0

Alexandre Julliard : libwine: Move casemap tables to libwine_port.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 9de388258f55ca82e794a234e36550c30b33ed1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9de388258f55ca82e794a234… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 24 10:21:57 2019 +0100 libwine: Move casemap tables to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 4 ++-- libs/port/Makefile.in | 1 + libs/{wine => port}/casemap.c | 4 ++-- libs/wine/Makefile.in | 1 - tools/make_unicode | 18 +++++++++--------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index de3ac56..d0bbdcc 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -124,13 +124,13 @@ WINE_UNICODE_INLINE int wine_is_dbcs_leadbyte( const union cptable *table, unsig WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) { - extern WINE_UNICODE_API const WCHAR wine_casemap_lower[]; + extern const WCHAR wine_casemap_lower[]; return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; } WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ) { - extern WINE_UNICODE_API const WCHAR wine_casemap_upper[]; + extern const WCHAR wine_casemap_upper[]; return ch + wine_casemap_upper[wine_casemap_upper[ch >> 8] + (ch & 0xff)]; } diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 45ce182..e2b265d 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -73,6 +73,7 @@ C_SRCS = \ c_936.c \ c_949.c \ c_950.c \ + casemap.c \ combclass.c \ compose.c \ cpsymbol.c \ diff --git a/libs/wine/casemap.c b/libs/port/casemap.c similarity index 99% rename from libs/wine/casemap.c rename to libs/port/casemap.c index 1c975db..d440fce 100644 --- a/libs/wine/casemap.c +++ b/libs/port/casemap.c @@ -4,7 +4,7 @@ #include "wine/unicode.h" -const WCHAR wine_casemap_lower[4259] = +const WCHAR DECLSPEC_HIDDEN wine_casemap_lower[4259] = { /* index */ 0x01bf, 0x02bf, 0x03bf, 0x044f, 0x054f, 0x064f, 0x0100, 0x0100, @@ -562,7 +562,7 @@ const WCHAR wine_casemap_lower[4259] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; -const WCHAR wine_casemap_upper[4828] = +const WCHAR DECLSPEC_HIDDEN wine_casemap_upper[4828] = { /* index */ 0x019f, 0x029f, 0x039f, 0x045a, 0x0556, 0x0656, 0x0100, 0x0100, diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index e544d99..b8f26af 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -2,7 +2,6 @@ EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) EXTRADEFS = -DWINE_UNICODE_API="" C_SRCS = \ - casemap.c \ collation.c \ config.c \ debug.c \ diff --git a/tools/make_unicode b/tools/make_unicode index d674570..a9acc27 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1598,7 +1598,7 @@ sub dump_mirroring($) print OUTPUT "/* generated from $UNIDATA/BidiMirroring.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - DUMP_CASE_TABLE( "DECLSPEC_HIDDEN wine_mirror_map", @mirror_table ); + dump_case_table( "wine_mirror_map", @mirror_table ); close OUTPUT; save_file($filename); } @@ -1756,9 +1756,9 @@ sub dump_digit_folding($) print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - DUMP_CASE_TABLE( "DECLSPEC_HIDDEN wine_digitmap", @digitmap_table ); + dump_case_table( "wine_digitmap", @digitmap_table ); print OUTPUT "\n"; - DUMP_CASE_TABLE( "DECLSPEC_HIDDEN wine_compatmap", @compatmap_table ); + dump_case_table( "wine_compatmap", @compatmap_table ); close OUTPUT; save_file($filename); } @@ -1766,7 +1766,7 @@ sub dump_digit_folding($) ################################################################ # dump the case mapping tables -sub DUMP_CASE_MAPPINGS($) +sub dump_case_mappings($) { my $filename = shift; open OUTPUT,">$filename.new" or die "Cannot create $filename"; @@ -1776,9 +1776,9 @@ sub DUMP_CASE_MAPPINGS($) print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - DUMP_CASE_TABLE( "wine_casemap_lower", @tolower_table ); + dump_case_table( "wine_casemap_lower", @tolower_table ); print OUTPUT "\n"; - DUMP_CASE_TABLE( "wine_casemap_upper", @toupper_table ); + dump_case_table( "wine_casemap_upper", @toupper_table ); close OUTPUT; save_file($filename); } @@ -1786,7 +1786,7 @@ sub DUMP_CASE_MAPPINGS($) ################################################################ # dump a case mapping table -sub DUMP_CASE_TABLE($@) +sub dump_case_table($@) { my ($name,@table) = @_; @@ -1835,7 +1835,7 @@ sub DUMP_CASE_TABLE($@) # dump the table - printf OUTPUT "const WCHAR %s[%d] =\n", $name, $index * 256 + 512 - $removed; + printf OUTPUT "const WCHAR DECLSPEC_HIDDEN %s[%d] =\n", $name, $index * 256 + 512 - $removed; printf OUTPUT "{\n /* index */\n"; printf OUTPUT "%s,\n", DUMP_ARRAY( "0x%04x", 256, @filled ); printf OUTPUT " /* defaults */\n"; @@ -2766,7 +2766,7 @@ sub REPLACE_IN_FILE($@) chdir ".." if -f "./make_unicode"; READ_DEFAULTS( $DEFAULTS ); -DUMP_CASE_MAPPINGS( "libs/wine/casemap.c" ); +dump_case_mappings( "libs/port/casemap.c" ); DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() ); dump_compose_table( "libs/port/compose.c" ); dump_decompose_table( "libs/port/decompose.c" );

1 0

Alexandre Julliard : libwine: Move collation table to libwine_port.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 84cd9043347c320f0747005bf66e1e7b1e17b25a URL: https://source.winehq.org/git/wine.git/?a=commit;h=84cd9043347c320f0747005b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 23 13:43:17 2019 +0100 libwine: Move collation table to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 8 -------- libs/port/Makefile.in | 2 ++ libs/{wine => port}/collation.c | 4 +++- libs/{wine => port}/sortkey.c | 0 libs/wine/Makefile.in | 3 --- libs/wine/port.c | 1 + tools/make_unicode | 7 ++++--- 7 files changed, 10 insertions(+), 15 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index d0bbdcc..22bb6dd 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -35,14 +35,6 @@ extern "C" { #endif -#ifndef WINE_UNICODE_API -# if defined(_MSC_VER) || defined(__MINGW32__) -# define WINE_UNICODE_API DECLSPEC_IMPORT -# else -# define WINE_UNICODE_API -# endif -#endif - #ifndef WINE_UNICODE_INLINE #define WINE_UNICODE_INLINE static inline #endif diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index e2b265d..ef3b23f 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -74,6 +74,7 @@ C_SRCS = \ c_949.c \ c_950.c \ casemap.c \ + collation.c \ combclass.c \ compose.c \ cpsymbol.c \ @@ -97,6 +98,7 @@ C_SRCS = \ pwrite.c \ readlink.c \ rint.c \ + sortkey.c \ spawn.c \ statvfs.c \ strnlen.c \ diff --git a/libs/wine/collation.c b/libs/port/collation.c similarity index 99% rename from libs/wine/collation.c rename to libs/port/collation.c index 465d740..2d990d8 100644 --- a/libs/wine/collation.c +++ b/libs/port/collation.c @@ -2,7 +2,9 @@ /* generated from http://www.unicode.org/reports/tr10/allkeys.txt */ /* DO NOT EDIT!! */ -const unsigned int collation_table[12800] = +#include "wine/unicode.h" + +const unsigned int DECLSPEC_HIDDEN collation_table[12800] = { /* index */ 0x00000200, 0x00000300, 0x00000400, 0x00000500, 0x00000600, 0x00000700, 0x00000800, 0x00000900, diff --git a/libs/wine/sortkey.c b/libs/port/sortkey.c similarity index 100% rename from libs/wine/sortkey.c rename to libs/port/sortkey.c diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index b8f26af..bd8a937 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,15 +1,12 @@ EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) -EXTRADEFS = -DWINE_UNICODE_API="" C_SRCS = \ - collation.c \ config.c \ debug.c \ ldt.c \ loader.c \ mmap.c \ port.c \ - sortkey.c \ string.c EXTRA_OBJS = version.o diff --git a/libs/wine/port.c b/libs/wine/port.c index 29e9091..666c4ca 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -33,6 +33,7 @@ #ifndef __ANDROID__ const void *libwine_port_functions[] = { + wine_compare_string, wine_cp_enum_table, wine_cp_get_table, wine_cp_mbstowcs, diff --git a/tools/make_unicode b/tools/make_unicode index a9acc27..0f3cdcc 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -844,7 +844,7 @@ sub READ_SORTKEYS_FILE() ################################################################ # build the sort keys table -sub DUMP_SORTKEYS($@) +sub dump_sortkeys($@) { my ($filename, @keys) = @_; @@ -868,8 +868,9 @@ sub DUMP_SORTKEYS($@) printf OUTPUT "/* Unicode collation element table */\n"; printf OUTPUT "/* generated from %s */\n", "$REPORTS/$SORTKEYS"; printf OUTPUT "/* DO NOT EDIT!! */\n\n"; + print OUTPUT "#include \"wine/unicode.h\"\n\n"; - printf OUTPUT "const unsigned int collation_table[%d] =\n{\n", $ranges*256; + printf OUTPUT "const unsigned int DECLSPEC_HIDDEN collation_table[%d] =\n{\n", $ranges*256; printf OUTPUT " /* index */\n"; printf OUTPUT "%s,\n", DUMP_ARRAY( "0x%08x", 0, @offsets ); @@ -2767,7 +2768,7 @@ sub REPLACE_IN_FILE($@) chdir ".." if -f "./make_unicode"; READ_DEFAULTS( $DEFAULTS ); dump_case_mappings( "libs/port/casemap.c" ); -DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() ); +dump_sortkeys( "libs/port/collation.c", READ_SORTKEYS_FILE() ); dump_compose_table( "libs/port/compose.c" ); dump_decompose_table( "libs/port/decompose.c" ); dump_ctype_tables( "libs/port/wctype.c" );

1 0

Michael Stefaniuc : dmcompos: Use HIWORD / LOWORD instead of open coding them.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: a938cbf5ddf3a2600e56d921ee02da224f22898c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a938cbf5ddf3a2600e56d921… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 24 14:26:47 2019 +0100 dmcompos: Use HIWORD / LOWORD instead of open coding them. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/dmcompos_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 2e68775..bcd6662 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -224,11 +224,13 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (const DMUS_VERSION *version) { - if (!version) return "'null'"; - return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), - (int)((version->dwVersionLS & 0xFFFF0000) >> 8), (int)(version->dwVersionLS & 0x0000FFFF)); +static const char *debugstr_dmversion(const DMUS_VERSION *version) +{ + if (!version) + return "'null'"; + return wine_dbg_sprintf("'%hu,%hu,%hu,%hu'", + HIWORD(version->dwVersionMS), LOWORD(version->dwVersionMS), + HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); } /* returns name of given GUID */

1 0

Michael Stefaniuc : dmscript: Use HIWORD / LOWORD instead of open coding them.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 2eac950ab690ded7f940b9f595d74c13b5ca4d55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eac950ab690ded7f940b9f5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 24 14:26:48 2019 +0100 dmscript: Use HIWORD / LOWORD instead of open coding them. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/dmscript_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index fd25b00..ec9026b 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -254,11 +254,13 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (const DMUS_VERSION *version) { - if (!version) return "'null'"; - return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), - (int)((version->dwVersionLS & 0xFFFF0000) >> 8), (int)(version->dwVersionLS & 0x0000FFFF)); +static const char *debugstr_dmversion(const DMUS_VERSION *version) +{ + if (!version) + return "'null'"; + return wine_dbg_sprintf("'%hu,%hu,%hu,%hu'", + HIWORD(version->dwVersionMS), LOWORD(version->dwVersionMS), + HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); } /* returns name of given GUID */

1 0