October 2022 - Wine-Commits

Martin Storsjö : win32u: Make sure that the stack buffer in set_multi_value_key is large enough.
by Alexandre Julliard Oct. 24, 2022

Oct. 24, 2022

Module: wine Branch: master Commit: 0cb279812546bedae68bc86210facd6c00dbb83f URL: https://gitlab.winehq.org/wine/wine/-/commit/0cb279812546bedae68bc86210facd… Author: Martin Storsjö <martin(a)martin.st> Date: Mon Oct 24 10:49:52 2022 +0300 win32u: Make sure that the stack buffer in set_multi_value_key is large enough. This fixes stack overflows since edecac8afdd04701314381b6386e0f7ac862e066. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/win32u/font.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 6746f7fcb40..75189f8ec5a 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -3043,12 +3043,19 @@ static void update_font_association_info(void) static void set_multi_value_key( HKEY hkey, const WCHAR *name, const char *value, DWORD len ) { - WCHAR valueW[256]; + WCHAR *valueW; + + if (!(valueW = malloc( len * sizeof(WCHAR) ))) + { + ERR( "malloc of %d * WCHAR failed\n", len ); + return; + } ascii_to_unicode( valueW, value, len ); if (value) set_reg_value( hkey, name, REG_MULTI_SZ, valueW, len * sizeof(WCHAR) ); else if (name) reg_delete_value( hkey, name ); + free( valueW ); } static void update_font_system_link_info(void)

1 0

Gabriel Ivăncescu : mshtml: Move the IHTMLDocument2 interface out of basedoc.
by Alexandre Julliard Oct. 24, 2022

Oct. 24, 2022

Module: wine Branch: master Commit: eaaae516956d5b39a798a6506442186120746a9b URL: https://gitlab.winehq.org/wine/wine/-/commit/eaaae516956d5b39a798a650644218… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 24 15:58:01 2022 +0300 mshtml: Move the IHTMLDocument2 interface out of basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 532 +++++++++++++++++++++---------------------- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlframe.c | 6 +- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/oleobj.c | 319 ++++++++++++++++++++++++++ dlls/mshtml/script.c | 2 +- dlls/mshtml/service.c | 4 +- dlls/mshtml/view.c | 2 +- 10 files changed, 594 insertions(+), 280 deletions(-)

1 0

Ziqing Hui : win32u: Add font links for Yu Gothic UI.
by Alexandre Julliard Oct. 24, 2022

Oct. 24, 2022

Module: wine Branch: master Commit: 802c12266175e01972998ca6b0e72196e90a9608 URL: https://gitlab.winehq.org/wine/wine/-/commit/802c12266175e01972998ca6b0e721… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Oct 21 10:07:40 2022 +0800 win32u: Add font links for Yu Gothic UI. --- dlls/win32u/font.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 9ead47e1983..a414da19287 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1534,6 +1534,16 @@ static const WCHAR microsoft_jheng_hei_ui_boldW[] = {'M','i','c','r','o','s','o','f','t',' ','J','h','e','n','g','H','e','i',' ','U','I',' ','B','o','l','d',0}; static const WCHAR microsoft_jheng_hei_ui_lightW[] = {'M','i','c','r','o','s','o','f','t',' ','J','h','e','n','g','H','e','i',' ','U','I',' ','L','i','g','h','t',0}; +static const WCHAR yu_gothic_uiW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',0}; +static const WCHAR yu_gothic_ui_boldW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','B','o','l','d',0}; +static const WCHAR yu_gothic_ui_lightW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','L','i','g','h','t',0}; +static const WCHAR yu_gothic_ui_semilightW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','S','e','m','i','l','i','g','h','t',0}; +static const WCHAR yu_gothic_ui_semiboldW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','S','e','m','i','b','o','l','d',0}; static const WCHAR * const font_links_list[] = { @@ -1777,6 +1787,41 @@ static const char system_link_ming_li_u_hkscs_ext_b[] = "MALGUN.TTF,Malgun Gothic\0" "SEGUISYM.TTF,Segoe UI Symbol\0"; +static const char system_link_yu_gothic_ui[] = + "SEGOEUI.TTF,Segoe UI\0" + "MSJH.TTC,Microsoft JhengHei\0" + "MSYH.TTC,Microsoft YaHei\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_yu_gothic_ui_bold[] = + "SEGOEUIB.TTF,Segoe UI Bold\0" + "MSJHBD.TTC,Microsoft Jhenghei UI Bold\0" + "MSYHBD.TTC,Microsoft YaHei Bold\0" + "MALGUNBD.TTF,Malgun Gothic Bold\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_yu_gothic_ui_light[] = + "SEGOEUIL.TTF,Segoe UI Light\0" + "MSJHL.TTC,Microsoft Jhenghei UI Light\0" + "MSYHL.TTC,Microsoft YaHei Light\0" + "MALGUNSL.TTF,Malgun Gothic Semilight\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_yu_gothic_ui_semilight[] = + "SEGOEUISL.TTF,Segoe UI Semilight\0" + "MSJH.TTC,Microsoft Jhenghei UI\0" + "MSYH.TTC,Microsoft YaHei\0" + "MALGUNSL.TTF,Malgun Gothic Semilight\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_yu_gothic_ui_semibold[] = + "SEGUISB.TTF,Segoe UI Semibold\0" + "MSJH.TTC,Microsoft Jhenghei UI\0" + "MSYH.TTC,Microsoft YaHei\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + static const struct system_link_reg { const WCHAR *font_name; @@ -1832,6 +1877,11 @@ default_system_link[] = { ming_li_u_ext_bW, FALSE, system_link_ming_li_u_ext_b, sizeof(system_link_ming_li_u_ext_b) }, { p_ming_li_u_ext_bW, FALSE, system_link_p_ming_li_u_ext_b, sizeof(system_link_p_ming_li_u_ext_b) }, { ming_li_u_hkscs_ext_bW, FALSE, system_link_ming_li_u_hkscs_ext_b, sizeof(system_link_ming_li_u_hkscs_ext_b) }, + { yu_gothic_uiW, FALSE, system_link_yu_gothic_ui, sizeof(system_link_yu_gothic_ui) }, + { yu_gothic_ui_boldW, FALSE, system_link_yu_gothic_ui_bold, sizeof(system_link_yu_gothic_ui_bold) }, + { yu_gothic_ui_lightW, FALSE, system_link_yu_gothic_ui_light, sizeof(system_link_yu_gothic_ui_light) }, + { yu_gothic_ui_semiboldW, FALSE, system_link_yu_gothic_ui_semibold, sizeof(system_link_yu_gothic_ui_semibold) }, + { yu_gothic_ui_semilightW, FALSE, system_link_yu_gothic_ui_semilight, sizeof(system_link_yu_gothic_ui_semilight) }, }; static void populate_system_links( const WCHAR *name, const WCHAR * const *values )

1 0

Ziqing Hui : win32u: Add font links for Meiryo.
by Alexandre Julliard Oct. 24, 2022

Oct. 24, 2022

Module: wine Branch: master Commit: fa411158dfe1facae8260014e0e4ad11a42522e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa411158dfe1facae8260014e0e4ad… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Oct 21 10:14:03 2022 +0800 win32u: Add font links for Meiryo. --- dlls/win32u/font.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index a414da19287..505c29c469b 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1544,6 +1544,14 @@ static const WCHAR yu_gothic_ui_semilightW[] = {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','S','e','m','i','l','i','g','h','t',0}; static const WCHAR yu_gothic_ui_semiboldW[] = {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','S','e','m','i','b','o','l','d',0}; +static const WCHAR meiryoW[] = + {'M','e','i','r','y','o',0}; +static const WCHAR meiryo_boldW[] = + {'M','e','i','r','y','o',' ','B','o','l','d',0}; +static const WCHAR meiryo_uiW[] = + {'M','e','i','r','y','o',' ','U','I',0}; +static const WCHAR meiryo_ui_boldW[] = + {'M','e','i','r','y','o',' ','U','I',' ','B','o','l','d',0}; static const WCHAR * const font_links_list[] = { @@ -1822,6 +1830,42 @@ static const char system_link_yu_gothic_ui_semibold[] = "MALGUN.TTF,Malgun Gothic\0" "SEGUISYM.TTF,Segoe UI Symbol\0"; +static const char system_link_meiryo[] = + "SEGOEUI.TTF,Segoe UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MSJH.TTC,Microsoft JhengHei\0" + "MSYH.TTC,Microsoft YaHei\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_meiryo_bold[] = + "SEGOEUIB.TTF,Segoe UI Bold\0" + "YUGOTHB.TTC,Yu Gothic UI Bold\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MSJHBD.TTC,Microsoft Jhenghei Bold\0" + "MSYHBD.TTC,Microsoft YaHei Bold\0" + "MALGUNBD.TTF,Malgun Gothic Bold\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_meiryo_ui[] = + "SEGOEUI.TTF,Segoe UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MSJH.TTC,Microsoft Jhenghei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_meiryo_ui_bold[] = + "SEGOEUIB.TTF,Segoe UI Bold\0" + "YUGOTHB.TTC,Yu Gothic UI Bold\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MSJHBD.TTC,Microsoft Jhenghei UI Bold\0" + "MSYHBD.TTC,Microsoft YaHei UI Bold\0" + "MALGUNBD.TTF,Malgun Gothic Bold\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + static const struct system_link_reg { const WCHAR *font_name; @@ -1882,6 +1926,10 @@ default_system_link[] = { yu_gothic_ui_lightW, FALSE, system_link_yu_gothic_ui_light, sizeof(system_link_yu_gothic_ui_light) }, { yu_gothic_ui_semiboldW, FALSE, system_link_yu_gothic_ui_semibold, sizeof(system_link_yu_gothic_ui_semibold) }, { yu_gothic_ui_semilightW, FALSE, system_link_yu_gothic_ui_semilight, sizeof(system_link_yu_gothic_ui_semilight) }, + { meiryoW, FALSE, system_link_meiryo, sizeof(system_link_meiryo) }, + { meiryo_boldW, FALSE, system_link_meiryo_bold, sizeof(system_link_meiryo_bold) }, + { meiryo_uiW, FALSE, system_link_meiryo_ui, sizeof(system_link_meiryo_ui) }, + { meiryo_ui_boldW, FALSE, system_link_meiryo_ui_bold, sizeof(system_link_meiryo_ui_bold) }, }; static void populate_system_links( const WCHAR *name, const WCHAR * const *values )

1 0

Alexandre Julliard : makedep: Make the delay load flags architecture-generic.
by Alexandre Julliard Oct. 24, 2022

Oct. 24, 2022

Module: wine Branch: master Commit: 815e766d9d70518c8a7668a088c3da6d845a102e URL: https://gitlab.winehq.org/wine/wine/-/commit/815e766d9d70518c8a7668a088c3da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 12:12:51 2022 +0200 makedep: Make the delay load flags architecture-generic. --- tools/makedep.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 6042689536b..44a08130b3f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -167,10 +167,10 @@ static const char *dlltool; static const char *msgfmt; static const char *ln_s; static const char *sed_cmd; -static const char *delay_load_flag; /* per-architecture global variables */ static const char *strip_progs[MAX_ARCHS]; static const char *debug_flags[MAX_ARCHS]; +static const char *delay_load_flags[MAX_ARCHS]; static struct strarray target_flags[MAX_ARCHS]; struct makefile @@ -2073,10 +2073,9 @@ static struct makefile *get_parent_makefile( struct makefile *make ) /******************************************************************* * needs_delay_lib */ -static int needs_delay_lib( const struct makefile *make ) +static int needs_delay_lib( const struct makefile *make, unsigned int arch ) { - if (delay_load_flag) return 0; - if (*dll_ext && archs.count == 1) return 0; + if (delay_load_flags[arch]) return 0; if (!make->importlib) return 0; return strarray_exists( &delay_import_libs, make->importlib ); } @@ -2238,7 +2237,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra { const char *ext = NULL; - if (type == IMPORT_TYPE_DELAYED && !delay_load_flag && (arch || !*dll_ext)) ext = ".delay.a"; + if (type == IMPORT_TYPE_DELAYED && !delay_load_flags[arch]) ext = ".delay.a"; else if (arch) ext = ".cross.a"; if (ext) lib = replace_extension( lib, ".a", ext ); strarray_add_uniq( deps, lib ); @@ -3175,7 +3174,6 @@ static void output_module( struct makefile *make, unsigned int arch ) struct strarray imports = make->imports; const char *module_name = make->module; const char *debug_file; - const char *delay_load = delay_load_flag; char *spec_file = NULL; unsigned int i; @@ -3198,11 +3196,10 @@ static void output_module( struct makefile *make, unsigned int arch ) strarray_addall( &all_libs, libs ); } - if (!arch && *dll_ext) delay_load = "-Wl,-delayload,"; - if (delay_load) + if (delay_load_flags[arch]) { for (i = 0; i < make->delayimports.count; i++) - strarray_add( &all_libs, strmake( "%s%s%s", delay_load, make->delayimports.str[i], + strarray_add( &all_libs, strmake( "%s%s%s", delay_load_flags[arch], make->delayimports.str[i], strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); } } @@ -3300,7 +3297,7 @@ static void output_import_lib( struct makefile *make, unsigned int arch ) strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); output_filename( strmake( "%s.a", importlib_path )); } - if ((arch || !*dll_ext) && needs_delay_lib( make )) + if (needs_delay_lib( make, arch )) { strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); output( " %s.delay.a", importlib_path ); @@ -4299,7 +4296,7 @@ static int parse_option( const char *opt ) int main( int argc, char *argv[] ) { const char *makeflags = getenv( "MAKEFLAGS" ); - const char *crosstarget, *debug_flag; + const char *crosstarget, *debug_flag, *delay_load_flag; unsigned int i, j, arch; if (makeflags) parse_makeflags( makeflags ); @@ -4408,11 +4405,13 @@ int main( int argc, char *argv[] ) for (arch = 0; arch < archs.count; arch++) { if (!is_multiarch( arch )) continue; + delay_load_flags[arch] = delay_load_flag; debug_flags[arch] = debug_flag; } if (*dll_ext) { + delay_load_flags[0] = "-Wl,-delayload,"; debug_flags[0] = NULL; }

1 0

Alexandre Julliard : makedep: Make the debug flags architecture-generic.
by Alexandre Julliard Oct. 24, 2022

Oct. 24, 2022

Module: wine Branch: master Commit: 55e2335f64950fb378f8a06d79b6e5792324bdc1 URL: https://gitlab.winehq.org/wine/wine/-/commit/55e2335f64950fb378f8a06d79b6e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 11:46:48 2022 +0200 makedep: Make the debug flags architecture-generic. --- tools/makedep.c | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index fe546b26aa1..6042689536b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -155,7 +155,6 @@ static const char *dll_ext; static const char *host_cpu; static const char *pe_dir; static const char *so_dir; -static const char *crossdebug; static const char *fontforge; static const char *convert; static const char *flex; @@ -171,6 +170,7 @@ static const char *sed_cmd; static const char *delay_load_flag; /* per-architecture global variables */ static const char *strip_progs[MAX_ARCHS]; +static const char *debug_flags[MAX_ARCHS]; static struct strarray target_flags[MAX_ARCHS]; struct makefile @@ -602,6 +602,18 @@ static char *concat_paths( const char *base, const char *path ) } +/******************************************************************* + * is_multiarch + * + * Check if arch is one of the PE architectures in multiarch. + * Also return TRUE for native arch iff there's no PE support. + */ +static int is_multiarch( unsigned int arch ) +{ + return archs.count == 1 || arch; +} + + /******************************************************************* * obj_dir_path */ @@ -2350,9 +2362,9 @@ static struct strarray remove_warning_flags( struct strarray flags ) static const char *get_debug_file( struct makefile *make, const char *name, unsigned int arch ) { const char *debug_file = NULL; - if (!arch || !crossdebug) return NULL; - if (!strcmp( crossdebug, "pdb" )) debug_file = strmake( "%s.pdb", get_base_name( name )); - else if(!strncmp( crossdebug, "split", 5 )) debug_file = strmake( "%s.debug", name ); + if (!debug_flags[arch]) return NULL; + if (!strcmp( debug_flags[arch], "pdb" )) debug_file = strmake( "%s.pdb", get_base_name( name )); + else if (!strncmp( debug_flags[arch], "split", 5 )) debug_file = strmake( "%s.debug", name ); if (debug_file) strarray_add( &make->debug_files, debug_file ); return debug_file; } @@ -4287,8 +4299,8 @@ static int parse_option( const char *opt ) int main( int argc, char *argv[] ) { const char *makeflags = getenv( "MAKEFLAGS" ); - const char *crosstarget; - int i, j; + const char *crosstarget, *debug_flag; + unsigned int i, j, arch; if (makeflags) parse_makeflags( makeflags ); @@ -4352,7 +4364,7 @@ int main( int argc, char *argv[] ) dll_ext = (exe_ext && !strcmp( exe_ext, ".exe" )) ? "" : ".so"; host_cpu = get_expanded_make_variable( top_makefile, "host_cpu" ); crosstarget = get_expanded_make_variable( top_makefile, "CROSSTARGET" ); - crossdebug = get_expanded_make_variable( top_makefile, "CROSSDEBUG" ); + debug_flag = get_expanded_make_variable( top_makefile, "CROSSDEBUG" ); fontforge = get_expanded_make_variable( top_makefile, "FONTFORGE" ); convert = get_expanded_make_variable( top_makefile, "CONVERT" ); flex = get_expanded_make_variable( top_makefile, "FLEX" ); @@ -4390,6 +4402,18 @@ int main( int argc, char *argv[] ) strarray_add( &target_flags[1], "-b" ); strarray_add( &target_flags[1], crosstarget ); strip_progs[1] = strmake( "%s-strip", crosstarget ); + debug_flags[1] = debug_flag; + } + + for (arch = 0; arch < archs.count; arch++) + { + if (!is_multiarch( arch )) continue; + debug_flags[arch] = debug_flag; + } + + if (*dll_ext) + { + debug_flags[0] = NULL; } extra_cflags_extlib = remove_warning_flags( extra_cflags );

1 0

Alexandre Julliard : makedep: Make the extra C flags architecture-generic.
by Alexandre Julliard Oct. 24, 2022

Oct. 24, 2022

Module: wine Branch: master Commit: 25735da0dea2c62b8362f613111fb145cd692545 URL: https://gitlab.winehq.org/wine/wine/-/commit/25735da0dea2c62b8362f613111fb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 12:22:25 2022 +0200 makedep: Make the extra C flags architecture-generic. --- tools/makedep.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 44a08130b3f..7100cacaf86 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -134,10 +134,6 @@ static struct strarray linguas; static struct strarray dll_flags; static struct strarray unix_dllflags; static struct strarray msvcrt_flags; -static struct strarray extra_cflags; -static struct strarray extra_cross_cflags; -static struct strarray extra_cflags_extlib; -static struct strarray extra_cross_cflags_extlib; static struct strarray cpp_flags; static struct strarray lddll_flags; static struct strarray libs; @@ -172,6 +168,8 @@ static const char *strip_progs[MAX_ARCHS]; static const char *debug_flags[MAX_ARCHS]; static const char *delay_load_flags[MAX_ARCHS]; static struct strarray target_flags[MAX_ARCHS]; +static struct strarray extra_cflags[MAX_ARCHS]; +static struct strarray extra_cflags_extlib[MAX_ARCHS]; struct makefile { @@ -3059,7 +3057,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "\t%s$(CC) -c -o $@ %s", cmd_prefix( "CC" ), source->filename ); output_filenames( defines ); if (!source->use_msvcrt) output_filenames( make->unix_cflags ); - output_filenames( make->extlib ? extra_cflags_extlib : extra_cflags ); + output_filenames( make->extlib ? extra_cflags_extlib[0] : extra_cflags[0] ); if (make->sharedlib || (source->file->flags & FLAG_C_UNIX)) { output_filenames( unix_dllflags ); @@ -3086,12 +3084,12 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "%s.cross.o: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s$(CROSSCC) -c -o $@ %s", cmd_prefix( "CC" ), source->filename ); output_filenames( defines ); - output_filenames( make->extlib ? extra_cross_cflags_extlib : extra_cross_cflags ); + output_filenames( make->extlib ? extra_cflags_extlib[arch] : extra_cflags[arch] ); if (make->module && is_crt_module( make->module )) output_filename( "-fno-builtin" ); /* force -Wformat when using 'long' types, until all modules have been converted * and we can remove -Wno-format */ - if (!make->extlib && strarray_exists( &extra_cross_cflags, "-Wno-format" ) && + if (!make->extlib && strarray_exists( &extra_cflags[arch], "-Wno-format" ) && !strarray_exists( &defines, "-DWINE_NO_LONG_TYPES" )) output_filename( "-Wformat" ); output_filenames( cpp_flags ); @@ -4343,8 +4341,8 @@ int main( int argc, char *argv[] ) target_flags[0] = get_expanded_make_var_array( top_makefile, "TARGETFLAGS" ); msvcrt_flags = get_expanded_make_var_array( top_makefile, "MSVCRTFLAGS" ); dll_flags = get_expanded_make_var_array( top_makefile, "DLLFLAGS" ); - extra_cflags = get_expanded_make_var_array( top_makefile, "EXTRACFLAGS" ); - extra_cross_cflags = get_expanded_make_var_array( top_makefile, "EXTRACROSSCFLAGS" ); + extra_cflags[0] = get_expanded_make_var_array( top_makefile, "EXTRACFLAGS" ); + extra_cflags[1] = get_expanded_make_var_array( top_makefile, "EXTRACROSSCFLAGS" ); unix_dllflags = get_expanded_make_var_array( top_makefile, "UNIXDLLFLAGS" ); cpp_flags = get_expanded_make_var_array( top_makefile, "CPPFLAGS" ); lddll_flags = get_expanded_make_var_array( top_makefile, "LDDLLFLAGS" ); @@ -4404,6 +4402,7 @@ int main( int argc, char *argv[] ) for (arch = 0; arch < archs.count; arch++) { + extra_cflags_extlib[arch] = remove_warning_flags( extra_cflags[arch] ); if (!is_multiarch( arch )) continue; delay_load_flags[arch] = delay_load_flag; debug_flags[arch] = debug_flag; @@ -4415,9 +4414,6 @@ int main( int argc, char *argv[] ) debug_flags[0] = NULL; } - extra_cflags_extlib = remove_warning_flags( extra_cflags ); - extra_cross_cflags_extlib = remove_warning_flags( extra_cross_cflags ); - top_makefile->src_dir = root_src_dir; subdirs = get_expanded_make_var_array( top_makefile, "SUBDIRS" ); disabled_dirs = get_expanded_make_var_array( top_makefile, "DISABLED_SUBDIRS" );

1 0

Alexandre Julliard : makedep: Pass a generic architecture value instead of the is_cross flag to various helpers.
by Alexandre Julliard Oct. 24, 2022

Oct. 24, 2022

Module: wine Branch: master Commit: 24d791e2e9792a28a18414710aee34c255b10c67 URL: https://gitlab.winehq.org/wine/wine/-/commit/24d791e2e9792a28a18414710aee34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 11:40:56 2022 +0200 makedep: Pass a generic architecture value instead of the is_cross flag to various helpers. --- tools/makedep.c | 209 ++++++++++++++++++++++++++------------------------------ 1 file changed, 95 insertions(+), 114 deletions(-)

1 0

Alexandre Julliard : makedep: Make the target flags architecture-generic.
by Alexandre Julliard Oct. 24, 2022

Oct. 24, 2022

Module: wine Branch: master Commit: afc286fb51f29f22a5a6c9280476afc3e1563b24 URL: https://gitlab.winehq.org/wine/wine/-/commit/afc286fb51f29f22a5a6c9280476af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 11:42:31 2022 +0200 makedep: Make the target flags architecture-generic. --- tools/makedep.c | 55 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4de28f3d83f..fe546b26aa1 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -126,11 +126,13 @@ enum install_rules { INSTALL_LIB, INSTALL_DEV, INSTALL_TEST, NB_INSTALL_RULES }; static const char *install_targets[NB_INSTALL_RULES] = { "install-lib", "install-dev", "install-test" }; static const char *install_variables[NB_INSTALL_RULES] = { "INSTALL_LIB", "INSTALL_DEV", "INSTALL_TEST" }; +#define MAX_ARCHS 2 + /* variables common to all makefiles */ +static struct strarray archs; static struct strarray linguas; static struct strarray dll_flags; static struct strarray unix_dllflags; -static struct strarray target_flags; static struct strarray msvcrt_flags; static struct strarray extra_cflags; static struct strarray extra_cross_cflags; @@ -153,7 +155,6 @@ static const char *dll_ext; static const char *host_cpu; static const char *pe_dir; static const char *so_dir; -static const char *crosstarget; static const char *crossdebug; static const char *fontforge; static const char *convert; @@ -168,6 +169,9 @@ static const char *msgfmt; static const char *ln_s; static const char *sed_cmd; static const char *delay_load_flag; +/* per-architecture global variables */ +static const char *strip_progs[MAX_ARCHS]; +static struct strarray target_flags[MAX_ARCHS]; struct makefile { @@ -2060,7 +2064,7 @@ static struct makefile *get_parent_makefile( struct makefile *make ) static int needs_delay_lib( const struct makefile *make ) { if (delay_load_flag) return 0; - if (*dll_ext && !crosstarget) return 0; + if (*dll_ext && archs.count == 1) return 0; if (!make->importlib) return 0; return strarray_exists( &delay_import_libs, make->importlib ); } @@ -2376,17 +2380,11 @@ static void output_winegcc_command( struct makefile *make, unsigned int arch ) output_filename( "--winebuild" ); output_filename( tools_path( make, "winebuild" )); } + output_filenames( target_flags[arch] ); if (arch) - { - output_filename( "-b" ); - output_filename( crosstarget ); output_filename( "--lib-suffix=.cross.a" ); - } else - { - output_filenames( target_flags ); output_filenames( lddll_flags ); - } } @@ -2460,8 +2458,8 @@ static void output_install_commands( struct makefile *make, struct strarray file switch (*files.str[i + 1]) { case 'c': /* cross-compiled program */ - output( "\tSTRIPPROG=%s-strip %s -m 644 $(INSTALL_PROGRAM_FLAGS) %s %s\n", - crosstarget, install_sh, obj_dir_path( make, file ), dest ); + output( "\tSTRIPPROG=%s %s -m 644 $(INSTALL_PROGRAM_FLAGS) %s %s\n", + strip_progs[1], install_sh, obj_dir_path( make, file ), dest ); output( "\t%s --builtin %s\n", tools_path( make, "winebuild" ), dest ); break; case 'd': /* data file */ @@ -2781,7 +2779,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output_filenames_obj_dir( make, targets ); output( ": %s\n", tools_path( make, "widl" )); output( "\t%s%s -o $@", cmd_prefix( "WIDL" ), tools_path( make, "widl" ) ); - output_filenames( target_flags ); + output_filenames( target_flags[0] ); output_filename( "--nostdinc" ); output_filename( "-Ldlls/\\*" ); output_filenames( defines ); @@ -3023,7 +3021,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour int is_dll_src = (make->testdll && strendswith( source->name, ".c" ) && find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); - int need_cross = (crosstarget && + int need_cross = (archs.count > 1 && !(source->file->flags & FLAG_C_UNIX) && (arch || make->staticlib || (source->file->flags & FLAG_C_IMPLIB))); @@ -3299,8 +3297,7 @@ static void output_import_lib( struct makefile *make, unsigned int arch ) output_filenames_obj_dir( make, arch ? make->crossimplib_files : make->implib_files ); output( "\n" ); output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); - if (arch) output( " -b %s", crosstarget ); - else output_filenames( target_flags ); + output_filenames( target_flags[arch] ); if (make->is_win16) output_filename( "-m16" ); output_filename( "--export" ); output_filename( spec_file ); @@ -3378,8 +3375,7 @@ static void output_static_lib( struct makefile *make, unsigned int arch ) if (!arch) output_filenames_obj_dir( make, make->unixobj_files ); output( "\n" ); output( "\t%s%s -w --staticlib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" )); - if (arch) output( " -b %s", crosstarget ); - else output_filenames( target_flags ); + output_filenames( target_flags[arch] ); output_filenames_obj_dir( make, arch ? make->crossobj_files : make->object_files ); if (!arch) output_filenames_obj_dir( make, make->unixobj_files ); output( "\n" ); @@ -3720,12 +3716,12 @@ static void output_sources( struct makefile *make ) else if (make->module) { output_module( make, arch ); - if (*dll_ext && !arch && !make->data_only) output_fake_module( make, crosstarget ? 1 : 0 ); + if (*dll_ext && !arch && !make->data_only) output_fake_module( make, archs.count - 1 ); if (make->unixlib) output_unix_lib( make ); if (make->importlib) { output_import_lib( make, 0 ); - if (crosstarget) output_import_lib( make, 1 ); + if (archs.count > 1) output_import_lib( make, 1 ); } } else if (make->testdll) output_test_module( make, arch ); @@ -4225,7 +4221,7 @@ static void load_sources( struct makefile *make ) LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); - make->is_cross = crosstarget && make->use_msvcrt; + make->is_cross = archs.count > 1 && make->use_msvcrt; if (!*dll_ext || make->is_cross) for (i = 0; i < make->delayimports.count; i++) @@ -4291,6 +4287,7 @@ static int parse_option( const char *opt ) int main( int argc, char *argv[] ) { const char *makeflags = getenv( "MAKEFLAGS" ); + const char *crosstarget; int i, j; if (makeflags) parse_makeflags( makeflags ); @@ -4334,7 +4331,7 @@ int main( int argc, char *argv[] ) top_makefile = parse_makefile( NULL ); - target_flags = get_expanded_make_var_array( top_makefile, "TARGETFLAGS" ); + target_flags[0] = get_expanded_make_var_array( top_makefile, "TARGETFLAGS" ); msvcrt_flags = get_expanded_make_var_array( top_makefile, "MSVCRTFLAGS" ); dll_flags = get_expanded_make_var_array( top_makefile, "DLLFLAGS" ); extra_cflags = get_expanded_make_var_array( top_makefile, "EXTRACFLAGS" ); @@ -4379,7 +4376,21 @@ int main( int argc, char *argv[] ) pe_dir = strmake( "$(dlldir)/%s-windows", host_cpu ); } else + { + host_cpu = "unknown"; so_dir = pe_dir = "$(dlldir)"; + } + + strarray_add( &archs, host_cpu ); + strip_progs[0] = "\"$(STRIP)\""; + + if (crosstarget) + { + strarray_add( &archs, host_cpu ); + strarray_add( &target_flags[1], "-b" ); + strarray_add( &target_flags[1], crosstarget ); + strip_progs[1] = strmake( "%s-strip", crosstarget ); + } extra_cflags_extlib = remove_warning_flags( extra_cflags ); extra_cross_cflags_extlib = remove_warning_flags( extra_cross_cflags );

1 0

Paul Gofman : winmm: Use a global timeout for refreshing joystick devices.
by Alexandre Julliard Oct. 24, 2022

Oct. 24, 2022

Module: wine Branch: master Commit: 6d9dd6e4882ea8ba63510ae467720ca851333605 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d9dd6e4882ea8ba63510ae467720c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 21 20:38:34 2022 -0500 winmm: Use a global timeout for refreshing joystick devices. --- dlls/winmm/joystick.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 52094504186..428593fa590 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -131,12 +131,12 @@ struct joystick UINT timer; DWORD threshold; BOOL changed; - ULONG last_check; }; static DIDEVICEINSTANCEW instances[16]; static struct joystick joysticks[16]; static IDirectInput8W *dinput; +static ULONG last_check; static BOOL CALLBACK enum_instances( const DIDEVICEINSTANCEW *instance, void *context ) { @@ -342,9 +342,9 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW( UINT_PTR id, JOYCAPSW *caps, U EnterCriticalSection( &joystick_cs ); - if (!(device = joysticks[id].device) && (ticks - joysticks[id].last_check) >= 2000) + if (!(device = joysticks[id].device) && (ticks - last_check) >= 2000) { - joysticks[id].last_check = ticks; + last_check = ticks; find_joysticks(); } @@ -477,9 +477,9 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetPosEx( UINT id, JOYINFOEX *info ) EnterCriticalSection( &joystick_cs ); - if (!(device = joysticks[id].device) && (ticks - joysticks[id].last_check) >= 2000) + if (!(device = joysticks[id].device) && (ticks - last_check) >= 2000) { - joysticks[id].last_check = ticks; + last_check = ticks; find_joysticks(); }

1 0