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

Rebase against 18d7bc985990c1022a9f42d20cc819ba141af5cb.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-08-04 10:43:36 +10:00
parent 90d57326b5
commit e4a11b1663
5 changed files with 25 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/iphlpapi-System_Ping/0001-iphlpapi-Fallback-to-system-ping-when-ICMP-permissio.patch
View File

@@ -1,4 +1,4 @@
From 04aceb5470fc9ca9133f7a6269144eb7aa8d6a10 Mon Sep 17 00:00:00 2001
From 6ecb74571f99faaaf558bf10fc7f626c0c58dc24 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 13 Jun 2015 05:03:54 +0200
Subject: [PATCH] iphlpapi: Fallback to system ping when ICMP permissions are
@@ -6,11 +6,11 @@ Subject: [PATCH] iphlpapi: Fallback to system ping when ICMP permissions are
Based on an idea by Bruno Jesus.
---
dlls/iphlpapi/icmp.c | 256 +++++++++++++++++++++++++++++++++++++++++++++++++--
dlls/iphlpapi/icmp.c | 256 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 250 insertions(+), 6 deletions(-)
diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c
index 0dc2f12..da3850b 100644
index 8e425ea68ed..1f55356c047 100644
--- a/dlls/iphlpapi/icmp.c
+++ b/dlls/iphlpapi/icmp.c
@@ -5,6 +5,7 @@
@@ -49,7 +49,7 @@ index 0dc2f12..da3850b 100644
#define USE_WS_PREFIX
@@ -212,6 +219,7 @@ DWORD WINAPI Icmp6SendEcho2(
@@ -213,6 +220,7 @@ DWORD WINAPI Icmp6SendEcho2(
*/
HANDLE WINAPI IcmpCreateFile(VOID)
{
@@ -57,8 +57,8 @@ index 0dc2f12..da3850b 100644
icmp_t* icp;
int sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP);
@@ -220,15 +228,14 @@ HANDLE WINAPI IcmpCreateFile(VOID)
/* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */
@@ -222,15 +230,14 @@ HANDLE WINAPI IcmpCreateFile(VOID)
non-privileged ICMP via SOCK_DGRAM type. */
sid=socket(AF_INET,SOCK_DGRAM,IPPROTO_ICMP);
}
- if (sid < 0) {
@@ -77,7 +77,7 @@ index 0dc2f12..da3850b 100644
SetLastError(IP_NO_RESOURCES);
return INVALID_HANDLE_VALUE;
}
@@ -250,11 +257,242 @@ BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle)
@@ -252,11 +259,242 @@ BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle)
return FALSE;
}
@@ -321,7 +321,7 @@ index 0dc2f12..da3850b 100644
/***********************************************************************
* IcmpSendEcho (IPHLPAPI.@)
@@ -308,6 +546,12 @@ DWORD WINAPI IcmpSendEcho(
@@ -310,6 +548,12 @@ DWORD WINAPI IcmpSendEcho(
return 0;
}
@@ -335,5 +335,5 @@ index 0dc2f12..da3850b 100644
id=getpid() & 0xFFFF;
seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF;
--
1.9.1
2.27.0