mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Updated ntdll-RtlIpv4StringToAddress patchset
This commit is contained in:
parent
af97ec8ce0
commit
2a9e87abea
@ -1,6 +1,6 @@
|
||||
From f19447eff25e8823df559a8c9a2506b404f4da4b Mon Sep 17 00:00:00 2001
|
||||
From 657b5b508badf3e4dc711ab97670b62f6d1f811d Mon Sep 17 00:00:00 2001
|
||||
From: Alex Henrie <alexhenrie24@gmail.com>
|
||||
Date: Wed, 26 Feb 2020 00:31:18 -0700
|
||||
Date: Thu, 19 Mar 2020 15:37:50 -0600
|
||||
Subject: [PATCH] ntdll: Implement RtlIpv6StringToAddress(Ex)[AW]
|
||||
|
||||
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
|
||||
@ -10,20 +10,20 @@ Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
|
||||
2 files changed, 211 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
|
||||
index 57055ae34e..c715a1f612 100644
|
||||
index 0ea72e3aef..8b9fb18eb1 100644
|
||||
--- a/dlls/ntdll/ntdll.spec
|
||||
+++ b/dlls/ntdll/ntdll.spec
|
||||
@@ -778,10 +778,10 @@
|
||||
@@ -781,10 +781,10 @@
|
||||
# @ stub RtlIpv6AddressToStringExA
|
||||
# @ stub RtlIpv6AddressToStringExW
|
||||
# @ stub RtlIpv6AddressToStringW
|
||||
-# @ stub RtlIpv6StringToAddressA
|
||||
-# @ stub RtlIpv6StringToAddressExA
|
||||
+@ stdcall RtlIpv6StringToAddressA(str ptr ptr)
|
||||
+@ stdcall RtlIpv6StringToAddressExA(str ptr ptr)
|
||||
+@ stdcall RtlIpv6StringToAddressExA(str ptr ptr ptr)
|
||||
@ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr)
|
||||
-# @ stub RtlIpv6StringToAddressW
|
||||
+@ stdcall RtlIpv6StringToAddressW(wstr ptr ptr ptr)
|
||||
+@ stdcall RtlIpv6StringToAddressW(wstr ptr ptr)
|
||||
@ stdcall RtlIsActivationContextActive(ptr)
|
||||
@ stdcall RtlIsCriticalSectionLocked(ptr)
|
||||
@ stdcall RtlIsCriticalSectionLockedByThread(ptr)
|
||||
@ -277,5 +277,5 @@ index 15ff037fef..11e76ed295 100644
|
||||
|
||||
/***********************************************************************
|
||||
--
|
||||
2.25.1
|
||||
2.26.0
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
From e32483cc37bc466fdf009acbf8c1c9fb404ec972 Mon Sep 17 00:00:00 2001
|
||||
From eaaefe1c916b7c66134bf0a3e37878fc9e1d7c56 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Henrie <alexhenrie24@gmail.com>
|
||||
Date: Fri, 30 Aug 2019 13:43:52 -0600
|
||||
Subject: [PATCH 5/5] ntdll: Implement RtlIpv6AddressToString(Ex)W
|
||||
Subject: [PATCH] ntdll: Implement RtlIpv6AddressToString(Ex)W
|
||||
|
||||
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
|
||||
---
|
||||
@ -10,10 +10,10 @@ Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
|
||||
2 files changed, 26 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
|
||||
index ac918bfa33..5a69721270 100644
|
||||
index 233ee929591..1bc39a9ee3b 100644
|
||||
--- a/dlls/ntdll/ntdll.spec
|
||||
+++ b/dlls/ntdll/ntdll.spec
|
||||
@@ -776,8 +776,8 @@
|
||||
@@ -779,8 +779,8 @@
|
||||
@ stdcall RtlIpv4StringToAddressW(wstr long ptr ptr)
|
||||
@ stdcall RtlIpv6AddressToStringA(ptr ptr)
|
||||
@ stdcall RtlIpv6AddressToStringExA(ptr long long ptr ptr)
|
||||
@ -22,13 +22,13 @@ index ac918bfa33..5a69721270 100644
|
||||
+@ stdcall RtlIpv6AddressToStringExW(ptr long long ptr ptr)
|
||||
+@ stdcall RtlIpv6AddressToStringW(ptr ptr)
|
||||
@ stdcall RtlIpv6StringToAddressA(str ptr ptr)
|
||||
@ stdcall RtlIpv6StringToAddressExA(str ptr ptr)
|
||||
@ stdcall RtlIpv6StringToAddressExA(str ptr ptr ptr)
|
||||
@ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr)
|
||||
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
|
||||
index d2a7a6aac9..eb23639edc 100644
|
||||
index c7f9bd1e537..81deaae78d5 100644
|
||||
--- a/dlls/ntdll/rtl.c
|
||||
+++ b/dlls/ntdll/rtl.c
|
||||
@@ -1468,6 +1468,30 @@ char * WINAPI RtlIpv6AddressToStringA(const IN6_ADDR *address, char *str)
|
||||
@@ -1472,6 +1472,30 @@ char * WINAPI RtlIpv6AddressToStringA(const IN6_ADDR *address, char *str)
|
||||
return str + len - 1;
|
||||
}
|
||||
|
||||
@ -60,5 +60,5 @@ index d2a7a6aac9..eb23639edc 100644
|
||||
* get_pointer_obfuscator (internal)
|
||||
*/
|
||||
--
|
||||
2.24.1
|
||||
2.25.1
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user