wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against bdaa571c5d7dd59dd28fd1f25cdad5761bfaf4dd.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-08-25 22:44:50 +02:00
parent 574959b168
commit 5aa6e7afe4
36 changed files with 184 additions and 3124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -53,7 +53,7 @@ releases, take a look at the
[changelog](https://github.com/wine-compholio/wine-staging/blob/master/debian/changelog)
for more details.*
* Add HTTP Host header in HttpSendRequest instead of HttpOpenRequest ([Wine Bug #28911](https://bugs.winehq.org/show_bug.cgi?id=28911))
* ~~Add HTTP Host header in HttpSendRequest instead of HttpOpenRequest~~ ([Wine Bug #28911](https://bugs.winehq.org/show_bug.cgi?id=28911))
* Add IDragSourceHelper stub interface ([Wine Bug #24699](https://bugs.winehq.org/show_bug.cgi?id=24699))
* Add a ProfileList\<UserSID> registry subkey ([Wine Bug #15670](https://bugs.winehq.org/show_bug.cgi?id=15670))
* Add implementation for mfplat.MFTRegister ([Wine Bug #37811](https://bugs.winehq.org/show_bug.cgi?id=37811))
@ -213,7 +213,7 @@ for more details.*
* MediaCoder needs CUDA for video encoding ([Wine Bug #37664](https://bugs.winehq.org/show_bug.cgi?id=37664))
* Multiple applications need EnumDisplayDevicesW implementation ([Wine Bug #34978](https://bugs.winehq.org/show_bug.cgi?id=34978))
* Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](https://bugs.winehq.org/show_bug.cgi?id=7115))
* Notepad should create new files immediately ([Wine Bug #19425](https://bugs.winehq.org/show_bug.cgi?id=19425))
* ~~Notepad should create new files immediately~~ ([Wine Bug #19425](https://bugs.winehq.org/show_bug.cgi?id=19425))
* Only set SFGAO_HASSUBFOLDER when there are really subfolders ([Wine Bug #24851](https://bugs.winehq.org/show_bug.cgi?id=24851))
* Other Pipelight-specific enhancements
* Port Royale doesn't display ocean correctly ([Wine Bug #17913](https://bugs.winehq.org/show_bug.cgi?id=17913))

6
debian/changelog vendored
View File

@ -10,6 +10,12 @@ wine-staging (1.7.51) UNRELEASED; urgency=low
* Removed patch to fix test failure in kernel32/thread tests (fixed upstream).
* Removed patch to use request->server->name when processing cookies
(identical patch accepted upstream).
* Removed patch to set Host header in HttpSendRequest instead of
HttpOpenRequest (accepted upstream).
* Removed patch to make sure Notepad creates new files immediately (accepted
upstream).
* Partially removed patches for stub dlls required by the MSVC 2015 runtime
library (accepted upstream).
-- Sebastian Lackner <sebastian@fds-team.de> Mon, 24 Aug 2015 07:55:18 +0200
wine-staging (1.7.50) unstable; urgency=low

2624
patches/api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Add-the-new-universal-CRT-DLL.patch
View File

File diff suppressed because it is too large Load Diff

23
patches/api-ms-win-crt-Stub_DLLs/0002-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch → patches/api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch
View File

@ -1,4 +1,4 @@
From a8d6331370eb45eef60eb3348e342288344fa622 Mon Sep 17 00:00:00 2001
From 15ae58e5e7a33fa53a1dcb66e916d747db8a09d2 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:01 +0300
Subject: ucrtbase: Hook up some functions with new names to existing
@ -7,14 +7,14 @@ Subject: ucrtbase: Hook up some functions with new names to existing
These are some functions that on a first glance seem to have a
matching signature even though the name has changed.
---
dlls/ucrtbase/ucrtbase.spec | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
dlls/ucrtbase/ucrtbase.spec | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index a1be10d..bcbfeaa 100644
index d6516d7..a7a7718 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -203,7 +203,7 @@
@@ -211,7 +211,7 @@
@ cdecl _c_exit() MSVCRT__c_exit
@ cdecl _cabs(long) MSVCRT__cabs
@ cdecl _callnewh(long)
@ -23,7 +23,7 @@ index a1be10d..bcbfeaa 100644
@ cdecl _cexit() MSVCRT__cexit
@ cdecl _cgets(ptr)
@ stub _cgets_s
@@ -233,7 +233,7 @@
@@ -241,7 +241,7 @@
@ cdecl _creat(str long) MSVCRT__creat
@ cdecl _create_locale(long str) MSVCRT__create_locale
@ stub _crt_at_quick_exit
@ -32,7 +32,7 @@ index a1be10d..bcbfeaa 100644
@ stub _crt_debugger_hook
@ cdecl _ctime32(ptr) MSVCRT__ctime32
@ cdecl _ctime32_s(str long ptr) MSVCRT__ctime32_s
@@ -323,7 +323,7 @@
@@ -333,7 +333,7 @@
@ cdecl _fputwchar(long) MSVCRT__fputwchar
@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
@ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s
@ -41,7 +41,7 @@ index a1be10d..bcbfeaa 100644
@ cdecl _free_locale(ptr) MSVCRT__free_locale
@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock
@ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64
@@ -566,7 +566,7 @@
@@ -580,7 +580,7 @@
@ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s
@ cdecl _makepath(ptr str str str str) MSVCRT__makepath
@ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s
@ -50,7 +50,7 @@ index a1be10d..bcbfeaa 100644
@ cdecl _mbbtombc(long)
@ stub _mbbtombc_l
@ cdecl _mbbtype(long long)
@@ -1842,16 +1842,15 @@
@@ -1881,15 +1881,15 @@
@ stdcall -arch=i386 _seh_longjmp_unwind(ptr)
@ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable
@ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior
@ -62,14 +62,13 @@ index a1be10d..bcbfeaa 100644
@ cdecl _set_error_mode(long)
@ cdecl _set_fmode(long) MSVCRT__set_fmode
@ cdecl _set_invalid_parameter_handler(ptr)
-@ stub -arch=win32 ?_set_new_handler@@YAP6AHI@ZH@Z # int(__cdecl*__cdecl _set_new_handler(int))(unsigned int)
-@ stub -arch=win64 ?_set_new_handler@@YAP6AH_K@ZH@Z # int(__cdecl*__cdecl _set_new_handler(int))(unsigned __int64)
-@ stub _set_new_handler
-@ stub _set_new_mode
+@ cdecl _set_new_handler(ptr) MSVCRT_set_new_handler
+@ cdecl _set_new_mode(long) MSVCRT__set_new_mode
@ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
@ cdecl _set_purecall_handler(ptr)
@ stub -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH@Z # void(__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS *)
@ stub _set_se_translator
--
2.5.0

6
patches/api-ms-win-crt-Stub_DLLs/0003-vcruntime140-Add-the-new-MSVC-2015-compiler-specific.patch → patches/api-ms-win-crt-Stub_DLLs/0002-vcruntime140-Add-the-new-MSVC-2015-compiler-specific.patch
View File

@ -1,4 +1,4 @@
From 4c5f9bb07041f41bae05c4e6487f0ba6a5456099 Mon Sep 17 00:00:00 2001
From 5bf6e56850354195aec9ec1146e3f82a0b2bcfdb Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:02 +0300
Subject: vcruntime140: Add the new MSVC 2015 compiler specific DLL.
@ -20,10 +20,10 @@ msvcrt.
create mode 100644 dlls/vcruntime140/vcruntime140.spec
diff --git a/configure.ac b/configure.ac
index 0a93a00..e6817bb 100644
index ed1052c..16d87ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3327,6 +3327,7 @@ WINE_CONFIG_TEST(dlls/vcomp/tests)
@@ -3328,6 +3328,7 @@ WINE_CONFIG_TEST(dlls/vcomp/tests)
WINE_CONFIG_DLL(vcomp100)
WINE_CONFIG_DLL(vcomp110)
WINE_CONFIG_DLL(vcomp90)

2
patches/api-ms-win-crt-Stub_DLLs/0004-vcruntime140-Hook-up-a-function-with-a-new-name-to-t.patch → patches/api-ms-win-crt-Stub_DLLs/0003-vcruntime140-Hook-up-a-function-with-a-new-name-to-t.patch
View File

@ -1,4 +1,4 @@
From af073a4d16fe89994017690db5a719940e66534b Mon Sep 17 00:00:00 2001
From 3d3dd8491369119ee0dea8ec571b917f8613910a Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:03 +0300
Subject: vcruntime140: Hook up a function with a new name to the existing

10
patches/api-ms-win-crt-Stub_DLLs/0005-ucrtbase-Add-stub-functions-for-narrow-environment.patch → patches/api-ms-win-crt-Stub_DLLs/0004-ucrtbase-Add-stub-functions-for-narrow-environment.patch
View File

@ -1,4 +1,4 @@
From dd7c7b7b6225700204da16f150524c2fbe4f1536 Mon Sep 17 00:00:00 2001
From f06ecd78dedb3c2beaa5f36a812ee78afa04ec74 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:04 +0300
Subject: ucrtbase: Add stub functions for narrow environment
@ -47,10 +47,10 @@ index e6989f1..7b6216d 100644
+ return 0;
+}
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index bcbfeaa..1ab1d7b 100644
index a7a7718..0f2a082 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -221,7 +221,7 @@
@@ -229,7 +229,7 @@
@ cdecl _close(long) MSVCRT__close
@ cdecl _commit(long) MSVCRT__commit
@ cdecl _configthreadlocale(long)
@ -59,7 +59,7 @@ index bcbfeaa..1ab1d7b 100644
@ stub _configure_wide_argv
@ cdecl _control87(long long)
@ cdecl _controlfp(long long)
@@ -354,7 +354,7 @@
@@ -365,7 +365,7 @@
@ cdecl _get_errno(ptr)
@ cdecl _get_fmode(ptr) MSVCRT__get_fmode
@ cdecl _get_heap_handle()
@ -68,7 +68,7 @@ index bcbfeaa..1ab1d7b 100644
@ stub _get_initial_wide_environment
@ cdecl _get_invalid_parameter_handler()
@ stub _get_narrow_winmain_command_line
@@ -407,7 +407,7 @@
@@ -418,7 +418,7 @@
@ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s
@ cdecl _i64tow(int64 ptr long) ntdll._i64tow
@ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s

2
patches/api-ms-win-crt-Stub_DLLs/0006-vcruntime140-Add-stubs-for-telemetry-functions.patch → patches/api-ms-win-crt-Stub_DLLs/0005-vcruntime140-Add-stubs-for-telemetry-functions.patch
View File

@ -1,4 +1,4 @@
From 8addd3884ce995b5d993a701ca5e1384fc234531 Mon Sep 17 00:00:00 2001
From 00e2e0a38d5ef81502d35a5aa3f62cb4ed834488 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:05 +0300
Subject: vcruntime140: Add stubs for telemetry functions

2
patches/api-ms-win-crt-Stub_DLLs/0007-make_specfiles-Use-cdecl-for-stub-redirects-to-ucrtb.patch → patches/api-ms-win-crt-Stub_DLLs/0006-make_specfiles-Use-cdecl-for-stub-redirects-to-ucrtb.patch
View File

@ -1,4 +1,4 @@
From 5041ce059770502a5d39223adaf2413475f201ec Mon Sep 17 00:00:00 2001
From b47092c85b03f1cbea95408f7472587c0ad93253 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:06 +0300
Subject: make_specfiles: Use cdecl for stub redirects to ucrtbase, just like

4
patches/api-ms-win-crt-Stub_DLLs/0008-api-ms-win-crt-conio-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0007-api-ms-win-crt-conio-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From 242996c2824aca4beea47e9f7c2fb698a0fc5386 Mon Sep 17 00:00:00 2001
From d62f0baa87e0b93524f0b74dadbd050210b17a42 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:07 +0300
Subject: api-ms-win-crt-conio-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-conio-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-conio-l1-1-0/api-ms-win-crt-conio-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index e6817bb..a1f38d6 100644
index 16d87ac..f414a6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2755,6 +2755,7 @@ WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1)

4
patches/api-ms-win-crt-Stub_DLLs/0009-api-ms-win-crt-convert-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0008-api-ms-win-crt-convert-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From c47fba8bb1e415834128dc16d812b222eacc087b Mon Sep 17 00:00:00 2001
From d6d651c0b25aab5d5a0dbb712e94868fbae067ae Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:08 +0300
Subject: api-ms-win-crt-convert-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-convert-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index a1f38d6..6cf2939 100644
index f414a6d..2b1e683 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2756,6 +2756,7 @@ WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0)

4
patches/api-ms-win-crt-Stub_DLLs/0010-api-ms-win-crt-environment-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0009-api-ms-win-crt-environment-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From 590d6ec37998f47cf3db2dc1c946d79942a81eb7 Mon Sep 17 00:00:00 2001
From 43151558574497be780735559f3c5117f8eef890 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:09 +0300
Subject: api-ms-win-crt-environment-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-environment-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-environment-l1-1-0/api-ms-win-crt-environment-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 6cf2939..73188cf 100644
index 2b1e683..126bc4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2757,6 +2757,7 @@ WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0)

4
patches/api-ms-win-crt-Stub_DLLs/0011-api-ms-win-crt-filesystem-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0010-api-ms-win-crt-filesystem-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From fa2b9196dae1cfe2ab52803bdc1704c504a4e2dc Mon Sep 17 00:00:00 2001
From 9d5d1c6825e39a3f06b71a4aa4fd2c908526d255 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:10 +0300
Subject: api-ms-win-crt-filesystem-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-filesystem-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 73188cf..47abb05 100644
index 126bc4e..f6fc051 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2758,6 +2758,7 @@ WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0)

4
patches/api-ms-win-crt-Stub_DLLs/0012-api-ms-win-crt-heap-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0011-api-ms-win-crt-heap-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From 3c9db1f1b8250c38cd78d6eee4167effb93fe9b3 Mon Sep 17 00:00:00 2001
From 50f23a4a1e8385d13628dc40b4f59bd6c3a92800 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:11 +0300
Subject: api-ms-win-crt-heap-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-heap-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 47abb05..f439add 100644
index f6fc051..625547e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2759,6 +2759,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-conio-l1-1-0)

4
patches/api-ms-win-crt-Stub_DLLs/0013-api-ms-win-crt-locale-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0012-api-ms-win-crt-locale-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From e9a3823a4db6c5eae002c677558e78c5f7005496 Mon Sep 17 00:00:00 2001
From c5b365b792e1bec24faefd423436862a6867483a Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:12 +0300
Subject: api-ms-win-crt-locale-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-locale-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index f439add..93e34b8 100644
index 625547e..458a7e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2760,6 +2760,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-convert-l1-1-0)

4
patches/api-ms-win-crt-Stub_DLLs/0014-api-ms-win-crt-math-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0013-api-ms-win-crt-math-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From 92e21c2e69ec3cfc88c1dfe1d92dcbfd5b901f71 Mon Sep 17 00:00:00 2001
From d9f8a6f3b575b2b3ac3a35f6a4d978b7dd7a5730 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:13 +0300
Subject: api-ms-win-crt-math-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-math-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 93e34b8..c06487e 100644
index 458a7e4..1ee611f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2761,6 +2761,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-environment-l1-1-0)

4
patches/api-ms-win-crt-Stub_DLLs/0015-api-ms-win-crt-multibyte-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0014-api-ms-win-crt-multibyte-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From 6793be9a3e812303ef1cd40d7236894fa08a6f66 Mon Sep 17 00:00:00 2001
From dee2c12b995d7cdf2d0779711c163641b447a049 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:14 +0300
Subject: api-ms-win-crt-multibyte-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-multibyte-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index c06487e..3484091 100644
index 1ee611f..b9855ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2762,6 +2762,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-filesystem-l1-1-0)

4
patches/api-ms-win-crt-Stub_DLLs/0016-api-ms-win-crt-private-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0015-api-ms-win-crt-private-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From 665dd4d94ddfcd0459994baf2945303725294989 Mon Sep 17 00:00:00 2001
From 746c7b93c8618fcbb3d085ff34bc527f20741fb2 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:15 +0300
Subject: api-ms-win-crt-private-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-private-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 3484091..9cf2158 100644
index b9855ed..2853538 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2763,6 +2763,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-heap-l1-1-0)

4
patches/api-ms-win-crt-Stub_DLLs/0017-api-ms-win-crt-process-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0016-api-ms-win-crt-process-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From f2f8aed4e38d19d33a63ce843b452fb88471a889 Mon Sep 17 00:00:00 2001
From 8e63ecbc4889eaa894e550bbb1e2ac804269de67 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:16 +0300
Subject: api-ms-win-crt-process-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-process-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-process-l1-1-0/api-ms-win-crt-process-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 9cf2158..f35ab71 100644
index 2853538..2560994 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2764,6 +2764,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-locale-l1-1-0)

4
patches/api-ms-win-crt-Stub_DLLs/0018-api-ms-win-crt-runtime-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0017-api-ms-win-crt-runtime-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From 20be096fcfa0ffaba988ab4eb6fad318c4a0f046 Mon Sep 17 00:00:00 2001
From cc7ad5c0a1b87dae7fbb3e73c2c1605d68970d8d Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:17 +0300
Subject: api-ms-win-crt-runtime-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-runtime-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index f35ab71..0b2be08 100644
index 2560994..6f36334 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2765,6 +2765,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-math-l1-1-0)

4
patches/api-ms-win-crt-Stub_DLLs/0019-api-ms-win-crt-stdio-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0018-api-ms-win-crt-stdio-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From 9c9b81b04f69cb93f948ba6d7e6ad8dc85bc0604 Mon Sep 17 00:00:00 2001
From 7ef77c382d1ac0a07b8c8ce575d01d43cec4975b Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:18 +0300
Subject: api-ms-win-crt-stdio-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-stdio-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 0b2be08..f39153e 100644
index 6f36334..4aeed6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2766,6 +2766,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-multibyte-l1-1-0)

4
patches/api-ms-win-crt-Stub_DLLs/0020-api-ms-win-crt-string-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0019-api-ms-win-crt-string-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From fedde420b260fdbc99453d09474ce61db3be2acb Mon Sep 17 00:00:00 2001
From 416258ddf02da79531a2f55683bcc988072cfdb5 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:19 +0300
Subject: api-ms-win-crt-string-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-string-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index f39153e..5d52949 100644
index 4aeed6c..1ed138f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2767,6 +2767,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-private-l1-1-0)

4
patches/api-ms-win-crt-Stub_DLLs/0021-api-ms-win-crt-time-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0020-api-ms-win-crt-time-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From 140404f0112b83949a5665e989388cd2403f558c Mon Sep 17 00:00:00 2001
From 1498586964a9b0652620a4d37f6cb80fd15e63eb Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:20 +0300
Subject: api-ms-win-crt-time-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-time-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 5d52949..b826d63 100644
index 1ed138f..d31086b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2768,6 +2768,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-process-l1-1-0)

4
patches/api-ms-win-crt-Stub_DLLs/0022-api-ms-win-crt-utility-l1-1-0-Add-stub-dll.patch → patches/api-ms-win-crt-Stub_DLLs/0021-api-ms-win-crt-utility-l1-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From aa62f276c14b80649d60d9c25f84d1a242758f4a Mon Sep 17 00:00:00 2001
From 2f7c095d927cb3d84ad47fdd74e5c0f7c9579d4d Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:21 +0300
Subject: api-ms-win-crt-utility-l1-1-0: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-crt-utility-l1-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index b826d63..9bb0a22 100644
index d31086b..2a1dcd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2769,6 +2769,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-runtime-l1-1-0)

19
patches/d3dx9_36-DDS/0001-d3dx9_36-Fix-several-issues-in-save_dds_surface_to_m.patch
View File

@ -1,4 +1,4 @@
From 85bb1e11795df868ab19f6b40b07036f2922eba4 Mon Sep 17 00:00:00 2001
From 226f9f6bd5622c18ec4ab78f3b71ef205a550d16 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Sun, 11 Jan 2015 16:09:43 +0100
Subject: d3dx9_36: Fix several issues in save_dds_surface_to_memory.
@ -9,22 +9,13 @@ The different fixes are:
- Fix DDS_WIDTH define to correct value 4
- Do not set depth and miplevels fields as their flags are not set (to match native)
---
dlls/d3dx9_36/surface.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
dlls/d3dx9_36/surface.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index f187031..ae10adc 100644
index b8bb710..6f6132c 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -77,7 +77,7 @@ static const GUID *d3dformat_to_wic_guid(D3DFORMAT format)
/* dds_header.flags */
#define DDS_CAPS 0x1
#define DDS_HEIGHT 0x2
-#define DDS_WIDTH 0x2
+#define DDS_WIDTH 0x4
#define DDS_PITCH 0x8
#define DDS_PIXELFORMAT 0x1000
#define DDS_MIPMAPCOUNT 0x20000
@@ -487,13 +487,12 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
memset(header, 0, sizeof(*header));
@ -43,5 +34,5 @@ index f187031..ae10adc 100644
hr = d3dformat_to_dds_pixel_format(&header->pixel_format, src_desc.Format);
if (FAILED(hr))
--
2.2.1
2.5.0

35
patches/notepad-New_File/0001-notepad-Make-sure-new-files-are-created-immediately.patch
View File

@ -1,35 +0,0 @@
From 391fff4e34db1ea266bf5abcfffb81f0ce127eb7 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 22 Aug 2015 21:59:22 +0200
Subject: notepad: Make sure new files are created immediately.
---
programs/notepad/main.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/programs/notepad/main.c b/programs/notepad/main.c
index 480f866..20e887b 100644
--- a/programs/notepad/main.c
+++ b/programs/notepad/main.c
@@ -702,9 +702,18 @@ static void HandleCommandLine(LPWSTR cmdline)
{
switch (AlertFileDoesNotExist(file_name)) {
case IDYES:
+ {
+
+ HANDLE file;
SetFileNameAndEncoding(file_name, ENCODING_ANSI);
+
+ file = CreateFileW(file_name, GENERIC_WRITE, FILE_SHARE_WRITE,
+ NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+ if (file != INVALID_HANDLE_VALUE) CloseHandle(file);
+
UpdateWindowCaption();
break;
+ }
case IDNO:
break;
--
2.5.0

1
patches/notepad-New_File/definition
View File

@ -1 +0,0 @@
Fixes: [19425] Notepad should create new files immediately

82
patches/patchinstall.sh
View File

@ -55,7 +55,7 @@ version()
echo "Copyright (C) 2014-2015 the Wine Staging project authors."
echo ""
echo "Patchset to be applied on upstream Wine:"
echo " commit 6038e2ab7957b65dd2e13ddd414c206718fb14b7"
echo " commit bdaa571c5d7dd59dd28fd1f25cdad5761bfaf4dd"
echo ""
}
@ -159,7 +159,6 @@ patch_enable_all ()
enable_msvcrt_Math_Precision="$1"
enable_msvcrt_StdHandle_RefCount="$1"
enable_msvfw32_Image_Size="$1"
enable_notepad_New_File="$1"
enable_ntdll_APC_Performance="$1"
enable_ntdll_APC_Start_Process="$1"
enable_ntdll_Activation_Context="$1"
@ -568,9 +567,6 @@ patch_enable ()
msvfw32-Image_Size)
enable_msvfw32_Image_Size="$2"
;;
notepad-New_File)
enable_notepad_New_File="$2"
;;
ntdll-APC_Performance)
enable_ntdll_APC_Performance="$2"
;;
@ -2153,34 +2149,32 @@ fi
# | crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec, dlls/api-ms-win-crt-string-l1-1-0/Makefile.in, dlls/api-ms-win-crt-
# | string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec, dlls/api-ms-win-crt-time-l1-1-0/Makefile.in, dlls/api-ms-win-crt-
# | time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec, dlls/api-ms-win-crt-utility-l1-1-0/Makefile.in, dlls/api-ms-win-crt-
# | utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec, dlls/msvcrt/data.c, dlls/msvcrt/misc.c, dlls/ucrtbase/Makefile.in,
# | dlls/ucrtbase/ucrtbase.spec, dlls/vcruntime140/Makefile.in, dlls/vcruntime140/vcruntime140.spec, tools/make_specfiles
# | utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec, dlls/msvcrt/data.c, dlls/msvcrt/misc.c, dlls/ucrtbase/ucrtbase.spec,
# | dlls/vcruntime140/Makefile.in, dlls/vcruntime140/vcruntime140.spec, tools/make_specfiles
# |
if test "$enable_api_ms_win_crt_Stub_DLLs" -eq 1; then
patch_apply api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Add-the-new-universal-CRT-DLL.patch
patch_apply api-ms-win-crt-Stub_DLLs/0002-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch
patch_apply api-ms-win-crt-Stub_DLLs/0003-vcruntime140-Add-the-new-MSVC-2015-compiler-specific.patch
patch_apply api-ms-win-crt-Stub_DLLs/0004-vcruntime140-Hook-up-a-function-with-a-new-name-to-t.patch
patch_apply api-ms-win-crt-Stub_DLLs/0005-ucrtbase-Add-stub-functions-for-narrow-environment.patch
patch_apply api-ms-win-crt-Stub_DLLs/0006-vcruntime140-Add-stubs-for-telemetry-functions.patch
patch_apply api-ms-win-crt-Stub_DLLs/0007-make_specfiles-Use-cdecl-for-stub-redirects-to-ucrtb.patch
patch_apply api-ms-win-crt-Stub_DLLs/0008-api-ms-win-crt-conio-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0009-api-ms-win-crt-convert-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0010-api-ms-win-crt-environment-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0011-api-ms-win-crt-filesystem-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0012-api-ms-win-crt-heap-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0013-api-ms-win-crt-locale-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0014-api-ms-win-crt-math-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0015-api-ms-win-crt-multibyte-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0016-api-ms-win-crt-private-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0017-api-ms-win-crt-process-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0018-api-ms-win-crt-runtime-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0019-api-ms-win-crt-stdio-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0020-api-ms-win-crt-string-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0021-api-ms-win-crt-time-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0022-api-ms-win-crt-utility-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch
patch_apply api-ms-win-crt-Stub_DLLs/0002-vcruntime140-Add-the-new-MSVC-2015-compiler-specific.patch
patch_apply api-ms-win-crt-Stub_DLLs/0003-vcruntime140-Hook-up-a-function-with-a-new-name-to-t.patch
patch_apply api-ms-win-crt-Stub_DLLs/0004-ucrtbase-Add-stub-functions-for-narrow-environment.patch
patch_apply api-ms-win-crt-Stub_DLLs/0005-vcruntime140-Add-stubs-for-telemetry-functions.patch
patch_apply api-ms-win-crt-Stub_DLLs/0006-make_specfiles-Use-cdecl-for-stub-redirects-to-ucrtb.patch
patch_apply api-ms-win-crt-Stub_DLLs/0007-api-ms-win-crt-conio-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0008-api-ms-win-crt-convert-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0009-api-ms-win-crt-environment-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0010-api-ms-win-crt-filesystem-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0011-api-ms-win-crt-heap-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0012-api-ms-win-crt-locale-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0013-api-ms-win-crt-math-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0014-api-ms-win-crt-multibyte-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0015-api-ms-win-crt-private-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0016-api-ms-win-crt-process-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0017-api-ms-win-crt-runtime-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0018-api-ms-win-crt-stdio-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0019-api-ms-win-crt-string-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0020-api-ms-win-crt-time-l1-1-0-Add-stub-dll.patch
patch_apply api-ms-win-crt-Stub_DLLs/0021-api-ms-win-crt-utility-l1-1-0-Add-stub-dll.patch
(
echo '+ { "Martin Storsjo", "ucrtbase: Add the new universal CRT DLL.", 1 },';
echo '+ { "Martin Storsjo", "ucrtbase: Hook up some functions with new names to existing implementations.", 1 },';
echo '+ { "Martin Storsjo", "vcruntime140: Add the new MSVC 2015 compiler specific DLL.", 1 },';
echo '+ { "Martin Storsjo", "vcruntime140: Hook up a function with a new name to the existing implementation.", 1 },';
@ -3589,21 +3583,6 @@ if test "$enable_msvfw32_Image_Size" -eq 1; then
) >> "$patchlist"
fi
# Patchset notepad-New_File
# |
# | This patchset fixes the following Wine bugs:
# | * [#19425] Notepad should create new files immediately
# |
# | Modified files:
# | * programs/notepad/main.c
# |
if test "$enable_notepad_New_File" -eq 1; then
patch_apply notepad-New_File/0001-notepad-Make-sure-new-files-are-created-immediately.patch
(
echo '+ { "Sebastian Lackner", "notepad: Make sure new files are created immediately.", 1 },';
) >> "$patchlist"
fi
# Patchset ntdll-APC_Performance
# |
# | Modified files:
@ -5989,9 +5968,6 @@ fi
# Patchset wininet-Cleanup
# |
# | This patchset fixes the following Wine bugs:
# | * [#28911] Add HTTP Host header in HttpSendRequest instead of HttpOpenRequest
# |
# | Modified files:
# | * dlls/wininet/http.c, dlls/wininet/tests/http.c
# |
@ -5999,18 +5975,12 @@ if test "$enable_wininet_Cleanup" -eq 1; then
patch_apply wininet-Cleanup/0001-wininet-tests-Add-more-tests-for-cookies.patch
patch_apply wininet-Cleanup/0002-wininet-tests-Test-auth-credential-reusage-with-host.patch
patch_apply wininet-Cleanup/0003-wininet-tests-Check-cookie-behaviour-when-overriding.patch
patch_apply wininet-Cleanup/0004-wininet-Delay-setting-the-http-host-header.patch
patch_apply wininet-Cleanup/0005-wininet-Use-request-server-canon_host_port-in-authen.patch
patch_apply wininet-Cleanup/0006-wininet-Use-request-server-canon_host_port-when-quer.patch
patch_apply wininet-Cleanup/0007-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch
patch_apply wininet-Cleanup/0008-wininet-Replacing-header-fields-should-fail-if-they-.patch
patch_apply wininet-Cleanup/0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch
patch_apply wininet-Cleanup/0005-wininet-Replacing-header-fields-should-fail-if-they-.patch
(
echo '+ { "Michael Müller", "wininet/tests: Add more tests for cookies.", 1 },';
echo '+ { "Michael Müller", "wininet/tests: Test auth credential reusage with host override.", 1 },';
echo '+ { "Michael Müller", "wininet/tests: Check cookie behaviour when overriding host.", 1 },';
echo '+ { "Michael Müller", "wininet: Delay setting the http host header.", 1 },';
echo '+ { "Michael Müller", "wininet: Use request->server->canon_host_port in authentication process.", 1 },';
echo '+ { "Michael Müller", "wininet: Use request->server->canon_host_port when querying for INTERNET_OPTION_URL.", 1 },';
echo '+ { "Michael Müller", "wininet: Strip filename if no path is set in cookie.", 1 },';
echo '+ { "Michael Müller", "wininet: Replacing header fields should fail if they do not exist yet.", 1 },';
) >> "$patchlist"

162
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

@ -7760,7 +7760,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
/* Read the framebuffer contents into a texture. Note that this function
@@ -2845,6 +3615,85 @@
@@ -2858,6 +3628,85 @@
}
}
@ -7846,7 +7846,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
/* Does a direct frame buffer -> texture copy. Stretching is done with single
* pixel copy calls. */
static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struct wined3d_surface *src_surface,
@@ -2951,8 +3800,13 @@
@@ -2964,8 +3813,13 @@
/* The texture is now most up to date - If the surface is a render target
* and has a drawable, this path is never entered. */
@ -7860,7 +7860,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
/* Uses the hardware to stretch and flip the image */
@@ -3020,7 +3874,11 @@
@@ -3033,7 +3887,11 @@
checkGLcall("glEnable(texture_target)");
/* For now invalidate the texture copy of the back buffer. Drawable and sysmem copy are untouched */
@ -7872,7 +7872,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
/* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag
@@ -3217,6 +4075,7 @@
@@ -3230,6 +4088,7 @@
checkGLcall("glDeleteTextures(1, &backup)");
}
@ -7880,7 +7880,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
if (wined3d_settings.cs_multithreaded)
gl_info->gl_ops.gl.p_glFinish();
else if (wined3d_settings.strict_draw_ordering)
@@ -3228,6 +4087,17 @@
@@ -3241,6 +4100,17 @@
* and has a drawable, this path is never entered. */
wined3d_resource_validate_location(&dst_surface->resource, WINED3D_LOCATION_TEXTURE_RGB);
wined3d_resource_invalidate_location(&dst_surface->resource, ~WINED3D_LOCATION_TEXTURE_RGB);
@ -7898,7 +7898,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
/* Front buffer coordinates are always full screen coordinates, but our GL
@@ -3258,6 +4128,7 @@
@@ -3271,6 +4141,7 @@
rect->bottom = drawable_height - rect->bottom;
}
@ -7906,7 +7906,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
/* Context activation is done by the caller. */
static void surface_blt_to_drawable(const struct wined3d_device *device,
struct wined3d_context *old_ctx,
@@ -3292,6 +4163,26 @@
@@ -3305,6 +4176,26 @@
/* Make sure the surface is up-to-date. This should probably use
* wined3d_resource_load_location() and worry about the destination
* surface too, unless we're overwriting it completely. */
@ -7933,7 +7933,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
wined3d_texture_load(src_surface->container, context, FALSE);
/* Activate the destination context, set it up for blitting */
@@ -3334,6 +4225,7 @@
@@ -3347,6 +4238,7 @@
/* Leave the opengl state valid for blitting */
device->blitter->unset_shader(context->gl_info);
@ -7941,7 +7941,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
if (wined3d_settings.cs_multithreaded)
gl_info->gl_ops.gl.p_glFinish();
else if (wined3d_settings.strict_draw_ordering
@@ -3347,6 +4239,14 @@
@@ -3360,6 +4252,14 @@
context = context_acquire(device, restore_rt);
context_release(context);
}
@ -7956,7 +7956,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color)
@@ -3370,8 +4270,13 @@
@@ -3383,8 +4283,13 @@
enum wined3d_texture_filter_type filter)
{
struct wined3d_device *device = dst_surface->resource.device;
@ -7970,7 +7970,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, blt_fx %p, filter %s.\n",
dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect),
@@ -3562,6 +4467,7 @@
@@ -3575,6 +4480,7 @@
{
TRACE("surface %p, new location %#x, w %u, h %u.\n", surface, location, w, h);
@ -7978,7 +7978,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
if (((surface->resource.locations & WINED3D_LOCATION_TEXTURE_RGB) && !(location & WINED3D_LOCATION_TEXTURE_RGB))
|| (!(surface->resource.locations & WINED3D_LOCATION_TEXTURE_RGB)
&& (location & WINED3D_LOCATION_TEXTURE_RGB)))
@@ -3570,6 +4476,15 @@
@@ -3583,6 +4489,15 @@
surface->ds_current_size.cx = w;
surface->ds_current_size.cy = h;
surface->resource.locations = location;
@ -7994,7 +7994,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
/* Context activation is done by the caller. */
@@ -3584,7 +4499,11 @@
@@ -3597,7 +4512,11 @@
/* TODO: Make this work for modes other than FBO */
if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return;
@ -8006,7 +8006,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
{
w = surface->ds_current_size.cx;
h = surface->ds_current_size.cy;
@@ -3610,7 +4529,11 @@
@@ -3623,7 +4542,11 @@
return;
}
@ -8018,7 +8018,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
{
TRACE("Surface was discarded, no need copy data.\n");
switch (location)
@@ -3630,6 +4553,7 @@
@@ -3643,6 +4566,7 @@
default:
FIXME("Unhandled location %#x\n", location);
}
@ -8026,7 +8026,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
surface->resource.locations &= ~WINED3D_LOCATION_DISCARDED;
surface->resource.locations |= location;
surface->ds_current_size.cx = surface->resource.width;
@@ -3641,6 +4565,19 @@
@@ -3654,6 +4578,19 @@
{
FIXME("No up to date depth stencil location.\n");
surface->resource.locations |= location;
@ -8046,7 +8046,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
surface->ds_current_size.cx = surface->resource.width;
surface->ds_current_size.cy = surface->resource.height;
return;
@@ -3705,9 +4642,13 @@
@@ -3718,9 +4655,13 @@
context_invalidate_state(context, STATE_FRAMEBUFFER);
@ -8060,7 +8060,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */
}
else if (location == WINED3D_LOCATION_DRAWABLE)
@@ -3723,9 +4664,13 @@
@@ -3736,9 +4677,13 @@
context_invalidate_state(context, STATE_FRAMEBUFFER);
@ -8074,7 +8074,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */
}
else
@@ -3733,6 +4678,7 @@
@@ -3746,6 +4691,7 @@
ERR("Invalid location (%#x) specified.\n", location);
}
@ -8082,7 +8082,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
surface->resource.locations |= location;
surface->ds_current_size.cx = surface->resource.width;
surface->ds_current_size.cy = surface->resource.height;
@@ -3778,6 +4724,135 @@
@@ -3791,6 +4737,135 @@
TRACE("Surface was discarded, nothing to do.\n");
return WINED3D_OK;
}
@ -8218,7 +8218,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO
&& wined3d_resource_is_offscreen(&surface->container->resource))
@@ -3787,6 +4862,7 @@
@@ -3800,6 +4875,7 @@
}
surface_get_rect(surface, NULL, &r);
@ -8226,7 +8226,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
wined3d_resource_load_location(&surface->resource, context, WINED3D_LOCATION_TEXTURE_RGB);
surface_blt_to_drawable(surface->resource.device, context,
WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r);
@@ -3855,6 +4931,66 @@
@@ -3868,6 +4944,66 @@
RECT rect = {0, 0, surface->resource.width, surface->resource.height};
surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location,
@ -8293,7 +8293,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
&rect, surface, dst_location, &rect);
return WINED3D_OK;
@@ -3864,6 +5000,7 @@
@@ -3877,6 +5013,7 @@
if (srgb)
{
@ -8301,7 +8301,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
if ((surface->resource.locations & (WINED3D_LOCATION_TEXTURE_RGB | surface->resource.map_binding))
== WINED3D_LOCATION_TEXTURE_RGB)
{
@@ -3898,6 +5035,45 @@
@@ -3911,6 +5048,45 @@
width = surface->resource.width;
wined3d_resource_get_pitch(&surface->resource, &src_row_pitch, &src_slice_pitch);
@ -8347,7 +8347,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
format = *texture->resource.format;
if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE)))
@@ -3906,7 +5082,11 @@
@@ -3919,7 +5095,11 @@
/* Don't use PBOs for converted surfaces. During PBO conversion we look at
* WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is
* getting called. */
@ -8359,7 +8359,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
{
TRACE("Removing the pbo attached to surface %p.\n", surface);
@@ -3915,6 +5095,7 @@
@@ -3928,6 +5108,7 @@
else
surface->resource.map_binding = WINED3D_LOCATION_SYSMEM;
@ -8367,7 +8367,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
wined3d_resource_prepare_map_memory(&surface->resource, context);
wined3d_resource_load_location(&surface->resource, context, surface->resource.map_binding);
wined3d_resource_free_bo(&surface->resource);
@@ -3922,6 +5103,14 @@
@@ -3935,6 +5116,14 @@
}
wined3d_resource_get_memory(&surface->resource, surface->resource.locations, &data);
@ -8382,7 +8382,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
if (format.convert)
{
/* This code is entered for texture formats which need a fixup. */
@@ -3936,9 +5125,15 @@
@@ -3949,9 +5138,15 @@
context_release(context);
return E_OUTOFMEMORY;
}
@ -8398,7 +8398,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
data.addr = mem;
}
else if (conversion)
@@ -3958,6 +5153,7 @@
@@ -3971,6 +5166,7 @@
}
if (texture->swapchain && texture->swapchain->palette)
palette = texture->swapchain->palette;
@ -8406,7 +8406,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
conversion->convert(data.addr, src_row_pitch, mem, dst_pitch,
width, height, palette, &texture->async.gl_color_key);
src_row_pitch = dst_pitch;
@@ -3990,6 +5186,40 @@
@@ -4003,6 +5199,40 @@
struct wined3d_context *context, DWORD location)
{
struct wined3d_surface *surface = surface_from_resource(resource);
@ -8447,7 +8447,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
HRESULT hr;
TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location));
@@ -3997,6 +5227,7 @@
@@ -4010,6 +5240,7 @@
if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)
{
if (location == WINED3D_LOCATION_TEXTURE_RGB
@ -8455,7 +8455,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
&& surface->resource.locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_DISCARDED))
{
surface_load_ds_location(surface, context, location);
@@ -4006,21 +5237,63 @@
@@ -4019,21 +5250,63 @@
&& surface->container->resource.draw_binding != WINED3D_LOCATION_DRAWABLE)
{
/* Already up to date, nothing to do. */
@ -8524,7 +8524,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
switch (location)
@@ -4029,6 +5302,7 @@
@@ -4042,6 +5315,7 @@
case WINED3D_LOCATION_USER_MEMORY:
case WINED3D_LOCATION_SYSMEM:
case WINED3D_LOCATION_BUFFER:
@ -8532,7 +8532,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
surface_load_sysmem(surface, context, location);
break;
@@ -4046,6 +5320,24 @@
@@ -4059,6 +5333,24 @@
if (FAILED(hr = surface_load_texture(surface, context,
location == WINED3D_LOCATION_TEXTURE_SRGB)))
return;
@ -8557,7 +8557,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
break;
default:
@@ -4053,12 +5345,21 @@
@@ -4066,12 +5358,21 @@
break;
}
@ -8579,7 +8579,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
static HRESULT ffp_blit_alloc(struct wined3d_device *device) { return WINED3D_OK; }
@@ -4166,6 +5467,7 @@
@@ -4179,6 +5480,7 @@
const RECT *dst_rect, const struct wined3d_color *color)
{
const RECT draw_rect = {0, 0, dst_surface->resource.width, dst_surface->resource.height};
@ -8587,7 +8587,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
struct wined3d_rendertarget_view view, *view_ptr = &view;
struct wined3d_fb_state fb = {&view_ptr, NULL, 1};
struct wined3d_texture *texture = dst_surface->container;
@@ -4186,6 +5488,21 @@
@@ -4199,6 +5501,21 @@
view.sub_resource_idx = dst_surface->texture_layer * texture->level_count + dst_surface->texture_level;
device_clear_render_targets(device, 1, &fb, 1, dst_rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0);
@ -8609,7 +8609,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
return WINED3D_OK;
}
@@ -4194,6 +5511,7 @@
@@ -4207,6 +5524,7 @@
const RECT *dst_rect, float depth)
{
const RECT draw_rect = {0, 0, dst_surface->resource.width, dst_surface->resource.height};
@ -8617,7 +8617,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
struct wined3d_rendertarget_view view;
struct wined3d_fb_state fb = {NULL, &view};
struct wined3d_texture *texture = dst_surface->container;
@@ -4209,6 +5527,20 @@
@@ -4222,6 +5540,20 @@
view.sub_resource_idx = dst_surface->texture_layer * texture->level_count + dst_surface->texture_level;
device_clear_render_targets(device, 0, &fb, 1, dst_rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0);
@ -8638,7 +8638,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
return WINED3D_OK;
}
@@ -4221,6 +5553,7 @@
@@ -4234,6 +5566,7 @@
/* Blit from offscreen surface to render target */
struct wined3d_color_key old_blt_key = src_surface->container->async.src_blt_color_key;
DWORD old_color_key_flags = src_surface->container->async.color_key_flags;
@ -8646,7 +8646,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
struct wined3d_context *context;
TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface);
@@ -4238,6 +5571,22 @@
@@ -4251,6 +5584,22 @@
wined3d_resource_validate_location(&dst_surface->resource, dst_surface->container->resource.draw_binding);
wined3d_resource_invalidate_location(&dst_surface->resource, ~dst_surface->container->resource.draw_binding);
@ -8669,7 +8669,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
const struct blit_shader ffp_blit = {
@@ -4397,6 +5746,7 @@
@@ -4410,6 +5759,7 @@
const struct wined3d_format *src_format, *dst_format;
unsigned int src_fmt_flags, dst_fmt_flags;
struct wined3d_texture *src_texture = NULL;
@ -8677,7 +8677,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
void *src_data = NULL, *dst_data = NULL;
UINT src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch;
const BYTE *sbase = NULL;
@@ -4427,6 +5777,23 @@
@@ -4440,6 +5790,23 @@
wined3d_resource_get_pitch(&dst_surface->resource, &dst_row_pitch, &dst_slice_pitch);
src_data = dst_data;
src_row_pitch = dst_row_pitch;
@ -8701,7 +8701,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
src_format = dst_surface->resource.format;
dst_format = src_format;
dst_fmt_flags = dst_surface->container->resource.format_flags;
@@ -4438,12 +5805,14 @@
@@ -4451,12 +5818,14 @@
dst_fmt_flags = dst_surface->container->resource.format_flags;
if (src_surface)
{
@ -8716,7 +8716,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
if (dst_surface->resource.format->id != src_surface->resource.format->id)
{
if (!(src_texture = surface_convert_format(src_surface, dst_format->id)))
@@ -4454,9 +5823,13 @@
@@ -4467,9 +5836,13 @@
}
src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, 0));
}
@ -8730,7 +8730,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
src_format = src_surface->resource.format;
src_fmt_flags = src_surface->container->resource.format_flags;
}
@@ -4466,8 +5839,12 @@
@@ -4479,8 +5852,12 @@
src_fmt_flags = dst_fmt_flags;
}
@ -8743,7 +8743,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
bpp = dst_surface->resource.format->byte_count;
@@ -4478,12 +5855,24 @@
@@ -4491,12 +5868,24 @@
width = (dst_rect->right - dst_rect->left) * bpp;
if (src_surface)
@ -8768,7 +8768,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
if (src_fmt_flags & dst_fmt_flags & WINED3DFMT_FLAG_BLOCKS)
{
@@ -4518,7 +5907,11 @@
@@ -4531,7 +5920,11 @@
}
hr = surface_cpu_blt_compressed(sbase, dbuf,
@ -8780,7 +8780,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
src_format, flags, fx);
goto release;
}
@@ -4526,7 +5919,11 @@
@@ -4539,7 +5932,11 @@
/* First, all the 'source-less' blits */
if (flags & WINEDDBLT_COLORFILL)
{
@ -8792,7 +8792,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
flags &= ~WINEDDBLT_COLORFILL;
}
@@ -4575,6 +5972,7 @@
@@ -4588,6 +5985,7 @@
for (y = 0; y < dstheight; ++y)
{
memcpy(dbuf, sbuf, width);
@ -8800,7 +8800,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
sbuf += src_row_pitch;
dbuf += dst_row_pitch;
}
@@ -4588,6 +5986,21 @@
@@ -4601,6 +5999,21 @@
{
sbuf -= src_row_pitch;
dbuf -= dst_row_pitch;
@ -8822,7 +8822,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
memcpy(dbuf, sbuf, width);
}
}
@@ -4597,8 +6010,13 @@
@@ -4610,8 +6023,13 @@
for (y = 0; y < dstheight; ++y)
{
memmove(dbuf, sbuf, width);
@ -8836,7 +8836,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
}
}
@@ -4607,9 +6025,15 @@
@@ -4620,9 +6038,15 @@
/* Stretching in y direction only. */
for (y = sy = 0; y < dstheight; ++y, sy += yinc)
{
@ -8852,7 +8852,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
}
}
@@ -4619,6 +6043,7 @@
@@ -4632,6 +6056,7 @@
int last_sy = -1;
for (y = sy = 0; y < dstheight; ++y, sy += yinc)
{
@ -8860,7 +8860,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
sbuf = sbase + (sy >> 16) * src_row_pitch;
if ((sy >> 16) == (last_sy >> 16))
@@ -4626,6 +6051,15 @@
@@ -4639,6 +6064,15 @@
/* This source row is the same as last source row -
* Copy the already stretched row. */
memcpy(dbuf, dbuf - dst_row_pitch, width);
@ -8876,7 +8876,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
else
{
@@ -4672,6 +6106,7 @@
@@ -4685,6 +6119,7 @@
}
#undef STRETCH_ROW
}
@ -8884,7 +8884,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
dbuf += dst_row_pitch;
last_sy = sy;
}
@@ -4680,6 +6115,16 @@
@@ -4693,6 +6128,16 @@
else
{
LONG dstyinc = dst_row_pitch, dstxinc = bpp;
@ -8901,7 +8901,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
DWORD keylow = 0xffffffff, keyhigh = 0, keymask = 0xffffffff;
DWORD destkeylow = 0x0, destkeyhigh = 0xffffffff, destkeymask = 0xffffffff;
if (flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYDEST | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_KEYDESTOVERRIDE))
@@ -4729,7 +6174,11 @@
@@ -4742,7 +6187,11 @@
LONG tmpxy;
dTopLeft = dbuf;
dTopRight = dbuf + ((dstwidth - 1) * bpp);
@ -8913,7 +8913,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
dBottomRight = dBottomLeft + ((dstwidth - 1) * bpp);
if (fx->dwDDFX & WINEDDBLTFX_ARITHSTRETCHY)
@@ -4806,6 +6255,7 @@
@@ -4819,6 +6268,7 @@
flags &= ~(WINEDDBLT_DDFX);
}
@ -8921,7 +8921,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
#define COPY_COLORKEY_FX(type) \
do { \
const type *s; \
@@ -4827,6 +6277,29 @@
@@ -4840,6 +6290,29 @@
d = (type *)(((BYTE *)d) + dstyinc); \
} \
} while(0)
@ -8951,7 +8951,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
switch (bpp)
{
@@ -4845,7 +6318,11 @@
@@ -4858,7 +6331,11 @@
BYTE *d = dbuf, *dx;
for (y = sy = 0; y < dstheight; ++y, sy += yinc)
{
@ -8963,7 +8963,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
dx = d;
for (x = sx = 0; x < dstwidth; ++x, sx+= xinc)
{
@@ -4876,10 +6353,12 @@
@@ -4889,10 +6366,12 @@
}
}
@ -8976,7 +8976,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
error:
if (flags && FIXME_ON(d3d_surface))
{
@@ -4887,6 +6366,7 @@
@@ -4900,6 +6379,7 @@
}
release:
@ -8984,7 +8984,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
if (dst_data)
{
wined3d_resource_release_map_ptr(&dst_surface->resource, context);
@@ -4905,6 +6385,14 @@
@@ -4918,6 +6398,14 @@
wined3d_texture_decref(src_texture);
if (context)
context_release(context);
@ -8999,7 +8999,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
return hr;
}
@@ -4949,6 +6437,7 @@
@@ -4962,6 +6450,7 @@
cpu_blit_blit_surface,
};
@ -9007,7 +9007,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
void surface_blt_ugly(struct wined3d_surface *dst_surface, const RECT *dst_rect,
struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags,
const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter)
@@ -4956,6 +6445,16 @@
@@ -4969,6 +6458,16 @@
struct wined3d_swapchain *src_swapchain, *dst_swapchain;
struct wined3d_device *device = dst_surface->resource.device;
DWORD src_ds_flags, dst_ds_flags;
@ -9024,7 +9024,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
BOOL scale, convert;
static const DWORD simple_blit = WINEDDBLT_ASYNC
@@ -4966,6 +6465,106 @@
@@ -4979,6 +6478,106 @@
| WINEDDBLT_DEPTHFILL
| WINEDDBLT_DONOTWAIT;
@ -9131,7 +9131,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
if (!device->d3d_initialized)
{
WARN("D3D not initialized, using fallback.\n");
@@ -5008,8 +6607,13 @@
@@ -5021,8 +6620,13 @@
}
scale = src_surface
@ -9145,7 +9145,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
convert = src_surface && src_surface->resource.format->id != dst_surface->resource.format->id;
dst_ds_flags = dst_surface->container->resource.format_flags
@@ -5029,6 +6633,7 @@
@@ -5042,6 +6646,7 @@
TRACE("Depth fill.\n");
if (!surface_convert_depth_to_float(dst_surface, fx->u5.dwFillDepth, &depth))
@ -9153,7 +9153,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
return;
if (SUCCEEDED(wined3d_surface_depth_fill(dst_surface, dst_rect, depth)))
@@ -5039,6 +6644,24 @@
@@ -5052,6 +6657,24 @@
if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_surface->container->resource.draw_binding,
src_rect, dst_surface, dst_surface->container->resource.draw_binding, dst_rect)))
return;
@ -9178,7 +9178,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
}
else
@@ -5047,8 +6670,13 @@
@@ -5060,8 +6683,13 @@
/* In principle this would apply to depth blits as well, but we don't
* implement those in the CPU blitter at the moment. */
@ -9192,7 +9192,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
{
if (scale)
TRACE("Not doing sysmem blit because of scaling.\n");
@@ -5069,8 +6697,13 @@
@@ -5082,8 +6710,13 @@
palette, fx->u5.dwFillColor, &color))
goto fallback;
@ -9206,7 +9206,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
else
{
@@ -5088,8 +6721,13 @@
@@ -5101,8 +6734,13 @@
color_key = &src_surface->container->async.src_blt_color_key;
blit_op = WINED3D_BLIT_OP_COLOR_BLIT_CKEY;
}
@ -9220,7 +9220,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
{
/* Upload */
if (scale)
@@ -5098,6 +6736,7 @@
@@ -5111,6 +6749,7 @@
TRACE("Not doing upload because of format conversion.\n");
else
{
@ -9228,7 +9228,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
POINT dst_point = {dst_rect->left, dst_rect->top};
if (SUCCEEDED(surface_upload_from_surface(dst_surface, &dst_point, src_surface, src_rect)))
@@ -5110,6 +6749,15 @@
@@ -5123,6 +6762,15 @@
context_release(context);
}
return;
@ -9244,7 +9244,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
}
}
@@ -5133,6 +6781,7 @@
@@ -5146,6 +6794,7 @@
wined3d_swapchain_present(dst_swapchain, NULL, NULL, dst_swapchain->win_handle, NULL, 0);
dst_swapchain->desc.swap_effect = swap_effect;
@ -9252,7 +9252,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
return;
}
@@ -5328,6 +6977,49 @@
@@ -5341,6 +6990,49 @@
wined3d_surface_location_invalidated,
wined3d_surface_load_location,
};
@ -9302,7 +9302,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_texture *container,
const struct wined3d_resource_desc *desc, GLenum target, unsigned int level, unsigned int layer, DWORD flags)
@@ -5395,9 +7087,13 @@
@@ -5402,9 +7094,13 @@
}
surface->container = container;
@ -9316,7 +9316,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
list_init(&surface->renderbuffers);
list_init(&surface->overlays);
@@ -5429,9 +7125,14 @@
@@ -5436,9 +7132,14 @@
if (surface->resource.map_binding == WINED3D_LOCATION_DIB)
{
wined3d_resource_free_sysmem(&surface->resource);
@ -9331,7 +9331,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
}
return hr;
@@ -5458,7 +7159,11 @@
@@ -5465,7 +7166,11 @@
if (FAILED(hr = surface_init(object, container, desc, target, level, layer, flags)))
{
WARN("Failed to initialize surface, returning %#x.\n", hr);
@ -9879,7 +9879,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -5493,9 +5493,15 @@
@@ -5492,9 +5492,15 @@
DebugBreak();
}

27
patches/wined3d-Multisampling/0001-wined3d-Allow-to-specify-multisampling-AA-quality-le.patch
View File

@ -1,43 +1,38 @@
From 6e90ea5d3a677b1f073effab2eef34edc328075b Mon Sep 17 00:00:00 2001
From 20c5727bab6314d9d788f5b782cf8f5d1b6fc281 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Sat, 28 Feb 2015 00:34:07 +0100
Subject: wined3d: Allow to specify multisampling AA quality levels via
registry.
---
dlls/wined3d/directx.c | 11 +++++++++--
dlls/wined3d/directx.c | 7 ++++++-
dlls/wined3d/wined3d_main.c | 12 ++++++++++++
dlls/wined3d/wined3d_private.h | 1 +
3 files changed, 22 insertions(+), 2 deletions(-)
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 4ca13f4..94a2f7b 100644
index 019b415..b9eb03c 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -4231,9 +4231,16 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3
@@ -4404,7 +4404,12 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3
if (quality_levels)
{
- if (multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE)
- /* FIXME: This is probably wrong. */
+ if (wined3d_settings.msaa_quality_levels)
+ {
+ *quality_levels = wined3d_settings.msaa_quality_levels;
+ TRACE("Overriding MSAA quality levels to %i\n", *quality_levels);
+ }
+ else if (multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE)
+ {
*quality_levels = gl_info->limits.samples;
+ WARN("probably wrong, setting quality_levels to %d\n", *quality_levels);
+ }
else
*quality_levels = 1;
}
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 758ba43..0bf6c9f 100644
index 0543d97..c985c2d 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -76,6 +76,7 @@ struct wined3d_settings wined3d_settings =
@@ -77,6 +77,7 @@ struct wined3d_settings wined3d_settings =
ORM_FBO, /* Use FBOs to do offscreen rendering */
PCI_VENDOR_NONE,/* PCI Vendor ID */
PCI_DEVICE_NONE,/* PCI Device ID */
@ -45,7 +40,7 @@ index 758ba43..0bf6c9f 100644
0, /* The default of memory is set in init_driver_info */
NULL, /* No wine logo by default */
TRUE, /* Multisampling enabled by default. */
@@ -251,6 +252,17 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
@@ -261,6 +262,17 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
wined3d_settings.pci_vendor_id = pci_vendor_id;
}
}
@ -64,10 +59,10 @@ index 758ba43..0bf6c9f 100644
{
int TmpVideoMemorySize = atoi(buffer);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index b0c7a53..2f2511e 100644
index 7847557..9e39dd7 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -269,6 +269,7 @@ struct wined3d_settings
@@ -268,6 +268,7 @@ struct wined3d_settings
unsigned short pci_vendor_id;
unsigned short pci_device_id;
/* Memory tracking and object counting. */
@ -76,5 +71,5 @@ index b0c7a53..2f2511e 100644
char *logo;
int allow_multisampling;
--
2.3.0
2.5.0

138
patches/wininet-Cleanup/0004-wininet-Delay-setting-the-http-host-header.patch
View File

@ -1,138 +0,0 @@
From 72a8f7896554e752e1c924b71709e8cb0e48a51c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 16 May 2015 01:39:33 +0200
Subject: wininet: Delay setting the http host header.
This change temporarly breaks two other tests which were only
working by pure accident before.
---
dlls/wininet/http.c | 28 ++++++++++++++++++----------
dlls/wininet/tests/http.c | 10 +++++-----
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 5dd1b3b..e24a337 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -376,6 +376,7 @@ static WCHAR *get_host_header( http_request_t *req )
EnterCriticalSection( &req->headers_section );
if ((header = HTTP_GetHeader( req, hostW ))) ret = heap_strdupW( header->lpszValue );
+ else ret = heap_strdupW( req->server->canon_host_port );
LeaveCriticalSection( &req->headers_section );
return ret;
}
@@ -1886,20 +1887,21 @@ static BOOL HTTP_GetRequestURL(http_request_t *req, LPWSTR buf)
static const WCHAR https[] = { 'h','t','t','p','s',':','/','/',0 };
static const WCHAR slash[] = { '/',0 };
LPHTTPHEADERW host_header;
+ const WCHAR *host;
LPCWSTR scheme;
- host_header = HTTP_GetHeader(req, hostW);
- if(!host_header)
- return FALSE;
-
EnterCriticalSection( &req->headers_section );
+ host_header = HTTP_GetHeader(req, hostW);
+ if (host_header) host = host_header->lpszValue;
+ else host = req->server->canon_host_port;
+
if (req->hdr.dwFlags & INTERNET_FLAG_SECURE)
scheme = https;
else
scheme = http;
strcpyW(buf, scheme);
- strcatW(buf, host_header->lpszValue);
+ strcatW(buf, host);
if (req->path[0] != '/')
strcatW(buf, slash);
strcatW(buf, req->path);
@@ -2140,14 +2142,19 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
case INTERNET_OPTION_URL: {
static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0};
WCHAR url[INTERNET_MAX_URL_LENGTH];
- HTTPHEADERW *host;
+ HTTPHEADERW *host_header;
+ const WCHAR *host;
TRACE("INTERNET_OPTION_URL\n");
EnterCriticalSection( &req->headers_section );
- host = HTTP_GetHeader(req, hostW);
+
+ host_header = HTTP_GetHeader(req, hostW);
+ if (host_header) host = host_header->lpszValue;
+ else host = req->server->canon_host_port;
+
strcpyW(url, httpW);
- strcatW(url, host->lpszValue);
+ strcatW(url, host);
strcatW(url, req->path);
LeaveCriticalSection( &req->headers_section );
@@ -3417,8 +3424,6 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session,
request->verb = heap_strdupW(lpszVerb && *lpszVerb ? lpszVerb : szGET);
request->version = heap_strdupW(lpszVersion && *lpszVersion ? lpszVersion : g_szHttp1_1);
- HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ);
-
if (hIC->proxy && hIC->proxy[0] && !HTTP_ShouldBypassProxy(hIC, session->hostName))
HTTP_DealWithProxy( hIC, session, request );
@@ -4911,6 +4916,9 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
if (!request->verb)
request->verb = heap_strdupW(szGET);
+ HTTP_ProcessHeader(request, hostW, request->server->canon_host_port,
+ HTTP_ADDREQ_FLAG_ADD_IF_NEW | HTTP_ADDHDR_FLAG_REQ);
+
if (dwContentLength || strcmpW(request->verb, szGET))
{
sprintfW(contentLengthStr, szContentLength, dwContentLength);
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index 46a2258..5725b30 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -3054,8 +3054,8 @@ static void test_header_override(int port)
memset(buffer, 0, sizeof(buffer));
ret = HttpQueryInfoA(req, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, &count);
err = GetLastError();
- todo_wine ok(!ret, "HttpQueryInfo succeeded\n");
- todo_wine ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err);
+ ok(!ret, "HttpQueryInfo succeeded\n");
+ ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err);
size = sizeof(buffer) - 1;
memset(buffer, 0, sizeof(buffer));
@@ -3081,7 +3081,7 @@ static void test_header_override(int port)
ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
ok(ret, "HttpSendRequest failed\n");
- test_status_code_todo(req, 200);
+ test_status_code(req, 200);
InternetCloseHandle(req);
req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0);
@@ -3229,7 +3229,7 @@ static void test_header_override(int port)
ret = HttpSendRequestA( req, NULL, 0, NULL, 0 );
ok( ret, "HttpSendRequestA failed %u\n", GetLastError() );
- test_status_code(req, 200);
+ test_status_code_todo(req, 200);
InternetCloseHandle(req);
InternetCloseHandle(con);
@@ -3268,7 +3268,7 @@ static void test_header_override(int port)
ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
ok(ret, "HttpSendRequestA failed %u\n", GetLastError());
- test_status_code(req, 200);
+ test_status_code_todo(req, 200);
InternetCloseHandle(req);
InternetCloseHandle(con);
--
2.4.3

0
patches/wininet-Cleanup/0007-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch → patches/wininet-Cleanup/0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch
View File

0
patches/wininet-Cleanup/0008-wininet-Replacing-header-fields-should-fail-if-they-.patch → patches/wininet-Cleanup/0005-wininet-Replacing-header-fields-should-fail-if-they-.patch
View File

49
patches/wininet-Cleanup/0005-wininet-Use-request-server-canon_host_port-in-authen.patch
View File

@ -1,49 +0,0 @@
From f0e05bd23a5a4377462586a0f8bd9c54117dcbb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 16 May 2015 01:57:17 +0200
Subject: wininet: Use request->server->canon_host_port in authentication
process.
---
dlls/wininet/http.c | 2 +-
dlls/wininet/tests/http.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 356ebb6..3232fad 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -5116,7 +5116,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
dwBufferSize=2048;
if (request->status_code == HTTP_STATUS_DENIED)
{
- WCHAR *host = get_host_header( request );
+ WCHAR *host = heap_strdupW( request->server->canon_host_port );
DWORD dwIndex = 0;
while (HTTP_HttpQueryInfoW(request,HTTP_QUERY_WWW_AUTHENTICATE,szAuthValue,&dwBufferSize,&dwIndex) == ERROR_SUCCESS)
{
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index 2ac075f..9e207b9 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -3215,7 +3215,7 @@ static void test_header_override(int port)
ret = HttpSendRequestA( req, NULL, 0, NULL, 0 );
ok( ret, "HttpSendRequestA failed %u\n", GetLastError() );
- test_status_code_todo(req, 200);
+ test_status_code(req, 200);
InternetCloseHandle(req);
InternetCloseHandle(con);
@@ -3254,7 +3254,7 @@ static void test_header_override(int port)
ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
ok(ret, "HttpSendRequestA failed %u\n", GetLastError());
- test_status_code_todo(req, 200);
+ test_status_code(req, 200);
InternetCloseHandle(req);
InternetCloseHandle(con);
--
2.4.0

54
patches/wininet-Cleanup/0006-wininet-Use-request-server-canon_host_port-when-quer.patch
View File

@ -1,54 +0,0 @@
From 53df41c8abfc5bafd1ba214d58a3edda1099024b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 16 May 2015 02:00:57 +0200
Subject: wininet: Use request->server->canon_host_port when querying for
INTERNET_OPTION_URL.
---
dlls/wininet/http.c | 11 +----------
dlls/wininet/tests/http.c | 2 +-
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index b61a96a..edea9f8 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -2142,21 +2142,12 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
case INTERNET_OPTION_URL: {
static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0};
WCHAR url[INTERNET_MAX_URL_LENGTH];
- HTTPHEADERW *host_header;
- const WCHAR *host;
TRACE("INTERNET_OPTION_URL\n");
- EnterCriticalSection( &req->headers_section );
-
- host_header = HTTP_GetHeader(req, hostW);
- if (host_header) host = host_header->lpszValue;
- else host = req->server->canon_host_port;
-
strcpyW(url, httpW);
- strcatW(url, host);
+ strcatW(url, req->server->canon_host_port);
strcatW(url, req->path);
- LeaveCriticalSection( &req->headers_section );
TRACE("INTERNET_OPTION_URL: %s\n",debugstr_w(url));
return str_to_buffer(url, buffer, size, unicode);
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index fd235b1..1a82aba 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -3076,7 +3076,7 @@ static void test_header_override(int port)
memset(buffer, 0, sizeof(buffer));
ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size);
ok(ret, "InternetQueryOption failed\n");
- todo_wine ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer);
+ ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer);
ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
ok(ret, "HttpSendRequest failed\n");
--
2.4.3

2
patches/wininet-Cleanup/definition
View File

@ -1 +1 @@
Fixes: [28911] Add HTTP Host header in HttpSendRequest instead of HttpOpenRequest
# Fixes: [28911] Add HTTP Host header in HttpSendRequest instead of HttpOpenRequest