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

Remove various patches (accepted upstream), rebase some patches.

Browse Source
This commit is contained in:
Sebastian Lackner 2014-12-02 21:24:57 +01:00
parent f317ba0b0c
commit fb6a771a44
18 changed files with 53 additions and 392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -79,7 +79,7 @@ Included bug fixes and improvements
* Fix issues when driver dispatch routine returns different status codes ([Wine Bug #30155](https://bugs.winehq.org/show_bug.cgi?id=30155))
* Fix issues with dragging layers between images in Adobe Photoshop 7.0 ([Wine Bug #12007](https://bugs.winehq.org/show_bug.cgi?id=12007))
* Fix missing video introduced by pixelformat changes. ([Wine Bug #36900](https://bugs.winehq.org/show_bug.cgi?id=36900))
* Fix ordering of IP addresses by metric if two addresses have the same metric.
* ~~Fix ordering of IP addresses by metric if two addresses have the same metric.~~
* Fix passing of unicode environment from msvcrt to CreateProcessW. ([Wine Bug #37635](https://bugs.winehq.org/show_bug.cgi?id=37635))
* Fix texture corruption in CSI: Fatal Conspiracy ([Wine Bug #33768](https://bugs.winehq.org/show_bug.cgi?id=33768))
* Fix unintentional leaks with ntdll internals
@ -146,7 +146,7 @@ Included bug fixes and improvements
* Use manual relay for RunDLL_CallEntry16 in shell32 ([Wine Bug #23033](https://bugs.winehq.org/show_bug.cgi?id=23033))
* Voobly expects correct handling of WRITECOPY memory protection ([Wine Bug #29384](https://bugs.winehq.org/show_bug.cgi?id=29384))
* Wine ignores IDF_CHECKFIRST flag in SetupPromptForDisk ([Wine Bug #20465](https://bugs.winehq.org/show_bug.cgi?id=20465))
* Wintrust doesn't reset data->pWintrustData->u.pFile->hFile after closing handle ([Wine Bug #36257](https://bugs.winehq.org/show_bug.cgi?id=36257))
* ~~Wintrust doesn't reset data->pWintrustData->u.pFile->hFile after closing handle~~ ([Wine Bug #36257](https://bugs.winehq.org/show_bug.cgi?id=36257))
* Workaround for shlwapi URLs with relative paths
* XEMBED support for embedding Wine windows inside Linux applications
* nVidia driver for high-end laptop cards does not list all supported resolutions

4
debian/changelog vendored
View File

@ -2,6 +2,10 @@ wine-compholio (1.7.33) UNRELEASED; urgency=low
* Added additional tests for VerifyVersionInfoA.
* Added patch to fix condition handling in RtlVerifyVersionInfo.
* Removed patch to fix copy and paste errors in ws2_32 tests (accepted upstream).
* Removed patch to fix ordering of IP addresses by metric if two addresses have the same metric (accepted upstream).
* Removed patch to reset data->pWintrustData->u.pFile->hFile after closing handle (accepted upstream).
* Removed patch to simplify implementation of ws32 get_poll_results (accepted upstream).
* Partially removed patches for api-ms-win-core-* stub dlls (accepted upstream).
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 30 Nov 2014 18:19:00 +0100
wine-compholio (1.7.32) unstable; urgency=low

49
patches/Makefile
View File

@ -122,11 +122,8 @@ PATCHLIST := \
winex11-Window_Groups.ok \
winex11-XEMBED.ok \
winex11-wglShareLists.ok \
wintrust-Reset_hFile.ok \
wpcap-Dynamic_Linking.ok \
ws2_32-Connect_Time.ok \
ws2_32-IP_Ordering.ok \
ws2_32-Overlapping_FDS.ok \
ws2_32-TransmitFile.ok \
ws2_32-WriteWatches.ok \
wtsapi32-EnumerateProcesses.ok
@ -268,8 +265,7 @@ Staging.ok:
# | win-core-fibers-l1-1-1.spec, dlls/api-ms-win-core-file-l2-1-0/Makefile.in, dlls/api-ms-win-core-file-l2-1-0/api-ms-win-
# | core-file-l2-1-0.spec, dlls/api-ms-win-core-localization-l1-2-1/Makefile.in, dlls/api-ms-win-core-localization-l1-2-1
# | /api-ms-win-core-localization-l1-2-1.spec, dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in, dlls/api-ms-win-core-
# | winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec, dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in, dlls/api-ms-
# | win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec, dlls/api-ms-win-core-xstate-l2-1-0/Makefile.in, dlls/api-ms-
# | winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec, dlls/api-ms-win-core-xstate-l2-1-0/Makefile.in, dlls/api-ms-
# | win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec, tools/make_specfiles
# |
.INTERMEDIATE: api-ms-win-core-Stubs.ok
@ -281,8 +277,7 @@ api-ms-win-core-Stubs.ok:
$(call APPLY_FILE,api-ms-win-core-Stubs/0005-api-ms-win-core-datetime-l1-1-0-Add-dll.patch)
$(call APPLY_FILE,api-ms-win-core-Stubs/0006-api-ms-win-core-datetime-l1-1-1-Add-stub-dll.patch)
$(call APPLY_FILE,api-ms-win-core-Stubs/0007-api-ms-win-core-xstate-l2-1-0-Add-stub-dll.patch)
$(call APPLY_FILE,api-ms-win-core-Stubs/0008-api-ms-win-core-winrt-l1-1-0-Add-stub-dll.patch)
$(call APPLY_FILE,api-ms-win-core-Stubs/0009-api-ms-win-core-winrt-error-l1-1-1-Add-stub-dll.patch)
$(call APPLY_FILE,api-ms-win-core-Stubs/0008-api-ms-win-core-winrt-error-l1-1-1-Add-stub-dll.patch)
@( \
echo '+ { "Michael Müller", "api-ms-win-core-fibers-l1-1-0: Add dll.", 1 },'; \
echo '+ { "Michael Müller", "api-ms-win-core-fibers-l1-1-1: Add dll.", 1 },'; \
@ -291,7 +286,6 @@ api-ms-win-core-Stubs.ok:
echo '+ { "Michael Müller", "api-ms-win-core-datetime-l1-1-0: Add dll.", 1 },'; \
echo '+ { "Michael Müller", "api-ms-win-core-datetime-l1-1-1: Add stub dll.", 1 },'; \
echo '+ { "Michael Müller", "api-ms-win-core-xstate-l2-1-0: Add stub dll.", 1 },'; \
echo '+ { "Michael Müller", "api-ms-win-core-winrt-l1-1-0: Add stub dll.", 1 },'; \
echo '+ { "Michael Müller", "api-ms-win-core-winrt-error-l1-1-1: Add stub dll.", 1 },'; \
) > api-ms-win-core-Stubs.ok
@ -1973,21 +1967,6 @@ winex11-wglShareLists.ok:
echo '+ { "Michael Müller", "winex11.drv: Only warn about used contexts in wglShareLists.", 1 },'; \
) > winex11-wglShareLists.ok
# Patchset wintrust-Reset_hFile
# |
# | This patchset fixes the following Wine bugs:
# | * [#36257] Wintrust doesn't reset data->pWintrustData->u.pFile->hFile after closing handle
# |
# | Modified files:
# | * dlls/wintrust/softpub.c
# |
.INTERMEDIATE: wintrust-Reset_hFile.ok
wintrust-Reset_hFile.ok:
$(call APPLY_FILE,wintrust-Reset_hFile/0001-wintrust-Reset-data-pWintrustData-u.pFile-hFile-afte.patch)
@( \
echo '+ { "Sebastian Lackner", "wintrust: Reset data->pWintrustData->u.pFile->hFile after closing handle.", 1 },'; \
) > wintrust-Reset_hFile.ok
# Patchset wpcap-Dynamic_Linking
# |
# | Modified files:
@ -2012,30 +1991,6 @@ ws2_32-Connect_Time.ok:
echo '+ { "Sebastian Lackner", "ws2_32: Implement returning the proper time with SO_CONNECT_TIME.", 1 },'; \
) > ws2_32-Connect_Time.ok
# Patchset ws2_32-IP_Ordering
# |
# | Modified files:
# | * dlls/ws2_32/socket.c
# |
.INTERMEDIATE: ws2_32-IP_Ordering.ok
ws2_32-IP_Ordering.ok:
$(call APPLY_FILE,ws2_32-IP_Ordering/0001-ws2_32-WS_get_local_ips-Fix-ordering-of-IP-addresses.patch)
@( \
echo '+ { "Joachim Priesner", "ws2_32: WS_get_local_ips: Fix ordering of IP addresses by metric if two addresses have the same metric.", 2 },'; \
) > ws2_32-IP_Ordering.ok
# Patchset ws2_32-Overlapping_FDS
# |
# | Modified files:
# | * dlls/ws2_32/socket.c
# |
.INTERMEDIATE: ws2_32-Overlapping_FDS.ok
ws2_32-Overlapping_FDS.ok:
$(call APPLY_FILE,ws2_32-Overlapping_FDS/0001-ws2_32-Improve-implementation-of-get_poll_results.patch)
@( \
echo '+ { "Sebastian Lackner", "ws2_32: Improve implementation of get_poll_results.", 1 },'; \
) > ws2_32-Overlapping_FDS.ok
# Patchset ws2_32-TransmitFile
# |
# | This patchset fixes the following Wine bugs:

10
patches/api-ms-win-core-Stubs/0001-api-ms-win-core-fibers-l1-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From f15052fa02af7b2cfa23131b713ba95a2bc1cfd5 Mon Sep 17 00:00:00 2001
From 64f473f115548812ccaaff7d891650d0059afb34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Nov 2014 21:31:43 +0100
Subject: api-ms-win-core-fibers-l1-1-0: Add dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-core-fibers-l1-1-0: Add dll.
create mode 100644 dlls/api-ms-win-core-fibers-l1-1-0/api-ms-win-core-fibers-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 04bcbd8..08baf3d 100644
index c33869e..48a2d0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2649,6 +2649,7 @@ WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0)
@ -22,8 +22,8 @@ index 04bcbd8..08baf3d 100644
WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1)
+WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0)
WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1)
WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0)
diff --git a/dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in b/dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in
new file mode 100644
index 0000000..f4cc782
@ -42,7 +42,7 @@ index 0000000..26afab1
+@ stdcall FlsGetValue(long) kernel32.FlsGetValue
+@ stdcall FlsSetValue(long ptr) kernel32.FlsSetValue
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 9eae0ac..7f232f3 100755
index 411f65e..d0d245c 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -134,6 +134,7 @@ my @dll_groups =
@ -54,5 +54,5 @@ index 9eae0ac..7f232f3 100755
"api-ms-win-core-profile-l1-1-0",
"api-ms-win-core-string-l1-1-0",
--
1.9.1
2.1.3

10
patches/api-ms-win-core-Stubs/0002-api-ms-win-core-fibers-l1-1-1-Add-dll.patch
View File

@ -1,4 +1,4 @@
From db337923b88b8c4ee1d3ff1dfdf2f23342d6e050 Mon Sep 17 00:00:00 2001
From 0e08bdde2ad4c44435ae02c3453ff6f9b87b6499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Nov 2014 18:09:04 +0100
Subject: api-ms-win-core-fibers-l1-1-1: Add dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-core-fibers-l1-1-1: Add dll.
create mode 100644 dlls/api-ms-win-core-fibers-l1-1-1/api-ms-win-core-fibers-l1-1-1.spec
diff --git a/configure.ac b/configure.ac
index 08baf3d..2e520b7 100644
index 48a2d0b..b8faada 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0)
@ -22,8 +22,8 @@ index 08baf3d..2e520b7 100644
WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-0)
+WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1)
WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0)
WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1)
WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0)
diff --git a/dlls/api-ms-win-core-fibers-l1-1-1/Makefile.in b/dlls/api-ms-win-core-fibers-l1-1-1/Makefile.in
new file mode 100644
index 0000000..98b7880
@ -43,7 +43,7 @@ index 0000000..4947543
+@ stdcall FlsSetValue(long ptr) kernel32.FlsSetValue
+@ stdcall IsThreadAFiber() kernel32.IsThreadAFiber
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 7f232f3..e9fe690 100755
index d0d245c..8c0c6b4 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -135,6 +135,7 @@ my @dll_groups =
@ -55,5 +55,5 @@ index 7f232f3..e9fe690 100755
"api-ms-win-core-profile-l1-1-0",
"api-ms-win-core-string-l1-1-0",
--
1.9.1
2.1.3

10
patches/api-ms-win-core-Stubs/0003-api-ms-win-core-file-l2-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From 3b0b1a819646462793dc613c5c26b0bb5cb99359 Mon Sep 17 00:00:00 2001
From a043b3b87b22c92e3c0014bf41ec39c87f9e4719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Nov 2014 18:33:41 +0100
Subject: api-ms-win-core-file-l2-1-0: Add dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-core-file-l2-1-0: Add dll.
create mode 100644 dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec
diff --git a/configure.ac b/configure.ac
index 2e520b7..66ff875 100644
index b8faada..5bceaad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2652,6 +2652,7 @@ WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1)
@ -21,9 +21,9 @@ index 2e520b7..66ff875 100644
WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1)
WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0)
+WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-0)
WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1)
WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0)
WINE_CONFIG_DLL(api-ms-win-core-heap-obsolete-l1-1-0)
diff --git a/dlls/api-ms-win-core-file-l2-1-0/Makefile.in b/dlls/api-ms-win-core-file-l2-1-0/Makefile.in
new file mode 100644
index 0000000..8edf54e
@ -49,7 +49,7 @@ index 0000000..914e0c0
+@ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW
+@ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW
diff --git a/tools/make_specfiles b/tools/make_specfiles
index e9fe690..0526dad 100755
index 8c0c6b4..ef78bb2 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -144,6 +144,7 @@ my @dll_groups =
@ -61,5 +61,5 @@ index e9fe690..0526dad 100755
"api-ms-win-core-heap-l1-2-0",
"api-ms-win-core-heap-obsolete-l1-1-0",
--
1.9.1
2.1.3

10
patches/api-ms-win-core-Stubs/0004-api-ms-win-core-localization-l1-2-1-Add-dll.patch
View File

@ -1,4 +1,4 @@
From 632b42d0b87dbfae613321374723d02ac6ddd3b1 Mon Sep 17 00:00:00 2001
From e89be694a987e4d2fc1f6f3e554b08b07c8b2ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Nov 2014 18:46:49 +0100
Subject: api-ms-win-core-localization-l1-2-1: Add dll.
@ -13,10 +13,10 @@ Subject: api-ms-win-core-localization-l1-2-1: Add dll.
create mode 100644 dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec
diff --git a/configure.ac b/configure.ac
index 66ff875..de6f5f3 100644
index 5bceaad..83ade37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2661,6 +2661,7 @@ WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1)
@@ -2662,6 +2662,7 @@ WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1)
WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-1)
WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-0)
@ -98,7 +98,7 @@ index 0000000..ccba739
+@ stdcall VerLanguageNameA(long str long) kernel32.VerLanguageNameA
+@ stdcall VerLanguageNameW(long wstr long) kernel32.VerLanguageNameW
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 0526dad..1896b86 100755
index ef78bb2..ab6c6b9 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -152,6 +152,7 @@ my @dll_groups =
@ -110,5 +110,5 @@ index 0526dad..1896b86 100755
"api-ms-win-core-memory-l1-1-1",
"api-ms-win-core-namedpipe-l1-2-0",
--
1.9.1
2.1.3

8
patches/api-ms-win-core-Stubs/0005-api-ms-win-core-datetime-l1-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From 68f5f730c4ae543796680c701a145f70f76ebb1f Mon Sep 17 00:00:00 2001
From cdba1db947a3d786cf655ad30070072d0fa1cff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Nov 2014 21:50:28 +0100
Subject: api-ms-win-core-datetime-l1-1-0: Add dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-core-datetime-l1-1-0: Add dll.
create mode 100644 dlls/api-ms-win-core-datetime-l1-1-0/api-ms-win-core-datetime-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index de6f5f3..ba780cb 100644
index 83ade37..39deabe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2647,6 +2647,7 @@ WINE_CONFIG_DLL(amstream,,[clean])
@ -42,7 +42,7 @@ index 0000000..c49cf5e
+@ stdcall GetTimeFormatA(long long ptr str ptr long) kernel32.GetTimeFormatA
+@ stdcall GetTimeFormatW(long long ptr wstr ptr long) kernel32.GetTimeFormatW
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 1896b86..abb6598 100755
index ab6c6b9..34c52d0 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -132,6 +132,7 @@ my @dll_groups =
@ -54,5 +54,5 @@ index 1896b86..abb6598 100755
"api-ms-win-core-errorhandling-l1-1-1",
"api-ms-win-core-fibers-l1-1-0",
--
1.9.1
2.1.3

8
patches/api-ms-win-core-Stubs/0006-api-ms-win-core-datetime-l1-1-1-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From a76edebdf974e92b8901605379dd29410bc5906d Mon Sep 17 00:00:00 2001
From 51ecbb1b098b251508fb91d6f1bf4a4cb5572438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Nov 2014 18:53:12 +0100
Subject: api-ms-win-core-datetime-l1-1-1: Add stub dll.
@ -13,7 +13,7 @@ Subject: api-ms-win-core-datetime-l1-1-1: Add stub dll.
create mode 100644 dlls/api-ms-win-core-datetime-l1-1-1/api-ms-win-core-datetime-l1-1-1.spec
diff --git a/configure.ac b/configure.ac
index ba780cb..acf34f8 100644
index 39deabe..e2b2da6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2648,6 +2648,7 @@ WINE_CONFIG_TEST(dlls/amstream/tests)
@ -44,7 +44,7 @@ index 0000000..5630929
+@ stub GetTimeFormatEx
+@ stdcall GetTimeFormatW(long long ptr wstr ptr long) kernel32.GetTimeFormatW
diff --git a/tools/make_specfiles b/tools/make_specfiles
index abb6598..71757a2 100755
index 34c52d0..8ab41d8 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -133,6 +133,7 @@ my @dll_groups =
@ -56,5 +56,5 @@ index abb6598..71757a2 100755
"api-ms-win-core-errorhandling-l1-1-1",
"api-ms-win-core-fibers-l1-1-0",
--
1.9.1
2.1.3

20
patches/api-ms-win-core-Stubs/0007-api-ms-win-core-xstate-l2-1-0-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From 26fdfe057afab41055eb1042f99f7aa603b399e7 Mon Sep 17 00:00:00 2001
From d506f1bb199ea494227ec0d5b86a5cbfee4711c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Nov 2014 19:07:20 +0100
Subject: api-ms-win-core-xstate-l2-1-0: Add stub dll.
@ -13,12 +13,12 @@ Subject: api-ms-win-core-xstate-l2-1-0: Add stub dll.
create mode 100644 dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec
diff --git a/configure.ac b/configure.ac
index acf34f8..dbf1695 100644
index e2b2da6..00103b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2685,6 +2685,7 @@ WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0)
@@ -2689,6 +2689,7 @@ WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0)
+WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0)
WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0)
@ -44,17 +44,17 @@ index 0000000..0f9438d
+@ stub LocateXStateFeature
+@ stub SetXStateFeaturesMask
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 71757a2..90fc838 100755
index 8ab41d8..bda1692 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -162,6 +162,7 @@ my @dll_groups =
"api-ms-win-core-psapi-l1-1-0",
"api-ms-win-core-threadpool-legacy-l1-1-0",
"api-ms-win-core-timezone-l1-1-0",
@@ -165,6 +165,7 @@ my @dll_groups =
"api-ms-win-core-file-l2-1-1",
"api-ms-win-core-sysinfo-l1-2-1",
"api-ms-win-core-processthreads-l1-1-2",
+ "api-ms-win-core-xstate-l2-1-0",
],
[
"ole32",
--
1.9.1
2.1.3

50
patches/api-ms-win-core-Stubs/0008-api-ms-win-core-winrt-l1-1-0-Add-stub-dll.patch
View File

@ -1,50 +0,0 @@
From e2bf5c71085b978c4b885e30f95a0c1d9ed08eeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Nov 2014 19:56:40 +0100
Subject: api-ms-win-core-winrt-l1-1-0: Add stub dll.
---
configure.ac | 1 +
dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in | 1 +
.../api-ms-win-core-winrt-l1-1-0.spec | 9 +++++++++
3 files changed, 11 insertions(+)
create mode 100644 dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in
create mode 100644 dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index dbf1695..f527861 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2684,6 +2684,7 @@ WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0)
+WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0)
WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0)
diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in b/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in
new file mode 100644
index 0000000..1660441
--- /dev/null
+++ b/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in
@@ -0,0 +1 @@
+MODULE = api-ms-win-core-winrt-l1-1-0.dll
diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec
new file mode 100644
index 0000000..08409ee
--- /dev/null
+++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec
@@ -0,0 +1,9 @@
+@ stub RoActivateInstance
+@ stub RoGetActivationFactory
+@ stub RoGetApartmentIdentifier
+@ stub RoInitialize
+@ stub RoRegisterActivationFactories
+@ stub RoRegisterForApartmentShutdown
+@ stub RoRevokeActivationFactories
+@ stub RoUninitialize
+@ stub RoUnregisterForApartmentShutdown
--
1.9.1

60
patches/api-ms-win-core-Stubs/0009-api-ms-win-core-winrt-error-l1-1-1-Add-stub-dll.patch
View File

@ -1,60 +0,0 @@
From 5ba78d48fe540ae4d5ae8b1c434983498fa8d2ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Nov 2014 20:13:34 +0100
Subject: api-ms-win-core-winrt-error-l1-1-1: Add stub dll.
---
configure.ac | 1 +
dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in | 1 +
.../api-ms-win-core-winrt-error-l1-1-1.spec | 19 +++++++++++++++++++
3 files changed, 21 insertions(+)
create mode 100644 dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in
create mode 100644 dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
diff --git a/configure.ac b/configure.ac
index f527861..b9b0e54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2684,6 +2684,7 @@ WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0)
+WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1)
WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0)
diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in b/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in
new file mode 100644
index 0000000..fe36f7b
--- /dev/null
+++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in
@@ -0,0 +1 @@
+MODULE = api-ms-win-core-winrt-error-l1-1-1.dll
diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
new file mode 100644
index 0000000..b1ad813
--- /dev/null
+++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
@@ -0,0 +1,19 @@
+@ stub GetRestrictedErrorInfo
+@ stub IsErrorPropagationEnabled
+@ stub RoCaptureErrorContext
+@ stub RoClearError
+@ stub RoFailFastWithErrorContext
+@ stub RoGetErrorReportingFlags
+@ stub RoGetMatchingRestrictedErrorInfo
+@ stub RoInspectCapturedStackBackTrace
+@ stub RoInspectThreadErrorInfo
+@ stub RoOriginateError
+@ stub RoOriginateErrorW
+@ stub RoOriginateLanguageException
+@ stub RoReportFailedDelegate
+@ stub RoReportUnhandledError
+@ stub RoResolveRestrictedErrorInfoReference
+@ stub RoSetErrorReportingFlags
+@ stub RoTransformError
+@ stub RoTransformErrorW
+@ stub SetRestrictedErrorInfo
--
1.9.1

14
patches/kernel32-GetFinalPathNameByHandle/0002-kernel32-tests-Add-tests-for-GetFinalPathNameByHandl.patch
View File

@ -1,4 +1,4 @@
From 10a86e0d87850cc77ee13b9e814dc8a9a558721b Mon Sep 17 00:00:00 2001
From 071454e8a76f0b26cc097434d780c12e472d5c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 12 Aug 2014 20:25:18 +0200
Subject: kernel32/tests: Add tests for GetFinalPathNameByHandle
@ -8,7 +8,7 @@ Subject: kernel32/tests: Add tests for GetFinalPathNameByHandle
1 file changed, 204 insertions(+)
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index ddfa019..55e9045 100644
index 8849eb3..bd92162 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -34,6 +34,7 @@
@ -26,9 +26,9 @@ index ddfa019..55e9045 100644
+static DWORD (WINAPI* pGetFinalPathNameByHandleA)(HANDLE, LPSTR, DWORD, DWORD);
+static DWORD (WINAPI* pGetFinalPathNameByHandleW)(HANDLE, LPWSTR, DWORD, DWORD);
/* keep filename and filenameW the same */
static const char filename[] = "testfile.xxx";
@@ -85,6 +88,8 @@ static void InitFunctionPointers(void)
static const char sillytext[] =
@@ -83,6 +86,8 @@ static void InitFunctionPointers(void)
pSetFileValidData = (void *) GetProcAddress(hkernel32, "SetFileValidData");
pCopyFile2 = (void *) GetProcAddress(hkernel32, "CopyFile2");
pCreateFile2 = (void *) GetProcAddress(hkernel32, "CreateFile2");
@ -37,7 +37,7 @@ index ddfa019..55e9045 100644
}
static void test__hread( void )
@@ -4145,6 +4150,203 @@ todo_wine
@@ -4182,6 +4187,203 @@ todo_wine
}
}
@ -241,7 +241,7 @@ index ddfa019..55e9045 100644
START_TEST(file)
{
InitFunctionPointers();
@@ -4191,4 +4393,6 @@ START_TEST(file)
@@ -4234,4 +4436,6 @@ START_TEST(file)
test_SetFileValidData();
test_WriteFileGather();
test_file_access();
@ -249,5 +249,5 @@ index ddfa019..55e9045 100644
+ test_GetFinalPathNameByHandleW();
}
--
2.1.0
2.1.3

29
patches/wintrust-Reset_hFile/0001-wintrust-Reset-data-pWintrustData-u.pFile-hFile-afte.patch
View File

@ -1,29 +0,0 @@
From 64e1f4ac26867d15c0957c0b0212c9b67a87cb5d Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 25 Nov 2014 21:26:54 +0100
Subject: wintrust: Reset data->pWintrustData->u.pFile->hFile after closing
handle.
---
dlls/wintrust/softpub.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c
index 358ba01..4e8582e 100644
--- a/dlls/wintrust/softpub.c
+++ b/dlls/wintrust/softpub.c
@@ -1209,7 +1209,11 @@ HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *data)
if (data->fOpenedFile &&
data->pWintrustData->dwUnionChoice == WTD_CHOICE_FILE &&
data->pWintrustData->u.pFile)
+ {
CloseHandle(data->pWintrustData->u.pFile->hFile);
+ data->pWintrustData->u.pFile->hFile = INVALID_HANDLE_VALUE;
+ data->fOpenedFile = FALSE;
+ }
return S_OK;
}
--
2.1.3

1
patches/wintrust-Reset_hFile/definition
View File

@ -1 +0,0 @@
Fixes: [36257] Wintrust doesn't reset data->pWintrustData->u.pFile->hFile after closing handle

86
patches/ws2_32-IP_Ordering/0001-ws2_32-WS_get_local_ips-Fix-ordering-of-IP-addresses.patch
View File

@ -1,86 +0,0 @@
From d35f6c60fc0b58a5a259b386ce7cad10d4ea2688 Mon Sep 17 00:00:00 2001
From: Joachim Priesner <joachim.priesner@web.de>
Date: Tue, 28 Oct 2014 10:20:31 +0100
Subject: ws2_32: WS_get_local_ips: Fix ordering of IP addresses by metric if
two addresses have the same metric (try 2)
The previous implementation required the metrics to be mutually inequal
(because of the "this_metric > last_metric" check). If the metrics were
not mutually inequal, it would write only one address per metric value to the list
and fill up the rest of the list with the magic loopback IP address 127.12.34.56.
Try 2 that uses qsort() as suggested by Ken Thomases.
---
dlls/ws2_32/socket.c | 38 +++++++++++++++++---------------------
1 file changed, 17 insertions(+), 21 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 29ac800..09c175a 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -5167,6 +5167,17 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type)
}
/***********************************************************************
+ * WS_compare_routes_by_metric_asc (INTERNAL)
+ *
+ * Comparison function for qsort(), for sorting two routes (struct route)
+ * by metric in ascending order.
+ */
+static int WS_compare_routes_by_metric_asc(const void *left, const void *right)
+{
+ return ((const struct route*)left)->metric - ((const struct route*)right)->metric;
+}
+
+/***********************************************************************
* WS_get_local_ips (INTERNAL)
*
* Returns the list of local IP addresses by going through the network
@@ -5180,7 +5191,7 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type)
*/
static struct WS_hostent* WS_get_local_ips( char *hostname )
{
- int last_metric, numroutes = 0, i, j;
+ int numroutes = 0, i, j;
DWORD n;
PIP_ADAPTER_INFO adapters = NULL, k;
struct WS_hostent *hostlist = NULL;
@@ -5260,30 +5271,15 @@ static struct WS_hostent* WS_get_local_ips( char *hostname )
hostlist->h_aliases[0] = NULL; /* NULL-terminate the alias list */
hostlist->h_addrtype = AF_INET;
hostlist->h_length = sizeof(struct in_addr); /* = 4 */
- /* Reorder the entries when placing them in the host list, Windows expects
+ /* Reorder the entries before placing them in the host list. Windows expects
* the IP list in order from highest priority to lowest (the critical thing
* is that most applications expect the first IP to be the default route).
*/
- last_metric = -1;
- for (i = 0; i < numroutes; i++)
- {
- struct in_addr addr;
- int metric = 0xFFFF;
+ if (numroutes > 1)
+ qsort(route_addrs, numroutes, sizeof(*route_addrs), WS_compare_routes_by_metric_asc);
- memcpy(&addr, magic_loopback_addr, 4);
- for (j = 0; j < numroutes; j++)
- {
- int this_metric = route_addrs[j].metric;
-
- if (this_metric > last_metric && this_metric < metric)
- {
- addr = route_addrs[j].addr;
- metric = this_metric;
- }
- }
- last_metric = metric;
- (*(struct in_addr *) hostlist->h_addr_list[i]) = addr;
- }
+ for (i = 0; i < numroutes; i++)
+ (*(struct in_addr *) hostlist->h_addr_list[i]) = route_addrs[i].addr;
/* Cleanup all allocated memory except the address list,
* the address list is used by the calling app.
--
2.1.3

1
patches/ws2_32-IP_Ordering/definition
View File

@ -1 +0,0 @@
Fixes: Fix ordering of IP addresses by metric if two addresses have the same metric.

71
patches/ws2_32-Overlapping_FDS/0001-ws2_32-Improve-implementation-of-get_poll_results.patch
View File

@ -1,71 +0,0 @@
From f99ad6da713e01db0db819cad23c59e3d5ba2886 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 29 Nov 2014 11:18:18 +0100
Subject: ws2_32: Improve implementation of get_poll_results.
The recent commit to allow overlapping fd sets made the implementation a bit ugly -
at some points elements in fds[...] are accessed with j, at other points its accessed
using other indices. By using pointers instead we can make that code look much simpler.
---
dlls/ws2_32/socket.c | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 29ac800..79c5a30 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -4386,36 +4386,37 @@ static void release_poll_fds( const WS_fd_set *readfds, const WS_fd_set *writefd
static int get_poll_results( WS_fd_set *readfds, WS_fd_set *writefds, WS_fd_set *exceptfds,
const struct pollfd *fds )
{
- unsigned int exceptfds_off = (readfds ? readfds->fd_count : 0) + (writefds ? writefds->fd_count : 0);
- unsigned int i, j = 0, k, total = 0;
+ const struct pollfd *poll_writefds = fds + (readfds ? readfds->fd_count : 0);
+ const struct pollfd *poll_exceptfds = poll_writefds + (writefds ? writefds->fd_count : 0);
+ unsigned int i, k, total = 0;
if (readfds)
{
- for (i = k = 0; i < readfds->fd_count; i++, j++)
+ for (i = k = 0; i < readfds->fd_count; i++)
{
-
- if (fds[j].revents ||
- (readfds==writefds && (fds[readfds->fd_count+i].revents & POLLOUT) &&
- !(fds[readfds->fd_count+i].revents & POLLHUP)) ||
- (readfds==exceptfds && fds[exceptfds_off+i].revents))
+ if (fds[i].revents ||
+ (readfds == writefds && (poll_writefds[i].revents & POLLOUT) && !(poll_writefds[i].revents & POLLHUP)) ||
+ (readfds == exceptfds && poll_exceptfds[i].revents))
readfds->fd_array[k++] = readfds->fd_array[i];
}
readfds->fd_count = k;
total += k;
}
- if (writefds && writefds!=readfds)
+ if (writefds && writefds != readfds)
{
- for (i = k = 0; i < writefds->fd_count; i++, j++)
- if (((fds[j].revents & POLLOUT) && !(fds[j].revents & POLLHUP)) ||
- (writefds==exceptfds && fds[exceptfds_off+i].revents))
+ for (i = k = 0; i < writefds->fd_count; i++)
+ {
+ if (((poll_writefds[i].revents & POLLOUT) && !(poll_writefds[i].revents & POLLHUP)) ||
+ (writefds == exceptfds && poll_exceptfds[i].revents))
writefds->fd_array[k++] = writefds->fd_array[i];
+ }
writefds->fd_count = k;
total += k;
}
- if (exceptfds && exceptfds!=readfds && exceptfds!=writefds)
+ if (exceptfds && exceptfds != readfds && exceptfds != writefds)
{
for (i = k = 0; i < exceptfds->fd_count; i++)
- if (fds[exceptfds_off+i].revents) exceptfds->fd_array[k++] = exceptfds->fd_array[i];
+ if (poll_exceptfds[i].revents) exceptfds->fd_array[k++] = exceptfds->fd_array[i];
exceptfds->fd_count = k;
total += k;
}
--
2.1.3