Rebase against bdaa571c5d7dd59dd28fd1f25cdad5761bfaf4dd.

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

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

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

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)

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

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

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

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

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

Some files were not shown because too many files have changed in this diff Show More