From 3a0e02cede4e9b6b26858ef2b2e75c10c137ab3b Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 16 Feb 2025 10:58:49 +0200 Subject: [PATCH] [WS2_32] Improve exports - Add 64 bit exports - Fix some parameters - Add stubs file to build --- dll/win32/ws2_32/CMakeLists.txt | 1 + dll/win32/ws2_32/ws2_32.spec | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dll/win32/ws2_32/CMakeLists.txt b/dll/win32/ws2_32/CMakeLists.txt index 6b3ebb429ce..d5a85ffb3fc 100644 --- a/dll/win32/ws2_32/CMakeLists.txt +++ b/dll/win32/ws2_32/CMakeLists.txt @@ -48,6 +48,7 @@ list(APPEND SOURCE add_library(ws2_32 MODULE ${SOURCE} ws2_32.rc + ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def) set_module_type(ws2_32 win32dll) diff --git a/dll/win32/ws2_32/ws2_32.spec b/dll/win32/ws2_32/ws2_32.spec index ee6b1414c80..349c46faaa7 100644 --- a/dll/win32/ws2_32/ws2_32.spec +++ b/dll/win32/ws2_32/ws2_32.spec @@ -87,7 +87,7 @@ @ stdcall WSALookupServiceEnd(long) @ stdcall WSALookupServiceNextA(long long ptr ptr) @ stdcall WSALookupServiceNextW(long long ptr ptr) -@ stdcall WSANSPIoctl(long long ptr long ptr long ptr ptr) +@ stdcall WSANSPIoctl(ptr long ptr long ptr long ptr ptr) @ stdcall WSANtohl(long long ptr) @ stdcall WSANtohs(long long ptr) @ stdcall WSAProviderConfigChange(ptr ptr ptr) @@ -108,15 +108,26 @@ @ stdcall WSAStringToAddressW(wstr long ptr ptr ptr) @ stdcall WSAWaitForMultipleEvents(long ptr long long long) @ stdcall WSCDeinstallProvider(ptr ptr) +@ stdcall -stub -arch=win64 WSCDeinstallProvider32(ptr ptr) @ stdcall WSCEnableNSProvider(ptr long) +@ stdcall -stub -arch=win64 WSCEnableNSProvider32(ptr long) +@ stdcall -stub -arch=win64 WSCEnumNameSpaceProviders32(ptr ptr) @ stdcall WSCEnumProtocols(ptr ptr ptr ptr) +@ stdcall -stub -arch=win64 WSCEnumProtocols32(ptr ptr ptr ptr) @ stdcall WSCGetProviderPath(ptr ptr ptr ptr) +@ stdcall -stub -arch=win64 WSCGetProviderPath32(ptr ptr ptr ptr) @ stdcall WSCInstallNameSpace(wstr wstr long long ptr) +@ stdcall -stub -arch=win64 WSCInstallNameSpace32(wstr wstr long long ptr) @ stdcall WSCInstallProvider(ptr wstr ptr long ptr) +@ stdcall -stub -arch=win64 WSCInstallProvider64_32(ptr wstr ptr long ptr) @ stdcall WSCUnInstallNameSpace(ptr) -@ stdcall WSCUpdateProvider(ptr ptr ptr long ptr) +@ stdcall -stub -arch=win64 WSCUnInstallNameSpace32(ptr) +@ stdcall WSCUpdateProvider(ptr wstr ptr long ptr) +@ stdcall -stub -arch=win64 WSCUpdateProvider32(ptr wstr ptr long ptr) @ stdcall WSCWriteNameSpaceOrder(ptr long) +@ stdcall -stub -arch=win64 WSCWriteNameSpaceOrder32(ptr long) @ stdcall WSCWriteProviderOrder(ptr long) +@ stdcall -stub -arch=win64 WSCWriteProviderOrder32(ptr long) @ stdcall freeaddrinfo(ptr) @ stdcall getaddrinfo(str str ptr ptr) @ stdcall getnameinfo(ptr long ptr long ptr long long)