- The virtual netbios device driver is properly named vnbt.vxd, not

vnb.vxd.
- Make it not depend on UNIX includes.

configure.ac

@@ -1599,7 +1599,7 @@ dlls/uxtheme/Makefile
 dlls/vdhcp.vxd/Makefile
 dlls/version/Makefile
 dlls/vmm.vxd/Makefile
-dlls/vnb.vxd/Makefile
+dlls/vnbt.vxd/Makefile
 dlls/vnetbios.vxd/Makefile
 dlls/vtdapi.vxd/Makefile
 dlls/vwin32.vxd/Makefile

dlls/Makefile.in

@@ -116,7 +116,7 @@ BASEDIRS = \
 	vdhcp.vxd \
 	version \
 	vmm.vxd \
-	vnb.vxd \
+	vnbt.vxd \
 	vnetbios.vxd \
 	vtdapi.vxd \
 	vwin32.vxd \
@@ -332,7 +332,7 @@ SYMLINKS = \
 	vdhcp.vxd$(DLLEXT) \
 	version.dll$(DLLEXT) \
 	vmm.vxd$(DLLEXT) \
-	vnb.vxd$(DLLEXT) \
+	vnbt.vxd$(DLLEXT) \
 	vnetbios.vxd$(DLLEXT) \
 	vtdapi.vxd$(DLLEXT) \
 	vwin32.vxd$(DLLEXT) \
@@ -764,8 +764,8 @@ ver.dll$(DLLEXT) : version.dll$(DLLEXT)
 vmm.vxd$(DLLEXT): vmm.vxd/vmm.vxd$(DLLEXT)
 	$(RM) $@ && $(LN_S) vmm.vxd/vmm.vxd$(DLLEXT) $@
 
-vnb.vxd$(DLLEXT): vnb.vxd/vnb.vxd$(DLLEXT)
-	$(RM) $@ && $(LN_S) vnb.vxd/vnb.vxd$(DLLEXT) $@
+vnbt.vxd$(DLLEXT): vnbt.vxd/vnbt.vxd$(DLLEXT)
+	$(RM) $@ && $(LN_S) vnbt.vxd/vnbt.vxd$(DLLEXT) $@
 
 vnetbios.vxd$(DLLEXT): vnetbios.vxd/vnetbios.vxd$(DLLEXT)
 	$(RM) $@ && $(LN_S) vnetbios.vxd/vnetbios.vxd$(DLLEXT) $@
@@ -1786,7 +1786,7 @@ uxtheme/uxtheme.dll$(DLLEXT): uxtheme
 vdhcp.vxd/vdhcp.vxd$(DLLEXT): vdhcp.vxd
 version/version.dll$(DLLEXT): version
 vmm.vxd/vmm.vxd$(DLLEXT): vmm.vxd
-vnb.vxd/vnb.vxd$(DLLEXT): vnb.vxd
+vnbt.vxd/vnbt.vxd$(DLLEXT): vnbt.vxd
 vnetbios.vxd/vnetbios.vxd$(DLLEXT): vnetbios.vxd
 vtdapi.vxd/vtdapi.vxd$(DLLEXT): vtdapi.vxd
 vwin32.vxd/vwin32.vxd$(DLLEXT): vwin32.vxd

dlls/vnb.vxd/.cvsignore

@@ -1,3 +0,0 @@
-Makefile
-vnb.vxd.dbg.c
-vnb.vxd.spec.c

dlls/vnb.vxd/vnb.vxd.spec

@@ -1 +0,0 @@
-@ stdcall DeviceIoControl(long ptr long ptr long ptr ptr) VNB_DeviceIoControl

dlls/vnbt.vxd/.cvsignore

@@ -0,0 +1,3 @@
+Makefile
+vnbt.vxd.dbg.c
+vnbt.vxd.spec.c

dlls/vnbt.vxd/Makefile.in

@@ -2,11 +2,11 @@ TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = vnb.vxd
+MODULE    = vnbt.vxd
 IMPORTS   = iphlpapi kernel32
 
 C_SRCS = \
-	vnb.c
+	vnbt.c
 
 @MAKE_DLL_RULES@
 

dlls/vnbt.vxd/vnbt.c

@@ -1,5 +1,5 @@
 /*
- * VNB VxD implementation
+ * VNBT VxD implementation
  *
  * Copyright 2003 Juan Lang
  *
@@ -20,25 +20,11 @@
 
 #include "config.h"
 
-#include <stdlib.h>
 #include <stdarg.h>
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #include "windef.h"
 #include "winbase.h"
 #include "iphlpapi.h"
+#include "winsock2.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(vxd);
@@ -73,11 +59,11 @@ typedef struct _nbtTable
 /***********************************************************************
  *           DeviceIoControl   (VNB.VXD.@)
  */
-BOOL WINAPI VNB_DeviceIoControl(DWORD dwIoControlCode,
-                                LPVOID lpvInBuffer, DWORD cbInBuffer,
-                                LPVOID lpvOutBuffer, DWORD cbOutBuffer,
-                                LPDWORD lpcbBytesReturned,
-                                LPOVERLAPPED lpOverlapped)
+BOOL WINAPI VNBT_DeviceIoControl(DWORD dwIoControlCode,
+                                 LPVOID lpvInBuffer, DWORD cbInBuffer,
+                                 LPVOID lpvOutBuffer, DWORD cbOutBuffer,
+                                 LPDWORD lpcbBytesReturned,
+                                 LPOVERLAPPED lpOverlapped)
 {
     DWORD error;
 

dlls/vnbt.vxd/vnbt.vxd.spec

@@ -0,0 +1 @@
+@ stdcall DeviceIoControl(long ptr long ptr long ptr ptr) VNBT_DeviceIoControl