wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Francois Gouget : inetmib1: Avoid overflows in IPv4 address comparisons.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 3cf123bf78b7bc9405254de9754b8ba9916b195c URL: https://gitlab.winehq.org/wine/wine/-/commit/3cf123bf78b7bc9405254de9754b8b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 16 13:05:48 2022 +0100 inetmib1: Avoid overflows in IPv4 address comparisons. The difference between two ULONGs may not fit in an int, causing comparison errors. 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 85c6caf65b43c289a84b062e761005b8d03d1e48) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetmib1/main.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 31dc4d5e8e2..f9ef113aad9 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -770,11 +770,15 @@ static void oidToIpAddrRow(AsnObjectIdentifier *oid, void *dst) row->dwAddr = oidToIpAddr(oid); } -static int __cdecl compareIpAddrRow(const void *a, const void *b) +static int __cdecl DWORD_cmp(DWORD a, DWORD b) { - const MIB_IPADDRROW *key = a, *value = b; + return a < b ? -1 : a > b ? 1 : 0; /* a subtraction would overflow */ +} - return key->dwAddr - value->dwAddr; +static int __cdecl compareIpAddrRow(const void *a, const void *b) +{ + const MIB_IPADDRROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); } static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -865,9 +869,8 @@ static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareIpForwardRow(const void *a, const void *b) { - const MIB_IPFORWARDROW *key = a, *value = b; - - return key->dwForwardDest - value->dwForwardDest; + const MIB_IPFORWARDROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest); } static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -1223,13 +1226,9 @@ static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareUdpRow(const void *a, const void *b) { - const MIB_UDPROW *key = a, *value = b; - int ret; - - ret = ntohl(key->dwLocalAddr) - ntohl(value->dwLocalAddr); - if (ret == 0) - ret = ntohs(key->dwLocalPort) - ntohs(value->dwLocalPort); - return ret; + const MIB_UDPROW *rowA = a, *rowB = b; + return DWORD_cmp(ntohl(rowA->dwLocalAddr), ntohl(rowB->dwLocalAddr)) || + ntohs(rowA->dwLocalPort) - ntohs(rowB->dwLocalPort); } static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind,

1 0

Alexandre Julliard : wininet/tests: Update WineHQ certificate.
by Alexandre Julliard 08 Nov '22

08 Nov '22

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

Alexandre Julliard : webservices/tests: Mark tests that fail on 64-bit as todo.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: ae008aec4690353ab2ab9ec8df7122078d2bffcf URL: https://gitlab.winehq.org/wine/wine/-/commit/ae008aec4690353ab2ab9ec8df7122… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:28:46 2022 +0200 webservices/tests: Mark tests that fail on 64-bit as todo. (cherry picked from commit c0c93d80173c1540accbf9638ba9d0826ada932e) Conflicts: dlls/webservices/tests/writer.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/webservices/tests/writer.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 1d769189014..0bf0a92dd0b 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2222,12 +2222,14 @@ static void test_text_types(void) static void test_double(void) { + static const BOOL is_win64 = sizeof(void*) > sizeof(int); WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; unsigned int fpword, fpword_orig; static const struct { double val; const char *result; + BOOL todo64; } tests[] = { @@ -2240,12 +2242,12 @@ static void test_double(void) {1.0000000000000004, "<t>1.0000000000000004</t>"}, {100000000000000, "<t>100000000000000</t>"}, {1000000000000000, "<t>1E+15</t>"}, - {0.1, "<t>0.1</t>"}, - {0.01, "<t>1E-2</t>"}, - {-0.1, "<t>-0.1</t>"}, - {-0.01, "<t>-1E-2</t>"}, - {1.7976931348623158e308, "<t>1.7976931348623157E+308</t>"}, - {-1.7976931348623158e308, "<t>-1.7976931348623157E+308</t>"}, + {0.1, "<t>0.1</t>", TRUE}, + {0.01, "<t>1E-2</t>", TRUE}, + {-0.1, "<t>-0.1</t>", TRUE}, + {-0.01, "<t>-1E-2</t>", TRUE}, + {1.7976931348623158e308, "<t>1.7976931348623157E+308</t>", TRUE}, + {-1.7976931348623158e308, "<t>-1.7976931348623157E+308</t>", TRUE}, }; HRESULT hr; WS_XML_WRITER *writer; @@ -2268,8 +2270,23 @@ static void test_double(void) ok( hr == S_OK, "%u: got %08x\n", i, hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); - check_output( writer, tests[i].result, __LINE__ ); + ok( hr == S_OK, "%u: got %#x\n", i, hr ); + if (tests[i].todo64 && is_win64) + { + WS_BYTES bytes; + ULONG size = sizeof(bytes); + int len = strlen( tests[i].result ); + HRESULT hr; + + memset( &bytes, 0, sizeof(bytes) ); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); + ok( hr == S_OK, "%u: got %#x\n", i, hr ); + todo_wine + ok( bytes.length == len && !memcmp( bytes.bytes, tests[i].result, len ), + "%u: got %u %s expected %d %s\n", i, bytes.length, + debugstr_bytes(bytes.bytes, bytes.length), len, tests[i].result ); + } + else check_output( writer, tests[i].result, __LINE__ ); } hr = set_output( writer );

1 0

Alexandre Julliard : urlmon/tests: Run tests against the gitlab server to avoid redirects.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: c0e76838dc6dc8fb3e40c8b656682c4f9fcfbf68 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0e76838dc6dc8fb3e40c8b656682c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 15:18:26 2022 +0200 urlmon/tests: Run tests against the gitlab server to avoid redirects. (cherry picked from commit 81e91afb36f014956db75d29f0dad334bf0f9e75) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/tests/url.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 2f2667cea2d..d465a9e8a7a 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -158,8 +158,8 @@ static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; -#define WINEHQ_IP "4.4.81.124" -static const WCHAR wszWineHQSite[] = L"www.winehq.org"; +#define WINEHQ_IP "4.4.81.126" +static const WCHAR wszWineHQSite[] = L"gitlab.winehq.org"; static const WCHAR wszWineHQIP[] = L"" WINEHQ_IP; static const CHAR wszIndexHtmlA[] = "index.html"; static const WCHAR cache_fileW[] = {'c',':','\\','c','a','c','h','e','.','h','t','m',0};

1 0

Alexandre Julliard : secur32/tests: Update for new WineHQ certificate.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: fbeb7b006ca2ee86aad2a2c896bf3ee4fa4b620b URL: https://gitlab.winehq.org/wine/wine/-/commit/fbeb7b006ca2ee86aad2a2c896bf3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 21:41:38 2022 +0200 secur32/tests: Update for new WineHQ certificate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 02eae36ec861a4133d66035b623dfd81242990c0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 7cb3871193c..cea5dad06ff 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -566,7 +566,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Alexandre Julliard : ntdll/tests: Fix affinity test when there are too many CPUs.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: a79b0d4bcccdd9570195133239be6b95657c9d69 URL: https://gitlab.winehq.org/wine/wine/-/commit/a79b0d4bcccdd9570195133239be6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:54:24 2022 +0200 ntdll/tests: Fix affinity test when there are too many CPUs. (cherry picked from commit 3c9c1ffdba637f11681cda26b8205db9d6316134) Conflicts: dlls/ntdll/tests/info.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/info.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5bcccd8a322..1fc3b38f00b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2947,11 +2947,13 @@ static void test_affinity(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); proc_affinity = pbi.AffinityMask; ok( proc_affinity == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected process affinity\n" ); - proc_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; - status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); - ok( status == STATUS_INVALID_PARAMETER, - "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); - + if (si.dwNumberOfProcessors < 8 * sizeof(DWORD_PTR)) + { + proc_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); + ok( status == STATUS_INVALID_PARAMETER, + "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + } proc_affinity = 0; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); ok( status == STATUS_INVALID_PARAMETER, @@ -2960,10 +2962,13 @@ static void test_affinity(void) status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected thread affinity\n" ); - thread_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; - status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); - ok( status == STATUS_INVALID_PARAMETER, - "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + if (si.dwNumberOfProcessors < 8 * sizeof(DWORD_PTR)) + { + thread_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; + status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); + ok( status == STATUS_INVALID_PARAMETER, + "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + } thread_affinity = 0; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); ok( status == STATUS_INVALID_PARAMETER,

1 0

Alexandre Julliard : kernel32/tests: Fix affinity test when there are too many CPUs.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: a2b7d799dfb7b8c4adff64a8d347729421846616 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2b7d799dfb7b8c4adff64a8d34772… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:53:50 2022 +0200 kernel32/tests: Fix affinity test when there are too many CPUs. (cherry picked from commit 5314fac5b77ef7d6b157e975b90ec094d4353db8) Conflicts: dlls/kernel32/tests/thread.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/thread.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index e9fd90b1889..bbff60ab596 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -954,12 +954,15 @@ static VOID test_thread_processor(void) affinity_new.Mask, affinity.Mask); /* show that the "all processors" flag is not supported for SetThreadGroupAffinity */ - affinity_new.Group = 0; - affinity_new.Mask = ~0u; - SetLastError(0xdeadbeef); - ok(!pSetThreadGroupAffinity(curthread, &affinity_new, NULL), "SetThreadGroupAffinity succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + if (sysInfo.dwNumberOfProcessors < 8 * sizeof(DWORD_PTR)) + { + affinity_new.Group = 0; + affinity_new.Mask = ~(DWORD_PTR)0; + SetLastError(0xdeadbeef); + ok(!pSetThreadGroupAffinity(curthread, &affinity_new, NULL), "SetThreadGroupAffinity succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } affinity_new.Group = 1; /* assumes that you have less than 64 logical processors */ affinity_new.Mask = 0x1;

1 0

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: e41dd49f36548a174b8fa637a18efa356985e110 URL: https://gitlab.winehq.org/wine/wine/-/commit/e41dd49f36548a174b8fa637a18efa… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sun Aug 14 17:34:30 2022 +0300 readme: Update Finnish translation. (cherry picked from commit 41274a09737f59b8c4e471c915e50510db7bebf8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.fi | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi index e459bbc779a..00af959c033 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -146,6 +146,8 @@ Kysymyksiä: Wiki: Wine Wiki on osoitteessa https://wiki.winehq.org/. +Gitlab: Winen kehitykseen voi osallistua sivustolla https://gitlab.winehq.org + Postituslistat: Winen käyttäjille ja kehittäjille on joitakin postituslistoja, sivulla https://www.winehq.org/forums kerrotaan niistä lisää. @@ -157,14 +159,6 @@ Virheet: IRC: Online-apua voi saada kanavalta #WineHQ palvelimella irc.libera.chat. -Git: Winen tämänhetkinen kehitysversio on jaossa Git-järjestelmän kautta. - Sivulla https://www.winehq.org/git kerrotaan tästä lisää. - - -Jos lisäät jotain tai korjaat jonkin virheen, lähetä toki muutoksesi -(mieluiten komennon git-format-patch avulla) listalle wine-devel(a)winehq.org, -jotta se voidaan lisätä Winen seuraavaan versioon. - -- Alkuperäisen version tekstistä on kirjoittanut Alexandre Julliard

1 0

Alexandre Julliard : readme: Mention Gitlab.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 9035ed965177645eac1df98fcecb38fb19d76d0b URL: https://gitlab.winehq.org/wine/wine/-/commit/9035ed965177645eac1df98fcecb38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 19:51:42 2022 +0200 readme: Mention Gitlab. (cherry picked from commit 3253cbd8691e924ea7f49053ee1af49c612b2111) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- README | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/README b/README index afcbbd48220..2d754da4b82 100644 --- a/README +++ b/README @@ -151,6 +151,8 @@ FAQ: The Wine FAQ is located at https://www.winehq.org/FAQ Wiki: The Wine Wiki is located at https://wiki.winehq.org +Gitlab: Wine development is hosted at https://gitlab.winehq.org + Mailing lists: There are several mailing lists for Wine users and developers; see https://www.winehq.org/forums for more information. @@ -161,13 +163,6 @@ Bugs: Report bugs to Wine Bugzilla at https://bugs.winehq.org IRC: Online help is available at channel #WineHQ on irc.libera.chat. -Git: The current Wine development tree is available through Git. - Go to https://www.winehq.org/git for more information. - -If you add something, or fix a bug, please send a patch (preferably -using git-format-patch) to the wine-devel(a)winehq.org list for -inclusion in the next release. - -- Alexandre Julliard julliard(a)winehq.org

1 0

Zhiyi Zhang : light.msstyles: Use stretch sizing type for scroll bar arrow button background.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: bbe9da6669fc354fced8b50cba5fe9d581e57528 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbe9da6669fc354fced8b50cba5fe9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:14:16 2022 +0800 light.msstyles: Use stretch sizing type for scroll bar arrow button background. Scroll bar arrow button background within its sizing margins is all white, using stretch instead of tile has no visual difference and is more efficient. On Windows, stretch sizing type is also used for this part. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3acf12b8676c15be52ac4c4145112f0c0c646559) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/light.msstyles/light.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 38b5ac1377b..5e9e24ab5df 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -611,7 +611,7 @@ BLUE_INI TEXTFILE "BgType = ImageFile\r\n" "SizingMargins = 5, 5, 5, 5\r\n" "ContentMargins = 0, 0, 3, 3\r\n" -"SizingType = Tile\r\n" +"SizingType = Stretch\r\n" "ImageFile = blue_scrollbar_arrows.bmp\r\n" "ImageCount = 16\r\n" "ImageLayout = Vertical\r\n"

1 0

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 November 2022