Added missing exports to wsock32.dll/mswsock.dll and tweaked Makefile.

Makefile

@@ -28,8 +28,8 @@ SRC_FILES := changes.txt license.txt Makefile mkstubs.pl readme.txt src/config.h
 all: ipxwrapper.dll wsock32.dll mswsock.dll ipxconfig.exe
 
 clean:
-	rm -f src/*.o
-	rm -f src/*_stubs.s
+	rm -f ipxwrapper.dll wsock32.dll mswsock.dll ipxconfig.exe
+	rm -f src/*.o src/*_stubs.s
 
 dist: all
 	mkdir ipxwrapper-$(VERSION)
@@ -42,6 +42,9 @@ dist: all
 	zip -r ipxwrapper-$(VERSION)-src.zip ipxwrapper-$(VERSION)-src/
 	rm -r ipxwrapper-$(VERSION)-src/
 
+.SECONDARY:
+.PHONY: all clean dist
+
 ipxwrapper.dll: $(IPXWRAPPER_DEPS)
 	$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup,-s -shared -o ipxwrapper.dll $(IPXWRAPPER_DEPS) -liphlpapi
 

changes.txt

@@ -7,6 +7,8 @@ Version ???:
 	
 	Bugfix: Correctly order interfaces when first interface has the force
 	primary flag set.
+	
+	Bugfix: Added missing exports to wsock32.dll and mswsock.dll.
 
 Version 0.2.1:
 	Bugfix: Delay stub DLL LoadLibrary calls until first API call as using

src/mswsock.def

@@ -1,7 +1,7 @@
 LIBRARY MSWSOCK.dll
 EXPORTS
-	; ServiceMain			@1
-	; SvchostPushServiceGlobals	@2
+	ServiceMain			@1
+	SvchostPushServiceGlobals	@2
 	AcceptEx			@3
 	EnumProtocolsA			@4
 	EnumProtocolsW			@5
@@ -14,10 +14,21 @@ EXPORTS
 	GetServiceW			@12
 	GetTypeByNameA			@13
 	GetTypeByNameW			@14
+	MigrateWinsockConfiguration	@15
+	NPLoadNameSpaces		@16
 	NSPStartup			@17
 	SetServiceA			@18
 	SetServiceW			@19
+	StartWsdpService		@20
+	StopWsdpService			@21
 	TransmitFile			@22
 	WSARecvEx			@23
 	WSPStartup			@24
+	dn_expand			@25
+	getnetbyname			@26
+	inet_network			@27
+	rcmd				@28
+	rexec				@29
+	rresvport			@30
+	s_perror			@31
 	sethostname			@32

src/wsock32.def

@@ -23,6 +23,7 @@ EXPORTS
 	setsockopt			@21
 	shutdown			@22
 	socket				@23
+	MigrateWinsockConfiguration	@24
 	gethostbyaddr			@51
 	gethostbyname			@52
 	getprotobyname			@53
@@ -47,8 +48,17 @@ EXPORTS
 	WSAStartup			@115
 	WSACleanup			@116
 	__WSAFDIsSet			@151
+	WEP				@500
+	WSApSetPostRoutine		@1000
+	inet_network			@1100
+	getnetbyname			@1101
+	rcmd				@1102
+	rexec				@1103
+	rresvport			@1104
 	sethostname			@1105
+	dn_expand			@1106
 	WSARecvEx			@1107
+	s_perror			@1108
 	GetAddressByNameA		@1109
 	GetAddressByNameW		@1110
 	EnumProtocolsA			@1111
@@ -61,6 +71,7 @@ EXPORTS
 	SetServiceW			@1118
 	GetServiceA			@1119
 	GetServiceW			@1120
+	NPLoadNameSpaces		@1130
 	TransmitFile			@1140
 	AcceptEx			@1141
 	GetAcceptExSockaddrs		@1142