From bd2608b12c2df62b137a7ea72f4e79b529ba1ca7 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 2 Nov 2022 10:28:15 +1100 Subject: [PATCH] Rebase against 7be72ce2a708ec88aa2362352f37db30529251c4. --- ...-support-for-creating-reparse-points.patch | 18 ++++++------ .../0001-nvapi-First-implementation.patch | 29 ++++++++++--------- patches/patchinstall.sh | 2 +- staging/upstream-commit | 2 +- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-creating-reparse-points.patch b/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-creating-reparse-points.patch index 1efa90b6..73e993d8 100644 --- a/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-creating-reparse-points.patch +++ b/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-creating-reparse-points.patch @@ -1,4 +1,4 @@ -From 5a529bea97ee22d51f07f9d3cd77c00ea5292878 Mon Sep 17 00:00:00 2001 +From 0dfebc8cb8ed9804c6616fe7eec519b7c3e7ea13 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Thu, 16 Jan 2014 20:56:49 -0700 Subject: [PATCH] ntdll: Add support for creating reparse points. @@ -13,10 +13,10 @@ Signed-off-by: Erich E. Hoover 5 files changed, 447 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac -index 628cce28815..2adf40c0ef1 100644 +index 16c4c33d816..e492a707a48 100644 --- a/configure.ac +++ b/configure.ac -@@ -2018,6 +2018,8 @@ AC_CHECK_FUNCS(\ +@@ -2061,6 +2061,8 @@ AC_CHECK_FUNCS(\ prctl \ proc_pidinfo \ sched_yield \ @@ -26,7 +26,7 @@ index 628cce28815..2adf40c0ef1 100644 setprogname \ sigprocmask \ diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in -index 3b1cdb54f9f..6eb4690f8e0 100644 +index 89e4d5bb579..07688a5fcf6 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -4,7 +4,7 @@ UNIXLIB = ntdll.so @@ -36,8 +36,8 @@ index 3b1cdb54f9f..6eb4690f8e0 100644 -UNIX_LIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) +UNIX_LIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) -lm - EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000 - x86_64_EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x170000000 + EXTRADLLFLAGS = -nodefaultlibs + i386_EXTRADLLFLAGS = -Wl,--image-base,0x7bc00000 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 98d9e6b3b0a..93e50bd6952 100644 --- a/dlls/ntdll/tests/file.c @@ -586,10 +586,10 @@ index 6b73d9dc7e8..52b85cfc6d1 100644 TRACE("FSCTL_SET_SPARSE: Ignoring request\n"); io->Information = 0; diff --git a/include/Makefile.in b/include/Makefile.in -index 1c04f9a298b..7a2c9f96c1b 100644 +index 28ac4b3f2dc..7c69ddbfddf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in -@@ -563,6 +563,7 @@ SOURCES = \ +@@ -564,6 +564,7 @@ SOURCES = \ ntdef.h \ ntdsapi.h \ ntgdi.h \ @@ -598,5 +598,5 @@ index 1c04f9a298b..7a2c9f96c1b 100644 ntquery.h \ ntsecapi.h \ -- -2.37.2 +2.38.1 diff --git a/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch b/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch index bbf32673..8e9cc8f7 100644 --- a/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch +++ b/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch @@ -1,10 +1,10 @@ -From 689a5a7bf13f6e809967907537de85ec28c04d8f Mon Sep 17 00:00:00 2001 +From 3b711fd2f449364855e985f834373361d760bddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 5 Jan 2015 18:11:53 +0100 Subject: [PATCH] nvapi: First implementation. --- - configure.ac | 9 + + configure.ac | 10 + dlls/nvapi/Makefile.in | 6 + dlls/nvapi/nvapi.c | 460 +++++++++++++++++++++++++++++++++++ dlls/nvapi/nvapi.spec | 5 + @@ -14,7 +14,7 @@ Subject: [PATCH] nvapi: First implementation. dlls/nvapi64/nvapi64.spec | 5 + include/Makefile.in | 1 + include/nvapi.h | 76 ++++++ - 10 files changed, 850 insertions(+) + 10 files changed, 851 insertions(+) create mode 100644 dlls/nvapi/Makefile.in create mode 100644 dlls/nvapi/nvapi.c create mode 100644 dlls/nvapi/nvapi.spec @@ -25,23 +25,24 @@ Subject: [PATCH] nvapi: First implementation. create mode 100644 include/nvapi.h diff --git a/configure.ac b/configure.ac -index 40aed003e11..80ee05a0959 100644 +index 67551950263..8c64eeb79be 100644 --- a/configure.ac +++ b/configure.ac -@@ -232,6 +232,12 @@ enable_win16=${enable_win16:-no} - enable_win64=${enable_win64:-no} - enable_wow64=${enable_wow64:-no} - enable_wow64win=${enable_wow64win:-no} +@@ -199,6 +199,13 @@ enable_wow64=${enable_wow64:-aarch64,x86_64} + enable_wow64win=${enable_wow64win:-aarch64,x86_64} + enable_wow64cpu=${enable_wow64cpu:-x86_64} + +if test "x$enable_win64" != "xyes" +then + enable_win32="yes" +else + enable_win32="no" +fi - enable_wow64cpu=${enable_wow64cpu:-no} - ++ dnl Disable winetest too if tests are disabled -@@ -3459,6 +3465,9 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe) + enable_winetest=${enable_winetest:-$enable_tests} + +@@ -2966,6 +2973,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,10 +859,10 @@ index 00000000000..f0c054b2bf9 +@ stub DllRegisterServer +@ stub DllUnregisterServer diff --git a/include/Makefile.in b/include/Makefile.in -index 4085fa679db..a303c90689c 100644 +index f971a95f7f9..5f2efa538eb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in -@@ -555,6 +555,7 @@ SOURCES = \ +@@ -572,6 +572,7 @@ SOURCES = \ ntsecpkg.h \ ntstatus.h \ ntuser.h \ @@ -952,5 +953,5 @@ index 00000000000..4204256cca2 + +#endif /* __WINE_NVAPI_H */ -- -2.33.0 +2.38.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 24006adb..e4a1ffff 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "e43cb422502d5883a0fcde3dadcb8e6ef25632de" + echo "7be72ce2a708ec88aa2362352f37db30529251c4" } # Show version information diff --git a/staging/upstream-commit b/staging/upstream-commit index 2e416915..f015ba09 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -e43cb422502d5883a0fcde3dadcb8e6ef25632de +7be72ce2a708ec88aa2362352f37db30529251c4