November 2022 - Wine-Commits

Michael Stefaniuc : Release 7.0.1.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 8a6bc2c73736fd65af0ee910ef0316706b149aff URL: https://gitlab.winehq.org/wine/wine/-/commit/8a6bc2c73736fd65af0ee910ef0316… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 28 21:03:17 2022 +0200 Release 7.0.1. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- ANNOUNCE | 657 ++++++++++++++++++++++---------------------------------------- AUTHORS | 6 + VERSION | 2 +- configure | 18 +- 4 files changed, 251 insertions(+), 432 deletions(-)

1 0

Michael Stefaniuc : gitlab: Import the gitlab CI from the master branch (devel tree).
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: d7092992875b1090d5427c02ec5609f0d8f3c1d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7092992875b1090d5427c02ec5609… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 24 21:58:20 2022 +0200 gitlab: Import the gitlab CI from the master branch (devel tree). Original code written by Alexandre Julliard, Rémi Bernon and Hugh McMaster. Changes specific for stable: - Do not run the build script on each commit. The build scripts are missing on the initially pulled commits. Also it is common for the stable build to be broken until a few commits are cherry-picked. - Use the correct Gecko and Mono versions. - Don't run the tests for now as too many fail. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .gitlab-ci.yml | 12 +++++++ tools/gitlab/build-linux | 28 +++++++++++++++++ tools/gitlab/build-mac | 17 ++++++++++ tools/gitlab/build.yml | 80 +++++++++++++++++++++++++++++++++++++++++++++++ tools/gitlab/image.docker | 62 ++++++++++++++++++++++++++++++++++++ tools/gitlab/image.yml | 21 +++++++++++++ tools/gitlab/release.yml | 22 +++++++++++++ tools/gitlab/test.yml | 73 ++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 315 insertions(+)

1 0

Michael Stefaniuc : tools: Import make_announce changes from the devel tree.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 8e4f7ddcef4a9b2913569e96431fe53c1fb20623 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e4f7ddcef4a9b2913569e96431fe5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 7 18:17:11 2022 +0100 tools: Import make_announce changes from the devel tree. Partial cherry-pick of a1af412482d36c4046061faa676ff7bc774f40eb Changes by Alexandre Julliard. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/make_announce b/tools/make_announce index b38b7b0a70a..cd61cbb6bce 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -144,24 +144,20 @@ print NEW "----------------------------------------------------------------\n\n" printf NEW "Bugs fixed in %s (total %u):\n\n", $new, scalar( keys %bugs ); foreach my $id (sort {$a <=> $b} keys %bugs) { - printf NEW " %6d %s\n", $id, unescape( $bugs{$id} ); + printf NEW " - #%-6d %s\n", $id, unescape( $bugs{$id} ); } print NEW "\n----------------------------------------------------------------\n\n"; -print NEW "Changes since $old:\n\n"; +print NEW "Changes since $old:\n"; open LOG, "-|" or exec "git", "shortlog", "wine-$old..HEAD" or die "cannot run git shortlog"; while (<LOG>) { - if (/^(\S.*)\s$\d+$:$/) { $authors{$1} = 1; } + next if /^$/; + if (/^(\S.*)\s$\d+$:$/) { $authors{$1} = 1; print NEW "\n"; } print NEW $_; } close LOG; - -while (<ANNOUNCE>) { last if /^--$/; } -print NEW "--\n"; -while (<ANNOUNCE>) { print NEW $_; } - close ANNOUNCE; close NEW; update_file( "ANNOUNCE" );

1 0

Alexandre Julliard : winetest: Don't require an email if we have a URL.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 56eeaa9b30962cd3ad11a47f1d4f8dfb858e03a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/56eeaa9b30962cd3ad11a47f1d4f8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 13 13:01:38 2022 +0200 winetest: Don't require an email if we have a URL. (cherry picked from commit 12bf088ac0b47b1cc5deb3096856c930b99f8ff4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winetest/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 0c431a903d7..cd4d2c6b528 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -404,7 +404,8 @@ static void print_version (void) xprintf(", %s", is_elevated ? "elevated" : "not elevated"); xprintf ("\n"); } - xprintf (" Submitter=%s\n", email ); + if (email) + xprintf (" Submitter=%s\n", email ); if (description) xprintf (" Description=%s\n", description ); if (url) @@ -1448,8 +1449,11 @@ int __cdecl main( int argc, char *argv[] ) while (!email) { if (!interactive) + { + if (url) break; report (R_FATAL, "Please specify an email address (-m option) to enable developers\n" " to contact you about your report if necessary."); + } if (guiAskEmail () == IDABORT) exit (1); }

1 0

Alexandre Julliard : makedep: Make the handling of install rules more generic.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 14eead4f038153be056245eec13fdc688655dd72 URL: https://gitlab.winehq.org/wine/wine/-/commit/14eead4f038153be056245eec13fdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 10:12:00 2022 +0200 makedep: Make the handling of install rules more generic. (cherry picked from commit f9cad1bd19ec8525f918cf09f3f8ebc0a0945880) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/makedep.c | 101 +++++++++++++++++++++++++++----------------------------- 1 file changed, 49 insertions(+), 52 deletions(-)

1 0

Zhiyi Zhang : uxtheme: Support parsing menu class.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: b40dae2a83b66b1cc70d737b740385d5ccd4f6fe URL: https://gitlab.winehq.org/wine/wine/-/commit/b40dae2a83b66b1cc70d737b740385… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 25 17:28:28 2022 +0800 uxtheme: Support parsing menu class. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7e48747bd67f8dcd47a0f5754d73b4b231fa723c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uxtheme/stylemap.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index afeda659a36..07fafbe0bde 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -485,6 +485,59 @@ static const MSSTYLES_CLASS_MAP classListview[] = { {0, 0, L""} }; +static const MSSTYLES_CLASS_MAP classMenu[] = { + {MENU_MENUITEM_TMSCHEMA, 0, L"MENUITEM"}, + {MENU_MENUDROPDOWN_TMSCHEMA, 0, L"MENUDROPDOWN"}, + {MENU_MENUBARITEM_TMSCHEMA, 0, L"MENUBARITEM"}, + {MENU_MENUBARDROPDOWN_TMSCHEMA, 0, L"MENUBARDROPDOWN"}, + {MENU_CHEVRON_TMSCHEMA, 0, L"CHEVRON"}, + {MENU_SEPARATOR_TMSCHEMA, 0, L"SEPARATOR"}, + {MENU_BARBACKGROUND, 0, L"BARBACKGROUND"}, + {MENU_BARBACKGROUND, MB_ACTIVE, L"ACTIVE"}, + {MENU_BARBACKGROUND, MB_INACTIVE, L"INACTIVE"}, + {MENU_BARITEM, 0, L"BARITEM"}, + {MENU_BARITEM, MBI_NORMAL, L"NORMAL"}, + {MENU_BARITEM, MBI_HOT, L"HOT"}, + {MENU_BARITEM, MBI_PUSHED, L"PUSHED"}, + {MENU_BARITEM, MBI_DISABLED, L"DISABLED"}, + {MENU_BARITEM, MBI_DISABLEDHOT, L"DISABLEDHOT"}, + {MENU_BARITEM, MBI_DISABLEDPUSHED, L"DISABLEDPUSHED"}, + {MENU_POPUPBACKGROUND, 0, L"POPUPBACKGROUND"}, + {MENU_POPUPBORDERS, 0, L"POPUPBORDERS"}, + {MENU_POPUPCHECK, 0, L"POPUPCHECK"}, + {MENU_POPUPCHECK, MC_CHECKMARKNORMAL, L"CHECKMARKNORMAL"}, + {MENU_POPUPCHECK, MC_CHECKMARKDISABLED, L"CHECKMARKDISABLED"}, + {MENU_POPUPCHECK, MC_BULLETNORMAL, L"BULLETNORMAL"}, + {MENU_POPUPCHECK, MC_BULLETDISABLED, L"BULLETDISABLED"}, + {MENU_POPUPCHECKBACKGROUND, 0, L"POPUPCHECKBACKGROUND"}, + {MENU_POPUPCHECKBACKGROUND, MCB_DISABLED, L"DISABLED"}, + {MENU_POPUPCHECKBACKGROUND, MCB_NORMAL, L"NORMAL"}, + {MENU_POPUPCHECKBACKGROUND, MCB_BITMAP, L"BITMAP"}, + {MENU_POPUPGUTTER, 0, L"POPUPGUTTER"}, + {MENU_POPUPITEM, 0, L"POPUPITEM"}, + {MENU_POPUPITEM, MPI_NORMAL, L"NORMAL"}, + {MENU_POPUPITEM, MPI_HOT, L"HOT"}, + {MENU_POPUPITEM, MPI_DISABLED, L"DISABLED"}, + {MENU_POPUPITEM, MPI_DISABLEDHOT, L"DISABLEDHOT"}, + {MENU_POPUPSEPARATOR, 0, L"POPUPSEPARATOR"}, + {MENU_POPUPSUBMENU, 0, L"POPUPSUBMENU"}, + {MENU_POPUPSUBMENU, MSM_NORMAL, L"NORMAL"}, + {MENU_POPUPSUBMENU, MSM_DISABLED, L"DISABLED"}, + {MENU_SYSTEMCLOSE, 0, L"SYSTEMCLOSE"}, + {MENU_SYSTEMCLOSE, MSYSC_NORMAL, L"NORMAL"}, + {MENU_SYSTEMCLOSE, MSYSC_DISABLED, L"DISABLED"}, + {MENU_SYSTEMMAXIMIZE, 0, L"SYSTEMMAXIMIZE"}, + {MENU_SYSTEMMAXIMIZE, MSYSMX_NORMAL, L"NORMAL"}, + {MENU_SYSTEMMAXIMIZE, MSYSMX_DISABLED, L"DISABLED"}, + {MENU_SYSTEMMINIMIZE, 0, L"SYSTEMMINIMIZE"}, + {MENU_SYSTEMMINIMIZE, MSYSMN_NORMAL, L"NORMAL"}, + {MENU_SYSTEMMINIMIZE, MSYSMN_DISABLED, L"DISABLED"}, + {MENU_SYSTEMRESTORE, 0, L"SYSTEMRESTORE"}, + {MENU_SYSTEMRESTORE, MSYSR_NORMAL, L"NORMAL"}, + {MENU_SYSTEMRESTORE, MSYSR_DISABLED, L"DISABLED"}, + {0, 0, L""} +}; + static const MSSTYLES_CLASS_MAP classMenuband[] = { {MDP_NEWAPPBUTTON, 0, L"NEWAPPBUTTON"}, {MDP_NEWAPPBUTTON, MDS_NORMAL, L"NORMAL"}, @@ -1020,6 +1073,7 @@ static const MSSTYLES_CLASS_NAME mapClass[] = { {classExplorerbar, L"EXPLORERBAR"}, {classHeader, L"HEADER"}, {classListview, L"LISTVIEW"}, + {classMenu, L"MENU"}, {classMenuband, L"MENUBAND"}, {classPage, L"PAGE"}, {classProgress, L"PROGRESS"},

1 0

Zhiyi Zhang : light.msstyles: Add Menu parts.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 8fb2ae94365ea324d87a0874efbde11f68057cea URL: https://gitlab.winehq.org/wine/wine/-/commit/8fb2ae94365ea324d87a0874efbde1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 25 17:28:37 2022 +0800 light.msstyles: Add Menu parts. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53034 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b90662e695c512de1d4476d7ff15004e4f1e2497) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 8 ++ dlls/light.msstyles/blue_menu_popup_check_16px.bmp | Bin 0 -> 4234 bytes dlls/light.msstyles/blue_menu_popup_check_16px.svg | 9 ++ dlls/light.msstyles/blue_menu_popup_check_18px.bmp | Bin 0 -> 5322 bytes dlls/light.msstyles/blue_menu_popup_check_18px.svg | 9 ++ dlls/light.msstyles/blue_menu_popup_separator.bmp | Bin 0 -> 162 bytes dlls/light.msstyles/blue_menu_popup_separator.svg | 5 + dlls/light.msstyles/blue_menu_popup_submenu.bmp | Bin 0 -> 786 bytes dlls/light.msstyles/blue_menu_popup_submenu.svg | 9 ++ dlls/light.msstyles/blue_menu_system_close.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_close.svg | 5 + dlls/light.msstyles/blue_menu_system_maximize.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_maximize.svg | 5 + dlls/light.msstyles/blue_menu_system_minimize.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_minimize.svg | 5 + dlls/light.msstyles/blue_menu_system_restore.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_restore.svg | 15 ++ dlls/light.msstyles/light.rc | 154 +++++++++++++++++++++ 18 files changed, 224 insertions(+)

1 0

Alexandre Julliard : makefiles: Add install-test target to install winetest.exe.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 3237a368a49e699bc68d0dd1e60b506b51362058 URL: https://gitlab.winehq.org/wine/wine/-/commit/3237a368a49e699bc68d0dd1e60b50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 10:29:14 2022 +0200 makefiles: Add install-test target to install winetest.exe. Conflicts: tools/gitlab/build.yml (cherry picked from commit dbb55ed91aded087a6c0320a2f4ae7980200b1e3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winetest/Makefile.in | 2 +- tools/makedep.c | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index c4d505e4545..f82ba5ec438 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -19,4 +19,4 @@ EXTRA_OBJS = build.res EXTRA_TARGETS = build.nfo -INSTALL_LIB = none +INSTALL_TEST = winetest.exe diff --git a/tools/makedep.c b/tools/makedep.c index 86f96f5c5e8..e10ccc7bfc2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -119,9 +119,9 @@ static const struct static struct list files[HASH_SIZE]; -enum install_rules { INSTALL_LIB, INSTALL_DEV, NB_INSTALL_RULES }; -static const char *install_targets[NB_INSTALL_RULES] = { "install-lib", "install-dev" }; -static const char *install_variables[NB_INSTALL_RULES] = { "INSTALL_LIB", "INSTALL_DEV" }; +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" }; /* variables common to all makefiles */ static struct strarray linguas; @@ -3603,10 +3603,14 @@ static void output_subdirs( struct makefile *make ) for (j = 0; j < NB_INSTALL_RULES; j++) { if (!install_deps[j].count) continue; - output( "install %s::", install_targets[j] ); + if (strcmp( install_targets[j], "install-test" )) + { + output( "install " ); + strarray_add_uniq( &make->phony_targets, "install" ); + } + output( "%s::", install_targets[j] ); output_filenames( install_deps[j] ); output( "\n" ); - strarray_add_uniq( &make->phony_targets, "install" ); strarray_add_uniq( &make->phony_targets, install_targets[j] ); } output_uninstall_rules( make );

1 0

Alexandre Julliard : wininet/tests: Update WineHQ certificate.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 408a27e6f235cc82e13275b6c15b398469c36273 URL: https://gitlab.winehq.org/wine/wine/-/commit/408a27e6f235cc82e13275b6c15b39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 21:39:48 2022 +0200 wininet/tests: Update WineHQ certificate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 79f68cb35f251f8e165338bf6097261876ba2d1e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/tests/http.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index cf3f62f868a..dfe224fabd4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6286,12 +6286,9 @@ typedef struct { static const cert_struct_test_t test_winehq_org_cert = { "US\r\n" - "55114\r\n" "Minnesota\r\n" "Saint Paul\r\n" - "Ste 120\r\n" - "700 Raymond Ave\r\n" - "CodeWeavers\r\n" + "\"CodeWeavers, Inc.\"\r\n" "IT\r\n" "*.winehq.org",

1 0

Francois Gouget : inetmib1: Fix the IPv4 address network order for comparisons.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 43e9041e13ed1462bf0693d90d805e6b4d4b137d URL: https://gitlab.winehq.org/wine/wine/-/commit/43e9041e13ed1462bf0693d90d805e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 16 13:05:55 2022 +0100 inetmib1: Fix the IPv4 address network order for comparisons. compareUdpRow() was already performing the byte-swaps but compareIpAddrRow() and compareIpForwardRow() need them too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 631fde70b8da49de63eca1e161c9b0059b0ad61c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetmib1/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index f9ef113aad9..b3074c415b0 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -778,7 +778,7 @@ static int __cdecl DWORD_cmp(DWORD a, DWORD b) static int __cdecl compareIpAddrRow(const void *a, const void *b) { const MIB_IPADDRROW *rowA = a, *rowB = b; - return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); + return DWORD_cmp(ntohl(rowA->dwAddr), ntohl(rowB->dwAddr)); } static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -870,7 +870,7 @@ static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareIpForwardRow(const void *a, const void *b) { const MIB_IPFORWARDROW *rowA = a, *rowB = b; - return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest); + return DWORD_cmp(ntohl(rowA->dwForwardDest), ntohl(rowB->dwForwardDest)); } static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind,

1 0