wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 94845c400e2d09c96854e756075a0004c17776bb.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-08-24 09:28:14 +02:00
parent d86ab36369
commit 9961dd76da
8 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/api-ms-win-Stub_DLLs/0005-api-ms-win-core-heap-l2-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From d8b9e665f8ec796e7232700e0cc9df5b6b945c77 Mon Sep 17 00:00:00 2001
From 44b3c322128fed9096fb2a329d64e838c20b8a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 16 Jan 2016 20:03:48 +0100
Subject: api-ms-win-core-heap-l2-1-0: Add dll.
@ -13,10 +13,10 @@ Subject: api-ms-win-core-heap-l2-1-0: Add dll.
create mode 100644 dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec
diff --git a/configure.ac b/configure.ac
index 36d95c9..4fe0992 100644
index 430fa05..2ec53be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2645,6 +2645,7 @@ WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1)
@@ -2660,6 +2660,7 @@ 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-1-0)
WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0)
@ -45,17 +45,17 @@ index 0000000..81308d2
+@ stdcall LocalReAlloc(long long long) kernel32.LocalReAlloc
+@ stdcall LocalUnlock(long) kernel32.LocalUnlock
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 03e753f..d945fbe 100755
index 87a31d0..e504e24 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -185,6 +185,7 @@ my @dll_groups =
@@ -154,6 +154,7 @@ my @dll_groups =
"api-ms-win-core-handle-l1-1-0",
"api-ms-win-core-heap-l1-1-0",
"api-ms-win-core-heap-l1-2-0",
+ "api-ms-win-core-heap-l2-1-0",
"api-ms-win-core-heap-obsolete-l1-1-0",
"api-ms-win-core-io-l1-1-1",
"api-ms-win-core-kernel32-legacy-l1-1-0",
"api-ms-win-core-job-l1-1-0",
--
2.6.4
2.9.0

14
patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From 9a4670c39fd3973522c8c5f7bb9252129aab0967 Mon Sep 17 00:00:00 2001
From bfbf931272f7ed81a9e04c55c47abbc70f0d2b0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 17:02:41 +0100
Subject: api-ms-win-shcore-obsolete-l1-1-0: Add dll.
@ -13,17 +13,17 @@ Subject: api-ms-win-shcore-obsolete-l1-1-0: Add dll.
create mode 100644 dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index d5f8e7d..ec0afd4 100644
index c79dc8b..222c17f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2735,6 +2735,7 @@ WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0)
@@ -2756,6 +2756,7 @@ WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1)
WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0)
+WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0)
WINE_CONFIG_DLL(apphelp)
WINE_CONFIG_TEST(dlls/apphelp/tests)
WINE_CONFIG_DLL(appwiz.cpl,,[clean])
diff --git a/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in
new file mode 100644
index 0000000..6588d13
@ -41,10 +41,10 @@ index 0000000..edb8143
+@ stdcall SHStrDupA(str ptr) shcore.SHStrDupA
+@ stdcall SHStrDupW(wstr ptr) shcore.SHStrDupW
diff --git a/tools/make_specfiles b/tools/make_specfiles
index cf8bc20..b5aa9d6 100755
index aad0771..65b5757 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -266,6 +266,10 @@ my @dll_groups =
@@ -238,6 +238,10 @@ my @dll_groups =
"shcore",
],
[
@ -56,5 +56,5 @@ index cf8bc20..b5aa9d6 100755
"api-ms-win-core-string-l2-1-0",
"api-ms-win-downlevel-user32-l1-1-0",
--
2.7.1
2.9.0

14
patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From 7100e12fb3dcc986f210cf0a41e462fbcc122906 Mon Sep 17 00:00:00 2001
From ff834a2e2b529302bb042c163bcb46428e5dba63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 19 Jan 2016 16:19:11 +0100
Subject: api-ms-win-shcore-thread-l1-1-0: Add dll
@ -13,17 +13,17 @@ Subject: api-ms-win-shcore-thread-l1-1-0: Add dll
create mode 100644 dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 442335d..d2bac7d 100644
index d293ad4..09ca59b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2751,6 +2751,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1)
@@ -2757,6 +2757,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1)
WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0)
WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0)
+WINE_CONFIG_DLL(api-ms-win-shcore-thread-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0)
WINE_CONFIG_DLL(apphelp)
WINE_CONFIG_TEST(dlls/apphelp/tests)
WINE_CONFIG_DLL(appwiz.cpl,,[clean])
diff --git a/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in
new file mode 100644
index 0000000..0a20ccf
@ -46,10 +46,10 @@ index 0000000..1533005
+@ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef
+@ stub SetProcessReference
diff --git a/tools/make_specfiles b/tools/make_specfiles
index f7d7ede..c7761b9 100755
index 65b5757..44304e4 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -266,6 +266,7 @@ my @dll_groups =
@@ -240,6 +240,7 @@ my @dll_groups =
[
"shcore",
"api-ms-win-shcore-obsolete-l1-1-0",
@ -58,5 +58,5 @@ index f7d7ede..c7761b9 100755
[
"user32",
--
2.7.1
2.9.0

14
patches/api-ms-win-Stub_DLLs/0013-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From ffe4994aea8261274e79e142c0ba37df87ffdebb Mon Sep 17 00:00:00 2001
From 3a6430e77123ca8e40593877cea943ac2baff144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 21 Jan 2016 00:52:33 +0100
Subject: api-ms-win-core-shlwapi-obsolete-l1-2-0: Add dll.
@ -13,17 +13,17 @@ Subject: api-ms-win-core-shlwapi-obsolete-l1-2-0: Add dll.
create mode 100644 dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec
diff --git a/configure.ac b/configure.ac
index dd3074a..2ba3014 100644
index 09ca59b..fa754f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2680,6 +2680,7 @@ WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0)
@@ -2698,6 +2698,7 @@ WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0)
WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0)
+WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-2-0)
WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0)
WINE_CONFIG_DLL(api-ms-win-core-synch-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-string-obsolete-l1-1-0)
diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in
new file mode 100644
index 0000000..3f39b0b
@ -97,10 +97,10 @@ index 0000000..8b8b520
+@ stdcall StrTrimA(str str) shlwapi.StrTrimA
+@ stdcall StrTrimW(wstr wstr) shlwapi.StrTrimW
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 4a08e9c..3777632 100755
index 44304e4..9084162 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -258,6 +258,7 @@ my @dll_groups =
@@ -230,6 +230,7 @@ my @dll_groups =
"api-ms-win-downlevel-shlwapi-l1-1-0",
"api-ms-win-downlevel-shlwapi-l2-1-0",
"api-ms-win-core-shlwapi-legacy-l1-1-0",
@ -109,5 +109,5 @@ index 4a08e9c..3777632 100755
],
[
--
2.7.1
2.9.0

14
patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From 3c6d2e90631603492ca4aab85db1369f6b8377ac Mon Sep 17 00:00:00 2001
From c67dacd83cecd143683464fe0ce4cc35a13ff34d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 23 Jan 2016 20:56:53 +0100
Subject: api-ms-win-shcore-stream-l1-1-0: Add dll
@ -13,17 +13,17 @@ Subject: api-ms-win-shcore-stream-l1-1-0: Add dll
create mode 100644 dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 0aeb5dd..ecd03c7 100644
index fa754f9..0f1b88a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2734,6 +2734,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1)
@@ -2758,6 +2758,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1)
WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0)
WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0)
+WINE_CONFIG_DLL(api-ms-win-shcore-stream-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-shcore-thread-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0)
WINE_CONFIG_DLL(apphelp)
WINE_CONFIG_TEST(dlls/apphelp/tests)
diff --git a/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in
new file mode 100644
index 0000000..df2caad
@ -53,10 +53,10 @@ index 0000000..1ee9dd3
+@ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA
+@ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 46284d5..289b980 100755
index 9084162..9ced1f0 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -268,6 +268,7 @@ my @dll_groups =
@@ -242,6 +242,7 @@ my @dll_groups =
"shcore",
"api-ms-win-shcore-obsolete-l1-1-0",
"api-ms-win-shcore-thread-l1-1-0",
@ -65,5 +65,5 @@ index 46284d5..289b980 100755
[
"user32",
--
2.6.4
2.9.0

14
patches/api-ms-win-Stub_DLLs/0017-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From 7e4ebcb33dad0af77407a89d2691a1c0c9690688 Mon Sep 17 00:00:00 2001
From 86ff91dc33ace73a88368efbd5019500b153d8eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 23 Jan 2016 21:05:14 +0100
Subject: api-ms-win-rtcore-ntuser-window-l1-1-0: Add dll
@ -13,12 +13,12 @@ Subject: api-ms-win-rtcore-ntuser-window-l1-1-0: Add dll
create mode 100644 dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 402b642..1c707b3 100644
index c31ebf8..67d826a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2728,6 +2728,7 @@ WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-eventing-classicprovider-l1-1-0)
@@ -2749,6 +2749,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-classicprovider-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0)
+WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-window-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0)
@ -119,10 +119,10 @@ index 0000000..b7575c6
+@ stdcall WaitMessage() user32.WaitMessage
+@ stdcall WindowFromPoint(int64) user32.WindowFromPoint
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 4a782ba..090640b 100755
index 0f299c5..7678d54 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -277,6 +277,7 @@ my @dll_groups =
@@ -249,6 +249,7 @@ my @dll_groups =
"api-ms-win-core-string-l2-1-0",
"api-ms-win-downlevel-user32-l1-1-0",
"api-ms-win-ntuser-dc-access-l1-1-0",
@ -131,5 +131,5 @@ index 4a782ba..090640b 100755
],
[
--
2.7.1
2.9.0

14
patches/api-ms-win-Stub_DLLs/0019-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From b25de463a2989e3c328f6250e109fa143782fcc6 Mon Sep 17 00:00:00 2001
From 6d55805327e47fe237814aa4944fe5c7bb5f142a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 23 Jan 2016 21:08:48 +0100
Subject: api-ms-win-rtcore-ntuser-draw-l1-1-0: Add dll.
@ -13,12 +13,12 @@ Subject: api-ms-win-rtcore-ntuser-draw-l1-1-0: Add dll.
create mode 100644 dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index bf93e84..628ae61 100644
index 4a67c23..aa2181d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2728,6 +2728,7 @@ WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-eventing-classicprovider-l1-1-0)
@@ -2749,6 +2749,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-classicprovider-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0)
+WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-draw-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-window-l1-1-0)
@ -39,10 +39,10 @@ index 0000000..59900a9
@@ -0,0 +1 @@
+@ stdcall RedrawWindow(long ptr long long) user32.RedrawWindow
diff --git a/tools/make_specfiles b/tools/make_specfiles
index ed6d72a..bbf2b5e 100755
index 615e6e3..8e768d0 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -277,6 +277,7 @@ my @dll_groups =
@@ -249,6 +249,7 @@ my @dll_groups =
"api-ms-win-core-string-l2-1-0",
"api-ms-win-downlevel-user32-l1-1-0",
"api-ms-win-ntuser-dc-access-l1-1-0",
@ -51,5 +51,5 @@ index ed6d72a..bbf2b5e 100755
"ext-ms-win-ntuser-mouse-l1-1-0",
"ext-ms-win-rtcore-ntuser-syscolors-l1-1-0",
--
2.7.1
2.9.0

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "90173ce448e5afe55627c2cbece28fb4f6bae99d"
echo "94845c400e2d09c96854e756075a0004c17776bb"
}
# Show version information