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

Rebase against 50f889fd19d329bef7c001f9eafd1030fc1e3a56.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2021-10-13 09:41:59 +11:00
parent f3fd4a3903
commit 1af920f698
6 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch
View File

@ -1,4 +1,4 @@
From 75e63f301be09d0e1e858bc4bde5774468852b1a Mon Sep 17 00:00:00 2001
From 689a5a7bf13f6e809967907537de85ec28c04d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 5 Jan 2015 18:11:53 +0100
Subject: [PATCH] nvapi: First implementation.
@ -25,10 +25,10 @@ Subject: [PATCH] nvapi: First implementation.
create mode 100644 include/nvapi.h
diff --git a/configure.ac b/configure.ac
index 32cf76bb8fc..f83ae22cf5e 100644
index 40aed003e11..80ee05a0959 100644
--- a/configure.ac
+++ b/configure.ac
@@ -238,6 +238,12 @@ enable_win16=${enable_win16:-no}
@@ -232,6 +232,12 @@ enable_win16=${enable_win16:-no}
enable_win64=${enable_win64:-no}
enable_wow64=${enable_wow64:-no}
enable_wow64win=${enable_wow64win:-no}
@ -41,7 +41,7 @@ index 32cf76bb8fc..f83ae22cf5e 100644
enable_wow64cpu=${enable_wow64cpu:-no}
dnl Disable winetest too if tests are disabled
@@ -3569,6 +3575,9 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe)
@@ -3459,6 +3465,9 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe)
WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe/tests)
WINE_CONFIG_MAKEFILE(dlls/ntprint)
WINE_CONFIG_MAKEFILE(dlls/ntprint/tests)
@ -858,13 +858,13 @@ index 00000000000..f0c054b2bf9
+@ stub DllRegisterServer
+@ stub DllUnregisterServer
diff --git a/include/Makefile.in b/include/Makefile.in
index 0cb69abe5d0..cd60b036710 100644
index 4085fa679db..a303c90689c 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -549,6 +549,7 @@ SOURCES = \
ntsecapi.h \
@@ -555,6 +555,7 @@ SOURCES = \
ntsecpkg.h \
ntstatus.h \
ntuser.h \
+ nvapi.h \
oaidl.idl \
objbase.h \
@ -952,5 +952,5 @@ index 00000000000..4204256cca2
+
+#endif /* __WINE_NVAPI_H */
--
2.30.2
2.33.0

12
patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch
View File

@ -1,4 +1,4 @@
From b65a4bd03ba8ef03599ded3d2ac1180cc0ae1c5b Mon Sep 17 00:00:00 2001
From ad7f655644a94f8469cdeb8d091503e3740185c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 6 Jan 2015 05:16:36 +0100
Subject: [PATCH] nvcuvid: First implementation. (rev 2)
@ -21,10 +21,10 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
create mode 100644 include/nvcuvid.h
diff --git a/configure.ac b/configure.ac
index 73925b808fc..c81b347762f 100644
index 80ee05a0959..f081f3fbb71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3574,6 +3574,7 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi/tests)
@@ -3470,6 +3470,7 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi/tests)
WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64)
WINE_CONFIG_MAKEFILE(dlls/nvcuda)
WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests)
@ -592,7 +592,7 @@ index 00000000000..433e7db3b7e
+@ stdcall cuvidSetVideoSourceState(ptr long) wine_cuvidSetVideoSourceState
+@ stdcall cuvidUnmapVideoFrame(ptr long) wine_cuvidUnmapVideoFrame
diff --git a/include/Makefile.in b/include/Makefile.in
index e409d8d788b..b4ae2bbcd96 100644
index a303c90689c..80d27a57d6c 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -97,6 +97,7 @@ SOURCES = \
@ -603,9 +603,9 @@ index e409d8d788b..b4ae2bbcd96 100644
cvconst.h \
cvttyp.idl \
d2d1.idl \
@@ -555,6 +556,7 @@ SOURCES = \
ntsecpkg.h \
@@ -556,6 +557,7 @@ SOURCES = \
ntstatus.h \
ntuser.h \
nvapi.h \
+ nvcuvid.h \
oaidl.idl \

24
patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch
View File

@ -1,18 +1,18 @@
From 12499caabc7010d8ba89f3886ecdadd636cbc123 Mon Sep 17 00:00:00 2001
From 05d5df3292d6ae3ad5b2fa540bedbc011285c4d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 8 Feb 2015 06:10:26 +0100
Subject: [PATCH] nvencodeapi: First implementation.
---
configure.ac | 2 +
dlls/nvencodeapi/Makefile.in | 4 +
dlls/nvencodeapi/Makefile.in | 5 +
dlls/nvencodeapi/nvencodeapi.c | 369 ++++++++++++++++++++++++++
dlls/nvencodeapi/nvencodeapi.spec | 1 +
dlls/nvencodeapi64/Makefile.in | 5 +
dlls/nvencodeapi64/Makefile.in | 6 +
dlls/nvencodeapi64/nvencodeapi64.spec | 1 +
include/Makefile.in | 1 +
include/nvencodeapi.h | 281 ++++++++++++++++++++
8 files changed, 664 insertions(+)
8 files changed, 666 insertions(+)
create mode 100644 dlls/nvencodeapi/Makefile.in
create mode 100644 dlls/nvencodeapi/nvencodeapi.c
create mode 100644 dlls/nvencodeapi/nvencodeapi.spec
@ -21,10 +21,10 @@ Subject: [PATCH] nvencodeapi: First implementation.
create mode 100644 include/nvencodeapi.h
diff --git a/configure.ac b/configure.ac
index a278e6d30ac..3df3fb9ae18 100644
index f081f3fbb71..420e34e3245 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3613,6 +3613,8 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64)
@@ -3471,6 +3471,8 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64)
WINE_CONFIG_MAKEFILE(dlls/nvcuda)
WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests)
WINE_CONFIG_MAKEFILE(dlls/nvcuvid)
@ -35,7 +35,7 @@ index a278e6d30ac..3df3fb9ae18 100644
WINE_CONFIG_MAKEFILE(dlls/odbcbcp)
diff --git a/dlls/nvencodeapi/Makefile.in b/dlls/nvencodeapi/Makefile.in
new file mode 100644
index 00000000000..a2e58acaf0d
index 00000000000..3b6a50ea828
--- /dev/null
+++ b/dlls/nvencodeapi/Makefile.in
@@ -0,0 +1,5 @@
@ -428,7 +428,7 @@ index 00000000000..11d74e82d99
+@ stdcall NvEncodeAPICreateInstance(ptr)
diff --git a/dlls/nvencodeapi64/Makefile.in b/dlls/nvencodeapi64/Makefile.in
new file mode 100644
index 00000000000..8297ec352b5
index 00000000000..c6d72871f73
--- /dev/null
+++ b/dlls/nvencodeapi64/Makefile.in
@@ -0,0 +1,6 @@
@ -446,11 +446,11 @@ index 00000000000..11d74e82d99
@@ -0,0 +1 @@
+@ stdcall NvEncodeAPICreateInstance(ptr)
diff --git a/include/Makefile.in b/include/Makefile.in
index 22ed27ed968..667b4640d80 100644
index 80d27a57d6c..a22e7803ac5 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -532,6 +532,7 @@ SOURCES = \
ntstatus.h \
@@ -558,6 +558,7 @@ SOURCES = \
ntuser.h \
nvapi.h \
nvcuvid.h \
+ nvencodeapi.h \
@ -745,5 +745,5 @@ index 00000000000..45e9fb97f16
+
+#endif /* __WINE_NVENCODEAPI_H */
--
2.28.0
2.33.0

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "dfeded6460ce067fe1c0540306c2964a170bed2a"
echo "50f889fd19d329bef7c001f9eafd1030fc1e3a56"
}
# Show version information

18
patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch
View File

@ -1,4 +1,4 @@
From 221f46fd34a5bd6260024c5bf90842b8ed897de0 Mon Sep 17 00:00:00 2001
From 2acb9244431b15464254efcb9f597d71e9d3d784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 8 Jun 2017 23:38:38 +0200
Subject: [PATCH] win32k.sys: Add stub driver.
@ -16,17 +16,17 @@ Subject: [PATCH] win32k.sys: Add stub driver.
create mode 100644 dlls/win32k.sys/win32k.sys.spec
diff --git a/configure.ac b/configure.ac
index 00e9e32ee36..c859d852102 100644
index 4e9dccfbb51..3c5e88e3f2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3808,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
@@ -3691,6 +3691,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
WINE_CONFIG_MAKEFILE(dlls/wiaservc)
WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests)
WINE_CONFIG_MAKEFILE(dlls/wimgapi)
+WINE_CONFIG_MAKEFILE(dlls/win32k.sys)
WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/win32u)
WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/win32u/tests)
diff --git a/dlls/win32k.sys/Makefile.in b/dlls/win32k.sys/Makefile.in
new file mode 100644
index 00000000000..7fac5d557eb
@ -337,10 +337,10 @@ index 00000000000..c79439151e4
+@ cdecl -private memmove(ptr ptr long) ntoskrnl.exe.memmove
+@ cdecl -private memset(ptr long long) ntoskrnl.exe.memset
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index af6c94c9f0b..bfa5c0cfce4 100644
index d023701c04b..23a97ddb412 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2922,6 +2922,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
@@ -2680,6 +2680,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,explorer.exe
11,,iexplore.exe
11,,notepad.exe
@ -349,10 +349,10 @@ index af6c94c9f0b..bfa5c0cfce4 100644
; themes
10,resources\themes\light,light.msstyles
diff --git a/tools/make_specfiles b/tools/make_specfiles
index e6a831025c6..da3e87edec5 100755
index ecfc6d0e8f2..f8e6203bb96 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -503,6 +503,7 @@ my @dll_groups =
@@ -511,6 +511,7 @@ my @dll_groups =
[
"ntoskrnl.exe",
"hal",
@ -361,5 +361,5 @@ index e6a831025c6..da3e87edec5 100755
[
"mscoree",
--
2.30.2
2.33.0

2
staging/upstream-commit
View File

@ -1 +1 @@
dfeded6460ce067fe1c0540306c2964a170bed2a
50f889fd19d329bef7c001f9eafd1030fc1e3a56