From ee89d77f185ffb48741f98d491eace2ff26accb8 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sun, 19 Jul 2020 09:06:06 +1000 Subject: [PATCH] Added ntdll-freebsd-compile --- ...-ntdll-Include-signal.h-for-sigset_t.patch | 42 +++++++++++++++++++ patches/ntdll-freebsd-compile/definition | 2 + patches/patchinstall.sh | 16 +++++++ 3 files changed, 60 insertions(+) create mode 100644 patches/ntdll-freebsd-compile/0001-ntdll-Include-signal.h-for-sigset_t.patch create mode 100644 patches/ntdll-freebsd-compile/definition diff --git a/patches/ntdll-freebsd-compile/0001-ntdll-Include-signal.h-for-sigset_t.patch b/patches/ntdll-freebsd-compile/0001-ntdll-Include-signal.h-for-sigset_t.patch new file mode 100644 index 00000000..1c747b8c --- /dev/null +++ b/patches/ntdll-freebsd-compile/0001-ntdll-Include-signal.h-for-sigset_t.patch @@ -0,0 +1,42 @@ +From 7e213371499499eac50f59e99ef42ec0e7b61da1 Mon Sep 17 00:00:00 2001 +From: Gerald Pfeifer +Date: Sat, 18 Jul 2020 12:02:58 +0300 +Subject: [PATCH] ntdll: Include for sigset_t + +commit 7053b7c615b44e7112ab8fb4c056206d32b6f1c9 +Author: Alexandre Julliard +Date: Fri Jul 17 11:46:15 2020 +0200 + + ntdll: Move the registry system calls to the Unix library. + + Signed-off-by: Alexandre Julliard + +broke non-Linux platforms since sigset_t isn't necessarily defined +based on the #include statements in the new dlls/ntdll/unix/registry.c. + +This fixes it. + +Observed and tested on FreeBSD 11.4/i386. + +Gerald + +Signed-off-by: Gerald Pfeifer +--- + dlls/ntdll/unix/registry.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c +index f94c8ff98ee..6d583618180 100644 +--- a/dlls/ntdll/unix/registry.c ++++ b/dlls/ntdll/unix/registry.c +@@ -25,6 +25,7 @@ + #pragma makedep unix + #endif + ++#include + #include + #include + +-- +2.27.0 + diff --git a/patches/ntdll-freebsd-compile/definition b/patches/ntdll-freebsd-compile/definition new file mode 100644 index 00000000..237170e7 --- /dev/null +++ b/patches/ntdll-freebsd-compile/definition @@ -0,0 +1,2 @@ +# From Mailing list +Fixes: Fixes compile on FreeBSD diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 6d87e75d..a360c4d7 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -199,6 +199,7 @@ patch_enable_all () enable_ntdll_Zero_mod_name="$1" enable_ntdll_aarch_TEB="$1" enable_ntdll_ext4_case_folder="$1" + enable_ntdll_freebsd_compile="$1" enable_ntdll_set_full_cpu_context="$1" enable_ntdll_x86_64_SegDs="$1" enable_ntoskrnl_Stubs="$1" @@ -688,6 +689,9 @@ patch_enable () ntdll-ext4-case-folder) enable_ntdll_ext4_case_folder="$2" ;; + ntdll-freebsd-compile) + enable_ntdll_freebsd_compile="$2" + ;; ntdll-set_full_cpu_context) enable_ntdll_set_full_cpu_context="$2" ;; @@ -4079,6 +4083,18 @@ if test "$enable_ntdll_ext4_case_folder" -eq 1; then ) >> "$patchlist" fi +# Patchset ntdll-freebsd-compile +# | +# | Modified files: +# | * dlls/ntdll/unix/registry.c +# | +if test "$enable_ntdll_freebsd_compile" -eq 1; then + patch_apply ntdll-freebsd-compile/0001-ntdll-Include-signal.h-for-sigset_t.patch + ( + printf '%s\n' '+ { "Gerald Pfeifer", "ntdll: Include for sigset_t.", 1 },'; + ) >> "$patchlist" +fi + # Patchset ntdll-set_full_cpu_context # | # | Modified files: