Added iphlpapi-GetBestRoute2 patchset

This commit is contained in:
Alistair Leslie-Hughes 2019-01-25 15:53:45 +11:00
parent 04c8f24337
commit 5e5c754a8b
3 changed files with 73 additions and 2 deletions

View File

@ -0,0 +1,51 @@
From 593664b03b00092f0db519ce537f62e0c041d28e Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Sun, 4 Nov 2018 04:05:15 -0600
Subject: [PATCH] iphlpapi: Add GetBestRoute2 stub.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44850
Signed-off-by: Austin English <austinenglish@gmail.com>
---
dlls/iphlpapi/iphlpapi.spec | 2 +-
dlls/iphlpapi/iphlpapi_main.c | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec
index b4f77be..7a447e7 100644
--- a/dlls/iphlpapi/iphlpapi.spec
+++ b/dlls/iphlpapi/iphlpapi.spec
@@ -77,7 +77,7 @@
@ stdcall GetBestInterfaceEx( ptr ptr )
@ stub GetBestInterfaceFromStack
@ stdcall GetBestRoute( long long ptr )
-#@ stub GetBestRoute2
+@ stdcall GetBestRoute2( ptr long ptr ptr long ptr ptr )
@ stub GetBestRouteFromStack
#@ stub GetCurrentThreadCompartmentId
@ stdcall GetExtendedTcpTable( ptr ptr long long long long )
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index 5df4cd8..ae8f7b4 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -3313,3 +3313,18 @@ DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY family, PMIB_IPINTERFACE_TABLE *
FIXME("(%u %p): stub\n", family, table);
return ERROR_NOT_SUPPORTED;
}
+
+/******************************************************************
+ * GetIpInterfaceTable (IPHLPAPI.@)
+ */
+DWORD WINAPI GetBestRoute2(NET_LUID *luid, NET_IFINDEX index,
+ const SOCKADDR_INET *source, const SOCKADDR_INET *destination,
+ ULONG options, PMIB_IPFORWARD_ROW2 bestroute,
+ SOCKADDR_INET *bestaddress)
+{
+ static int once;
+ if (!once++)
+ FIXME("(%p, %d, %p, %p, 0x%08x, %p, %p): stub\n", luid, index, source,
+ destination, options, bestroute, bestaddress);
+ return ERROR_NOT_SUPPORTED;
+}
--
1.9.1

View File

@ -0,0 +1 @@
Fixes: [44850] iphlpapi: Add GetBestRoute2 stub.

View File

@ -154,6 +154,7 @@ patch_enable_all ()
enable_imm32_message_on_focus="$1"
enable_include_winsock="$1"
enable_inseng_Implementation="$1"
enable_iphlpapi_GetBestRoute2="$1"
enable_iphlpapi_System_Ping="$1"
enable_iphlpapi_TCP_Table="$1"
enable_kernel32_CopyFileEx="$1"
@ -622,6 +623,9 @@ patch_enable ()
inseng-Implementation)
enable_inseng_Implementation="$2"
;;
iphlpapi-GetBestRoute2)
enable_iphlpapi_GetBestRoute2="$2"
;;
iphlpapi-System_Ping)
enable_iphlpapi_System_Ping="$2"
;;
@ -3726,6 +3730,21 @@ if test "$enable_inseng_Implementation" -eq 1; then
) >> "$patchlist"
fi
# Patchset iphlpapi-GetBestRoute2
# |
# | This patchset fixes the following Wine bugs:
# | * [#44850] iphlpapi: Add GetBestRoute2 stub.
# |
# | Modified files:
# | * dlls/iphlpapi/iphlpapi.spec, dlls/iphlpapi/iphlpapi_main.c
# |
if test "$enable_iphlpapi_GetBestRoute2" -eq 1; then
patch_apply iphlpapi-GetBestRoute2/0001-iphlpapi-Add-GetBestRoute2-stub.patch
(
printf '%s\n' '+ { "Austin English", "iphlpapi: Add GetBestRoute2 stub.", 1 },';
) >> "$patchlist"
fi
# Patchset iphlpapi-System_Ping
# |
# | This patchset fixes the following Wine bugs:
@ -4333,8 +4352,8 @@ fi
# | * [#29168] Update user shared data at realtime
# |
# | Modified files:
# | * dlls/ntdll/loader.c, dlls/ntdll/nt.c, dlls/ntdll/ntdll.spec, dlls/ntdll/ntdll_misc.h, dlls/ntdll/tests/time.c,
# | dlls/ntdll/thread.c, dlls/ntdll/virtual.c, dlls/ntoskrnl.exe/instr.c
# | * dlls/ntdll/loader.c, dlls/ntdll/ntdll.spec, dlls/ntdll/ntdll_misc.h, dlls/ntdll/tests/time.c, dlls/ntdll/thread.c,
# | dlls/ntdll/virtual.c, dlls/ntoskrnl.exe/instr.c
# |
if test "$enable_ntdll_User_Shared_Data" -eq 1; then
patch_apply ntdll-User_Shared_Data/0001-ntdll-Move-code-to-update-user-shared-data-into-a-se.patch