From f7fdbd9bbfef68b2a3a4e4b386a465e1f814b678 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 29 Sep 2017 09:54:59 +0200 Subject: [PATCH] Rebase against 2ae0574d8eac19db501a79ce2597f2fe30a770bd. --- ...ters-for-RtlIpv4StringToAddressExW-s.patch | 57 ------------------- ...d-stub-for-RtlIpv6StringToAddressExW.patch | 34 ++++------- patches/patchinstall.sh | 4 +- 3 files changed, 13 insertions(+), 82 deletions(-) delete mode 100644 patches/ntdll-RtlIpStringToAddress_Stubs/0001-ntdll-Fix-parameters-for-RtlIpv4StringToAddressExW-s.patch diff --git a/patches/ntdll-RtlIpStringToAddress_Stubs/0001-ntdll-Fix-parameters-for-RtlIpv4StringToAddressExW-s.patch b/patches/ntdll-RtlIpStringToAddress_Stubs/0001-ntdll-Fix-parameters-for-RtlIpv4StringToAddressExW-s.patch deleted file mode 100644 index e7f372640..000000000 --- a/patches/ntdll-RtlIpStringToAddress_Stubs/0001-ntdll-Fix-parameters-for-RtlIpv4StringToAddressExW-s.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7f439e90221b6ef02371935f2f49528a0537af8c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Thu, 21 Jan 2016 00:33:12 +0100 -Subject: ntdll: Fix parameters for RtlIpv4StringToAddressExW stub. - ---- - dlls/ntdll/ntdll.spec | 2 +- - dlls/ntdll/rtl.c | 5 ++--- - dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- - 3 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 4e49709..9712b3a 100644 ---- a/dlls/ntdll/ntdll.spec -+++ b/dlls/ntdll/ntdll.spec -@@ -714,7 +714,7 @@ - @ stdcall RtlIpv4AddressToStringW(ptr ptr) - # @ stub RtlIpv4StringToAddressA - # @ stub RtlIpv4StringToAddressExA --@ stdcall RtlIpv4StringToAddressExW(ptr ptr wstr ptr) -+@ stdcall RtlIpv4StringToAddressExW(wstr long ptr ptr) - # @ stub RtlIpv4StringToAddressW - # @ stub RtlIpv6AddressToStringA - # @ stub RtlIpv6AddressToStringExA -diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c -index f699cff..ec5c999b 100644 ---- a/dlls/ntdll/rtl.c -+++ b/dlls/ntdll/rtl.c -@@ -882,10 +882,9 @@ void WINAPI RtlCopyLuidAndAttributesArray( - for (i = 0; i < Count; i++) Dest[i] = Src[i]; - } - --NTSTATUS WINAPI RtlIpv4StringToAddressExW(PULONG IP, PULONG Port, -- LPCWSTR Buffer, PULONG MaxSize) -+NTSTATUS WINAPI RtlIpv4StringToAddressExW(LPCWSTR str, BOOLEAN strict, IN_ADDR *address, PUSHORT port) - { -- FIXME("(%p,%p,%p,%p): stub\n", IP, Port, Buffer, MaxSize); -+ FIXME("(%s, %u, %p, %p): stub\n", debugstr_w(str), strict, address, port); - - return STATUS_SUCCESS; - } -diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -index 1319ada..7ec49f1 100644 ---- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -@@ -1075,7 +1075,7 @@ - @ stdcall RtlIpv4AddressToStringW(ptr ptr) ntdll.RtlIpv4AddressToStringW - @ stub RtlIpv4StringToAddressA - @ stub RtlIpv4StringToAddressExA --@ stdcall RtlIpv4StringToAddressExW(ptr ptr wstr ptr) ntdll.RtlIpv4StringToAddressExW -+@ stdcall RtlIpv4StringToAddressExW(wstr long ptr ptr) ntdll.RtlIpv4StringToAddressExW - @ stub RtlIpv4StringToAddressW - @ stub RtlIpv6AddressToStringA - @ stub RtlIpv6AddressToStringExA --- -2.6.4 - diff --git a/patches/ntdll-RtlIpStringToAddress_Stubs/0002-ntdll-Add-stub-for-RtlIpv6StringToAddressExW.patch b/patches/ntdll-RtlIpStringToAddress_Stubs/0002-ntdll-Add-stub-for-RtlIpv6StringToAddressExW.patch index ecab98cf6..3db01d8b8 100644 --- a/patches/ntdll-RtlIpStringToAddress_Stubs/0002-ntdll-Add-stub-for-RtlIpv6StringToAddressExW.patch +++ b/patches/ntdll-RtlIpStringToAddress_Stubs/0002-ntdll-Add-stub-for-RtlIpv6StringToAddressExW.patch @@ -1,19 +1,19 @@ -From 6f149e702d91a7aeb1e541bb13bdde9993ce69d4 Mon Sep 17 00:00:00 2001 +From 3d107f1c34d56ee2a7fbd2ed25e6198e4f8aebe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 21 Jan 2016 00:34:27 +0100 Subject: ntdll: Add stub for RtlIpv6StringToAddressExW. --- dlls/ntdll/ntdll.spec | 2 +- - dlls/ntdll/rtl.c | 14 ++++++++++++++ + dlls/ntdll/rtl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- - 3 files changed, 16 insertions(+), 2 deletions(-) + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 9712b3a..24057ad 100644 +index 5e27f0af952..7c12f06aa5a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec -@@ -722,7 +722,7 @@ +@@ -733,7 +733,7 @@ # @ stub RtlIpv6AddressToStringW # @ stub RtlIpv6StringToAddressA # @ stub RtlIpv6StringToAddressExA @@ -23,7 +23,7 @@ index 9712b3a..24057ad 100644 @ stdcall RtlIsActivationContextActive(ptr) @ stdcall RtlIsCriticalSectionLocked(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c -index ec5c999b..262cc86 100644 +index 8630ddecdf2..b9b99b24b1c 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -45,6 +45,7 @@ @@ -34,20 +34,11 @@ index ec5c999b..262cc86 100644 #include "ddk/ntddk.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); -@@ -882,6 +883,9 @@ void WINAPI RtlCopyLuidAndAttributesArray( - for (i = 0; i < Count; i++) Dest[i] = Src[i]; +@@ -902,6 +903,16 @@ NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const + return STATUS_NOT_IMPLEMENTED; } +/*********************************************************************** -+ * RtlIpv4StringToAddressExW [NTDLL.@] -+ */ - NTSTATUS WINAPI RtlIpv4StringToAddressExW(LPCWSTR str, BOOLEAN strict, IN_ADDR *address, PUSHORT port) - { - FIXME("(%s, %u, %p, %p): stub\n", debugstr_w(str), strict, address, port); -@@ -890,6 +894,16 @@ NTSTATUS WINAPI RtlIpv4StringToAddressExW(LPCWSTR str, BOOLEAN strict, IN_ADDR * - } - - /*********************************************************************** + * RtlIpv6StringToAddressExW [NTDLL.@] + */ +NTSTATUS NTAPI RtlIpv6StringToAddressExW(LPCWSTR str, IN6_ADDR *address, PULONG scope, PUSHORT port) @@ -57,15 +48,14 @@ index ec5c999b..262cc86 100644 + return STATUS_INVALID_PARAMETER; +} + -+/*********************************************************************** + /*********************************************************************** * RtlIpv4AddressToStringExW [NTDLL.@] * - * Convert the given ipv4 address and optional the port to a string diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -index 7ec49f1..526c707 100644 +index 69f605922e4..c50073b7aa5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -@@ -1083,7 +1083,7 @@ +@@ -1088,7 +1088,7 @@ @ stub RtlIpv6AddressToStringW @ stub RtlIpv6StringToAddressA @ stub RtlIpv6StringToAddressExA @@ -75,5 +65,5 @@ index 7ec49f1..526c707 100644 @ stub RtlIsGenericTableEmpty @ stub RtlIsGenericTableEmptyAvl -- -2.6.4 +2.14.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index a0eb72a53..d22ebd539 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "40166848a7944383a4cfdaac9b18bd03fbb2b4f9" + echo "2ae0574d8eac19db501a79ce2597f2fe30a770bd" } # Show version information @@ -6788,10 +6788,8 @@ fi # | * dlls/ntdll/ntdll.spec, dlls/ntdll/rtl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec # | if test "$enable_ntdll_RtlIpStringToAddress_Stubs" -eq 1; then - patch_apply ntdll-RtlIpStringToAddress_Stubs/0001-ntdll-Fix-parameters-for-RtlIpv4StringToAddressExW-s.patch patch_apply ntdll-RtlIpStringToAddress_Stubs/0002-ntdll-Add-stub-for-RtlIpv6StringToAddressExW.patch ( - printf '%s\n' '+ { "Michael Müller", "ntdll: Fix parameters for RtlIpv4StringToAddressExW stub.", 1 },'; printf '%s\n' '+ { "Michael Müller", "ntdll: Add stub for RtlIpv6StringToAddressExW.", 1 },'; ) >> "$patchlist" fi