wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to fix prototype of RtlIpv4StringToAddressExW and add stub for RtlIpv6StringToAddressExW.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-01-21 01:33:19 +01:00
parent 295e6d21eb
commit ea31b08725
9 changed files with 170 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
patches/ntdll-RtlIpStringToAddress_Stubs/0001-ntdll-Fix-parameters-for-RtlIpv4StringToAddressExW-s.patch Normal file
View File

@@ -0,0 +1,57 @@
From 7f439e90221b6ef02371935f2f49528a0537af8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
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

79
patches/ntdll-RtlIpStringToAddress_Stubs/0002-ntdll-Add-stub-for-RtlIpv6StringToAddressExW.patch Normal file
View File

@@ -0,0 +1,79 @@
From 6f149e702d91a7aeb1e541bb13bdde9993ce69d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
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/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 9712b3a..24057ad 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -722,7 +722,7 @@
# @ stub RtlIpv6AddressToStringW
# @ stub RtlIpv6StringToAddressA
# @ stub RtlIpv6StringToAddressExA
-# @ stub RtlIpv6StringToAddressExW
+@ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr)
# @ stub RtlIpv6StringToAddressW
@ stdcall RtlIsActivationContextActive(ptr)
@ stdcall RtlIsCriticalSectionLocked(ptr)
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index ec5c999b..262cc86 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -45,6 +45,7 @@
#include "wine/unicode.h"
#include "ntdll_misc.h"
#include "inaddr.h"
+#include "in6addr.h"
#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];
}
+/***********************************************************************
+ * 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)
+{
+ FIXME("(%s, %p, %p, %p): stub\n", debugstr_w(str), address, scope, port);
+
+ 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
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -1083,7 +1083,7 @@
@ stub RtlIpv6AddressToStringW
@ stub RtlIpv6StringToAddressA
@ stub RtlIpv6StringToAddressExA
-@ stub RtlIpv6StringToAddressExW
+@ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr) ntdll.RtlIpv6StringToAddressExW
@ stub RtlIpv6StringToAddressW
@ stub RtlIsGenericTableEmpty
@ stub RtlIsGenericTableEmptyAvl
--
2.6.4

2
patches/ntdll-RtlIpStringToAddress_Stubs/definition Normal file
View File

@@ -0,0 +1,2 @@
Fixes: Fix prototype of RtlIpv4StringToAddressExW
Fixes: Add stub for RtlIpv6StringToAddressExW