https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c94266177e30b47168747fb4ea65edf906da907
commit 1c94266177e30b47168747fb4ea65edf906da907 Author: Amine Khaldi <[email protected]> AuthorDate: Sat Nov 2 18:35:29 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sat Nov 2 18:35:29 2019 +0100 [INETMIB1] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/inetmib1/main.c | 9 ++++----- media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dll/win32/inetmib1/main.c b/dll/win32/inetmib1/main.c index 2f7b9cadfe6..6345573350e 100644 --- a/dll/win32/inetmib1/main.c +++ b/dll/win32/inetmib1/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <assert.h> #include <stdarg.h> #include <stdlib.h> @@ -319,7 +318,7 @@ static DWORD oidToIpAddr(AsnObjectIdentifier *oid) } typedef void (*oidToKeyFunc)(AsnObjectIdentifier *oid, void *dst); -typedef int (*compareFunc)(const void *key, const void *value); +typedef int (__cdecl *compareFunc)(const void *key, const void *value); /* Finds the first value in the table that matches key. Returns its 1-based * index if found, or 0 if not found. @@ -770,7 +769,7 @@ static void oidToIpAddrRow(AsnObjectIdentifier *oid, void *dst) row->dwAddr = oidToIpAddr(oid); } -static int compareIpAddrRow(const void *a, const void *b) +static int __cdecl compareIpAddrRow(const void *a, const void *b) { const MIB_IPADDRROW *key = a, *value = b; @@ -863,7 +862,7 @@ static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) row->dwForwardDest = oidToIpAddr(oid); } -static int compareIpForwardRow(const void *a, const void *b) +static int __cdecl compareIpForwardRow(const void *a, const void *b) { const MIB_IPFORWARDROW *key = a, *value = b; @@ -1221,7 +1220,7 @@ static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) row->dwLocalPort = oid->ids[4]; } -static int compareUdpRow(const void *a, const void *b) +static int __cdecl compareUdpRow(const void *a, const void *b) { const MIB_UDPROW *key = a, *value = b; int ret; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 6ba03be6384..5195ec8a194 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -80,7 +80,7 @@ dll/win32/imaadp32.acm # Synced to WineStaging-4.0 dll/win32/imagehlp # Synced to WineStaging-4.18 dll/win32/imm32 # Synced to WineStaging-4.18 dll/win32/inetcomm # Synced to WineStaging-4.18 -dll/win32/inetmib1 # Synced to WineStaging-3.17 +dll/win32/inetmib1 # Synced to WineStaging-4.18 dll/win32/initpki # Synced to WineStaging-3.3 dll/win32/inseng # Synced to WineStaging-3.3 dll/win32/iphlpapi # Out of sync
