Windows would normally have .Net strings that follow but Wine does not in 64-bit mode. Still the formatting makes sense so allow it.
Signed-off-by: Francois Gouget fgouget@codeweavers.com --- This fixes a test failure in Wine in wow64 mode. https://test.winehq.org/data/patterns.html#urlmon:misc https://testbot.winehq.org/JobDetails.pl?Key=89589
An alternative would be to turn it into a todo if i == 1. --- dlls/urlmon/tests/misc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 2b3df65d5fc..5b179b55770 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1544,7 +1544,9 @@ static void test_user_agent(void) }else if(sizeof(void*) == 8) { p += check_prefix(p, "Win64; "); #ifdef __x86_64__ - p += check_prefix(p, "x64; "); + p += check_prefix(p, "x64"); + if (*p == ';') + p += check_prefix(p, "; "); #endif } if(i != 1) {
On 4/30/21 9:11 AM, Francois Gouget wrote:
Windows would normally have .Net strings that follow but Wine does not in 64-bit mode. Still the formatting makes sense so allow it.
Why does it make sense to allow it? Those .net strings are always present on Windows, so this test just found a bug in Wine Mono installer: it's missing 64-bit version of 'Post Platform' registries. Ideally we should fix it in Wine Mono. We could have something like your patch meantime, but I think it would be better to have a todo_wine in that case.
Thanks, Jacek
On Sat, 1 May 2021, Jacek Caban wrote:
On 4/30/21 9:11 AM, Francois Gouget wrote:
Windows would normally have .Net strings that follow but Wine does not in 64-bit mode. Still the formatting makes sense so allow it.
Why does it make sense to allow it?
Because I consider .Net to be an optional Windows components. But while that may have been true in the XP or older days it does not seem to be nowadays.
So I'll send a patch adding a todo.
Those .net strings are always present on Windows, so this test just found a bug in Wine Mono installer: it's missing 64-bit version of 'Post Platform' registries. Ideally we should fix it in Wine Mono.
Esme, is this hard to fix?
There are some missing 64-bit registry settings causing obtain_user_agent() in urlmon/session.c to not include .Net in the 64-bit user-agent string.
misc.c:1527: i=1 Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Win64; x64)
instead of the following in 32-bit:
misc.c:1527: i=1 Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; .NET CLR 2.0.50727; .NET CLR 3.0.30729; .NET CLR 3.5.30729; .NET4.0C; .NET4.0E)
-
Francois Gouget -
Jacek Caban