From 3e6d6e3909d7cbb2d647255ac072824a41afdc52 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Mon, 9 Dec 2019 21:29:30 -0600 Subject: [PATCH] Rebase against f870aa4988fa8e980919c144682da72865364ff0. --- ...d-implicit-cast-of-interface-pointer.patch | 14 ++++---- patches/Compiler_Warnings/definition | 1 - ...rnel32-Implement-SetProcessDEPPolicy.patch | 16 ++++----- .../0002-nvcuda-Add-stub-dll.patch | 24 ++++++------- .../0003-nvcuda-First-implementation.patch | 32 ++++++++--------- .../0001-nvcuvid-First-implementation.patch | 34 +++++++++---------- ...001-nvencodeapi-First-implementation.patch | 30 ++++++++-------- patches/patchinstall.sh | 2 +- 8 files changed, 76 insertions(+), 77 deletions(-) diff --git a/patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch b/patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch index 36dc060c..b4847ab7 100644 --- a/patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch +++ b/patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch @@ -1,4 +1,4 @@ -From f5c1515f74740db99fbae93cf46f2162be65b93d Mon Sep 17 00:00:00 2001 +From 7529755fcc41fda650aac6b27f34438354435d34 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 22 Mar 2016 21:58:40 +0100 Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer. @@ -9,10 +9,10 @@ Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer. 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c -index 1bf88d6b17..94cbb82875 100644 +index 9280b5d32..2f0974a4c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c -@@ -1865,7 +1865,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface) +@@ -1887,7 +1887,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface) if (!iface) return NULL; assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl); @@ -21,7 +21,7 @@ index 1bf88d6b17..94cbb82875 100644 } struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface) -@@ -1873,7 +1873,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface) +@@ -1895,7 +1895,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface) if (!iface) return NULL; assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl); @@ -29,9 +29,9 @@ index 1bf88d6b17..94cbb82875 100644 + return CONTAINING_RECORD((IDWriteFontFace5 *)iface, struct dwrite_fontface, IDWriteFontFace5_iface); } - void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf) + static struct dwrite_fontfacereference *unsafe_impl_from_IDWriteFontFaceReference(IDWriteFontFaceReference *iface) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c -index 6f166b03f7..dcbfea7fdd 100644 +index b9321157a..76ea23ba6 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -5895,7 +5895,7 @@ static const IDWriteTextFormat3Vtbl dwritetextformatvtbl = @@ -44,5 +44,5 @@ index 6f166b03f7..dcbfea7fdd 100644 HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, -- -2.23.0 +2.24.0 diff --git a/patches/Compiler_Warnings/definition b/patches/Compiler_Warnings/definition index 82da4eb8..05408f5d 100644 --- a/patches/Compiler_Warnings/definition +++ b/patches/Compiler_Warnings/definition @@ -1,2 +1 @@ Fixes: Fixes compile warnings. -#Depends: mailing-list-patches diff --git a/patches/kernel32-SetProcessDEPPolicy/0001-kernel32-Implement-SetProcessDEPPolicy.patch b/patches/kernel32-SetProcessDEPPolicy/0001-kernel32-Implement-SetProcessDEPPolicy.patch index c9b683ab..000e1044 100644 --- a/patches/kernel32-SetProcessDEPPolicy/0001-kernel32-Implement-SetProcessDEPPolicy.patch +++ b/patches/kernel32-SetProcessDEPPolicy/0001-kernel32-Implement-SetProcessDEPPolicy.patch @@ -1,4 +1,4 @@ -From 63db3d2aef606a1c197dac103510479391044f84 Mon Sep 17 00:00:00 2001 +From 2399eb182bc12b6643953d9182c1c89ba42fcce3 Mon Sep 17 00:00:00 2001 From: "Olivier F. R. Dierick" Date: Tue, 19 Apr 2016 07:25:39 +0200 Subject: [PATCH] kernel32: Implement SetProcessDEPPolicy(). @@ -8,10 +8,10 @@ Subject: [PATCH] kernel32: Implement SetProcessDEPPolicy(). 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c -index 4ec6ebc415b..70c5b33f14c 100644 +index e5e51a93d..e582c6d5b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c -@@ -71,6 +71,8 @@ typedef struct +@@ -70,6 +70,8 @@ typedef struct DWORD dwReserved; } LOADPARMS32; @@ -20,7 +20,7 @@ index 4ec6ebc415b..70c5b33f14c 100644 HMODULE kernel32_handle = 0; SYSTEM_BASIC_INFORMATION system_info = { 0 }; -@@ -86,6 +88,7 @@ const WCHAR DIR_System[] = {'C',':','\\','w','i','n','d','o','w','s', +@@ -85,6 +87,7 @@ const WCHAR DIR_System[] = {'C',':','\\','w','i','n','d','o','w','s', #define PDB32_FILE_APIS_OEM 0x0040 /* File APIs are OEM */ #define PDB32_WIN32S_PROC 0x8000 /* Win32s process */ @@ -28,15 +28,15 @@ index 4ec6ebc415b..70c5b33f14c 100644 #ifdef __i386__ extern DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry ); -@@ -188,6 +191,7 @@ void * CDECL __wine_kernel_init(void) +@@ -171,6 +174,7 @@ void * CDECL __wine_kernel_init(void) static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; kernel32_handle = GetModuleHandleW(kernel32W); + IsWow64Process( GetCurrentProcess(), &is_wow64 ); RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); - LOCALE_Init(); -@@ -890,9 +894,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void) + return start_process_wrapper; +@@ -871,9 +875,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void) */ BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP) { @@ -76,5 +76,5 @@ index 4ec6ebc415b..70c5b33f14c 100644 /********************************************************************** -- -2.17.1 +2.24.0 diff --git a/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch b/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch index 26f0cdd1..32f9fade 100644 --- a/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch +++ b/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From 68c74810cacdbc0d32259cc46ca847e8069a8463 Mon Sep 17 00:00:00 2001 +From efd5568fb54159ffb5d8af057047aa0ee5b602d6 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 3 Jan 2015 03:32:12 +0100 Subject: [PATCH] nvcuda: Add stub dll. @@ -6,9 +6,9 @@ Subject: [PATCH] nvcuda: Add stub dll. --- configure.ac | 1 + dlls/nvcuda/Makefile.in | 6 + - dlls/nvcuda/nvcuda.c | 37 ++++++ - dlls/nvcuda/nvcuda.rc | 33 ++++++ - dlls/nvcuda/nvcuda.spec | 308 ++++++++++++++++++++++++++++++++++++++++++++++++ + dlls/nvcuda/nvcuda.c | 37 +++++ + dlls/nvcuda/nvcuda.rc | 33 +++++ + dlls/nvcuda/nvcuda.spec | 308 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 385 insertions(+) create mode 100644 dlls/nvcuda/Makefile.in create mode 100644 dlls/nvcuda/nvcuda.c @@ -16,20 +16,20 @@ Subject: [PATCH] nvcuda: Add stub dll. create mode 100644 dlls/nvcuda/nvcuda.spec diff --git a/configure.ac b/configure.ac -index 02769bc..305a209 100644 +index 13f971866..2bc340b70 100644 --- a/configure.ac +++ b/configure.ac -@@ -3512,6 +3512,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe) +@@ -3543,6 +3543,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe) WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe/tests) WINE_CONFIG_MAKEFILE(dlls/ntprint) WINE_CONFIG_MAKEFILE(dlls/ntprint/tests) +WINE_CONFIG_MAKEFILE(dlls/nvcuda) WINE_CONFIG_MAKEFILE(dlls/objsel) WINE_CONFIG_MAKEFILE(dlls/odbc32) - WINE_CONFIG_MAKEFILE(dlls/odbccp32) + WINE_CONFIG_MAKEFILE(dlls/odbcbcp) diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in new file mode 100644 -index 0000000..4b33278 +index 000000000..4b33278c1 --- /dev/null +++ b/dlls/nvcuda/Makefile.in @@ -0,0 +1,6 @@ @@ -41,7 +41,7 @@ index 0000000..4b33278 +RC_SRCS = nvcuda.rc diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c new file mode 100644 -index 0000000..8b7eb9c +index 000000000..8b7eb9c37 --- /dev/null +++ b/dlls/nvcuda/nvcuda.c @@ -0,0 +1,37 @@ @@ -84,7 +84,7 @@ index 0000000..8b7eb9c +} diff --git a/dlls/nvcuda/nvcuda.rc b/dlls/nvcuda/nvcuda.rc new file mode 100644 -index 0000000..f135e83 +index 000000000..f135e8331 --- /dev/null +++ b/dlls/nvcuda/nvcuda.rc @@ -0,0 +1,33 @@ @@ -123,7 +123,7 @@ index 0000000..f135e83 +#include "wine/wine_common_ver.rc" diff --git a/dlls/nvcuda/nvcuda.spec b/dlls/nvcuda/nvcuda.spec new file mode 100644 -index 0000000..279f7ab +index 000000000..279f7ab80 --- /dev/null +++ b/dlls/nvcuda/nvcuda.spec @@ -0,0 +1,308 @@ @@ -436,5 +436,5 @@ index 0000000..279f7ab +@ stub cuTexRefSetMipmappedArray +@ stub cuWGLGetDevice -- -2.7.4 +2.24.0 diff --git a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch index 33af63f2..c6df6557 100644 --- a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch +++ b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch @@ -1,4 +1,4 @@ -From 23dc0ba4777faeb635fbe3ae2f77dd64574d703a Mon Sep 17 00:00:00 2001 +From c5c277e9a6d54ff4b9b22fd9f412401c47a71a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 3 Jan 2015 03:39:11 +0100 Subject: [PATCH] nvcuda: First implementation. (rev 2) @@ -10,12 +10,12 @@ Changes by Sebastian Lackner : --- configure.ac | 1 + dlls/nvcuda/Makefile.in | 1 + - dlls/nvcuda/internal.c | 515 ++++++++++ - dlls/nvcuda/nvcuda.c | 2097 ++++++++++++++++++++++++++++++++++++++++- + dlls/nvcuda/internal.c | 515 ++++++++ + dlls/nvcuda/nvcuda.c | 2097 ++++++++++++++++++++++++++++++++- dlls/nvcuda/nvcuda.h | 29 + - dlls/nvcuda/nvcuda.spec | 492 +++++----- + dlls/nvcuda/nvcuda.spec | 492 ++++---- dlls/nvcuda/tests/Makefile.in | 4 + - dlls/nvcuda/tests/nvcuda.c | 168 ++++ + dlls/nvcuda/tests/nvcuda.c | 168 +++ 8 files changed, 3056 insertions(+), 251 deletions(-) create mode 100644 dlls/nvcuda/internal.c create mode 100644 dlls/nvcuda/nvcuda.h @@ -23,19 +23,19 @@ Changes by Sebastian Lackner : create mode 100644 dlls/nvcuda/tests/nvcuda.c diff --git a/configure.ac b/configure.ac -index 7b6f885..55d8931 100644 +index 2bc340b70..d70d21d94 100644 --- a/configure.ac +++ b/configure.ac -@@ -3555,6 +3555,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe) +@@ -3544,6 +3544,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe/tests) WINE_CONFIG_MAKEFILE(dlls/ntprint) WINE_CONFIG_MAKEFILE(dlls/ntprint/tests) WINE_CONFIG_MAKEFILE(dlls/nvcuda) +WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests) WINE_CONFIG_MAKEFILE(dlls/objsel) WINE_CONFIG_MAKEFILE(dlls/odbc32) - WINE_CONFIG_MAKEFILE(dlls/odbccp32) + WINE_CONFIG_MAKEFILE(dlls/odbcbcp) diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in -index 4b33278..0921ce6 100644 +index 4b33278c1..0921ce64c 100644 --- a/dlls/nvcuda/Makefile.in +++ b/dlls/nvcuda/Makefile.in @@ -1,6 +1,7 @@ @@ -48,7 +48,7 @@ index 4b33278..0921ce6 100644 RC_SRCS = nvcuda.rc diff --git a/dlls/nvcuda/internal.c b/dlls/nvcuda/internal.c new file mode 100644 -index 0000000..611e310 +index 000000000..611e3108d --- /dev/null +++ b/dlls/nvcuda/internal.c @@ -0,0 +1,515 @@ @@ -568,7 +568,7 @@ index 0000000..611e310 + return CUDA_ERROR_UNKNOWN; +} diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c -index 8b7eb9c..3ef7c35 100644 +index 8b7eb9c37..3ef7c3505 100644 --- a/dlls/nvcuda/nvcuda.c +++ b/dlls/nvcuda/nvcuda.c @@ -1,4 +1,5 @@ @@ -2690,7 +2690,7 @@ index 8b7eb9c..3ef7c35 100644 diff --git a/dlls/nvcuda/nvcuda.h b/dlls/nvcuda/nvcuda.h new file mode 100644 -index 0000000..aaffe13 +index 000000000..aaffe13af --- /dev/null +++ b/dlls/nvcuda/nvcuda.h @@ -0,0 +1,29 @@ @@ -2724,7 +2724,7 @@ index 0000000..aaffe13 + +#endif diff --git a/dlls/nvcuda/nvcuda.spec b/dlls/nvcuda/nvcuda.spec -index 279f7ab..621b8d5 100644 +index 279f7ab80..621b8d59c 100644 --- a/dlls/nvcuda/nvcuda.spec +++ b/dlls/nvcuda/nvcuda.spec @@ -1,36 +1,36 @@ @@ -3238,7 +3238,7 @@ index 279f7ab..621b8d5 100644 @ stub cuWGLGetDevice diff --git a/dlls/nvcuda/tests/Makefile.in b/dlls/nvcuda/tests/Makefile.in new file mode 100644 -index 0000000..81f9290 +index 000000000..81f9290e5 --- /dev/null +++ b/dlls/nvcuda/tests/Makefile.in @@ -0,0 +1,4 @@ @@ -3248,7 +3248,7 @@ index 0000000..81f9290 + nvcuda.c diff --git a/dlls/nvcuda/tests/nvcuda.c b/dlls/nvcuda/tests/nvcuda.c new file mode 100644 -index 0000000..fc8f300 +index 000000000..fc8f300a2 --- /dev/null +++ b/dlls/nvcuda/tests/nvcuda.c @@ -0,0 +1,168 @@ @@ -3421,5 +3421,5 @@ index 0000000..fc8f300 + test_TlsNotifyInterface(); +} -- -1.9.1 +2.24.0 diff --git a/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch b/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch index c7cac751..905782bb 100644 --- a/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch +++ b/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch @@ -1,4 +1,4 @@ -From f01ffa305cbc1f2150dbe5d08975a79eef5a7382 Mon Sep 17 00:00:00 2001 +From 0e8472f74df21fed8e0b86ba1e2ae2e34b4082d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 6 Jan 2015 05:16:36 +0100 Subject: [PATCH] nvcuvid: First implementation. (rev 2) @@ -8,11 +8,11 @@ Changes by Sebastian Lackner : --- configure.ac | 1 + dlls/nvcuvid/Makefile.in | 4 + - dlls/nvcuvid/nvcuvid.c | 537 ++++++++++++++++++++++++++++++++++++++++++++++ - dlls/nvcuvid/nvcuvid.spec | 24 +++ + dlls/nvcuvid/nvcuvid.c | 537 ++++++++++++++++++++++++++++++++++++++ + dlls/nvcuvid/nvcuvid.spec | 24 ++ include/Makefile.in | 2 + - include/cuviddec.h | 99 +++++++++ - include/nvcuvid.h | 79 +++++++ + include/cuviddec.h | 99 +++++++ + include/nvcuvid.h | 79 ++++++ 7 files changed, 746 insertions(+) create mode 100644 dlls/nvcuvid/Makefile.in create mode 100644 dlls/nvcuvid/nvcuvid.c @@ -21,20 +21,20 @@ Changes by Sebastian Lackner : create mode 100644 include/nvcuvid.h diff --git a/configure.ac b/configure.ac -index fbf0cce..d1367f4 100644 +index 90d5ed7df..326d03975 100644 --- a/configure.ac +++ b/configure.ac -@@ -3565,6 +3565,7 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi/tests) +@@ -3554,6 +3554,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) +WINE_CONFIG_MAKEFILE(dlls/nvcuvid) WINE_CONFIG_MAKEFILE(dlls/objsel) WINE_CONFIG_MAKEFILE(dlls/odbc32) - WINE_CONFIG_MAKEFILE(dlls/odbccp32) + WINE_CONFIG_MAKEFILE(dlls/odbcbcp) diff --git a/dlls/nvcuvid/Makefile.in b/dlls/nvcuvid/Makefile.in new file mode 100644 -index 0000000..2c2dc8c +index 000000000..2c2dc8ccf --- /dev/null +++ b/dlls/nvcuvid/Makefile.in @@ -0,0 +1,4 @@ @@ -44,7 +44,7 @@ index 0000000..2c2dc8c + nvcuvid.c diff --git a/dlls/nvcuvid/nvcuvid.c b/dlls/nvcuvid/nvcuvid.c new file mode 100644 -index 0000000..05fec0f +index 000000000..05fec0fff --- /dev/null +++ b/dlls/nvcuvid/nvcuvid.c @@ -0,0 +1,537 @@ @@ -587,7 +587,7 @@ index 0000000..05fec0f +} diff --git a/dlls/nvcuvid/nvcuvid.spec b/dlls/nvcuvid/nvcuvid.spec new file mode 100644 -index 0000000..433e7db +index 000000000..433e7db3b --- /dev/null +++ b/dlls/nvcuvid/nvcuvid.spec @@ -0,0 +1,24 @@ @@ -616,10 +616,10 @@ index 0000000..433e7db +@ stdcall cuvidSetVideoSourceState(ptr long) wine_cuvidSetVideoSourceState +@ stdcall cuvidUnmapVideoFrame(ptr long) wine_cuvidUnmapVideoFrame diff --git a/include/Makefile.in b/include/Makefile.in -index b7bf57f..8b23127 100644 +index c28834897..c38dd2ad1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in -@@ -79,6 +79,7 @@ SOURCES = \ +@@ -81,6 +81,7 @@ SOURCES = \ ctxtcall.idl \ cuda.h \ custcntl.h \ @@ -627,7 +627,7 @@ index b7bf57f..8b23127 100644 cvconst.h \ d2d1.idl \ d2d1_1.idl \ -@@ -478,6 +479,7 @@ SOURCES = \ +@@ -498,6 +499,7 @@ SOURCES = \ ntsecpkg.h \ ntstatus.h \ nvapi.h \ @@ -637,7 +637,7 @@ index b7bf57f..8b23127 100644 objectarray.idl \ diff --git a/include/cuviddec.h b/include/cuviddec.h new file mode 100644 -index 0000000..e450321 +index 000000000..e45032190 --- /dev/null +++ b/include/cuviddec.h @@ -0,0 +1,99 @@ @@ -742,7 +742,7 @@ index 0000000..e450321 +#endif /* __WINE_CUVIDDEC_H */ diff --git a/include/nvcuvid.h b/include/nvcuvid.h new file mode 100644 -index 0000000..a192ef6 +index 000000000..a192ef64c --- /dev/null +++ b/include/nvcuvid.h @@ -0,0 +1,79 @@ @@ -826,5 +826,5 @@ index 0000000..a192ef6 + +#endif /* __WINE_NVCUVID_H */ -- -1.9.1 +2.24.0 diff --git a/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch b/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch index 623dd02c..d73712d9 100644 --- a/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch +++ b/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch @@ -1,4 +1,4 @@ -From 07350060c944e605824dc4a849bf320e5a41ab32 Mon Sep 17 00:00:00 2001 +From aaf02d5e9c8e3d5d90ac3a1bae16df9669385011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 8 Feb 2015 06:10:26 +0100 Subject: [PATCH] nvencodeapi: First implementation. @@ -6,12 +6,12 @@ Subject: [PATCH] nvencodeapi: First implementation. --- configure.ac | 2 + dlls/nvencodeapi/Makefile.in | 4 + - dlls/nvencodeapi/nvencodeapi.c | 370 ++++++++++++++++++++++++++++++++++ + dlls/nvencodeapi/nvencodeapi.c | 370 ++++++++++++++++++++++++++ dlls/nvencodeapi/nvencodeapi.spec | 1 + dlls/nvencodeapi64/Makefile.in | 5 + dlls/nvencodeapi64/nvencodeapi64.spec | 1 + include/Makefile.in | 1 + - include/nvencodeapi.h | 281 ++++++++++++++++++++++++++ + include/nvencodeapi.h | 281 +++++++++++++++++++ 8 files changed, 665 insertions(+) create mode 100644 dlls/nvencodeapi/Makefile.in create mode 100644 dlls/nvencodeapi/nvencodeapi.c @@ -21,10 +21,10 @@ Subject: [PATCH] nvencodeapi: First implementation. create mode 100644 include/nvencodeapi.h diff --git a/configure.ac b/configure.ac -index d1367f4..40f96df 100644 +index 326d03975..a2f06d7ff 100644 --- a/configure.ac +++ b/configure.ac -@@ -3566,6 +3566,8 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64) +@@ -3555,6 +3555,8 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64) WINE_CONFIG_MAKEFILE(dlls/nvcuda) WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests) WINE_CONFIG_MAKEFILE(dlls/nvcuvid) @@ -32,10 +32,10 @@ index d1367f4..40f96df 100644 +WINE_CONFIG_MAKEFILE(dlls/nvencodeapi64,enable_win64) WINE_CONFIG_MAKEFILE(dlls/objsel) WINE_CONFIG_MAKEFILE(dlls/odbc32) - WINE_CONFIG_MAKEFILE(dlls/odbccp32) + WINE_CONFIG_MAKEFILE(dlls/odbcbcp) diff --git a/dlls/nvencodeapi/Makefile.in b/dlls/nvencodeapi/Makefile.in new file mode 100644 -index 0000000..a2e58ac +index 000000000..a2e58acaf --- /dev/null +++ b/dlls/nvencodeapi/Makefile.in @@ -0,0 +1,4 @@ @@ -45,7 +45,7 @@ index 0000000..a2e58ac + nvencodeapi.c diff --git a/dlls/nvencodeapi/nvencodeapi.c b/dlls/nvencodeapi/nvencodeapi.c new file mode 100644 -index 0000000..91a33fd +index 000000000..91a33fd58 --- /dev/null +++ b/dlls/nvencodeapi/nvencodeapi.c @@ -0,0 +1,370 @@ @@ -421,14 +421,14 @@ index 0000000..91a33fd +} diff --git a/dlls/nvencodeapi/nvencodeapi.spec b/dlls/nvencodeapi/nvencodeapi.spec new file mode 100644 -index 0000000..11d74e8 +index 000000000..11d74e82d --- /dev/null +++ b/dlls/nvencodeapi/nvencodeapi.spec @@ -0,0 +1 @@ +@ stdcall NvEncodeAPICreateInstance(ptr) diff --git a/dlls/nvencodeapi64/Makefile.in b/dlls/nvencodeapi64/Makefile.in new file mode 100644 -index 0000000..8297ec3 +index 000000000..8297ec352 --- /dev/null +++ b/dlls/nvencodeapi64/Makefile.in @@ -0,0 +1,5 @@ @@ -439,16 +439,16 @@ index 0000000..8297ec3 + nvencodeapi.c diff --git a/dlls/nvencodeapi64/nvencodeapi64.spec b/dlls/nvencodeapi64/nvencodeapi64.spec new file mode 100644 -index 0000000..11d74e8 +index 000000000..11d74e82d --- /dev/null +++ b/dlls/nvencodeapi64/nvencodeapi64.spec @@ -0,0 +1 @@ +@ stdcall NvEncodeAPICreateInstance(ptr) diff --git a/include/Makefile.in b/include/Makefile.in -index 8b23127..06dcaba 100644 +index c38dd2ad1..5b21ec0df 100644 --- a/include/Makefile.in +++ b/include/Makefile.in -@@ -480,6 +480,7 @@ SOURCES = \ +@@ -500,6 +500,7 @@ SOURCES = \ ntstatus.h \ nvapi.h \ nvcuvid.h \ @@ -458,7 +458,7 @@ index 8b23127..06dcaba 100644 objectarray.idl \ diff --git a/include/nvencodeapi.h b/include/nvencodeapi.h new file mode 100644 -index 0000000..45e9fb9 +index 000000000..45e9fb97f --- /dev/null +++ b/include/nvencodeapi.h @@ -0,0 +1,281 @@ @@ -744,5 +744,5 @@ index 0000000..45e9fb9 + +#endif /* __WINE_NVENCODEAPI_H */ -- -1.9.1 +2.24.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index b956c829..53491071 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "ac245040345e2039252b26f5c44841fc730f0854" + echo "f870aa4988fa8e980919c144682da72865364ff0" } # Show version information