Skip to content

W
wine-winehq
Commit 7dc9ea89 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

ws2_32: Make winsock.dll into a stand-alone 16-bit module.

parent f507e3c4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 29 deletions
.gitignore
View file @ 7dc9ea89
......@@ -122,7 +122,6 @@ dlls/stdole32.tlb/std_ole_v1.tlb
dlls/user.exe16
dlls/ver.dll16
dlls/wineps16.drv16
dlls/winsock.dll16
dlls/wprocs.dll16
include/activaut.h
include/activdbg.h
......
configure
View file @ 7dc9ea89
......@@ -17194,6 +17194,14 @@ dlls/winscard/Makefile: dlls/winscard/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/winscard/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/winsock.dll16/Makefile"
test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
winsock.dll16"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/winsock.dll16/Makefile: dlls/winsock.dll16/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/winsock.dll16/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/winspool.drv/Makefile"
test "x$enable_winspool_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
winspool.drv"
......@@ -19128,6 +19136,7 @@ do
"dlls/winnls.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winnls.dll16/Makefile" ;;
"dlls/winnls32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winnls32/Makefile" ;;
"dlls/winscard/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winscard/Makefile" ;;
"dlls/winsock.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winsock.dll16/Makefile" ;;
"dlls/winspool.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winspool.drv/Makefile" ;;
"dlls/winspool.drv/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winspool.drv/tests/Makefile" ;;
"dlls/wintab.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintab.dll16/Makefile" ;;
......
configure.ac
View file @ 7dc9ea89
......@@ -2510,6 +2510,7 @@ WINE_CONFIG_MAKEFILE([dlls/winmm/tests/Makefile],[dlls/Maketest.rules],[dlls],[A
WINE_CONFIG_MAKEFILE([dlls/winnls.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
WINE_CONFIG_MAKEFILE([dlls/winnls32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winscard/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winsock.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
WINE_CONFIG_MAKEFILE([dlls/winspool.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winspool.drv/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/wintab.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
......
dlls/Makefile.in
View file @ 7dc9ea89
......@@ -26,7 +26,6 @@ WIN16_FILES = \
user.exe16 \
ver.dll16 \
wineps16.drv16 \
winsock.dll16 \
wprocs.dll16
@MAKE_RULES@
......@@ -64,9 +63,6 @@ wineps16.drv16:
mmsystem.dll16:
echo "winmm.dll" >$@
winsock.dll16:
echo "ws2_32.dll" >$@
# Import libraries
STATIC_IMPLIBEXT = $(IMPLIBEXT:def=def.a)
......
dlls/winsock.dll16/Makefile.in 0 → 100644
View file @ 7dc9ea89
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = winsock.dll16
IMPORTS = ws2_32 kernel32
DELAYIMPORTS = user32
EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ws2_32.dll
C_SRCS = socket.c
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend
dlls/ws2_32/winsock.spec → dlls/winsock.dll16/winsock.dll16.spec
View file @ 7dc9ea89
......@@ -5,14 +5,14 @@
5 pascal -ret16 getpeername(word ptr ptr) getpeername16
6 pascal -ret16 getsockname(word ptr ptr) getsockname16
7 pascal -ret16 getsockopt(word word word ptr ptr) getsockopt16
8 pascal htonl(long) WS_htonl
9 pascal -ret16 htons(word) WS_htons
10 pascal inet_addr(ptr) WS_inet_addr
8 pascal htonl(long) htonl16
9 pascal -ret16 htons(word) htons16
10 pascal inet_addr(ptr) inet_addr16
11 pascal inet_ntoa(long) inet_ntoa16
12 pascal -ret16 ioctlsocket(word long ptr) ioctlsocket16
13 pascal -ret16 listen(word word) listen16
14 pascal ntohl(long) WS_ntohl
15 pascal -ret16 ntohs(word) WS_ntohs
14 pascal ntohl(long) ntohl16
15 pascal -ret16 ntohs(word) ntohs16
16 pascal -ret16 recv(word ptr word word) recv16
17 pascal -ret16 recvfrom(word ptr word word ptr ptr) recvfrom16
18 pascal -ret16 select(word ptr ptr ptr ptr) select16
......@@ -38,10 +38,10 @@
108 pascal -ret16 WSACancelAsyncRequest(word) WSACancelAsyncRequest16
109 pascal -ret16 WSASetBlockingHook(segptr) WSASetBlockingHook16
110 pascal -ret16 WSAUnhookBlockingHook() WSAUnhookBlockingHook16
111 pascal -ret16 WSAGetLastError() WSAGetLastError
111 pascal -ret16 WSAGetLastError() WSAGetLastError16
112 pascal WSASetLastError(word) WSASetLastError16
113 pascal -ret16 WSACancelBlockingCall() WSACancelBlockingCall
114 pascal -ret16 WSAIsBlocking() WSAIsBlocking
113 pascal -ret16 WSACancelBlockingCall() WSACancelBlockingCall16
114 pascal -ret16 WSAIsBlocking() WSAIsBlocking16
115 pascal WSAStartup(word ptr) WSAStartup16
116 pascal WSACleanup() WSACleanup16
151 pascal -ret16 __WSAFDIsSet(word ptr) __WSAFDIsSet16
......
include/wine/winsock16.h → dlls/winsock.dll16/winsock16.h
View file @ 7dc9ea89
......@@ -19,9 +19,6 @@
#ifndef __WINE_WINE_WINSOCK16_H
#define __WINE_WINE_WINSOCK16_H
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <pshpack1.h>
typedef UINT16 SOCKET16;
......@@ -29,7 +26,7 @@ typedef UINT16 SOCKET16;
typedef struct
{
UINT16 fd_count; /* how many are SET? */
SOCKET16 fd_array[WS_FD_SETSIZE]; /* an array of SOCKETs */
SOCKET16 fd_array[FD_SETSIZE]; /* an array of SOCKETs */
} ws_fd_set16;
/* ws_hostent16, ws_protoent16, ws_servent16, ws_netent16
......
dlls/ws2_32/Makefile.in
View file @ 7dc9ea89
......@@ -14,10 +14,6 @@ C_SRCS = \
protocol.c \
socket.c
C_SRCS16 = socket16.c
SPEC_SRCS16 = winsock.spec
RC_SRCS = version.rc
@MAKE_DLL_RULES@
......
dlls/ws2_32/socket.c
View file @ 7dc9ea89
......@@ -822,7 +822,6 @@ INT WINAPI WSACleanup(void)
/***********************************************************************
* WSAGetLastError (WINSOCK.111)
* WSAGetLastError (WS2_32.111)
*/
INT WINAPI WSAGetLastError(void)
......@@ -2144,7 +2143,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
}
/***********************************************************************
* htonl (WINSOCK.8)
* htonl (WS2_32.8)
*/
WS_u_long WINAPI WS_htonl(WS_u_long hostlong)
......@@ -2154,7 +2152,6 @@ WS_u_long WINAPI WS_htonl(WS_u_long hostlong)
/***********************************************************************
* htons (WINSOCK.9)
* htons (WS2_32.9)
*/
WS_u_short WINAPI WS_htons(WS_u_short hostshort)
......@@ -2201,7 +2198,6 @@ int WINAPI WSAHtons(SOCKET s, WS_u_short hostshort, WS_u_short *lpnetshort)
/***********************************************************************
* inet_addr (WINSOCK.10)
* inet_addr (WS2_32.11)
*/
WS_u_long WINAPI WS_inet_addr(const char *cp)
......@@ -2212,7 +2208,6 @@ WS_u_long WINAPI WS_inet_addr(const char *cp)
/***********************************************************************
* ntohl (WINSOCK.14)
* ntohl (WS2_32.14)
*/
WS_u_long WINAPI WS_ntohl(WS_u_long netlong)
......@@ -2222,7 +2217,6 @@ WS_u_long WINAPI WS_ntohl(WS_u_long netlong)
/***********************************************************************
* ntohs (WINSOCK.15)
* ntohs (WS2_32.15)
*/
WS_u_short WINAPI WS_ntohs(WS_u_short netshort)
......@@ -4252,7 +4246,6 @@ int WINAPI __WSAFDIsSet(SOCKET s, WS_fd_set *set)
}
/***********************************************************************
* WSAIsBlocking (WINSOCK.114)
* WSAIsBlocking (WS2_32.114)
*/
BOOL WINAPI WSAIsBlocking(void)
......@@ -4270,7 +4263,6 @@ BOOL WINAPI WSAIsBlocking(void)
}
/***********************************************************************
* WSACancelBlockingCall (WINSOCK.113)
* WSACancelBlockingCall (WS2_32.113)
*/
INT WINAPI WSACancelBlockingCall(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment