mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 62277fb7779f76341efc71999d59242055be5c31.
This commit is contained in:
Sebastian Lackner
parent
9dd2e4a075
commit
c11992eadd
@ -1,4 +1,4 @@
|
||||
From 973646f2c179624b6de64b6cb4d2be74ce6a7f0f Mon Sep 17 00:00:00 2001
|
||||
From e7dfb60036cd8a437bbe586507ea7f895c0da0e0 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 17 Jan 2016 20:17:46 +0100
|
||||
Subject: shcore: Add dll.
|
||||
@ -13,10 +13,10 @@ Subject: shcore: Add dll.
|
||||
create mode 100644 dlls/shcore/shcore.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 2de0e77..29e46ec 100644
|
||||
index 7daf5a8..d5f8e7d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3253,6 +3253,7 @@ WINE_CONFIG_TEST(dlls/setupapi/tests)
|
||||
@@ -3238,6 +3238,7 @@ WINE_CONFIG_TEST(dlls/setupapi/tests)
|
||||
WINE_CONFIG_DLL(setupx.dll16,enable_win16)
|
||||
WINE_CONFIG_DLL(sfc,,[implib])
|
||||
WINE_CONFIG_DLL(sfc_os,,[implib])
|
||||
@ -121,10 +121,10 @@ index 0000000..12a4ef3
|
||||
+@ stub SetProcessReference
|
||||
+@ stub UnregisterScaleChangeEvent
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index ef32690..613c9c7 100755
|
||||
index ce6dc2f..cf8bc20 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -259,6 +259,11 @@ my @dll_groups =
|
||||
@@ -261,6 +261,11 @@ my @dll_groups =
|
||||
"api-ms-win-core-url-l1-1-0",
|
||||
],
|
||||
[
|
||||
@ -134,8 +134,8 @@ index ef32690..613c9c7 100755
|
||||
+ ],
|
||||
+ [
|
||||
"user32",
|
||||
"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",
|
||||
--
|
||||
2.7.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From ffb9c50ef1528d11dad953314da5f615bbe18a36 Mon Sep 17 00:00:00 2001
|
||||
From 9a4670c39fd3973522c8c5f7bb9252129aab0967 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,10 +13,10 @@ 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 29e46ec..b61d4d8 100644
|
||||
index d5f8e7d..ec0afd4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2750,6 +2750,7 @@ WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0)
|
||||
@@ -2735,6 +2735,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)
|
||||
@ -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 613c9c7..f7d7ede 100755
|
||||
index cf8bc20..b5aa9d6 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -264,6 +264,10 @@ my @dll_groups =
|
||||
@@ -266,6 +266,10 @@ my @dll_groups =
|
||||
"shcore",
|
||||
],
|
||||
[
|
||||
@ -53,8 +53,8 @@ index 613c9c7..f7d7ede 100755
|
||||
+ ],
|
||||
+ [
|
||||
"user32",
|
||||
"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",
|
||||
--
|
||||
2.7.1
|
||||
|
||||
|
||||
@ -1,94 +0,0 @@
|
||||
From c61580a063cac3a8ed54afb5df03ab1ccf60f1df 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:42:35 +0100
|
||||
Subject: api-ms-win-core-memory-l1-1-2: Add dll.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/api-ms-win-core-memory-l1-1-2/Makefile.in | 1 +
|
||||
.../api-ms-win-core-memory-l1-1-2.spec | 40 ++++++++++++++++++++++
|
||||
tools/make_specfiles | 1 +
|
||||
4 files changed, 43 insertions(+)
|
||||
create mode 100644 dlls/api-ms-win-core-memory-l1-1-2/Makefile.in
|
||||
create mode 100644 dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 09332f4..67fd5d5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2664,6 +2664,7 @@ WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-1)
|
||||
+WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-2)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-misc-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0)
|
||||
diff --git a/dlls/api-ms-win-core-memory-l1-1-2/Makefile.in b/dlls/api-ms-win-core-memory-l1-1-2/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..d76aa0c
|
||||
--- /dev/null
|
||||
+++ b/dlls/api-ms-win-core-memory-l1-1-2/Makefile.in
|
||||
@@ -0,0 +1 @@
|
||||
+MODULE = api-ms-win-core-memory-l1-1-2.dll
|
||||
diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec
|
||||
new file mode 100644
|
||||
index 0000000..c563507
|
||||
--- /dev/null
|
||||
+++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec
|
||||
@@ -0,0 +1,40 @@
|
||||
+@ stdcall AllocateUserPhysicalPages(long ptr ptr) kernel32.AllocateUserPhysicalPages
|
||||
+@ stub AllocateUserPhysicalPagesNuma
|
||||
+@ stub CreateFileMappingFromApp
|
||||
+@ stub CreateFileMappingNumaW
|
||||
+@ stdcall CreateFileMappingW(long ptr long long long wstr) kernel32.CreateFileMappingW
|
||||
+@ stdcall CreateMemoryResourceNotification(long) kernel32.CreateMemoryResourceNotification
|
||||
+@ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile
|
||||
+@ stdcall FreeUserPhysicalPages(long ptr ptr) kernel32.FreeUserPhysicalPages
|
||||
+@ stub GetLargePageMinimum
|
||||
+@ stub GetMemoryErrorHandlingCapabilities
|
||||
+@ stub GetProcessWorkingSetSizeEx
|
||||
+@ stdcall GetSystemFileCacheSize(ptr ptr ptr) kernel32.GetSystemFileCacheSize
|
||||
+@ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch
|
||||
+@ stub MapUserPhysicalPages
|
||||
+@ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile
|
||||
+@ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx
|
||||
+@ stub MapViewOfFileFromApp
|
||||
+@ stdcall OpenFileMappingW(long long wstr) kernel32.OpenFileMappingW
|
||||
+@ stub PrefetchVirtualMemory
|
||||
+@ stdcall QueryMemoryResourceNotification(ptr ptr) kernel32.QueryMemoryResourceNotification
|
||||
+@ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory
|
||||
+@ stub RegisterBadMemoryNotification
|
||||
+@ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch
|
||||
+@ stub SetProcessWorkingSetSizeEx
|
||||
+@ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize
|
||||
+@ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile
|
||||
+@ stub UnmapViewOfFileEx
|
||||
+@ stub UnregisterBadMemoryNotification
|
||||
+@ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc
|
||||
+@ stdcall VirtualAllocEx(long ptr long long long) kernel32.VirtualAllocEx
|
||||
+@ stub VirtualAllocExNuma
|
||||
+@ stdcall VirtualFree(ptr long long) kernel32.VirtualFree
|
||||
+@ stdcall VirtualFreeEx(long ptr long long) kernel32.VirtualFreeEx
|
||||
+@ stdcall VirtualLock(ptr long) kernel32.VirtualLock
|
||||
+@ stdcall VirtualProtect(ptr long long ptr) kernel32.VirtualProtect
|
||||
+@ stdcall VirtualProtectEx(long ptr long long ptr) kernel32.VirtualProtectEx
|
||||
+@ stdcall VirtualQuery(ptr ptr long) kernel32.VirtualQuery
|
||||
+@ stdcall VirtualQueryEx(long ptr ptr long) kernel32.VirtualQueryEx
|
||||
+@ stdcall VirtualUnlock(ptr long) kernel32.VirtualUnlock
|
||||
+@ stdcall WriteProcessMemory(long ptr ptr long ptr) kernel32.WriteProcessMemory
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index f972879..8498606 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -195,6 +195,7 @@ my @dll_groups =
|
||||
"api-ms-win-core-localization-obsolete-l1-1-0",
|
||||
"api-ms-win-core-memory-l1-1-0",
|
||||
"api-ms-win-core-memory-l1-1-1",
|
||||
+ "api-ms-win-core-memory-l1-1-2",
|
||||
"api-ms-win-core-processenvironment-l1-1-0",
|
||||
"api-ms-win-core-processenvironment-l1-2-0",
|
||||
"api-ms-win-core-psapi-l1-1-0",
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 5d0b4a27e9ed7d0ee6a763586715c8d9d7f424ee Mon Sep 17 00:00:00 2001
|
||||
From ffe4994aea8261274e79e142c0ba37df87ffdebb 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 e10e890..e329038 100644
|
||||
index dd3074a..2ba3014 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2681,6 +2681,7 @@ WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0)
|
||||
@@ -2680,6 +2680,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-synch-l1-2-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 b9a96c7..8b63c60 100755
|
||||
index 4a08e9c..3777632 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -255,6 +255,7 @@ my @dll_groups =
|
||||
@@ -258,6 +258,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 b9a96c7..8b63c60 100755
|
||||
],
|
||||
[
|
||||
--
|
||||
2.6.4
|
||||
2.7.1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 26424422874fe4adece3ac6f9ac9b1264e4e3b52 Mon Sep 17 00:00:00 2001
|
||||
From 75862379c05979ced69231fc1d69a6d7a750dfcb 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:00:39 +0100
|
||||
Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
|
||||
@ -13,10 +13,10 @@ Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
|
||||
create mode 100644 dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ecd03c7..566b8f1 100644
|
||||
index c46edf6..ff6de50 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2937,6 +2937,7 @@ WINE_CONFIG_DLL(explorerframe,,[clean])
|
||||
@@ -2940,6 +2940,7 @@ WINE_CONFIG_DLL(explorerframe,,[clean])
|
||||
WINE_CONFIG_TEST(dlls/explorerframe/tests)
|
||||
WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
|
||||
@ -43,11 +43,11 @@ index 0000000..22128a2
|
||||
+@ stdcall SetCapture(long) user32.SetCapture
|
||||
+@ stdcall TrackMouseEvent(ptr) user32.TrackMouseEvent
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index 289b980..692acd8 100755
|
||||
index 1b2c0bf..6e39ccc 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -274,6 +274,7 @@ my @dll_groups =
|
||||
"user32",
|
||||
@@ -277,6 +277,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",
|
||||
+ "ext-ms-win-ntuser-mouse-l1-1-0",
|
||||
@ -55,5 +55,5 @@ index 289b980..692acd8 100755
|
||||
[
|
||||
"version",
|
||||
--
|
||||
2.6.4
|
||||
2.7.1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 94e15216c8b2079c5b1b503594ead6f548158f57 Mon Sep 17 00:00:00 2001
|
||||
From 7e4ebcb33dad0af77407a89d2691a1c0c9690688 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,10 +13,10 @@ 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 308f04e..9ee4464 100644
|
||||
index 402b642..1c707b3 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2725,6 +2725,7 @@ WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0)
|
||||
@@ -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)
|
||||
WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0)
|
||||
@ -119,11 +119,11 @@ index 0000000..b7575c6
|
||||
+@ stdcall WaitMessage() user32.WaitMessage
|
||||
+@ stdcall WindowFromPoint(int64) user32.WindowFromPoint
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index 7afc0c1..c88a32c 100755
|
||||
index 4a782ba..090640b 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -274,6 +274,7 @@ my @dll_groups =
|
||||
"user32",
|
||||
@@ -277,6 +277,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",
|
||||
+ "api-ms-win-rtcore-ntuser-window-l1-1-0",
|
||||
@ -131,5 +131,5 @@ index 7afc0c1..c88a32c 100755
|
||||
],
|
||||
[
|
||||
--
|
||||
2.6.4
|
||||
2.7.1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 509aeb70de5e2efb1a2e2c36263991392767bafa Mon Sep 17 00:00:00 2001
|
||||
From b25de463a2989e3c328f6250e109fa143782fcc6 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,10 +13,10 @@ 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 f38d37a..4c803cc 100644
|
||||
index bf93e84..628ae61 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2725,6 +2725,7 @@ WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0)
|
||||
@@ -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)
|
||||
WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0)
|
||||
@ -39,11 +39,11 @@ 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 a602e5d..f482264 100755
|
||||
index ed6d72a..bbf2b5e 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -274,6 +274,7 @@ my @dll_groups =
|
||||
"user32",
|
||||
@@ -277,6 +277,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",
|
||||
+ "api-ms-win-rtcore-ntuser-draw-l1-1-0",
|
||||
@ -51,5 +51,5 @@ index a602e5d..f482264 100755
|
||||
"ext-ms-win-ntuser-mouse-l1-1-0",
|
||||
"ext-ms-win-rtcore-ntuser-syscolors-l1-1-0",
|
||||
--
|
||||
2.6.4
|
||||
2.7.1
|
||||
|
||||
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "630f5e97b12c1bc934e44a632d30e9129651bb06"
|
||||
echo "62277fb7779f76341efc71999d59242055be5c31"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -2667,8 +2667,7 @@ fi
|
||||
# | * configure.ac, dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in, dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-
|
||||
# | appmodel-runtime-l1-1-1.spec, dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in, dlls/api-ms-win-core-apiquery-l1-1-0
|
||||
# | /api-ms-win-core-apiquery-l1-1-0.spec, dlls/api-ms-win-core-heap-l2-1-0/Makefile.in, dlls/api-ms-win-core-heap-l2-1-0
|
||||
# | /api-ms-win-core-heap-l2-1-0.spec, dlls/api-ms-win-core-memory-l1-1-2/Makefile.in, dlls/api-ms-win-core-memory-l1-1-2
|
||||
# | /api-ms-win-core-memory-l1-1-2.spec, dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in, dlls/api-ms-win-core-quirks-l1-1-0
|
||||
# | /api-ms-win-core-heap-l2-1-0.spec, dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in, dlls/api-ms-win-core-quirks-l1-1-0
|
||||
# | /api-ms-win-core-quirks-l1-1-0.spec, dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in, dlls/api-ms-win-core-
|
||||
# | shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec, dlls/api-ms-win-rtcore-ntuser-
|
||||
# | draw-l1-1-0/Makefile.in, dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec, dlls/api-
|
||||
@ -2703,20 +2702,19 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
|
||||
patch_apply api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0013-api-ms-win-core-memory-l1-1-2-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0014-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0015-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0016-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0017-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0018-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0019-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0020-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0021-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0022-ext-ms-win-kernel32-package-current-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0023-shcore-Add-SetProcessDpiAwareness-stub.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0024-shcore-Implement-stub-for-GetDpiForMonitor.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0025-kernelbase-Add-stub-for-QuirkIsEnabled3.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0026-shcore-Add-stub-for-GetProcessDpiAwareness.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0013-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0015-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0017-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0019-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0020-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0021-ext-ms-win-kernel32-package-current-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0022-shcore-Add-SetProcessDpiAwareness-stub.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0023-shcore-Implement-stub-for-GetDpiForMonitor.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0024-kernelbase-Add-stub-for-QuirkIsEnabled3.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0025-shcore-Add-stub-for-GetProcessDpiAwareness.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "kernelbase: Add dll and add stub for QuirkIsEnabled.", 1 },';
|
||||
echo '+ { "Michael Müller", "api-ms-win-core-quirks-l1-1-0: Add dll.", 1 },';
|
||||
@ -2730,7 +2728,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
|
||||
echo '+ { "Michael Müller", "ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for UserContextExtInitialize.", 1 },';
|
||||
echo '+ { "Michael Müller", "api-ms-win-shcore-thread-l1-1-0: Add dll.", 1 },';
|
||||
echo '+ { "Michael Müller", "ext-ms-win-xaml-pal-l1-1-0: Add stub for GetThemeServices.", 1 },';
|
||||
echo '+ { "Michael Müller", "api-ms-win-core-memory-l1-1-2: Add dll.", 1 },';
|
||||
echo '+ { "Michael Müller", "api-ms-win-core-shlwapi-obsolete-l1-2-0: Add dll.", 1 },';
|
||||
echo '+ { "Michael Müller", "api-ms-win-shcore-stream-l1-1-0: Add dll.", 1 },';
|
||||
echo '+ { "Michael Müller", "ext-ms-win-ntuser-mouse-l1-1-0: Add dll.", 1 },';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 53a49004741dbe3d7cf1b9e79ed0a5b021bef51a Mon Sep 17 00:00:00 2001
|
||||
From c89131518dc8b8fd1995628ccf2832c6fd0e106a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 6 Jun 2015 06:53:34 +0200
|
||||
Subject: wined3d: Use real values for memory accounting on NVIDIA cards.
|
||||
@ -10,10 +10,10 @@ Subject: wined3d: Use real values for memory accounting on NVIDIA cards.
|
||||
3 files changed, 38 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
|
||||
index c746d18..f33b313 100644
|
||||
index c410a47..cb80e0b 100644
|
||||
--- a/dlls/wined3d/device.c
|
||||
+++ b/dlls/wined3d/device.c
|
||||
@@ -1181,8 +1181,31 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device)
|
||||
@@ -1244,8 +1244,31 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device)
|
||||
|
||||
UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device *device)
|
||||
{
|
||||
@ -46,10 +46,10 @@ index c746d18..f33b313 100644
|
||||
wine_dbgstr_longlong(device->adapter->vram_bytes),
|
||||
wine_dbgstr_longlong(device->adapter->vram_bytes_used),
|
||||
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
|
||||
index ce23c47..af7a63b 100644
|
||||
index 1aea568..999c7b3 100644
|
||||
--- a/dlls/wined3d/directx.c
|
||||
+++ b/dlls/wined3d/directx.c
|
||||
@@ -220,6 +220,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
|
||||
@@ -225,6 +225,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
|
||||
{"GL_NV_vertex_program2", NV_VERTEX_PROGRAM2 },
|
||||
{"GL_NV_vertex_program2_option", NV_VERTEX_PROGRAM2_OPTION },
|
||||
{"GL_NV_vertex_program3", NV_VERTEX_PROGRAM3 },
|
||||
@ -57,7 +57,7 @@ index ce23c47..af7a63b 100644
|
||||
|
||||
/* SGI */
|
||||
{"GL_SGIS_generate_mipmap", SGIS_GENERATE_MIPMAP },
|
||||
@@ -1395,7 +1396,8 @@ static const struct gpu_description *get_gpu_description(enum wined3d_pci_vendor
|
||||
@@ -1401,7 +1402,8 @@ static const struct gpu_description *get_gpu_description(enum wined3d_pci_vendor
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -67,8 +67,8 @@ index ce23c47..af7a63b 100644
|
||||
enum wined3d_pci_vendor vendor, enum wined3d_pci_device device)
|
||||
{
|
||||
OSVERSIONINFOW os_version;
|
||||
@@ -1504,6 +1506,16 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
|
||||
driver = DRIVER_UNKNOWN;
|
||||
@@ -1522,6 +1524,16 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
|
||||
driver_info->vram_bytes = LONG_MAX;
|
||||
}
|
||||
|
||||
+ if (gl_info->supported[NVX_GPU_MEMORY_INFO])
|
||||
@ -84,7 +84,7 @@ index ce23c47..af7a63b 100644
|
||||
if (wined3d_settings.emulated_textureram)
|
||||
{
|
||||
TRACE("Overriding amount of video memory with 0x%s bytes.\n",
|
||||
@@ -3804,7 +3816,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
|
||||
@@ -3848,7 +3860,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD
|
||||
}
|
||||
|
||||
fixup_extensions(gl_info, gl_renderer_str, gl_vendor, card_vendor, device);
|
||||
@ -94,10 +94,10 @@ index ce23c47..af7a63b 100644
|
||||
| adapter->fragment_pipe->get_emul_mask(gl_info);
|
||||
if (gl_ext_emul_mask & GL_EXT_EMUL_ARB_MULTITEXTURE)
|
||||
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
|
||||
index 8c07ed1..3007516 100644
|
||||
index 51053c5..87eca96 100644
|
||||
--- a/dlls/wined3d/wined3d_gl.h
|
||||
+++ b/dlls/wined3d/wined3d_gl.h
|
||||
@@ -153,6 +153,7 @@ enum wined3d_gl_extension
|
||||
@@ -158,6 +158,7 @@ enum wined3d_gl_extension
|
||||
NV_VERTEX_PROGRAM2,
|
||||
NV_VERTEX_PROGRAM2_OPTION,
|
||||
NV_VERTEX_PROGRAM3,
|
||||
@ -106,5 +106,5 @@ index 8c07ed1..3007516 100644
|
||||
SGIS_GENERATE_MIPMAP,
|
||||
/* WGL extensions */
|
||||
--
|
||||
2.4.5
|
||||
2.7.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From ec5f680e18fcd9cc1b601cec01fb2bc289b966ba Mon Sep 17 00:00:00 2001
|
||||
From c81211b6fa3814abbb6e1aa27a4c3c7913f6cf53 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Wed, 4 Nov 2015 19:31:30 +0100
|
||||
Subject: wined3d: Rename wined3d_resource_(un)map to
|
||||
@ -105,19 +105,19 @@ index 565f642..c0f20eb 100644
|
||||
|
||||
switch(hr)
|
||||
diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c
|
||||
index dd75fff..639988b 100644
|
||||
index fb3afb3..a0095e2 100644
|
||||
--- a/dlls/d3d8/volume.c
|
||||
+++ b/dlls/d3d8/volume.c
|
||||
@@ -146,7 +146,7 @@ static HRESULT WINAPI d3d8_volume_LockBox(IDirect3DVolume8 *iface,
|
||||
iface, locked_box, box, flags);
|
||||
|
||||
wined3d_mutex_lock();
|
||||
- hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx,
|
||||
+ hr = wined3d_resource_sub_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx,
|
||||
&map_desc, (const struct wined3d_box *)box, flags);
|
||||
- if (FAILED(hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture),
|
||||
+ if (FAILED(hr = wined3d_resource_sub_resource_map(wined3d_texture_get_resource(volume->wined3d_texture),
|
||||
volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, flags)))
|
||||
map_desc.data = NULL;
|
||||
wined3d_mutex_unlock();
|
||||
|
||||
@@ -165,7 +165,7 @@ static HRESULT WINAPI d3d8_volume_UnlockBox(IDirect3DVolume8 *iface)
|
||||
@@ -166,7 +166,7 @@ static HRESULT WINAPI d3d8_volume_UnlockBox(IDirect3DVolume8 *iface)
|
||||
TRACE("iface %p.\n", iface);
|
||||
|
||||
wined3d_mutex_lock();
|
||||
@ -149,19 +149,19 @@ index a0a1f27..8a718a8 100644
|
||||
|
||||
switch(hr)
|
||||
diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c
|
||||
index c032a01..24067dd 100644
|
||||
index 0346f98..5b01fa7 100644
|
||||
--- a/dlls/d3d9/volume.c
|
||||
+++ b/dlls/d3d9/volume.c
|
||||
@@ -146,7 +146,7 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface,
|
||||
iface, locked_box, box, flags);
|
||||
|
||||
wined3d_mutex_lock();
|
||||
- hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx,
|
||||
+ hr = wined3d_resource_sub_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx,
|
||||
&map_desc, (const struct wined3d_box *)box, flags);
|
||||
- if (FAILED(hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture),
|
||||
+ if (FAILED(hr = wined3d_resource_sub_resource_map(wined3d_texture_get_resource(volume->wined3d_texture),
|
||||
volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, flags)))
|
||||
map_desc.data = NULL;
|
||||
wined3d_mutex_unlock();
|
||||
|
||||
@@ -165,7 +165,7 @@ static HRESULT WINAPI d3d9_volume_UnlockBox(IDirect3DVolume9 *iface)
|
||||
@@ -166,7 +166,7 @@ static HRESULT WINAPI d3d9_volume_UnlockBox(IDirect3DVolume9 *iface)
|
||||
TRACE("iface %p.\n", iface);
|
||||
|
||||
wined3d_mutex_lock();
|
||||
@ -307,7 +307,7 @@ index 423d162..0821fde 100644
|
||||
TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx);
|
||||
|
||||
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
|
||||
index 1169c00..d09289c 100644
|
||||
index 574069b..da8b61c 100644
|
||||
--- a/dlls/wined3d/surface.c
|
||||
+++ b/dlls/wined3d/surface.c
|
||||
@@ -1997,25 +1997,25 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr
|
||||
@ -341,7 +341,7 @@ index 1169c00..d09289c 100644
|
||||
|
||||
return dst_texture;
|
||||
}
|
||||
@@ -4046,7 +4046,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
|
||||
@@ -3893,7 +3893,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
|
||||
if (src_texture == dst_texture && src_sub_resource_idx == dst_sub_resource_idx)
|
||||
{
|
||||
same_sub_resource = TRUE;
|
||||
@ -350,7 +350,7 @@ index 1169c00..d09289c 100644
|
||||
src_map = dst_map;
|
||||
src_format = dst_texture->resource.format;
|
||||
dst_format = src_format;
|
||||
@@ -4071,7 +4071,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
|
||||
@@ -3918,7 +3918,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
|
||||
src_texture = converted_texture;
|
||||
src_sub_resource_idx = 0;
|
||||
}
|
||||
@ -359,7 +359,7 @@ index 1169c00..d09289c 100644
|
||||
src_format = src_texture->resource.format;
|
||||
src_fmt_flags = src_texture->resource.format_flags;
|
||||
}
|
||||
@@ -4081,7 +4081,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
|
||||
@@ -3928,7 +3928,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
|
||||
src_fmt_flags = dst_fmt_flags;
|
||||
}
|
||||
|
||||
@ -368,7 +368,7 @@ index 1169c00..d09289c 100644
|
||||
}
|
||||
|
||||
bpp = dst_format->byte_count;
|
||||
@@ -4499,9 +4499,9 @@ error:
|
||||
@@ -4346,9 +4346,9 @@ error:
|
||||
}
|
||||
|
||||
release:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 0799479e05302a5a416b0fcc1d6b577f2808107a Mon Sep 17 00:00:00 2001
|
||||
From 2629f350d6b567941b7a66eb39c9b74e2e2616eb Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Wed, 10 Feb 2016 15:09:29 +0800
|
||||
Subject: winex11.drv: Add support for _NET_ACTIVE_WINDOW.
|
||||
@ -105,7 +105,7 @@ index 51ef24b..0d8319b 100644
|
||||
Foreground window, because in most cases the messages sent
|
||||
above must have already changed the foreground window, in which
|
||||
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
|
||||
index 4a047e2..d0a1948 100644
|
||||
index 4789f98..22a05df 100644
|
||||
--- a/dlls/winex11.drv/window.c
|
||||
+++ b/dlls/winex11.drv/window.c
|
||||
@@ -2111,6 +2111,54 @@ BOOL CDECL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update )
|
||||
@ -176,13 +176,13 @@ index 7cdce52..01ac095 100644
|
||||
@ cdecl SetCapture(long long) X11DRV_SetCapture
|
||||
@ cdecl SetFocus(long) X11DRV_SetFocus
|
||||
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
|
||||
index 2694d23..c417bc6 100644
|
||||
index 23f4ab6..fa94136 100644
|
||||
--- a/dlls/winex11.drv/x11drv.h
|
||||
+++ b/dlls/winex11.drv/x11drv.h
|
||||
@@ -309,6 +309,7 @@ struct x11drv_thread_data
|
||||
Display *display;
|
||||
XEvent *current_event; /* event currently being processed */
|
||||
Window grab_window; /* window that currently grabs the mouse */
|
||||
HWND grab_hwnd; /* window that currently grabs the mouse */
|
||||
+ HWND active_window; /* active window */
|
||||
HWND last_focus; /* last window that had focus */
|
||||
XIM xim; /* input method */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user