From 760b632ad6145a3c64e0047b5a559eeadb3d4313 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 21 Dec 2016 01:13:23 +0100 Subject: [PATCH] Added patch to silence FIXME in RtlCaptureStackBackTrace stub function. --- ...XME-in-RtlCaptureStackBackTrace-stub.patch | 25 +++++++++++++++++++ .../ntdll-RtlCaptureStackBackTrace/definition | 1 + patches/patchinstall.sh | 19 ++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 patches/ntdll-RtlCaptureStackBackTrace/0001-ntdll-Silence-FIXME-in-RtlCaptureStackBackTrace-stub.patch create mode 100644 patches/ntdll-RtlCaptureStackBackTrace/definition diff --git a/patches/ntdll-RtlCaptureStackBackTrace/0001-ntdll-Silence-FIXME-in-RtlCaptureStackBackTrace-stub.patch b/patches/ntdll-RtlCaptureStackBackTrace/0001-ntdll-Silence-FIXME-in-RtlCaptureStackBackTrace-stub.patch new file mode 100644 index 00000000..7d03ada1 --- /dev/null +++ b/patches/ntdll-RtlCaptureStackBackTrace/0001-ntdll-Silence-FIXME-in-RtlCaptureStackBackTrace-stub.patch @@ -0,0 +1,25 @@ +From c7dc4a7cb6ce194725d5f2eeaac279f6a27c0d40 Mon Sep 17 00:00:00 2001 +From: Jarkko Korpi +Date: Sun, 18 Dec 2016 00:53:33 +0200 +Subject: ntdll: Silence FIXME in RtlCaptureStackBackTrace stub function + +--- + dlls/ntdll/signal_x86_64.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c +index dbab1c5..be4d35d 100644 +--- a/dlls/ntdll/signal_x86_64.c ++++ b/dlls/ntdll/signal_x86_64.c +@@ -3942,7 +3942,7 @@ __ASM_GLOBAL_FUNC( RtlRaiseException, + */ + USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) + { +- FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); ++ TRACE( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); + return 0; + } + +-- +2.9.0 + diff --git a/patches/ntdll-RtlCaptureStackBackTrace/definition b/patches/ntdll-RtlCaptureStackBackTrace/definition new file mode 100644 index 00000000..841d6570 --- /dev/null +++ b/patches/ntdll-RtlCaptureStackBackTrace/definition @@ -0,0 +1 @@ +Fixes: [40868] Silence FIXME in RtlCaptureStackBackTrace stub function diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index a9ec52b1..5c1d3853 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -230,6 +230,7 @@ patch_enable_all () enable_ntdll_Pipe_SpecialCharacters="$1" enable_ntdll_ProcessQuotaLimits="$1" enable_ntdll_Purist_Mode="$1" + enable_ntdll_RtlCaptureStackBackTrace="$1" enable_ntdll_RtlIpStringToAddress_Stubs="$1" enable_ntdll_RtlIpStringToAddress_Tests="$1" enable_ntdll_RtlQueryPackageIdentity="$1" @@ -875,6 +876,9 @@ patch_enable () ntdll-Purist_Mode) enable_ntdll_Purist_Mode="$2" ;; + ntdll-RtlCaptureStackBackTrace) + enable_ntdll_RtlCaptureStackBackTrace="$2" + ;; ntdll-RtlIpStringToAddress_Stubs) enable_ntdll_RtlIpStringToAddress_Stubs="$2" ;; @@ -5227,6 +5231,21 @@ if test "$enable_ntdll_Purist_Mode" -eq 1; then ) >> "$patchlist" fi +# Patchset ntdll-RtlCaptureStackBackTrace +# | +# | This patchset fixes the following Wine bugs: +# | * [#40868] Silence FIXME in RtlCaptureStackBackTrace stub function +# | +# | Modified files: +# | * dlls/ntdll/signal_x86_64.c +# | +if test "$enable_ntdll_RtlCaptureStackBackTrace" -eq 1; then + patch_apply ntdll-RtlCaptureStackBackTrace/0001-ntdll-Silence-FIXME-in-RtlCaptureStackBackTrace-stub.patch + ( + echo '+ { "Jarkko Korpi", "ntdll: Silence FIXME in RtlCaptureStackBackTrace stub function.", 1 },'; + ) >> "$patchlist" +fi + # Patchset ntdll-RtlIpStringToAddress_Stubs # | # | Modified files: