wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 27da4fa4498c3b6e0e46c72a9cdd13b620726e92.

Browse Source
This commit is contained in:
Zebediah Figura 2019-09-20 17:04:56 -05:00
parent c0389b0479
commit 7c57b6eba4
4 changed files with 9 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "e6138a52a907fe4b9b03abe0b6cf6cfb9fbc886b"
echo "27da4fa4498c3b6e0e46c72a9cdd13b620726e92"
}
# Show version information
@ -314,7 +314,6 @@ patch_enable_all ()
enable_wine_inf_Dummy_CA_Certificate="$1"
enable_wine_inf_Performance="$1"
enable_wine_inf_ProfileList_UserSID="$1"
enable_wine_inf_WMP_12="$1"
enable_wineboot_DriveSerial="$1"
enable_wineboot_HKEY_DYN_DATA="$1"
enable_wineboot_ProxySettings="$1"
@ -1072,9 +1071,6 @@ patch_enable ()
wine.inf-ProfileList_UserSID)
enable_wine_inf_ProfileList_UserSID="$2"
;;
wine.inf-WMP_12)
enable_wine_inf_WMP_12="$2"
;;
wineboot-DriveSerial)
enable_wineboot_DriveSerial="$2"
;;
@ -6684,21 +6680,6 @@ if test "$enable_wine_inf_ProfileList_UserSID" -eq 1; then
) >> "$patchlist"
fi
# Patchset wine.inf-WMP_12
# |
# | This patchset fixes the following Wine bugs:
# | * [#47779] iCloud refuses to install: "Your computer is missing Media features."
# |
# | Modified files:
# | * loader/wine.inf.in
# |
if test "$enable_wine_inf_WMP_12" -eq 1; then
patch_apply wine.inf-WMP_12/0001-wine.inf-Add-WMP-12-as-installed-windows-feature.patch
(
printf '%s\n' '+ { "Michael Müller", "wine.inf: Add WMP 12 as installed windows feature.", 1 },';
) >> "$patchlist"
fi
# Patchset wineboot-DriveSerial
# |
# | This patchset fixes the following Wine bugs:

25
patches/wine.inf-WMP_12/0001-wine.inf-Add-WMP-12-as-installed-windows-feature.patch
View File

@ -1,25 +0,0 @@
From 2ae1a26958e521ade74525d8f001d065138fb5f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 25 Feb 2016 15:21:56 +0100
Subject: wine.inf: Add WMP 12 as installed windows feature.
---
loader/wine.inf.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index d22b29b..717da09 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -474,6 +474,8 @@ HKLM,%CurrentVersion%\PreviewHandlers,,16
HKLM,%CurrentVersion%\Run,,16
HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%"
HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%"
+HKLM,%CurrentVersion%\Setup\WindowsFeatures\WindowsMediaVersion,,,"12.0.7601.18840"
+HKLM,%CurrentVersion%\Setup\WindowsFeatures\WindowsMediaVersion,"Version",1,00,00,0c,00,98,49,b1,1d
HKLM,%CurrentVersion%\Shell Extensions\Approved,,16
HKLM,%CurrentVersion%\Uninstall,,16
HKLM,%CurrentVersion%\Winlogon,,16
--
2.7.1

1
patches/wine.inf-WMP_12/definition
View File

@ -1 +0,0 @@
Fixes: [47779] iCloud refuses to install: "Your computer is missing Media features."

16
patches/wininet-Cleanup/0001-wininet-tests-Add-more-tests-for-cookies.patch
View File

@ -1,4 +1,4 @@
From fa5a5b2fd598b7b6f471a9479c5f2a9c684d05f5 Mon Sep 17 00:00:00 2001
From 915a805cabaec3cc265f4f8ad9f0005502f8fd24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 15 May 2015 20:37:19 +0200
Subject: [PATCH] wininet/tests: Add more tests for cookies.
@ -8,7 +8,7 @@ Subject: [PATCH] wininet/tests: Add more tests for cookies.
1 file changed, 89 insertions(+), 3 deletions(-)
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index fcbd95b8376..b06bd6c04d1 100644
index 90a38dc3a..55d51b299 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -2068,6 +2068,14 @@ static const char largemsg[] =
@ -26,9 +26,9 @@ index fcbd95b8376..b06bd6c04d1 100644
static const char notokmsg[] =
"HTTP/1.1 400 Bad Request\r\n"
"Server: winetest\r\n"
@@ -2431,6 +2439,32 @@ static DWORD CALLBACK server_thread(LPVOID param)
@@ -2438,6 +2446,32 @@ static DWORD CALLBACK server_thread(LPVOID param)
else
send(c, notokmsg, sizeof notokmsg-1, 0);
send(c, noauthmsg, sizeof noauthmsg-1, 0);
}
+ if (strstr(buffer, "/test_cookie_path1"))
+ {
@ -59,7 +59,7 @@ index fcbd95b8376..b06bd6c04d1 100644
if (strstr(buffer, "/test_host_override"))
{
if (strstr(buffer, host_header_override))
@@ -3809,7 +3843,7 @@ static void test_cookie_header(int port)
@@ -3816,7 +3850,7 @@ static void test_cookie_header(int port)
HINTERNET ses, con, req;
DWORD size, error;
BOOL ret;
@ -68,7 +68,7 @@ index fcbd95b8376..b06bd6c04d1 100644
ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0);
ok(ses != NULL, "InternetOpen failed\n");
@@ -3837,7 +3871,7 @@ static void test_cookie_header(int port)
@@ -3844,7 +3878,7 @@ static void test_cookie_header(int port)
size = sizeof(buffer);
ret = HttpQueryInfoA(req, HTTP_QUERY_COOKIE | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL);
ok(ret, "HttpQueryInfo failed: %u\n", GetLastError());
@ -77,7 +77,7 @@ index fcbd95b8376..b06bd6c04d1 100644
ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
ok(ret, "HttpSendRequest failed: %u\n", GetLastError());
@@ -3848,9 +3882,61 @@ static void test_cookie_header(int port)
@@ -3855,9 +3889,61 @@ static void test_cookie_header(int port)
size = sizeof(buffer);
ret = HttpQueryInfoA(req, HTTP_QUERY_COOKIE | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL);
ok(ret, "HttpQueryInfo failed: %u\n", GetLastError());
@ -141,5 +141,5 @@ index fcbd95b8376..b06bd6c04d1 100644
InternetCloseHandle(ses);
}
--
2.17.1
2.23.0