2025-04-05 00:31:10 +08:00
178 changed files with 87769 additions and 8918 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,12 +0,0 @@
-VisualStudio/
-bin/
-build/
-buildroot-configs/
-floppy/
-hotbird64-mass-build/
-lib/
-src/VisualStudio-Linux-Remote/
-*.vcxproj*
-*.html
-*.pdf
-*.txt
--- a/.gitmodules
+++ b/.gitmodules
@ -1,6 +0,0 @@
-[submodule "debian"]
-	path = debian
-	url = https://github.com/Wind4/vlmcsd-debian.git
-[submodule "docker"]
-	path = docker
-	url = https://github.com/Wind4/vlmcsd-docker.git
--- a/636
+++ b/636
@ -1,19 +1,32 @@
-.NOTPARALLEL:
+################################################################################

-MAX_THREADS ?= 16
+.PHONY: clean

-PROGRAM_NAME ?= bin/vlmcsd
-CLIENT_NAME ?= bin/vlmcs
-MULTI_NAME ?= bin/vlmcsdmulti
-OBJ_NAME ?= build/libkms-static.o
-A_NAME ?= lib/libkms.a
+PROGRAM_NAME ?= vlmcsd
+CLIENT_NAME ?= vlmcs
+MULTI_NAME ?= vlmcsdmulti
+OBJ_NAME ?= libkms-static.o
+A_NAME ?= libkms.a
+CONFIG ?= config.h
+COMPILER_LANGUAGE ?= c

-BASE_PROGRAM_NAME=$(notdir $(PROGRAM_NAME))
-BASE_CLIENT_NAME=$(notdir $(CLIENT_NAME))
-BASE_MULTI_NAME=$(notdir $(MULTI_NAME))
-BASE_DLL_NAME=$(notdir $(DLL_NAME))
-BASE_A_NAME=$(notdir $(A_NAME))
+# crypto library to use for standard algos, could save ~1-2kb ;)
+# can be either 'openssl', 'polarssl' or anything other for internal impl
+CRYPTO ?= internal

+# use DNS_PARSER=internal if your OS doesn't supply the DNS parser routines
+DNS_PARSER ?= OS
+
+# You should supply your own version string here
+
+VLMCSD_VERSION ?= $(shell test -d .svn && echo svn`svnversion`)
+
+FEATURES ?= full
+VERBOSE ?= NO
+
+################################################################################
+
+CC ?= gcc
 TARGETPLATFORM := $(shell LANG=en_US.UTF-8 $(CC) -v 2>&1 | grep '^Target: ' | cut -f 2 -d ' ')

 ifneq (,$(findstring darwin,$(TARGETPLATFORM)))
@ -93,63 +106,509 @@ endif
 endif

 ifeq ($(CYGWIN),1)
-  DLL_NAME ?= lib/cygkms.dll
+  DLL_NAME ?= cygkms.dll
 else ifeq ($(WIN),1)
-  DLL_NAME ?= lib/libkms.dll
+  DLL_NAME ?= libkms.dll
 else ifeq ($(DARWIN),1)
-  DLL_NAME ?= lib/libkms.dylib
+  DLL_NAME ?= libkms.dylib
 else
-  DLL_NAME ?= lib/libkms.so
+  DLL_NAME ?= libkms.so
 endif

-.DEFAULT:
-	+@(test -d bin || mkdir bin) & (test -d lib || mkdir lib) & (test -d build || mkdir build)
-	+@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
+BASECFLAGS = -DVLMCSD_COMPILER=\"$(notdir $(CC))\" -DVLMCSD_PLATFORM=\"$(TARGETPLATFORM)\" -DCONFIG=\"$(CONFIG)\" -DBUILD_TIME=$(shell date '+%s') -g -Os -fno-strict-aliasing -fomit-frame-pointer -ffunction-sections -fdata-sections
+BASELDFLAGS = 
+STRIPFLAGS =
+CLIENTLDFLAGS =
+SERVERLDFLAGS =

-all:
-	+@(test -d bin || mkdir bin) & (test -d lib || mkdir lib) & (test -d build || mkdir build)
-	+@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
+ifndef SAFE_MODE
+  BASECFLAGS += -fvisibility=hidden -pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants
+  
+  ifeq ($(ELF),1)
+    BASELDFLAGS += -Wl,-z,norelro
+  endif
+
+  ifneq (,$(findstring gcc,$(notdir $(CC))))
+    BASECFLAGS += -flto
+  endif
+
+endif
+
+ifeq ($(NOLIBS),1)
+  NOLRESOLV=1
+  NOLPTHREAD=1
+endif
+
+ifneq ($(NOLIBS),1)
+  ifeq ($(MINGW),1)
+    BASELDFLAGS += -lws2_32 -liphlpapi
+  endif
+endif 
+
+ifneq ($(NO_DNS),1)
+  ifneq ($(ANDROID),1)
+  ifneq ($(NOLRESOLV),1)
+
+    ifeq ($(MINGW),1)
+      CLIENTLDFLAGS += -ldnsapi
+    endif
+
+    ifeq ($(LINUX),1)
+      CLIENTLDFLAGS += -lresolv
+    endif
+
+    ifeq ($(HURD),1)
+      CLIENTLDFLAGS += -lresolv
+    endif
+
+    ifeq ($(DARWIN),1)
+      CLIENTLDFLAGS += -lresolv
+    endif
+
+    ifeq ($(CYGWIN),1)
+      DNS_PARSER := internal
+      CLIENTLDFLAGS += -lresolv
+    endif
+
+    ifeq ($(OPENBSD),1)
+      DNS_PARSER := internal
+    endif
+
+    ifeq ($(SOLARIS),1)
+      CLIENTLDFLAGS += -lresolv
+    endif
+
+  endif
+  endif
+else
+  BASECFLAGS += -DNO_DNS
+endif 
+
+ifneq ($(CAT),2)
+  BASECFLAGS += "-Wall"
+endif  
+
+ifeq ($(DARWIN), 1)
+  STRIPFLAGS += -Wl,-S -Wl,-x
+  BASECFLAGS += -Wno-deprecated-declarations
+else ifeq ($(shell uname), SunOS)
+  STRIPFLAGS += -s
+  ifeq ($(notdir $(LD_ALTEXEC)),gld)
+    BASELDFLAGS += -Wl,--gc-sections
+  endif
+  BASELDFLAGS += -lsocket
+else
+  ifneq ($(CC),tcc)
+  	BASELDFLAGS += -Wl,--gc-sections
+  endif
+  STRIPFLAGS += -s
+endif
+
+LIBRARY_CFLAGS = -DSIMPLE_SOCKETS -DNO_TIMEOUT -DNO_SIGHUP -DNO_CL_PIDS -DNO_EXTENDED_PRODUCT_LIST -DNO_BASIC_PRODUCT_LIST -DNO_LOG -DNO_RANDOM_EPID -DNO_INI_FILE -DNO_HELP -DNO_CUSTOM_INTERVALS -DNO_PID_FILE -DNO_USER_SWITCH -DNO_VERBOSE_LOG -DNO_LIMIT -DNO_VERSION_INFORMATION -DNO_PRIVATE_IP_DETECT
+
+ifeq ($(FEATURES), embedded)
+  BASECFLAGS += -DNO_HELP -DNO_USER_SWITCH -DNO_BASIC_PRODUCT_LIST -DNO_CUSTOM_INTERVALS -DNO_PID_FILE -DNO_VERBOSE_LOG -DNO_VERSION_INFORMATION
+else ifeq ($(FEATURES), autostart)
+  BASECFLAGS += -DNO_HELP -DNO_VERSION_INFORMATION
+else ifeq ($(FEATURES), minimum)
+  BASECFLAGS += -DSIMPLE_SOCKETS -DNO_TIMEOUT -DNO_SIGHUP -DNO_CL_PIDS -DNO_EXTENDED_PRODUCT_LIST -DNO_BASIC_PRODUCT_LIST -DNO_LOG -DNO_RANDOM_EPID -DNO_INI_FILE -DNO_HELP -DNO_CUSTOM_INTERVALS -DNO_PID_FILE -DNO_USER_SWITCH -DNO_VERBOSE_LOG -DNO_LIMIT -DNO_VERSION_INFORMATION -DNO_PRIVATE_IP_DETECT -DSMALL_AES
+else ifeq ($(FEATURES), most)
+  BASECFLAGS += -DNO_SIGHUP -DNO_PID_FILE -DNO_LIMIT
+else ifeq ($(FEATURES), inetd)
+  BASECFLAGS += -DNO_SIGHUP -DNO_SOCKETS -DNO_PID_FILE -DNO_LIMIT -DNO_VERSION_INFORMATION
+else ifeq ($(FEATURES), fixedepids)
+  BASECFLAGS += -DNO_SIGHUP -DNO_CL_PIDS -DNO_RANDOM_EPID -DNO_INI_FILE
+endif
+
+ifdef INI
+  BASECFLAGS += -DINI_FILE=\"$(INI)\"
+endif
+
+ifeq ($(NO_GETIFADDRS), 1)
+  BASECFLAGS += -DNO_GETIFADDRS
+endif
+
+ifeq ($(THREADS), 1)
+  BASECFLAGS += -DUSE_THREADS
+endif
+
+ifeq ($(CHILD_HANDLER), 1)
+  BASECFLAGS += -DCHILD_HANDLER
+endif
+
+ifeq ($(NO_TIMEOUT), 1)
+  BASECFLAGS += -DNO_TIMEOUT
+endif
+
+ifdef WINDOWS
+  BASECFLAGS += -DEPID_WINDOWS=\"$(WINDOWS)\"
+endif
+
+ifdef OFFICE2010
+  BASECFLAGS += -DEPID_OFFICE2010=\"$(OFFICE2010)\"
+endif
+
+ifdef OFFICE2013
+  BASECFLAGS += -DEPID_OFFICE2013=\"$(OFFICE2013)\"
+endif
+
+ifdef OFFICE2016
+  BASECFLAGS += -DEPID_OFFICE2016=\"$(OFFICE2016)\"
+endif
+
+ifdef HWID
+  BASECFLAGS += -DHWID=$(HWID)
+endif
+
+ifdef TERMINAL_WIDTH
+  BASECFLAGS += -DTERMINAL_FIXED_WIDTH=$(TERMINAL_WIDTH) -DDISPLAY_WIDTH=\"$(TERMINAL_WIDTH)\"
+endif
+
+ifeq ($(NOPROCFS), 1)
+  BASECFLAGS += -DNO_PROCFS
+endif
+
+ifeq ($(AUXV), 1)
+  BASECFLAGS += -DUSE_AUXV
+endif
+
+ifneq ($(ANDROID), 1)
+ifneq ($(MINIX), 1)
+ifneq ($(NOLPTHREAD), 1)
+
+  ifeq ($(THREADS), 1)
+    SERVERLDFLAGS += -lpthread
+  endif
+  
+  ifeq (,$(findstring NO_LIMIT,$(CFLAGS) $(BASECFLAGS)))  
+    SERVERLDFLAGS += -lpthread
+  endif
+
+endif
+endif
+endif
+
+$(MULTI_NAME): BASECFLAGS += -DMULTI_CALL_BINARY=1
+
+all: $(CLIENT_NAME) $(PROGRAM_NAME)
+
+#ifdef CAT
+  allmulti: $(CLIENT_NAME) $(PROGRAM_NAME) $(MULTI_NAME)
+#endif
+
+ifneq ($(strip $(VLMCSD_VERSION)),)
+  BASECFLAGS += -DVERSION=\"$(VLMCSD_VERSION),\ built\ $(shell date -u '+%Y-%m-%d %H:%M:%S' | sed -e 's/ /\\ /g')\ UTC\" 
+endif
+
+ifdef CAT
+  BASECFLAGS += -DONE_FILE
+endif
+
+SRCS = crypto.c kms.c endian.c output.c shared_globals.c helpers.c
+HEADERS = $(CONFIG) types.h rpc.h vlmcsd.h endian.h crypto.h kms.h network.h output.h shared_globals.h vlmcs.h helpers.h
+DEPS = $(MULTI_SRCS:.c=.d)
+
+VLMCSD_SRCS = vlmcsd.c $(SRCS)
+VLMCSD_OBJS = $(VLMCSD_SRCS:.c=.o)
+
+VLMCS_SRCS = vlmcs.c $(SRCS)
+VLMCS_OBJS = $(VLMCS_SRCS:.c=.o)
+
+MULTI_SRCS = vlmcsd.c vlmcs.c vlmcsdmulti.c $(SRCS)
+MULTI_OBJS = $(SRCS:.c=.o) vlmcsd-m.o vlmcs-m.o vlmcsdmulti-m.o
+
+DLL_SRCS = libkms.c vlmcs.c $(SRCS)
+DLL_OBJS = $(DLL_SRCS:.c=-l.o)
+
+PDFDOCS = vlmcs.1.pdf vlmcsd.7.pdf vlmcsd.8.pdf vlmcsdmulti.1.pdf vlmcsd.ini.5.pdf vlmcsd-floppy.7.pdf
+HTMLDOCS = $(PDFDOCS:.pdf=.html)
+UNIXDOCS = $(PDFDOCS:.pdf=.unix.txt)
+DOSDOCS = $(PDFDOCS:.pdf=.dos.txt)
+
+ifneq ($(NO_DNS),1)
+
+  VLMCS_SRCS += dns_srv.c
+  MULTI_SRCS += dns_srv.c
+  MULTI_OBJS += dns_srv.o
+
+ifeq ($(DNS_PARSER),internal)
+ifneq ($(MINGW),1)
+  VLMCS_SRCS += ns_parse.c ns_name.c
+  MULTI_SRCS += ns_parse.c ns_name.c
+  MULTI_OBJS += ns_parse.o ns_name.o
+  BASECFLAGS += "-DDNS_PARSER_INTERNAL"
+endif
+endif
+
+endif
+
+ifeq ($(MSRPC),1)
+  VLMCSD_SRCS += msrpc-server.c
+  VLMCS_SRCS += msrpc-client.c
+  MULTI_SRCS += msrpc-server.c msrpc-client.c
+  MULTI_OBJS += msrpc-server-m.o msrpc-client-m.o
+  DLL_SRCS += msrpc-server.c
+  BASECFLAGS += -DUSE_MSRPC -Wno-unknown-pragmas
+  BASELDFLAGS += -lrpcrt4
+else
+  SRCS += network.c rpc.c  
+endif
+
+ifeq ($(GETIFADDRS),musl)
+ifneq ($(NO_GETIFADDRS),1)
+  BASECFLAGS += -DGETIFADDRS_MUSL
+  VLMCSD_SRCS += getifaddrs-musl.c
+  MULTI_SRCS += getifaddrs-musl.c
+  VLMCS_SRCS += getifaddrs-musl.c
+  DLL_SRCS += getifaddrs-musl.c
+  MULTI_OBJS += getifaddrs-musl.o
+endif
+endif
+
+ifeq ($(ANDROID),1)
+ifneq ($(NO_GETIFADDRS),1)
+  VLMCSD_SRCS += ifaddrs-android.c
+  MULTI_SRCS += ifaddrs-android.c
+  DLL_SRCS += ifaddrs-android.c
+  MULTI_OBJS += ifaddrs-android.o
+endif
+endif
+
+ifeq "$(WIN)" "1"
+	VLMCSD_SRCS += ntservice.c
+	MULTI_SRCS += ntservice.c
+	MULTI_OBJS += ntservice.o
+endif
+
+ifeq ($(CRYPTO), openssl_with_aes)
+	BASECFLAGS += -D_CRYPTO_OPENSSL -D_USE_AES_FROM_OPENSSL
+	BASELDFLAGS += -lcrypto
+	SRCS += crypto_openssl.c
+else ifeq ($(CRYPTO), openssl_with_aes_soft)
+	BASECFLAGS += -D_CRYPTO_OPENSSL -D_USE_AES_FROM_OPENSSL -D_OPENSSL_SOFTWARE
+	BASELDFLAGS += -lcrypto
+	SRCS += crypto_openssl.c
+else ifeq ($(CRYPTO), openssl)
+	BASECFLAGS += -D_CRYPTO_OPENSSL
+	BASELDFLAGS += -lcrypto
+	SRCS += crypto_openssl.c
+else ifeq ($(CRYPTO), polarssl)
+	BASECFLAGS += -D_CRYPTO_POLARSSL
+	BASELDFLAGS += -lpolarssl
+else ifeq ($(CRYPTO), windows)
+	BASECFLAGS += -D_CRYPTO_WINDOWS
+	SRCS += crypto_windows.c
+else
+	BASECFLAGS += -D_CRYPTO_INTERNAL
+	SRCS += crypto_internal.c
+endif
+
+ifneq ($(STRIP),0)
+	BASELDFLAGS += $(STRIPFLAGS)
+endif
+
+ifeq ($(OPENSSL_HMAC),0)
+	BASECFLAGS += -D_OPENSSL_NO_HMAC
+endif
+
+ifeq ($(DEPENDENCIES),2)
+    BASECFLAGS += -MMD
+endif
+
+ifeq ($(VERBOSE),3)
+    COMPILER := $(shell printf "%-40s" $(notdir $(CC)))
+    ARCHIVER := $(shell printf "%-40s" $(notdir $(AR)))
+endif
+
+ARCMD := AR
+
+ifdef CAT
+    LDCMD := CC/LD
+else
+    LDCMD := LD    
+endif
+
+-include $(MULTI_SRCS:.c=.d)
+
+%.o: %.c 
+  ifeq ($(VERBOSE),1)
+	$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -c $<
+  ifeq ($(DEPENDENCIES),1)
+	$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -MM -MF $*.d $<
+  endif
+  else
+	@echo "$(COMPILER)	CC	$@ <- $<"
+	@$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -c $<
+  ifeq ($(DEPENDENCIES),1)
+	@echo "$(COMPILER)	DEP	$*.d <- $<"
+	@$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -MM -MF $*.d $<
+  endif
+  endif
+
+%-m.o: %.c
+  ifeq ($(VERBOSE),1)
+	$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -o $@ -c $<
+  ifeq ($(DEPENDENCIES),1)
+	$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -MM -MF $*.d $<
+  endif
+  else
+	@echo "$(COMPILER)	CC	$@ <- $<"
+	@$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -o $@ -c $<
+  ifeq ($(DEPENDENCIES),1)
+	@echo "$(COMPILER)	DEP	$*.d <- $<"
+	@$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -MM -MF $*.d $<
+  endif
+  endif
+
+%-l.o: %.c
+  ifeq ($(VERBOSE),1)
+	$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -fvisibility=hidden -c -DIS_LIBRARY=1 $(LIBRARY_CFLAGS) -UNO_SOCKETS -UUSE_MSRPC -o $@ -c $<
+  ifeq ($(DEPENDENCIES),1)
+	$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) $(SERVERLDFLAGS) -fvisibility=hidden -c -DIS_LIBRARY=1 $(LIBRARY_CFLAGS) -UNO_SOCKETS -UUSE_MSRPC -MM -MF $*.d $<
+  endif
+  else
+	@echo "$(COMPILER)	CC	$@ <- $<"
+	@$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) $(SERVERLDFLAGS) -fvisibility=hidden -c -DIS_LIBRARY=1 $(LIBRARY_CFLAGS) -UNO_SOCKETS -UUSE_MSRPC -o $@ -c $<
+  ifeq ($(DEPENDENCIES),1)
+	@echo "$(COMPILER)	DEP	$*.d <- $<"
+	@$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) $(SERVERLDFLAGS) -fvisibility=hidden -c -DIS_LIBRARY=1 $(LIBRARY_CFLAGS) -UNO_SOCKETS -UUSE_MSRPC -MM -MF $*.d $<
+  endif
+  endif
+
+
+ifdef CAT
+  BUILDCOMMAND = cat $^ | $(CC) -x$(COMPILER_LANGUAGE) -o $@ -
+  VLMCSD_PREREQUISITES = $(VLMCSD_SRCS)
+  VLMCS_PREREQUISITES = $(VLMCS_SRCS)
+  MULTI_PREREQUISITES = $(MULTI_SRCS)
+  DLL_PREREQUISITES = $(DLL_SRCS)
+  OBJ_PREREQUISITES = $(DLL_SRCS)
+else
+  BUILDCOMMAND = $(CC) -o $@ $^
+  VLMCSD_PREREQUISITES = $(VLMCSD_OBJS)
+  VLMCS_PREREQUISITES = $(VLMCS_OBJS)
+  MULTI_PREREQUISITES = $(MULTI_OBJS)
+  DLL_PREREQUISITES = $(DLL_OBJS)
+  OBJ_PREREQUISITES = $(DLL_OBJS)
+endif
+
+ifeq ($(VERBOSE),1)
+  BUILDCOMMANDPREFIX = +
+else
+  BUILDCOMMANDPREFIX = +@
+endif
+
+INFOCOMMAND = +@echo "$(COMPILER)	$(LDCMD)	$@ <- $^"
+ARINFOCOMMAND = +@echo "$(ARCHIVER)	$(ARCMD)	$@ <. $^"
+
+VLMCSD_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(SERVERLDFLAGS)
+VLMCS_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(CLIENTLDFLAGS)
+MULTI_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(CLIENTLDFLAGS) $(SERVERLDFLAGS)
+DLL_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(SERVERLDFLAGS) -fvisibility=hidden -shared -DIS_LIBRARY=1 $(LIBRARY_CFLAGS) -UNO_SOCKETS -UUSE_MSRPC
+OBJ_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(SERVERLDFLAGS) -fvisibility=hidden -c -DIS_LIBRARY=1 $(LIBRARY_CFLAGS) -UNO_SOCKETS -UUSE_MSRPC
+  
+$(PROGRAM_NAME): $(VLMCSD_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(VLMCSD_COMMAND)
+
+$(CLIENT_NAME): $(VLMCS_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(VLMCS_COMMAND)
+
+$(MULTI_NAME): $(MULTI_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(MULTI_COMMAND)
+
+$(DLL_NAME): $(DLL_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(DLL_COMMAND)
+
+ifndef CAT
+$(OBJ_NAME):
+	+@echo Cannot make $@ without CAT defined. Please create $(A_NAME)
+else
+$(OBJ_NAME): $(OBJ_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(OBJ_COMMAND)
+endif
+
+ifdef CAT
+$(A_NAME): $(OBJ_NAME)
+else
+$(A_NAME): BASECFLAGS += -fvisibility=hidden -DIS_LIBRARY=1 $(LIBRARY_CFLAGS) -UNO_SOCKETS -UUSE_MSRPC
+$(A_NAME): $(DLL_OBJS)
+endif
+  ifneq ($(VERBOSE),1)
+	$(ARINFOCOMMAND)
+  endif
+	+@rm -f $@
+	$(BUILDCOMMANDPREFIX)$(AR) rcs $@ $^
+
+%.pdf : %
+  ifeq ($(shell uname), Darwin)
+	groff -Tps -mandoc -c $< | pstopdf -i -o $@
+  else
+	groff -Tpdf -mandoc -c $< > $@
+  endif
+
+%.html : %
+	groff -Thtml -mandoc -c $< > $@ 
+
+%.unix.txt : %
+	groff -P -c -Tutf8 -mandoc -c $< | col -bx > $@
+
+%.dos.txt : %.unix.txt
+#	unix2dos -n $< $@
+#	sed -e 's/$$/\r/' $< > $@
+	awk 'sub("$$", "\r")' $< > $@
+
+pdfdocs : $(PDFDOCS)
+
+dosdocs : $(DOSDOCS)
+
+unixdocs : $(UNIXDOCS)
+
+htmldocs : $(HTMLDOCS)
+
+alldocs : $(UNIXDOCS) $(HTMLDOCS) $(PDFDOCS) $(DOSDOCS)

 clean:
-	+@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
-	+@$(MAKE) -j$(MAX_THREADS) -C man $@
+	rm -f *.o *.d *_all.c libkms_all_*.c $(PROGRAM_NAME) $(MULTI_NAME) $(DLL_NAME) $(CLIENT_NAME) $(PDFDOCS) $(DOSDOCS) $(UNIXDOCS) $(HTMLDOCS) $(OBJ_NAME) $(A_NAME) *.a

-alldocs:
-	+@$(MAKE) -j$(MAX_THREADS) -C man $@
-
-dosdocs:
-	+@$(MAKE) -j$(MAX_THREADS) -C man $@
-
-unixdocs:
-	+@$(MAKE) -j$(MAX_THREADS) -C man $@
-
-htmldocs:
-	+@$(MAKE) -j$(MAX_THREADS) -C man $@
-
-pdfdocs:
-	+@$(MAKE) -j$(MAX_THREADS) -C man $@
-
-GNUmakefile:
+dnsclean:
+	rm -f dns_srv.o

 help:
 	@echo "Type"
-	@echo "    ${MAKE}               - to build $(BASE_PROGRAM_NAME) and $(BASE_CLIENT_NAME)"
-	@echo "    ${MAKE} clean         - to remove all targets and temporary files"
-	@echo "    ${MAKE} pdfdocs       - Create PDF versions of the documentation (Requires groff with PDF support)."
-	@echo "    ${MAKE} htmldocs      - Create HTML versions of the documentation."
-	@echo "    ${MAKE} unixdocs      - Create Unix TXT versions of the documentation."
-	@echo "    ${MAKE} dosdocs       - Create DOS/Windows TXT versions of the documentation."
-	@echo "    ${MAKE} alldocs       - Create all versions of the documentation."
-	@echo "    ${MAKE} vlmcsd        - to build KMS server $(PROGRAM_NAME)"
-	@echo "    ${MAKE} vlmcs         - to build KMS client $(CLIENT_NAME)"
-	@echo "    ${MAKE} vlmcsdmulti   - to build $(BASE_PROGRAM_NAME) and $(BASE_CLIENT_NAME) in a single multi-call binary $(MULTI_NAME)"
-	@echo "    ${MAKE} libkms        - to build the shared library $(DLL_NAME)"
-	@echo "    ${MAKE} libkms-static - to build the static library $(A_NAME)"
+	@echo "    ${MAKE}          - to build $(PROGRAM_NAME) and $(CLIENT_NAME)"
+	@echo "    ${MAKE} clean    - to remove $(PROGRAM_NAME) and $(CLIENT_NAME)"
+	@echo "    ${MAKE} help     - to see this help"
+	@echo "    ${MAKE} pdfdocs  - Create PDF versions of the documentation (Requires groff with PDF support)."
+	@echo "    ${MAKE} htmldocs - Create HTML versions of the documentation."
+	@echo "    ${MAKE} unixdocs - Create Unix TXT versions of the documentation."
+	@echo "    ${MAKE} dosdocs  - Create DOS/Windows TXT versions of the documentation."
+	@echo "    ${MAKE} alldocs  - Create all versions of the documentation."
+	@echo "    ${MAKE} -j <x>   - Use <x> parallel tasks (SMP support) when compiling $(PROGRAM_NAME) and $(CLIENT_NAME)"
+	@echo ""
+	@echo "    ${MAKE} $(PROGRAM_NAME) - to build the server only."
+	@echo "    ${MAKE} $(CLIENT_NAME) - to build the client only."
+	@echo "    ${MAKE} $(MULTI_NAME) - to build $(PROGRAM_NAME) and $(CLIENT_NAME) in a single multi-call binary"
+	@echo "    ${MAKE} $(DLL_NAME) - to build the shared library $(DLL_NAME)"
+	@echo "    ${MAKE} $(A_NAME) - to build the static library $(A_NAME)"
 	@echo ""
 	@echo "Options"
 	@echo "    CONFIG=<x>                   Compile <x> as instead of config.h."
-	@echo "    INI=<x>                      Compile $(BASE_PROGRAM_NAME) with default ini file <x>"
-	@echo "    DATA=<x>                     Compile $(BASE_PROGRAM_NAME) and $(BASE_CLIENT_NAME) with default KMS data file <x>"
+	@echo "    INI=<x>                      Compile $(PROGRAM_NAME) with default ini file <x>"
 	@echo "    PROGRAM_NAME=<x>             Use <x> as output file name for the KMS server. Defaults to vlmcsd."
 	@echo "    CLIENT_NAME=<x>              Use <x> as output file name for the KMS client. Defaults to vlmcs."
 	@echo "    MULTI_NAME=<x>               Use <x> as output file name for the multi-call binary. Defaults to vlmcsdmulti."
@ -161,7 +620,7 @@ help:
 	@echo "    CRYPTO=windows               Use Windows CryptoAPI instead of internal crypto code for SHA256/HMAC calculations."
 	@echo "    MSRPC=1                      Use Microsoft RPC instead of vlmcsd's internal RPC. Only works with Windows and Cygwin targets."
 	@echo "    CC=<x>                       Use compiler <x>. Supported compilers are gcc, icc, tcc and clang. Others may or may not work."
-	@echo "    AR=<x>                       Use <x> instead of ar to build $(BASE_A_NAME). Set to gcc-ar if you want to use gcc's LTO feature."
+	@echo "    AR=<x>                       Use <x> instead of ar to build $(A_NAME). Set to gcc-ar if you want to use gcc's LTO feature."
 	@echo "    COMPILER_LANGUAGE=<x>        May be c or c++."
 	@echo "    TERMINAL_WIDTH=<x>           Assume a fixed terminal width of <x> columns. Use in case of problems only."  
 	@echo "    VLMCSD_VERSION=<x>           Sets <x> as your version identifier. Defaults to \"private build\"."
@ -170,24 +629,28 @@ help:
 	@echo "    PLATFORMFLAGS=<x>            Pass <x> as additional arguments to the compiler and the linker."
 	@echo "    BASECFLAGS=<x>               Pass only <x> as arguments to the compiler (advanced users only)."
 	@echo "    BASELDFLAGS=<x>              Pass only <x> as arguments to the linker (advanced users only)."
-	@echo "    STRIP=0                      Don't strip debug information from $(BASE_PROGRAM_NAME) and $(BASE_CLIENT_NAME) (for developers)."
+	@echo "    STRIP=0                      Don't strip debug information from $(PROGRAM_NAME) and $(CLIENT_NAME) (for developers)."
 	@echo "    VERBOSE=1                    Be verbose when making targets."
 	@echo "    VERBOSE=3                    Show name of compiler."
 	@echo "    THREADS=1                    Use threads instead of fork(). Automatically set for native Windows. Recommended for Cygwin."
+	@echo "    WINDOWS=<x>                  Use <x> as the default ePID for Windows (when using $(PROGRAM_NAME) with -r 0)."
+	@echo "    OFFICE2010=<x>               Use <x> as the default ePID for Office2010 (when using $(PROGRAM_NAME) with -r 0)."
+	@echo "    OFFICE2013=<x>               Use <x> as the default ePID for Office2013 (when using $(PROGRAM_NAME) with -r 0)."
+	@echo "    OFFICE2016=<x>               Use <x> as the default ePID for Office2016 (when using $(PROGRAM_NAME) with -r 0)."
 	@echo "    HWID=<x>                     Use <x> as the default HWID (when it can't be found in an ini file)."
-	@echo "    FEATURES=full                Compile $(BASE_PROGRAM_NAME) with all features (default)."
-	@echo "    FEATURES=most                Compile $(BASE_PROGRAM_NAME) without rarely used features."
-	@echo "    FEATURES=embedded            Compile $(BASE_PROGRAM_NAME) with typical features for embedded systems."
-	@echo "    FEATURES=autostart           Removes features typically not needed if you place $(BASE_PROGRAM_NAME) in an autostart script."
-	@echo "    FEATURES=inetd               Compile $(BASE_PROGRAM_NAME) for running through an internet superserver only."
-	@echo "    FEATURES=minimum             Compiles only basic features of $(BASE_PROGRAM_NAME)."
-	@echo "    FEATURES=fixedepids          $(BASE_PROGRAM_NAME) only uses bultin internal ePIDs."
+	@echo "    FEATURES=full                Compile $(PROGRAM_NAME) with all features (default)."
+	@echo "    FEATURES=most                Compile $(PROGRAM_NAME) without rarely used features."
+	@echo "    FEATURES=embedded            Compile $(PROGRAM_NAME) with typical features for embedded systems."
+	@echo "    FEATURES=autostart           Removes features typically not needed if you place $(PROGRAM_NAME) in an autostart script."
+	@echo "    FEATURES=inetd               Compile $(PROGRAM_NAME) for running through an internet superserver only."
+	@echo "    FEATURES=minimum             Compiles only basic features of $(PROGRAM_NAME)."
+	@echo "    FEATURES=fixedepids          $(PROGRAM_NAME) only uses bultin internal ePIDs."
 	@echo ""
-	@echo "Useful CFLAGS to save memory when running $(BASE_PROGRAM_NAME) on very small embedded devices (finer control than FEATURES=)"
-	@echo "    -DNO_STRICT_MODES            Don't support enhanced emulator detection prevention."
-	@echo "    -DNO_CLIENT_LIST             Don't support maintaining a client list (CMIDs)."
+	@echo "Useful CFLAGS to save memory when running $(PROGRAM_NAME) on very small embedded devices (finer control than FEATURES=)"
+	@echo "    -DNO_EXTENDED_PRODUCT_LIST   Don't compile the detailed product list."
+	@echo "    -DNO_BASIC_PRODUCT_LIST      Don't compile the basic product list."
 	@echo "    -DNO_VERBOSE_LOG             Don't support verbose logging. Removes -v option."
-	@echo "    -DNO_LOG                     Don't add support for logging. Implies -DNO_VERBOSE_LOG."
+	@echo "    -DNO_LOG                     Don't add support for logging. Implies -DNO_VERBOSE_LOG -DNO_EXTENDED_PRODUCT_LIST and -DNO_BASIC_PRODUCT_LIST."
 	@echo "    -DNO_RANDOM_EPID             Don't support random ePIDs."
 	@echo "    -DNO_INI_FILE                Don't support reading ePIDs/HWIDs from a file."
 	@echo "    -DNO_PID_FILE                Don't support writing a PID file. Removes -p option."
@ -195,19 +658,14 @@ help:
 	@echo "    -DNO_HELP                    Don't support command line help."
 	@echo "    -DNO_CUSTOM_INTERVALS        Don't support custom intervals for retry and refresh activation. Removes -A and -R options."
 	@echo "    -DNO_FREEBIND                Don't support binding to foreign IP addresses. Removes -F0 and -F1 options. Only affects FreeBSD and Linux."
-	@echo "    -DNO_SOCKETS                 Don't support standalone operation. Requires an internet superserver to start $(BASE_PROGRAM_NAME)."
-	@echo "    -DSIMPLE_SOCKETS             Compile $(BASE_PROGRAM_NAME) with basic socket support only. Removes -L option."
-	@echo "    -DSIMPLE_RPC                 Don't support RPC with NDR64 and BTFN in $(BASE_PROGRAM_NAME) (but do in $(BASE_CLIENT_NAME)). Makes emulator detection easy."
-	@echo "    -DNO_TAP                     Compile $(BASE_PROGRAM_NAME) without VPN support (Windows and Cygwin only)."
-	@echo "    -DNO_CL_PIDS                 Don't support specifying ePIDs and HwId from the command line in $(BASE_PROGRAM_NAME)."
-	@echo "    -DNO_LIMIT                   Don't support limiting concurrent clients in $(BASE_PROGRAM_NAME)."
-	@echo "    -DNO_SIGHUP                  Don't support SIGHUP handling in $(BASE_PROGRAM_NAME)."
-	@echo "    -DNO_VERSION_INFORMATION     Don't support displaying version information in $(BASE_PROGRAM_NAME) and $(BASE_CLIENT_NAME). Removes -V option."
-	@echo "    -DNO_PRIVATE_IP_DETECT       Don't support protection against clients with public IP addresses in $(BASE_PROGRAM_NAME)"	
+	@echo "    -DNO_SOCKETS                 Don't support standalone operation. Requires an internet superserver to start $(PROGRAM_NAME)."
+	@echo "    -DNO_CL_PIDS                 Don't support specifying ePIDs and HwId from the command line in $(PROGRAM_NAME)."
+	@echo "    -DNO_LIMIT                   Don't support limiting concurrent clients in $(PROGRAM_NAME)."
+	@echo "    -DNO_SIGHUP                  Don't support SIGHUP handling in $(PROGRAM_NAME)."
+	@echo "    -DNO_VERSION_INFORMATION     Don't support displaying version information in $(PROGRAM_NAME) and $(CLIENT_NAME). Removes -V option."
+	@echo "    -DNO_PRIVATE_IP_DETECT       Don't support protection against clients with public IP addresses in $(PROGRAM_NAME)"	
+	@echo "    -DSIMPLE_SOCKETS             Compile $(PROGRAM_NAME) with basic socket support only. Removes -L option."
 	@echo "    -DSMALL_AES                  Use a smaller (saves about 200 bytes) but slower implementation of AES."
-	@echo "    -DNO_EXTERNAL_DATA           Don't support loading an external database. Mutually exclusive with -DNO_INTERNAL_DATA"
-	@echo "    -DNO_INTERNAL_DATA           Don't compile an internal database. Mutually exclusive with -DNO_EXTERNAL_DATA"
-	@echo "    -DUNSAFE_DATA_LOAD           Don't check the KMS data file for integrity. Saves some bytes but is dangerous."
 	@echo ""
 	@echo "Troubleshooting options"
 	@echo "    CAT=1                        Combine all sources in a single in-memory file and compile directly to target."
@ -219,15 +677,17 @@ help:
 	@echo "    OPENSSL_HMAC=0               Compile for openssl versions that don't have HMAC support (required on some embedded devices)."
 	@echo "    NO_TIMEOUT=1                 Do not set timeouts for sockets (for systems that don't support it)."
 	@echo "    CHILD_HANDLER=1              Install a handler for SIGCHLD (for systems that don't support SA_NOCLDWAIT)."
-	@echo "    NO_DNS=1                     Compile $(BASE_CLIENT_NAME) without support for detecting KMS servers via DNS."
-	@echo "    NO_GETIFADDRS=1              Compile $(BASE_PROGRAM_NAME) without using getifaddrs()."
-	@echo "    GETIFADDRS=musl              Compile $(BASE_PROGRAM_NAME) with its own implementation of getifaddrs() based on musl."
-	@echo "    DNS_PARSER=internal          Use $(BASE_CLIENT_NAME) internal DNS parsing routines. No effect on MingW (native Windows)."
+	@echo "    NO_DNS=1                     Compile $(CLIENT_NAME) without support for detecting KMS servers via DNS."
+	@echo "    NO_GETIFADDRS=1              Compile $(PROGRAM_NAME) without using getifaddrs()."
+	@echo "    GETIFADDRS=musl              Compile $(PROGRAM_NAME) with its own implementation of getifaddrs() based on musl."
+	@echo "    DNS_PARSER=internal          Use $(CLIENT_NAME) internal DNS parsing routines. No effect on MingW (native Windows)."
 	@echo ""
 	@echo "Other useful CFLAGS"
-	@echo "    -DNO_COMPILER_UAA            Do not use compiler support for byte swapping and unaligned access"
-	@echo "    -DFULL_INTERNAL_DATA         Embed full internal KMS data in $(BASE_PROGRAM_NAME)."
-	@echo "    -DSUPPORT_WINE               Add code that the Windows version of $(BASE_PROGRAM_NAME) runs on Wine if MSRPC=1"
+	@echo "    -DSUPPORT_WINE               Add code that the Windows version of $(PROGRAM_NAME) runs on Wine if MSRPC=1"
 	@echo "    -D_PEDANTIC                  Report rare error/warning conditions instead of silently ignoring them."
-	@echo "    -DFD_SETSIZE=<x>             Allow <x> -L statements in $(BASE_PROGRAM_NAME) (default: 64 on Windows, 1024 on most Unixes)."
-
+	@echo "    -DINCLUDE_BETAS              Include SKU / activation IDs for obsolete beta/preview products."
+	@echo "    -DFD_SETSIZE=<x>             Allow <x> -L statements in $(PROGRAM_NAME) (default: 64 on Windows, 1024 on most Unixes)."
+	@echo "    -flto                        Use link time optimization. Not supported by old compilers (gcc < 4.7). Use whenever supported."
+	@echo "    -flto=jobserver              Utilize all CPUs during link time optimization. Requires ${MAKE} -j <cpus>"
+	@echo "    -fno-stack-protector         No stack checking. Smaller binaries."
+	@echo "    -pipe                        Use pipes instead of temporary files (faster compilation, extends the life of your SSD)." 
--- a/src/KMSServer.idl
+++ b/src/KMSServer.idl
--- a/src/KMSServer_c_mingw_gcc.c
+++ b/src/KMSServer_c_mingw_gcc.c
@ -41,8 +41,6 @@
 #define TRANSMIT_AS_TABLE_SIZE    0            
 #define WIRE_MARSHAL_TABLE_SIZE   0            

-#if !MULTI_CALL_BINARY
-
 typedef struct _KMSServer_MIDL_TYPE_FORMAT_STRING
    {
    short          Pad;
@ -70,8 +68,6 @@ extern const KMSServer_MIDL_TYPE_FORMAT_STRING KMSServer__MIDL_TypeFormatString;
 extern const KMSServer_MIDL_PROC_FORMAT_STRING KMSServer__MIDL_ProcFormatString;
 extern const KMSServer_MIDL_EXPR_FORMAT_STRING KMSServer__MIDL_ExprFormatString;

-#endif // !MULTI_CALL_BINARY
-
 #define GENERIC_BINDING_TABLE_SIZE   0            


@ -235,6 +231,8 @@ int RequestActivation(
        }
    };

+#endif // !MULTI_CALL_BINARY
+
 static const unsigned short KMSServer_FormatStringOffsetTable[] =
    {
    0
@ -243,6 +241,7 @@ static const unsigned short KMSServer_FormatStringOffsetTable[] =
 //typedef void *(__RPC_API midl_user_allocate_t)(size_t);
 typedef void *(__RPC_API *midl_allocate_t)(size_t);

+#if !MULTI_CALL_BINARY
 /*static*/ const MIDL_STUB_DESC KMSServer_StubDesc =
    {
    (void *)& KMSServer___RpcClientInterface,
--- a/src/KMSServer_c_x64_mingw_gcc.c
+++ b/src/KMSServer_c_x64_mingw_gcc.c
@ -33,8 +33,6 @@

 #include "KMSServer_h.h"

-#if !MULTI_CALL_BINARY
-
 #define TYPE_FORMAT_STRING_SIZE   43                                
 #define PROC_FORMAT_STRING_SIZE   61                                
 #define EXPR_FORMAT_STRING_SIZE   1                                 
@ -72,8 +70,6 @@ extern const KMSServer_MIDL_TYPE_FORMAT_STRING KMSServer__MIDL_TypeFormatString;
 extern const KMSServer_MIDL_PROC_FORMAT_STRING KMSServer__MIDL_ProcFormatString;
 extern const KMSServer_MIDL_EXPR_FORMAT_STRING KMSServer__MIDL_ExprFormatString;

-#endif // !MULTI_CALL_BINARY
-
 #define GENERIC_BINDING_TABLE_SIZE   0            


@ -237,12 +233,14 @@ int RequestActivation(
        }
    };

+#endif //!MULTI_CALL_BINARY
+
 static const unsigned short KMSServer_FormatStringOffsetTable[] =
    {
    0
    };

-#endif //!MULTI_CALL_BINARY
+

 #endif /* defined(_M_AMD64)*/

@ -278,8 +276,6 @@ static const unsigned short KMSServer_FormatStringOffsetTable[] =
 #include "ndr64types.h"
 #include "pshpack8.h"

-#if !MULTI_CALL_BINARY
-
 typedef 
 struct 
 {
@ -367,6 +363,7 @@ NDR64_FORMAT_UINT32
 __midl_frag1_t;
 extern const __midl_frag1_t __midl_frag1;

+#if !MULTI_CALL_BINARY
 /*static*/ const __midl_frag13_t __midl_frag13 =
 { 
 /*  */
@ -655,7 +652,6 @@ extern const __midl_frag1_t __midl_frag1;

 #include "poppack.h"

-#if !MULTI_CALL_BINARY

 static const FormatInfoRef KMSServer_Ndr64ProcTable[] =
    {
@ -665,6 +661,7 @@ static const FormatInfoRef KMSServer_Ndr64ProcTable[] =
 //typedef void *__RPC_USER MIDL_user_allocate_t(SIZE_T)
 typedef void *(__RPC_API *midl_allocate_t)(size_t);

+#if !MULTI_CALL_BINARY
 /*static*/ const MIDL_STUB_DESC KMSServer_StubDesc =
    {
    (void *)& KMSServer___RpcClientInterface,
@ -688,6 +685,7 @@ typedef void *(__RPC_API *midl_allocate_t)(size_t);
    (void *)& KMSServer_ProxyInfo,   /* proxy/server info */
    0
    };
+#endif // !MULTI_CALL_BINARY

 static const MIDL_SYNTAX_INFO KMSServer_SyntaxInfo [  2 ] = 
    {
@ -713,8 +711,6 @@ static const MIDL_SYNTAX_INFO KMSServer_SyntaxInfo [  2 ] =
    }
    };

-#endif // !MULTI_CALL_BINARY
-
 /*static*/ const MIDL_STUBLESS_PROXY_INFO KMSServer_ProxyInfo =
    {
    &KMSServer_StubDesc,
--- a/src/KMSServer_h.h
+++ b/src/KMSServer_h.h
@ -18,10 +18,6 @@
 */
 /* @@MIDL_FILE_HEADING(  ) */

-#if _WIN32
-#include "winsock2.h"
-#endif
-
 #pragma warning( disable: 4049 )  /* more than 64k source lines */


--- a/src/KMSServer_s2_mingw_gcc.c
+++ b/src/KMSServer_s2_mingw_gcc.c
--- a/src/KMSServer_s2_x64_mingw_gcc.c
+++ b/src/KMSServer_s2_x64_mingw_gcc.c
--- a/7
+++ b/7
@ -1,14 +1,13 @@
 To view the documentation cd to the directory containing the distribution
 files and type

-man man/vlmcsd.8
+man ./vlmcsd.8
 	to see documentation for vlmcsd

-man man/vlmcs.1
+man ./vlmcs.1
 	to see documentation for vlmcs

-man man/vlmcsd.7
+man ./vlmcsd.7
 	to see general documentation for kms

 If you don't have man, you may also use the .txt, .html and .pdf files
-in the man directory
--- a/VisualStudio/libkms/libkms.vcxproj
+++ b/VisualStudio/libkms/libkms.vcxproj
@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2A0FC04D-C3C0-43E2-8812-53AE901C5395}</ProjectGuid>
+    <RootNamespace>vlmcsdmulti</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140_xp</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120_xp</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140_xp</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120_xp</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)..\</OutDir>
+    <TargetName>libkms32</TargetName>
+    <GenerateManifest>false</GenerateManifest>
+    <TargetExt>.dll</TargetExt>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)..\</OutDir>
+    <TargetName>libkms64</TargetName>
+    <GenerateManifest>false</GenerateManifest>
+    <TargetExt>.dll</TargetExt>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <GenerateManifest>false</GenerateManifest>
+    <TargetName>$(ProjectName)64</TargetName>
+    <TargetExt>.dll</TargetExt>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <GenerateManifest>false</GenerateManifest>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>$(ProjectName)32</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PreprocessorDefinitions>_USING_V110_SDK71_;_MBCS;%(PreprocessorDefinitions);_CRYPTO_WINDOWS;_PEDANTIC;SIMPLE_SOCKETS;NO_TIMEOUT;NO_SIGHUP;NO_CL_PIDS;NO_EXTENDED_PRODUCT_LIST;NO_BASIC_PRODUCT_LIST;NO_LOG;NO_RANDOM_EPID;NO_INI_FILE;NO_HELP;NO_CUSTOM_INTERVALS;NO_PID_FILE;NO_USER_SWITCH;NO_VERBOSE_LOG;NO_LIMIT;NO_VERSION_INFORMATION;NO_PRIVATE_IP_DETECT;IS_LIBRARY=1</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;Iphlpapi.lib;Dnsapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>NotSet</SubSystem>
+      <MinimumRequiredVersion />
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions);_CRYPTO_WINDOWS;_PEDANTIC;SIMPLE_SOCKETS;NO_TIMEOUT;NO_SIGHUP;NO_CL_PIDS;NO_EXTENDED_PRODUCT_LIST;NO_BASIC_PRODUCT_LIST;NO_LOG;NO_RANDOM_EPID;NO_INI_FILE;NO_HELP;NO_CUSTOM_INTERVALS;NO_PID_FILE;NO_USER_SWITCH;NO_VERBOSE_LOG;NO_LIMIT;NO_VERSION_INFORMATION;NO_PRIVATE_IP_DETECT;IS_LIBRARY=1</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;Iphlpapi.lib;Dnsapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>NotSet</SubSystem>
+      <MinimumRequiredVersion />
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MinSpace</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>
+      </SDLCheck>
+      <CallingConvention>Cdecl</CallingConvention>
+      <DebugInformationFormat>None</DebugInformationFormat>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>false</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <FloatingPointExceptions>false</FloatingPointExceptions>
+      <CreateHotpatchableImage>false</CreateHotpatchableImage>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <OpenMPSupport>false</OpenMPSupport>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PreprocessorDefinitions>_X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions);_CRYPTO_WINDOWS;SIMPLE_SOCKETS;NO_TIMEOUT;NO_SIGHUP;NO_CL_PIDS;NO_EXTENDED_PRODUCT_LIST;NO_BASIC_PRODUCT_LIST;NO_LOG;NO_RANDOM_EPID;NO_INI_FILE;NO_HELP;NO_CUSTOM_INTERVALS;NO_PID_FILE;NO_USER_SWITCH;NO_VERBOSE_LOG;NO_LIMIT;NO_VERSION_INFORMATION;NO_PRIVATE_IP_DETECT;IS_LIBRARY=1</PreprocessorDefinitions>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(SolutionDir)\msvcrt.lib;Shlwapi.lib;Iphlpapi.lib;Dnsapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>NotSet</SubSystem>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <LargeAddressAware>true</LargeAddressAware>
+      <TerminalServerAware>
+      </TerminalServerAware>
+      <SwapRunFromCD>true</SwapRunFromCD>
+      <SwapRunFromNET>true</SwapRunFromNET>
+      <MinimumRequiredVersion />
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MinSpace</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>
+      </SDLCheck>
+      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions);_CRYPTO_WINDOWS;SIMPLE_SOCKETS;NO_TIMEOUT;NO_SIGHUP;NO_CL_PIDS;NO_EXTENDED_PRODUCT_LIST;NO_BASIC_PRODUCT_LIST;NO_LOG;NO_RANDOM_EPID;NO_INI_FILE;NO_HELP;NO_CUSTOM_INTERVALS;NO_PID_FILE;NO_USER_SWITCH;NO_VERBOSE_LOG;NO_LIMIT;NO_VERSION_INFORMATION;NO_PRIVATE_IP_DETECT;IS_LIBRARY=1</PreprocessorDefinitions>
+      <DebugInformationFormat>None</DebugInformationFormat>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>false</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <FloatingPointExceptions>false</FloatingPointExceptions>
+      <CreateHotpatchableImage>false</CreateHotpatchableImage>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <OpenMPSupport>false</OpenMPSupport>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(SolutionDir)\msvcrt64.lib;Shlwapi.lib;Iphlpapi.lib;Dnsapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>NotSet</SubSystem>
+      <LargeAddressAware>true</LargeAddressAware>
+      <TerminalServerAware>
+      </TerminalServerAware>
+      <SwapRunFromCD>true</SwapRunFromCD>
+      <SwapRunFromNET>true</SwapRunFromNET>
+      <MinimumRequiredVersion />
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\crypto.c" />
+    <ClCompile Include="..\..\crypto_windows.c" />
+    <ClCompile Include="..\..\endian.c" />
+    <ClCompile Include="..\..\helpers.c" />
+    <ClCompile Include="..\..\kms.c" />
+    <ClCompile Include="..\..\libkms.c" />
+    <ClCompile Include="..\..\network.c" />
+    <ClCompile Include="..\..\output.c" />
+    <ClCompile Include="..\..\rpc.c" />
+    <ClCompile Include="..\..\shared_globals.c" />
+    <ClCompile Include="..\..\vlmcs.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\config.h" />
+    <ClInclude Include="..\..\crypto.h" />
+    <ClInclude Include="..\..\crypto_windows.h" />
+    <ClInclude Include="..\..\endian.h" />
+    <ClInclude Include="..\..\helpers.h" />
+    <ClInclude Include="..\..\kms.h" />
+    <ClInclude Include="..\..\libkms.h" />
+    <ClInclude Include="..\..\network.h" />
+    <ClInclude Include="..\..\output.h" />
+    <ClInclude Include="..\..\rpc.h" />
+    <ClInclude Include="..\..\shared_globals.h" />
+    <ClInclude Include="..\..\types.h" />
+    <ClInclude Include="..\..\vlmcs.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/VisualStudio/libkms/libkms.vcxproj.filters
+++ b/VisualStudio/libkms/libkms.vcxproj.filters
@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\crypto.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\crypto_windows.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\endian.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\helpers.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\kms.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\network.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\output.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\rpc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\shared_globals.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\vlmcs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libkms.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\crypto.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\crypto_windows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\endian.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\helpers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\kms.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\network.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\output.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\rpc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\shared_globals.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\vlmcs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libkms.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
--- a/VisualStudio/msvcrt.lib
+++ b/VisualStudio/msvcrt.lib
--- a/VisualStudio/msvcrt64.lib
+++ b/VisualStudio/msvcrt64.lib
--- a/VisualStudio/vlmcs/vlmcs.vcxproj
+++ b/VisualStudio/vlmcs/vlmcs.vcxproj
@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2B3F305D-6351-4F4A-A7F2-1F9B1988CDEE}</ProjectGuid>
+    <RootNamespace>vlmcs</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140_xp</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120_xp</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140_xp</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120_xp</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)..\</OutDir>
+    <TargetName>vlmcs-Windows-x86</TargetName>
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)..\</OutDir>
+    <TargetName>vlmcs-Windows-x64</TargetName>
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PreprocessorDefinitions>_USING_V110_SDK71_;_MBCS;%(PreprocessorDefinitions);_CRYPTO_WINDOWS;_PEDANTIC</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;Iphlpapi.lib;Dnsapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions);_CRYPTO_WINDOWS;_PEDANTIC</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;Iphlpapi.lib;Dnsapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MinSpace</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>
+      </SDLCheck>
+      <CallingConvention>Cdecl</CallingConvention>
+      <DebugInformationFormat>None</DebugInformationFormat>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>false</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <FloatingPointExceptions>false</FloatingPointExceptions>
+      <CreateHotpatchableImage>false</CreateHotpatchableImage>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <OpenMPSupport>false</OpenMPSupport>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PreprocessorDefinitions>_X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions);_CRYPTO_WINDOWS</PreprocessorDefinitions>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(SolutionDir)\msvcrt.lib;Shlwapi.lib;Iphlpapi.lib;Dnsapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <LargeAddressAware>true</LargeAddressAware>
+      <TerminalServerAware>true</TerminalServerAware>
+      <SwapRunFromCD>true</SwapRunFromCD>
+      <SwapRunFromNET>true</SwapRunFromNET>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MinSpace</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>
+      </SDLCheck>
+      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions);_CRYPTO_WINDOWS</PreprocessorDefinitions>
+      <DebugInformationFormat>None</DebugInformationFormat>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>false</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <FloatingPointExceptions>false</FloatingPointExceptions>
+      <CreateHotpatchableImage>false</CreateHotpatchableImage>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <OpenMPSupport>false</OpenMPSupport>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(SolutionDir)\msvcrt64.lib;Shlwapi.lib;Iphlpapi.lib;Dnsapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <LargeAddressAware>true</LargeAddressAware>
+      <TerminalServerAware>true</TerminalServerAware>
+      <SwapRunFromCD>true</SwapRunFromCD>
+      <SwapRunFromNET>true</SwapRunFromNET>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\crypto.c" />
+    <ClCompile Include="..\..\crypto_windows.c" />
+    <ClCompile Include="..\..\dns_srv.c" />
+    <ClCompile Include="..\..\endian.c" />
+    <ClCompile Include="..\..\helpers.c" />
+    <ClCompile Include="..\..\kms.c" />
+    <ClCompile Include="..\..\network.c" />
+    <ClCompile Include="..\..\output.c" />
+    <ClCompile Include="..\..\rpc.c" />
+    <ClCompile Include="..\..\shared_globals.c" />
+    <ClCompile Include="..\..\vlmcs.c" />
+    <ClCompile Include="..\..\wingetopt.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\config.h" />
+    <ClInclude Include="..\..\crypto.h" />
+    <ClInclude Include="..\..\crypto_internal.h" />
+    <ClInclude Include="..\..\crypto_windows.h" />
+    <ClInclude Include="..\..\dns_srv.h" />
+    <ClInclude Include="..\..\endian.h" />
+    <ClInclude Include="..\..\helpers.h" />
+    <ClInclude Include="..\..\kms.h" />
+    <ClInclude Include="..\..\network.h" />
+    <ClInclude Include="..\..\output.h" />
+    <ClInclude Include="..\..\rpc.h" />
+    <ClInclude Include="..\..\shared_globals.h" />
+    <ClInclude Include="..\..\types.h" />
+    <ClInclude Include="..\..\vlmcs.h" />
+    <ClInclude Include="..\..\wingetopt.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/VisualStudio/vlmcs/vlmcs.vcxproj.filters
+++ b/VisualStudio/vlmcs/vlmcs.vcxproj.filters
@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\crypto.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\crypto_windows.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dns_srv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\endian.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\helpers.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\kms.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\network.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\output.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\rpc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\shared_globals.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\vlmcs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\wingetopt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\crypto.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\crypto_internal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\crypto_windows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dns_srv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\endian.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\helpers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\kms.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\network.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\output.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\rpc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\shared_globals.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\vlmcs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\wingetopt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
--- a/VisualStudio/vlmcsd-2015-with-2013-c++-build-tools.sln
+++ b/VisualStudio/vlmcsd-2015-with-2013-c++-build-tools.sln
@ -0,0 +1,58 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vlmcsd", "vlmcsd.vcxproj", "{918B4F5B-6356-451E-998C-5FCB29988170}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vlmcs", "vlmcs\vlmcs.vcxproj", "{2B3F305D-6351-4F4A-A7F2-1F9B1988CDEE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vlmcsdmulti", "vlmcsdmulti\vlmcsdmulti.vcxproj", "{7F07671D-1432-43E9-9D72-08435F216B5E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libkms", "libkms\libkms.vcxproj", "{2A0FC04D-C3C0-43E2-8812-53AE901C5395}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{918B4F5B-6356-451E-998C-5FCB29988170}.Debug|x64.ActiveCfg = Debug|x64
+		{918B4F5B-6356-451E-998C-5FCB29988170}.Debug|x64.Build.0 = Debug|x64
+		{918B4F5B-6356-451E-998C-5FCB29988170}.Debug|x86.ActiveCfg = Debug|Win32
+		{918B4F5B-6356-451E-998C-5FCB29988170}.Debug|x86.Build.0 = Debug|Win32
+		{918B4F5B-6356-451E-998C-5FCB29988170}.Release|x64.ActiveCfg = Release|x64
+		{918B4F5B-6356-451E-998C-5FCB29988170}.Release|x64.Build.0 = Release|x64
+		{918B4F5B-6356-451E-998C-5FCB29988170}.Release|x86.ActiveCfg = Release|Win32
+		{918B4F5B-6356-451E-998C-5FCB29988170}.Release|x86.Build.0 = Release|Win32
+		{2B3F305D-6351-4F4A-A7F2-1F9B1988CDEE}.Debug|x64.ActiveCfg = Debug|x64
+		{2B3F305D-6351-4F4A-A7F2-1F9B1988CDEE}.Debug|x64.Build.0 = Debug|x64
+		{2B3F305D-6351-4F4A-A7F2-1F9B1988CDEE}.Debug|x86.ActiveCfg = Debug|Win32
+		{2B3F305D-6351-4F4A-A7F2-1F9B1988CDEE}.Debug|x86.Build.0 = Debug|Win32
+		{2B3F305D-6351-4F4A-A7F2-1F9B1988CDEE}.Release|x64.ActiveCfg = Release|x64
+		{2B3F305D-6351-4F4A-A7F2-1F9B1988CDEE}.Release|x64.Build.0 = Release|x64
+		{2B3F305D-6351-4F4A-A7F2-1F9B1988CDEE}.Release|x86.ActiveCfg = Release|Win32
+		{2B3F305D-6351-4F4A-A7F2-1F9B1988CDEE}.Release|x86.Build.0 = Release|Win32
+		{7F07671D-1432-43E9-9D72-08435F216B5E}.Debug|x64.ActiveCfg = Debug|x64
+		{7F07671D-1432-43E9-9D72-08435F216B5E}.Debug|x64.Build.0 = Debug|x64
+		{7F07671D-1432-43E9-9D72-08435F216B5E}.Debug|x86.ActiveCfg = Debug|Win32
+		{7F07671D-1432-43E9-9D72-08435F216B5E}.Debug|x86.Build.0 = Debug|Win32
+		{7F07671D-1432-43E9-9D72-08435F216B5E}.Release|x64.ActiveCfg = Release|x64
+		{7F07671D-1432-43E9-9D72-08435F216B5E}.Release|x64.Build.0 = Release|x64
+		{7F07671D-1432-43E9-9D72-08435F216B5E}.Release|x86.ActiveCfg = Release|Win32
+		{7F07671D-1432-43E9-9D72-08435F216B5E}.Release|x86.Build.0 = Release|Win32
+		{2A0FC04D-C3C0-43E2-8812-53AE901C5395}.Debug|x64.ActiveCfg = Debug|x64
+		{2A0FC04D-C3C0-43E2-8812-53AE901C5395}.Debug|x64.Build.0 = Debug|x64
+		{2A0FC04D-C3C0-43E2-8812-53AE901C5395}.Debug|x86.ActiveCfg = Debug|Win32
+		{2A0FC04D-C3C0-43E2-8812-53AE901C5395}.Debug|x86.Build.0 = Debug|Win32
+		{2A0FC04D-C3C0-43E2-8812-53AE901C5395}.Release|x64.ActiveCfg = Release|x64
+		{2A0FC04D-C3C0-43E2-8812-53AE901C5395}.Release|x64.Build.0 = Release|x64
+		{2A0FC04D-C3C0-43E2-8812-53AE901C5395}.Release|x86.ActiveCfg = Release|Win32
+		{2A0FC04D-C3C0-43E2-8812-53AE901C5395}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/VisualStudio/vlmcsd.vcxproj
+++ b/VisualStudio/vlmcsd.vcxproj
@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{918B4F5B-6356-451E-998C-5FCB29988170}</ProjectGuid>
+    <RootNamespace>vlmcsd</RootNamespace>
+    <WindowsTargetPlatformVersion>
+    </WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140_xp</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140_xp</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120_xp</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120_xp</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <GenerateManifest>false</GenerateManifest>
+    <OutDir>$(SolutionDir)..\</OutDir>
+    <TargetName>vlmcsd-Windows-x64</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <GenerateManifest>false</GenerateManifest>
+    <TargetName>vlmcsd-Windows-x86</TargetName>
+    <OutDir>$(SolutionDir)..\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions);_CRYPTO_WINDOWS;_PEDANTIC</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>Iphlpapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions);_CRYPTO_WINDOWS;_PEDANTIC</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>Iphlpapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MinSpace</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>
+      </SDLCheck>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>false</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <ControlFlowGuard>false</ControlFlowGuard>
+      <CreateHotpatchableImage>false</CreateHotpatchableImage>
+      <CallingConvention>Cdecl</CallingConvention>
+      <CompileAs>Default</CompileAs>
+      <DebugInformationFormat>None</DebugInformationFormat>
+      <CompileAsManaged>false</CompileAsManaged>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <FloatingPointExceptions>false</FloatingPointExceptions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <OpenMPSupport>false</OpenMPSupport>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <PreprocessorDefinitions>_X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions);_CRYPTO_WINDOWS</PreprocessorDefinitions>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+      <CompileAsWinRT>false</CompileAsWinRT>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>$(SolutionDir)\msvcrt.lib;Iphlpapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <ProgramDatabaseFile />
+      <LargeAddressAware>true</LargeAddressAware>
+      <TerminalServerAware>true</TerminalServerAware>
+      <SwapRunFromCD>true</SwapRunFromCD>
+      <SwapRunFromNET>true</SwapRunFromNET>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MinSpace</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>
+      </SDLCheck>
+      <DebugInformationFormat>None</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>false</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <ControlFlowGuard>false</ControlFlowGuard>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <OpenMPSupport>false</OpenMPSupport>
+      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions);_CRYPTO_WINDOWS</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <CompileAsManaged>false</CompileAsManaged>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>$(SolutionDir)\msvcrt64.lib;Iphlpapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <ProgramDatabaseFile />
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\config.h" />
+    <ClInclude Include="..\crypto.h" />
+    <ClInclude Include="..\crypto_internal.h" />
+    <ClInclude Include="..\crypto_windows.h" />
+    <ClInclude Include="..\endian.h" />
+    <ClInclude Include="..\helpers.h" />
+    <ClInclude Include="..\kms.h" />
+    <ClInclude Include="..\network.h" />
+    <ClInclude Include="..\ntservice.h" />
+    <ClInclude Include="..\output.h" />
+    <ClInclude Include="..\rpc.h" />
+    <ClInclude Include="..\shared_globals.h" />
+    <ClInclude Include="..\types.h" />
+    <ClInclude Include="..\vlmcsd.h" />
+    <ClInclude Include="..\wingetopt.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\crypto.c" />
+    <ClCompile Include="..\crypto_windows.c" />
+    <ClCompile Include="..\endian.c" />
+    <ClCompile Include="..\helpers.c" />
+    <ClCompile Include="..\kms.c" />
+    <ClCompile Include="..\network.c" />
+    <ClCompile Include="..\ntservice.c" />
+    <ClCompile Include="..\output.c" />
+    <ClCompile Include="..\rpc.c" />
+    <ClCompile Include="..\shared_globals.c" />
+    <ClCompile Include="..\vlmcsd.c" />
+    <ClCompile Include="..\wingetopt.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/VisualStudio/vlmcsd.vcxproj.filters
+++ b/VisualStudio/vlmcsd.vcxproj.filters
@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\crypto.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\crypto_internal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\crypto_windows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\endian.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\helpers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\kms.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\network.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ntservice.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\output.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\rpc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\shared_globals.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\vlmcsd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\wingetopt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\crypto.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\crypto_windows.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\endian.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\helpers.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\kms.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\network.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ntservice.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\output.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\rpc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\shared_globals.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\vlmcsd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\wingetopt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
--- a/VisualStudio/vlmcsdmulti/vlmcsdmulti.vcxproj
+++ b/VisualStudio/vlmcsdmulti/vlmcsdmulti.vcxproj
@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{7F07671D-1432-43E9-9D72-08435F216B5E}</ProjectGuid>
+    <RootNamespace>vlmcsdmulti</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140_xp</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120_xp</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140_xp</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120_xp</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)..\</OutDir>
+    <TargetName>vlmcsdmulti-Windows-x86</TargetName>
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)..\</OutDir>
+    <TargetName>vlmcsdmulti-Windows-x64</TargetName>
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PreprocessorDefinitions>_USING_V110_SDK71_;_MBCS;%(PreprocessorDefinitions);_CRYPTO_WINDOWS;_PEDANTIC;MULTI_CALL_BINARY=1</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;Iphlpapi.lib;Dnsapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions);_CRYPTO_WINDOWS;_PEDANTIC;MULTI_CALL_BINARY=1</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;Iphlpapi.lib;Dnsapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MinSpace</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>
+      </SDLCheck>
+      <CallingConvention>Cdecl</CallingConvention>
+      <DebugInformationFormat>None</DebugInformationFormat>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>false</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <FloatingPointExceptions>false</FloatingPointExceptions>
+      <CreateHotpatchableImage>false</CreateHotpatchableImage>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <OpenMPSupport>false</OpenMPSupport>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PreprocessorDefinitions>_X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions);_CRYPTO_WINDOWS;MULTI_CALL_BINARY=1</PreprocessorDefinitions>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(SolutionDir)\msvcrt.lib;Shlwapi.lib;Iphlpapi.lib;Dnsapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <LargeAddressAware>true</LargeAddressAware>
+      <TerminalServerAware>true</TerminalServerAware>
+      <SwapRunFromCD>true</SwapRunFromCD>
+      <SwapRunFromNET>true</SwapRunFromNET>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MinSpace</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>
+      </SDLCheck>
+      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions);_CRYPTO_WINDOWS;MULTI_CALL_BINARY=1</PreprocessorDefinitions>
+      <DebugInformationFormat>None</DebugInformationFormat>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>false</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <FloatingPointExceptions>false</FloatingPointExceptions>
+      <CreateHotpatchableImage>false</CreateHotpatchableImage>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <OpenMPSupport>false</OpenMPSupport>
+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(SolutionDir)\msvcrt64.lib;Shlwapi.lib;Iphlpapi.lib;Dnsapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <LargeAddressAware>true</LargeAddressAware>
+      <TerminalServerAware>true</TerminalServerAware>
+      <SwapRunFromCD>true</SwapRunFromCD>
+      <SwapRunFromNET>true</SwapRunFromNET>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\crypto.c" />
+    <ClCompile Include="..\..\crypto_windows.c" />
+    <ClCompile Include="..\..\dns_srv.c" />
+    <ClCompile Include="..\..\endian.c" />
+    <ClCompile Include="..\..\helpers.c" />
+    <ClCompile Include="..\..\kms.c" />
+    <ClCompile Include="..\..\network.c" />
+    <ClCompile Include="..\..\ntservice.c" />
+    <ClCompile Include="..\..\output.c" />
+    <ClCompile Include="..\..\rpc.c" />
+    <ClCompile Include="..\..\shared_globals.c" />
+    <ClCompile Include="..\..\vlmcs.c" />
+    <ClCompile Include="..\..\vlmcsd.c" />
+    <ClCompile Include="..\..\vlmcsdmulti.c" />
+    <ClCompile Include="..\..\wingetopt.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\config.h" />
+    <ClInclude Include="..\..\crypto.h" />
+    <ClInclude Include="..\..\crypto_windows.h" />
+    <ClInclude Include="..\..\dns_srv.h" />
+    <ClInclude Include="..\..\endian.h" />
+    <ClInclude Include="..\..\helpers.h" />
+    <ClInclude Include="..\..\kms.h" />
+    <ClInclude Include="..\..\network.h" />
+    <ClInclude Include="..\..\ntservice.h" />
+    <ClInclude Include="..\..\output.h" />
+    <ClInclude Include="..\..\rpc.h" />
+    <ClInclude Include="..\..\shared_globals.h" />
+    <ClInclude Include="..\..\types.h" />
+    <ClInclude Include="..\..\vlmcs.h" />
+    <ClInclude Include="..\..\vlmcsd.h" />
+    <ClInclude Include="..\..\wingetopt.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/VisualStudio/vlmcsdmulti/vlmcsdmulti.vcxproj.filters
+++ b/VisualStudio/vlmcsdmulti/vlmcsdmulti.vcxproj.filters
@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\crypto.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\crypto_windows.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dns_srv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\endian.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\helpers.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\kms.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\network.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\output.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\rpc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\shared_globals.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\vlmcs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\wingetopt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ntservice.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\vlmcsd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\vlmcsdmulti.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\crypto.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\crypto_windows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dns_srv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\endian.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\helpers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\kms.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\network.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\output.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\rpc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\shared_globals.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\vlmcs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\wingetopt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ntservice.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\vlmcsd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
--- a/buildroot-configs/arm/little-endian/glibc/armelv5t-glibc-2.23-gcc-6.1.0-binutils-2.26.config
+++ b/buildroot-configs/arm/little-endian/glibc/armelv5t-glibc-2.23-gcc-6.1.0-binutils-2.26.config
--- a/buildroot-configs/arm/little-endian/glibc/armv4-el-glibc2.20-gcc4.9.1-binutils2.24.config
+++ b/buildroot-configs/arm/little-endian/glibc/armv4-el-glibc2.20-gcc4.9.1-binutils2.24.config
--- a/buildroot-configs/arm/little-endian/glibc/armv4t-el-glibc2.20-gcc4.9.1-binutils2.24-thumb1.config
+++ b/buildroot-configs/arm/little-endian/glibc/armv4t-el-glibc2.20-gcc4.9.1-binutils2.24-thumb1.config
--- a/buildroot-configs/arm/little-endian/glibc/armv5-el-glibc2.20-gcc4.9.1-binutils2.24.config
+++ b/buildroot-configs/arm/little-endian/glibc/armv5-el-glibc2.20-gcc4.9.1-binutils2.24.config
--- a/buildroot-configs/arm/little-endian/glibc/armv5t-el-glibc2.20-gcc4.9.2-binutils2.25-thumb1.config
+++ b/buildroot-configs/arm/little-endian/glibc/armv5t-el-glibc2.20-gcc4.9.2-binutils2.25-thumb1.config
--- a/buildroot-configs/arm/little-endian/glibc/armv6-el-hf-glibc2.20-gcc4.9.1-binutils2.24.config
+++ b/buildroot-configs/arm/little-endian/glibc/armv6-el-hf-glibc2.20-gcc4.9.1-binutils2.24.config
--- a/buildroot-configs/arm/little-endian/glibc/armv7-el-glibc2.20-gcc4.9.1-binutils2.24-thumb2.config
+++ b/buildroot-configs/arm/little-endian/glibc/armv7-el-glibc2.20-gcc4.9.1-binutils2.24-thumb2.config
--- a/buildroot-configs/arm/little-endian/musl/armelv5t-musl-gcc6.1.0-binutils-2.26.config
+++ b/buildroot-configs/arm/little-endian/musl/armelv5t-musl-gcc6.1.0-binutils-2.26.config
--- a/buildroot-configs/arm/little-endian/musl/armv4-el-musl-gcc4.9.1-binutils2.24.config
+++ b/buildroot-configs/arm/little-endian/musl/armv4-el-musl-gcc4.9.1-binutils2.24.config
--- a/buildroot-configs/arm/little-endian/musl/armv4t-el-musl-gcc4.9.1-binutils2.24-thumb1.config
+++ b/buildroot-configs/arm/little-endian/musl/armv4t-el-musl-gcc4.9.1-binutils2.24-thumb1.config
--- a/buildroot-configs/arm/little-endian/musl/armv5-el-musl-gcc4.9.1-binutils2.24.config
+++ b/buildroot-configs/arm/little-endian/musl/armv5-el-musl-gcc4.9.1-binutils2.24.config
--- a/buildroot-configs/arm/little-endian/musl/armv5t-el-musl-gcc4.9.1-binutils2.24-thumb1.config
+++ b/buildroot-configs/arm/little-endian/musl/armv5t-el-musl-gcc4.9.1-binutils2.24-thumb1.config
--- a/buildroot-configs/arm/little-endian/musl/armv7-el-musl-gcc4.9.1-binutils2.24-thumb2.config
+++ b/buildroot-configs/arm/little-endian/musl/armv7-el-musl-gcc4.9.1-binutils2.24-thumb2.config
--- a/buildroot-configs/arm/little-endian/uclibc/armv4-el-uclibc0.9.33.2-gcc4.9.1-binutils2.24.config
+++ b/buildroot-configs/arm/little-endian/uclibc/armv4-el-uclibc0.9.33.2-gcc4.9.1-binutils2.24.config
--- a/buildroot-configs/arm/little-endian/uclibc/armv4t-el-uclibc0.9.33.2-gcc4.9.1-binutils2.24-thumb1.config
+++ b/buildroot-configs/arm/little-endian/uclibc/armv4t-el-uclibc0.9.33.2-gcc4.9.1-binutils2.24-thumb1.config
--- a/buildroot-configs/arm/little-endian/uclibc/armv5-el-uclibc0.9.33.2-gcc4.9.1-binutils2.24.config
+++ b/buildroot-configs/arm/little-endian/uclibc/armv5-el-uclibc0.9.33.2-gcc4.9.1-binutils2.24.config
--- a/buildroot-configs/arm/little-endian/uclibc/armv5t-el-uclibc0.9.33.2-gcc4.9.1-binutils2.24-thumb1.config
+++ b/buildroot-configs/arm/little-endian/uclibc/armv5t-el-uclibc0.9.33.2-gcc4.9.1-binutils2.24-thumb1.config
--- a/buildroot-configs/arm/little-endian/uclibc/armv7-el-uclibc0.9.33.2-gcc4.9.1-binutils2.24-thumb2.config
+++ b/buildroot-configs/arm/little-endian/uclibc/armv7-el-uclibc0.9.33.2-gcc4.9.1-binutils2.24-thumb2.config
--- a/buildroot-configs/intel/musl/i486-musl-gcc-5.3.0-binutils-2.25.1.config
+++ b/buildroot-configs/intel/musl/i486-musl-gcc-5.3.0-binutils-2.25.1.config
--- a/buildroot-configs/intel/musl/x86_64-musl-gcc-5.3.0-binutils-2.25.1.config
+++ b/buildroot-configs/intel/musl/x86_64-musl-gcc-5.3.0-binutils-2.25.1.config
--- a/buildroot-configs/mips/big-endian/glibc/mips16-eb-gcc4.9-glibc2.20-binutils2.24.config
+++ b/buildroot-configs/mips/big-endian/glibc/mips16-eb-gcc4.9-glibc2.20-binutils2.24.config
--- a/buildroot-configs/mips/big-endian/glibc/mips32-eb-gcc4.9-glibc2.20-binutils2.24.config
+++ b/buildroot-configs/mips/big-endian/glibc/mips32-eb-gcc4.9-glibc2.20-binutils2.24.config
--- a/buildroot-configs/mips/big-endian/glibc/mips32r2-eb-gcc4.9-glibc2.20-binutils2.24.config
+++ b/buildroot-configs/mips/big-endian/glibc/mips32r2-eb-gcc4.9-glibc2.20-binutils2.24.config
--- a/buildroot-configs/mips/big-endian/musl/mips32-eb-gcc4.9-musl-binutils2.24.config
+++ b/buildroot-configs/mips/big-endian/musl/mips32-eb-gcc4.9-musl-binutils2.24.config
--- a/buildroot-configs/mips/big-endian/musl/mips32r2-eb-gcc4.9-musl-binutils2.24.config
+++ b/buildroot-configs/mips/big-endian/musl/mips32r2-eb-gcc4.9-musl-binutils2.24.config
--- a/buildroot-configs/mips/big-endian/uclibc/mips16-eb-gcc4.9-uclibc0.9.33.2-binutils2.24.config
+++ b/buildroot-configs/mips/big-endian/uclibc/mips16-eb-gcc4.9-uclibc0.9.33.2-binutils2.24.config
--- a/buildroot-configs/mips/big-endian/uclibc/mips32-eb-gcc4.9-uclibc0.9.33.2-binutils2.24.config
+++ b/buildroot-configs/mips/big-endian/uclibc/mips32-eb-gcc4.9-uclibc0.9.33.2-binutils2.24.config
--- a/buildroot-configs/mips/big-endian/uclibc/mips32r2-eb-gcc4.9-uclibc0.9.33.2-binutils2.24.config
+++ b/buildroot-configs/mips/big-endian/uclibc/mips32r2-eb-gcc4.9-uclibc0.9.33.2-binutils2.24.config
--- a/buildroot-configs/mips/little-endian/glibc/mips16-el-gcc4.9-glibc2.20-binutils2.24.config
+++ b/buildroot-configs/mips/little-endian/glibc/mips16-el-gcc4.9-glibc2.20-binutils2.24.config
--- a/buildroot-configs/mips/little-endian/glibc/mips32-el-gcc4.9-glibc2.20-binutils2.24.config
+++ b/buildroot-configs/mips/little-endian/glibc/mips32-el-gcc4.9-glibc2.20-binutils2.24.config
--- a/buildroot-configs/mips/little-endian/glibc/mips32r2-el-gcc4.9-glibc2.20-binutils2.24.config
+++ b/buildroot-configs/mips/little-endian/glibc/mips32r2-el-gcc4.9-glibc2.20-binutils2.24.config
--- a/buildroot-configs/mips/little-endian/musl/mips32-el-gcc4.9-uclibc0.9.33.2-binutils2.24.config
+++ b/buildroot-configs/mips/little-endian/musl/mips32-el-gcc4.9-uclibc0.9.33.2-binutils2.24.config
--- a/buildroot-configs/mips/little-endian/musl/mips32r2-el-gcc4.9-uclibc0.9.33.2-binutils2.24.config
+++ b/buildroot-configs/mips/little-endian/musl/mips32r2-el-gcc4.9-uclibc0.9.33.2-binutils2.24.config
--- a/buildroot-configs/mips/little-endian/uclibc/mips16-el-gcc4.9-uclibc0.9.33.2-binutils2.24.config
+++ b/buildroot-configs/mips/little-endian/uclibc/mips16-el-gcc4.9-uclibc0.9.33.2-binutils2.24.config
--- a/buildroot-configs/mips/little-endian/uclibc/mips32-el-gcc4.9-uclibc0.9.33.2-binutils2.24.config
+++ b/buildroot-configs/mips/little-endian/uclibc/mips32-el-gcc4.9-uclibc0.9.33.2-binutils2.24.config
--- a/buildroot-configs/mips/little-endian/uclibc/mips32r2-el-gcc4.9-uclibc0.9.33.2-binutils2.24.config
+++ b/buildroot-configs/mips/little-endian/uclibc/mips32r2-el-gcc4.9-uclibc0.9.33.2-binutils2.24.config
--- a/buildroot-configs/ppc/big-endian/uclibc/ppc-eb-gcc4.9-uclibc0.9.33.2-binutils2.24.config
+++ b/buildroot-configs/ppc/big-endian/uclibc/ppc-eb-gcc4.9-uclibc0.9.33.2-binutils2.24.config
--- a/src/config.h
+++ b/src/config.h
@ -12,17 +12,17 @@



- /*
-  * ----------------------------------------------------------------------------------------
-  * Useful customizations. These options are mandatory. You cannot comment them out.
-  * Feel free to change them to fit your needs.
-  * ----------------------------------------------------------------------------------------
-  */
+/*
+ * ----------------------------------------------------------------------------------------
+ * Useful customizations. These options are mandatory. You cannot comment them out.
+ * Feel free to change them to fit your needs.
+ * ----------------------------------------------------------------------------------------
+ */

 #ifndef VERSION
-  /*
-   * Define your own version identifier here, e.g. '#define VERSION "my vlmcsd based on 1103"'
-   */
+/*
+ * Define your own version identifier here, e.g. '#define VERSION "my vlmcsd based on svn560"'
+ */

 #define VERSION "private build"

@ -31,9 +31,29 @@



+/*
+ * Define default ePIDs and HWID here. Preferrably grab ePIDs and HWID
+ * from a real KMS server.
+ */
+
+#ifndef EPID_WINDOWS
+#define EPID_WINDOWS "03612-00206-471-494932-03-1033-14393.0000-2382016"
+#endif
+
+#ifndef EPID_OFFICE2010
+#define EPID_OFFICE2010 "03612-00096-199-954738-03-1033-14393.0000-2382016"
+#endif
+
+#ifndef EPID_OFFICE2013
+#define EPID_OFFICE2013 "03612-00206-234-177489-03-1033-14393.0000-2382016"
+#endif
+
+#ifndef EPID_OFFICE2016
+#define EPID_OFFICE2016 "03612-00206-437-728387-03-1033-14393.0000-2382016"
+#endif

 #ifndef HWID // HwId from the Ratiborus VM
-#define HWID 0x3A, 0x1C, 0x04, 0x96, 0x00, 0xB6, 0x00, 0x76
+#define HWID 0x36, 0x4F, 0x46, 0x3A, 0x88, 0x63, 0xD3, 0x5F
 #endif


@ -47,39 +67,25 @@



- /*
-  * -------------------------------
-  * Defaults
-  * -------------------------------
-  */
-
+/*
+ * -------------------------------
+ * Defaults
+ * -------------------------------
+ */


 #ifndef INI_FILE
-  /*
-   * Uncomment and customize the following line if you want vlmcsd to look for an ini file
-   * at a default location.
-   */
+/*
+ * Uncomment and customize the following line if you want vlmcsd to look for an ini file
+ * at a default location
+ */

-   //#define INI_FILE "/etc/vlmcsd.ini"
+//#define INI_FILE "/etc/vlmcsd.ini"

 #endif // INI_FILE



-
-
-#ifndef DATA_FILE
-/*
- * Uncomment and customize the following line if you want vlmcsd to look for a KMS data file
- * at a custom default location.
- */
-
- //#define DATA_FILE "/etc/vlmcsd.kmd"
-
-#endif // DATA_FILE
-
-
 /*
 * ----------------------------------------------------------------------------------------
 * Troubleshooting options. Please note that disabling features may also help troubleshooting.
@ -91,15 +97,15 @@


 #ifndef CHILD_HANDLER
- /*
-  * Uncomment the following #define if you are compiling for a platform that does
-  * not correctly handle the SA_NOCLDWAIT flag when ignoring SIGCHLD, i.e. forked
-  * processes remain as "zombies" after dying. This option will add a SIGCHLD handler that
-  * "waits" for a child that has terminated. This is only required for a few
-  * unixoid OSses.
-  */
+/*
+ * Uncomment the following #define if you are compiling for a platform that does
+ * not correctly handle the SA_NOCLDWAIT flag when ignoring SIGCHLD, i.e. forked
+ * processes remain as "zombies" after dying. This option will add a SIGCHLD handler that
+ * "waits" for a child that has terminated. This is only required for a few
+ * unixoid OSses.
+ */

-  //#define CHILD_HANDLER
+//#define CHILD_HANDLER

 #endif // CHILD_HANDLER

@ -110,7 +116,7 @@
 * not support custom socket send or receive timeouts.
 */

- //#define NO_TIMEOUT
+//#define NO_TIMEOUT

 #endif // NO_TIMEOUT

@ -122,7 +128,7 @@
 * detecting KMS servers via DNS.
 */

- //#define NO_DNS
+//#define NO_DNS

 #endif // NO_DNS

@ -134,7 +140,7 @@
 * This affects the output of "vlmcsd -x" only. It should be rarely necessary to use this.
 */

- //#define TERMINAL_FIXED_WIDTH 80
+//#define TERMINAL_FIXED_WIDTH 80

 #endif // TERMINAL_FIXED_WIDTH

@ -148,7 +154,7 @@
 * you are testing any KMS server or client emulator that may send malformed KMS packets.
 */

- //#define _PEDANTIC
+//#define _PEDANTIC

 #endif // _PEDANTIC

@ -159,19 +165,27 @@
 /*
 * Cygwin, Linux, Android, NetBSD, DragonflyBSD:
 *    Do not rely on a properly mounted proc filesystem and use the less reliable
- *    argv[0] to determine the program's executable name.
- *    Use only if absolutely necessary (very old versions of these OSses).
+ *    argv[0] to determine the program's executable name when restarting vlmcsd
+ *    by sending a SIGHUP signal. Use only if absolutely necessary (very old versions
+ *    of these OSses).
 *
- * Minix, OpenBSD:
- *    This option has no effect since the OS always must use the less reliable argv[0].
+ * FreeBSD:
+ *    Do not use sysctl and but the less reliable
+ *    argv[0] to determine the program's executable name when restarting vlmcsd
+ *    by sending a SIGHUP signal. Use only if absolutely necessary (very old FreeBSD).
 *
- * FreeBSD, Mac OS X, iOS, Solaris, Windows:
+ * OpenBSD:
+ *    This option has no effect since OpenBSD always must use the less reliable argv[0].
+ *
+ * Mac OS X, Solaris:
 *    This option is not neccessary (and has no effect) since these OSses provide
 *    a reliable way to determine the executable name.
 *
+ * Windows:
+ *    This option is not used because Windows doesn't support signals.
 */

- //#define NO_PROCFS
+//#define NO_PROCFS

 #endif // NO_PROCFS

@ -181,9 +195,9 @@
 #ifndef USE_AUXV
 /*
 * Linux only:
- *    Use the process' ELF aux vector to determine the executable name.
- *    This is actually the best method but is supported only with
- *
+ *    Use the process' ELF aux vector to determine the executable name when restarting
+ *    vlmcsd by sending a SIGHUP signal. This is actually the best method but is supported
+ *    only with
 *        * the musl library
 *        * the glbic library 2.16 or newer
 *
@ -191,10 +205,10 @@
 *    Use it only if your system supports it and you do not plan to use the binary on older systems.
 *    It won't work on debian 7 or Red Hat 6.x.
 *
- *    It is safe to try this by yourself. vlmcsd won't compile if your system doesn't support it.
+ *    It it safe to try this by yourself. vlmcsd won't compile if your system doesn't support it.
 */

- //#define USE_AUXV
+//#define USE_AUXV

 #endif // USE_AUXV

@ -209,7 +223,7 @@
 * This may be necessary for some embedded devices that have OpenSSL without HMAC support.
 */

- //#define _OPENSSL_NO_HMAC
+//#define _OPENSSL_NO_HMAC

 #endif // _OPENSSL_NO_HMAC

@ -224,26 +238,26 @@


 #ifndef USE_THREADS
- /*
-  * Do not use fork() but threads to serve your clients.
-  *
-  * Unix-like operarting systems:
-  *    You may use this or not. Entirely your choice. Threads do not require explicitly allocating
-  *    a shared memory segment which might be a problem on some systems. Using fork() is more robust
-  *    although the threaded version of vlmcsd is rock solid too.
-  *
-  *    Some older unixoid OSses may not have pthreads. Do NOT use USE_THREADS and define NO_SIGHUP
-  *    and NO_LIMIT instead to disable use of the pthreads, shared memory and semaphores.
-  *
-  * Cygwin:
-  *    It is recommended to use threads since fork() is extremely slow (no copy on write) and somewhat
-  *    unstable.
-  *
-  * Windows:
-  *    This option has no effect since fork() is not supported.
-  */
+/*
+ * Do not use fork() but threads to serve your clients.
+ *
+ * Unix-like operarting systems:
+ *    You may use this or not. Entirely your choice. Threads do not require explicitly allocating
+ *    a shared memory segment which might be a problem on some systems. Using fork() is more robust
+ *    although the threaded version of vlmcsd is rock solid too.
+ *
+ *    Some older unixoid OSses may not have pthreads. Do NOT use USE_THREADS and define NO_SIGHUP
+ *    and NO_LIMIT instead to disable use of the pthreads, shared memory and semaphores.
+ *
+ * Cygwin:
+ *    It is recommended to use threads since fork() is extremely slow (no copy on write) and somewhat
+ *    unstable.
+ *
+ * Windows:
+ *    This option has no effect since fork() is not supported.
+ */

-  //#define USE_THREADS
+//#define USE_THREADS

 #endif // USE_THREADS

@ -264,7 +278,7 @@
 * Do not define both _CRYPTO_OPENSSL and _CRYPTO_POLARSSL
 */

- //#define _CRYPTO_POLARSSL
+//#define _CRYPTO_POLARSSL

 #endif // _CRYPTO_POLARSSL

@ -285,7 +299,7 @@
 * Do not define both _CRYPTO_OPENSSL and _CRYPTO_POLARSSL
 */

- //#define _CRYPTO_OPENSSL
+//#define _CRYPTO_OPENSSL

 #endif // _CRYPTO_OPENSSL

@ -305,7 +319,7 @@
 * Don't use this except for your own research on the internals of OpenSSL.
 */

- //#define _USE_AES_FROM_OPENSSL
+//#define _USE_AES_FROM_OPENSSL

 #endif // _USE_AES_FROM_OPENSSL

@ -321,20 +335,28 @@
 * compiled without support for hardware accelerated AES. It's worth a try if _USE_AES_FROM_OPENSSL doesn't work.
 */

- //#define _OPENSSL_SOFTWARE
+//#define _OPENSSL_SOFTWARE

 #endif // _OPENSSL_SOFTWARE




-#ifndef FULL_INTERNAL_DATA
 /*
- * Includes the full database in vlmcsd.
+ * ------------------------------------------------------------------------------------------
+ * Extra features not compiled by default because they are rarely needed
+ * ------------------------------------------------------------------------------------------
 */

- //#define FULL_INTERNAL_DATA
-#endif // FULL_INTERNAL_DATA
+
+#ifndef INCLUDE_BETAS
+/*
+ * Uncomment the following #define if you want obsolete beta/preview SKUs
+ * to be included in the extended product list.
+ */
+
+//#define INCLUDE_BETAS
+#endif



@ -348,11 +370,11 @@


 #ifndef NO_FREEBIND
- /*
-  * Do not compile support for FREEBIND (Linux) and IP_BINDANY (FreeBSD). This disables the -F1 command
-  * line option and you can bind only to (listen on) IP addresses that are currently up and running on
-  * your system.
-  */
+/*
+ * Do not compile support for FREEBIND (Linux) and IP_BINDANY (FreeBSD). This disables the -F1 command
+ * line option and you can bind only to (listen on) IP addresses that are currently up and running on
+ * your system.
+ */

 //#define NO_FREEBIND

@ -361,14 +383,35 @@



-#ifndef NO_TAP
- /*
-  * Do not compile support for using a VPN adapter under Windows. Disables -O command line option.
-  */
+#ifndef NO_EXTENDED_PRODUCT_LIST
+/*
+ * Do not compile the extended product list. Removes the list of Activation GUIDs (aka
+ * Client SKU Id, License Id) and their respective product names (e.g. Windows 8.1 Enterprise).
+ *
+ * This affects logging only and does not have an effect on activation itself. As long as you
+ * do not also define NO_BASIC_PRODUCT_LIST more generic names like Windows 8.1 or Office 2013
+ * will still be logged. Saves a lot of space without loosing much functionality.
+ *
+ */

-//#define NO_TAP
+//#define NO_EXTENDED_PRODUCT_LIST

-#endif // NO_TAP
+#endif // NO_EXTENDED_PRODUCT_LIST
+
+
+
+
+#ifndef NO_BASIC_PRODUCT_LIST
+/*
+ * Do not compile the basic product list. Removes the list KMS GUIDs (aka Server SKU Id) and their
+ * respective product names. Only affects logging not activation. This has a negative impact only
+ * if you activate a product that is not (yet) in the extended product list. On the other hand you
+ * do not save much space by not compiling this list.
+ */
+
+//#define NO_BASIC_PRODUCT_LIST
+
+#endif // NO_BASIC_PRODUCT_LIST



@ -378,7 +421,7 @@
 * Removes the -V option from vlmcsd and vlmcs that displays the version information
 */

- //#define NO_VERSION_INFORMATION
+//#define NO_VERSION_INFORMATION

 #endif // NO_VERSION_INFORMATION

@ -391,7 +434,7 @@
 * option in the vlmcs client. Disables ini file directive LogVerbose.
 */

- //#define NO_VERBOSE_LOG
+//#define NO_VERBOSE_LOG

 #endif // NO_VERBOSE_LOG

@ -402,51 +445,24 @@
 /*
 * Disables logging completely. You can neither log to a file nor to the console. -D and -f will
 * start vlmcsd in foreground. -e will not be available. Disables ini file directive LogFile.
- * Implies NO_VERBOSE_LOG.
+ * Implies NO_VERBOSE_LOG, NO_EXTENDED_PRODUCT_LIST and NO_BASIC_PRODUCT_LIST.
 */

- //#define NO_LOG
+//#define NO_LOG

 #endif // NO_LOG




-#ifndef NO_STRICT_MODES
-/*
- * Disables emulator detection protection. Removes -M0, -M1, -E0, -E1, -K0, -K1, -K2 and -K3 from
- * vlmcsd command line options and WhitelistingLevel from INI file parameters. vlmcsd always behaves
- * as if it was started with -K0, -M0.
- */
-
- //#define NO_STRICT_MODES
-
-#endif // NO_STRICT_MODES
-
-
-
-
-
-#ifndef NO_CLIENT_LIST
-/*
- * Disables the ability to maintain a list of Client Machine IDs (CMIDs). Removes -M0, -M1, -E0 and -E1
- * from vlmcsd command line options.
- */
-
- //#define NO_CLIENT_LIST
-
-#endif // !NO_CLIENT_LIST
-
-
-
 #ifndef NO_RANDOM_EPID
- /*
-  * Disables the ability to generate random ePIDs. Useful if you managed to grab ePID/HWID from a
-  * real KMS server and want to use these. Removes -r from the vlmcsd command line and the ini
-  * file directive RandomizationLevel (The randomization level will be harcoded to 0).
-  */
+/*
+ * Disables the ability to generate random ePIDs. Useful if you managed to grab ePID/HWID from a
+ * real KMS server and want to use these. Removes -r from the vlmcsd command line and the ini
+ * file directive RandomizationLevel (The randomization level will be harcoded to 0).
+ */

-  //#define NO_RANDOM_EPID
+//#define NO_RANDOM_EPID

 #endif // NO_RANDOM_EPID

@ -458,7 +474,7 @@
 * Disables the ability to use a configuration file (aka ini file). Removes -i from the command line.
 */

- //#define NO_INI_FILE
+//#define NO_INI_FILE

 #endif // NO_INI_FILE

@ -466,59 +482,19 @@


 #ifndef NO_PID_FILE
- /*
+/*
 * Disables the abilty to write a pid file containing the process id of vlmcsd. If your init system
 * does not need this feature, you can safely disables this but it won't save much space. Disables
 * the use of -p from the command line and PidFile from the ini file.
 */

- //#define NO_PID_FILE
+//#define NO_PID_FILE

 #endif // NO_PID_FILE




-#ifndef NO_EXTERNAL_DATA
- /*
- * Disables the abilty to load external KMS data from a file. Disables command line options -j
- * and ini file parameter KmsData. Implies UNSAFE_DATA_LOAD.
- */
-
- //#define NO_EXTERNAL_DATA
-
-#endif // NO_EXTERNAL_DATA
-
-
-
-
-#ifndef NO_INTERNAL_DATA
- /*
- * Compiles vlmcsd and vlmcs without an internal database. If no database is found at
- * either the default location or the file specified with command line option -j.,
- * the program exits with an error message.
- */
-
- //#define NO_INTERNAL_DATA
-
-#endif // NO_INTERNAL_DATA
-
-
-
-
-#ifndef UNSAFE_DATA_LOAD
- /*
- * Does not check an external KMS data file for integrity.
- * This save some bytes but it dangerous if you load a KMS data file from an unknown source.
- */
-
- //#define UNSAFE_DATA_LOAD
-
-#endif // UNSAFE_DATA_LOAD
-
-
-
-
 #ifndef NO_USER_SWITCH
 /*
 * Disables switching to another uid and/or gid after starting the program and setting up the sockets.
@ -530,7 +506,7 @@
 * Cygwin.
 */

- //#define NO_USER_SWITCH
+//#define NO_USER_SWITCH

 #endif // NO_USER_SWITCH

@ -543,7 +519,7 @@
 * access to the man files vlmcsd.8 and vlmcs.1
 */

- //#define NO_HELP
+//#define NO_HELP

 #endif // NO_HELP

@ -557,7 +533,7 @@
 * -A and -R from the command line as well as ActivationInterval and RenewalInterval in the ini file.
 */

- //#define NO_CUSTOM_INTERVALS
+//#define NO_CUSTOM_INTERVALS

 #endif // NO_CUSTOM_INTERVALS

@ -570,7 +546,7 @@
 * Removes -o from the command line.
 */

- //#define NO_PRIVATE_IP_DETECT
+//#define NO_PRIVATE_IP_DETECT

 #endif // NO_PRIVATE_IP_DETECT

@ -584,7 +560,7 @@
 * command line. Socket setup is the job of your superserver.
 */

- //#define NO_SOCKETS
+//#define NO_SOCKETS

 #endif // NO_SOCKETS

@ -597,7 +573,7 @@
 * Removes -0, -3, -w and -H from the vlmcsd command line.
 */

- //#define NO_CL_PIDS
+//#define NO_CL_PIDS

 #endif // NO_CL_PIDS

@ -616,7 +592,7 @@
 * and NO_LIMIT instead to disable use of the pthreads, shared memory and semaphores.
 */

- //#define NO_LIMIT
+//#define NO_LIMIT

 #endif // NO_LIMIT

@ -636,33 +612,20 @@
 * This option has no effect on native Windows since Posix signaling is not supported. It can be used with Cygwin.
 */

- //#define NO_SIGHUP
+//#define NO_SIGHUP

 #endif // NO_SIGHUP




-#ifndef SIMPLE_RPC
-/*
- * Uses a simple version of the RPC protocol which does not support NDR64 and BTFN.
- * Supports RPC with the features present in Windows XP and earlier only. Using this creates
- * smaller binaries but makes emulator detection easier.
- */
-
- //#define SIMPLE_RPC
-#endif // !SIMPLE_RPC
-
-
-
-
 #ifndef SIMPLE_SOCKETS
 /*
 * Disables the ability to choose IP addresses using the -L option in vlmcsd. vlmcsd will listen on all IP addresses.
 * It still supports IPv4 and IPv6.
 */

- //#define SIMPLE_SOCKETS
+//#define SIMPLE_SOCKETS

 #endif // SIMPLE_SOCKETS

--- a/src/crypto.c
+++ b/src/crypto.c
--- a/src/crypto.h
+++ b/src/crypto.h
--- a/src/crypto_internal.c
+++ b/src/crypto_internal.c
--- a/src/crypto_internal.h
+++ b/src/crypto_internal.h
--- a/src/crypto_openssl.c
+++ b/src/crypto_openssl.c
--- a/src/crypto_openssl.h
+++ b/src/crypto_openssl.h
--- a/src/crypto_polarssl.h
+++ b/src/crypto_polarssl.h
--- a/src/crypto_windows.c
+++ b/src/crypto_windows.c
--- a/src/crypto_windows.h
+++ b/src/crypto_windows.h
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 96200e41ef8b25388b2fa0f78c29133424b2c425
--- a/src/dns_srv.c
+++ b/src/dns_srv.c
@ -22,7 +22,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <netdb.h>
- //#ifndef DNS_PARSER_INTERNAL
+//#ifndef DNS_PARSER_INTERNAL
 #if __ANDROID__
 #include <netinet/in.h>
 #include "nameser.h"
@ -46,7 +46,7 @@
 #include "ns_name.h"
 #include "ns_parse.h"

- // Define macros to redirect DNS parser functions to internal versions
+// Define macros to redirect DNS parser functions to internal versions

 #undef ns_msg
 #undef ns_initparse
@ -86,14 +86,14 @@ static unsigned int isqrt(unsigned int n)
 	unsigned int c = 0x8000;
 	unsigned int g = 0x8000;

-	for (;;)
+	for(;;)
 	{
-		if (g*g > n)
+		if(g*g > n)
 			g ^= c;

 		c >>= 1;

-		if (c == 0) return g;
+		if(c == 0) return g;

 		g |= c;
 	}
@ -106,11 +106,11 @@ static unsigned int isqrt(unsigned int n)
 */
 static int kmsServerListCompareFunc1(const void* a, const void* b)
 {
-	if (!a && !b) return 0;
-	if (a && !b) return -1;
-	if (!a && b) return 1;
+	if ( !a && !b) return 0;
+	if ( a && !b) return -1;
+	if ( !a && b) return 1;

-	int priority_order = (int)((*(kms_server_dns_ptr*)a)->priority) - ((int)(*(kms_server_dns_ptr*)b)->priority);
+	int priority_order =  (int)((*(kms_server_dns_ptr*)a)->priority) - ((int)(*(kms_server_dns_ptr*)b)->priority);

 	if (priority_order) return priority_order;

@ -154,12 +154,12 @@ static int getDnsRawAnswer(const char *restrict query, unsigned char** receive_b
 	if (*query == '.')
 	{
 #		if __ANDROID__ || __GLIBC__ /* including __UCLIBC__*/ || __APPLE__ || __CYGWIN__ || __FreeBSD__ || __NetBSD__ || __DragonFly__ || __OpenBSD__ || __sun__
-		bytes_received = res_querydomain("_vlmcs._tcp", query + 1, ns_c_in, ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE);
+			bytes_received = res_querydomain("_vlmcs._tcp", query + 1, ns_c_in,	ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE);
 #		else
-		char* querystring = (char*)alloca(strlen(query) + 12);
-		strcpy(querystring, "_vlmcs._tcp");
-		strcat(querystring, query);
-		bytes_received = res_query(querystring, ns_c_in, ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE);
+			char* querystring = (char*)alloca(strlen(query) + 12);
+			strcpy(querystring, "_vlmcs._tcp");
+			strcat(querystring, query);
+			bytes_received = res_query(querystring, ns_c_in, ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE);
 #		endif
 	}
 	else
@ -169,7 +169,7 @@ static int getDnsRawAnswer(const char *restrict query, unsigned char** receive_b

 	if (bytes_received < 0)
 	{
-		errorout("Fatal: DNS query to %s%s failed: %s\n", "_vlmcs._tcp", *query == '.' ? query : "", hstrerror(h_errno));
+		errorout("Fatal: DNS query to %s%s failed: %s\n", "_vlmcs._tcp",	*query == '.' ? query : "", hstrerror(h_errno));
 		return 0;
 	}

@ -236,9 +236,9 @@ int getKmsServerList(kms_server_dns_ptr** serverlist, const char *restrict query
 			continue;
 		}

-		sprintf(kms_server->serverName + strlen(kms_server->serverName), ":%hu", GET_UA16BE(&srvrecord->port));
-		kms_server->priority = GET_UA16BE(&srvrecord->priority);
-		kms_server->weight = GET_UA16BE(&srvrecord->weight);
+        sprintf(kms_server->serverName + strlen(kms_server->serverName), ":%hu", GET_UA16BE(&srvrecord->port));
+        kms_server->priority = GET_UA16BE(&srvrecord->priority);
+        kms_server->weight = GET_UA16BE(&srvrecord->weight);

 	}

@ -254,7 +254,7 @@ int getKmsServerList(kms_server_dns_ptr** serverlist, const char *restrict query
 int getKmsServerList(kms_server_dns_ptr** serverlist, const char *const restrict query)
 {
 #	define MAX_DNS_NAME_SIZE 254
-	* serverlist = NULL;
+	*serverlist = NULL;
 	PDNS_RECORD receive_buffer;
 	char dnsDomain[MAX_DNS_NAME_SIZE];
 	char FqdnQuery[MAX_DNS_NAME_SIZE];
--- a/src/dns_srv.h
+++ b/src/dns_srv.h
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 4195d04f687973a514e3fb663bd87161afd46697
--- a/src/endian.c
+++ b/src/endian.c
@ -6,67 +6,67 @@
 #include "endian.h"

 #if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN)  \
-	&& defined(BS16) && defined(BS32) && defined(BS64) && !defined(NO_COMPILER_UAA)
+	&& defined(BS16) && defined(BS32) && defined(BS64)

 #else // ! defined(__BYTE_ORDER)

 void PUT_UAA64BE(void *p, unsigned long long v, unsigned int i)
 {
 	unsigned char *_p = (unsigned char *)&((unsigned long long *)p)[i];
-	_p[ 0 ] = (unsigned char)(v >> 56);
-	_p[ 1 ] = (unsigned char)(v >> 48);
-	_p[ 2 ] = (unsigned char)(v >> 40);
-	_p[ 3 ] = (unsigned char)(v >> 32);
-	_p[ 4 ] = (unsigned char)(v >> 24);
-	_p[ 5 ] = (unsigned char)(v >> 16);
-	_p[ 6 ] = (unsigned char)(v >> 8);
-	_p[ 7 ] = (unsigned char)(v);
+	_p[ 0 ] = v >> 56;
+	_p[ 1 ] = v >> 48;
+	_p[ 2 ] = v >> 40;
+	_p[ 3 ] = v >> 32;
+	_p[ 4 ] = v >> 24;
+	_p[ 5 ] = v >> 16;
+	_p[ 6 ] = v >> 8;
+	_p[ 7 ] = v;
 }

 void PUT_UAA32BE(void *p, unsigned int v, unsigned int i)
 {
 	unsigned char *_p = (unsigned char *)&((unsigned int *)p)[i];
-	_p[ 0 ] = (unsigned char)(v >> 24);
-	_p[ 1 ] = (unsigned char)(v >> 16);
-	_p[ 2 ] = (unsigned char)(v >> 8);
-	_p[ 3 ] = (unsigned char)(v);
+	_p[ 0 ] = v >> 24;
+	_p[ 1 ] = v >> 16;
+	_p[ 2 ] = v >> 8;
+	_p[ 3 ] = v;
 }

 void PUT_UAA16BE(void *p, unsigned short v, unsigned int i)
 {
 	unsigned char *_p = (unsigned char *)&((unsigned short *)p)[i];
-	_p[ 0 ] = (unsigned char)(v >> 8);
-	_p[ 1 ] = (unsigned char)(v);
+	_p[ 0 ] = v >> 8;
+	_p[ 1 ] = v;
 }


 void PUT_UAA64LE(void *p, unsigned long long v, unsigned int i)
 {
 	unsigned char *_p = (unsigned char *)&((unsigned long long *)p)[i];
-	_p[ 0 ] = (unsigned char)(v);
-	_p[ 1 ] = (unsigned char)(v >> 8);
-	_p[ 2 ] = (unsigned char)(v >> 16);
-	_p[ 3 ] = (unsigned char)(v >> 24);
-	_p[ 4 ] = (unsigned char)(v >> 32);
-	_p[ 5 ] = (unsigned char)(v >> 40);
-	_p[ 6 ] = (unsigned char)(v >> 48);
-	_p[ 7 ] = (unsigned char)(v >> 56);
+	_p[ 0 ] = v;
+	_p[ 1 ] = v >> 8;
+	_p[ 2 ] = v >> 16;
+	_p[ 3 ] = v >> 24;
+	_p[ 4 ] = v >> 32;
+	_p[ 5 ] = v >> 40;
+	_p[ 6 ] = v >> 48;
+	_p[ 7 ] = v >> 56;
 }

 void PUT_UAA32LE(void *p, unsigned int v, unsigned int i)
 {
 	unsigned char *_p = (unsigned char *)&((unsigned int *)p)[i];
-	_p[ 0 ] = (unsigned char)(v);
-	_p[ 1 ] = (unsigned char)(v >> 8);
-	_p[ 2 ] = (unsigned char)(v >> 16);
-	_p[ 3 ] = (unsigned char)(v >> 24);
+	_p[ 0 ] = v;
+	_p[ 1 ] = v >> 8;
+	_p[ 2 ] = v >> 16;
+	_p[ 3 ] = v >> 24;
 }

 void PUT_UAA16LE(void *p, unsigned short v, unsigned int i)
 {
 	unsigned char *_p = (unsigned char *)&((unsigned short *)p)[i];
-	_p[ 0 ] = (unsigned char)(v);
-	_p[ 1 ] = (unsigned char)(v >> 8);
+	_p[ 0 ] = v;
+	_p[ 1 ] = v >> 8;
 }


@ -136,12 +136,8 @@ unsigned short GET_UAA16LE(void *p, unsigned int i)
 		(unsigned short)_p[ 0 ] |
 		(unsigned short)_p[ 1 ] << 8;
 }
-#endif


-#if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN)  \
-	&& defined(BS16) && defined(BS32) && defined(BS64)
-#else
 unsigned short BE16(unsigned short x)
 {
 	return GET_UAA16BE(&x, 0);
@ -167,7 +163,7 @@ unsigned long long BE64(unsigned long long x)
 	return GET_UAA64BE(&x, 0);
 }

-unsigned long long LE64(unsigned long long x)
+inline unsigned long long LE64(unsigned long long x)
 {
 	return GET_UAA64LE(&x, 0);
 }
--- a/src/endian.h
+++ b/src/endian.h
@ -9,17 +9,17 @@
 //
 // Unaligned access
 //
-
-#if !defined(NO_COMPILER_UAA)
 #define UAA16(p, i) (((PACKED16*)p)->val[i])
 #define UAA32(p, i) (((PACKED32*)p)->val[i])
 #define UAA64(p, i) (((PACKED64*)p)->val[i])
-#endif 
+
+#define UA64(p)  UAA64(p, 0)
+#define UA32(p)  UAA32(p, 0)
+#define UA16(p)  UAA16(p, 0)

 //
 //Byteswap: Use compiler support if available
 //
-#ifndef NO_COMPILER_UAA
 #ifdef __has_builtin // Clang supports this

 #if __has_builtin(__builtin_bswap16)
@ -56,7 +56,6 @@
 #endif // GNU C > 4.7
 #endif // __GNUC__ > 4
 #endif // __GNUC__
-#endif // NO_COMPILER_UAA

 //
 // Byteorder
@ -199,10 +198,6 @@
 #define __BE64(x)  BS64(x)
 #define __LE64(x)  (x)

-#define PUT_UA16(p, v) PUT_UA16LE(p, v)
-#define PUT_UA32(p, v) PUT_UA32LE(p, v)
-#define PUT_UA64(p, v) PUT_UA64LE(p, v)
-
 #else // __BYTE_ORDER == __BIG_ENDIAN

 #define __BE16(x)  (x)
@ -212,38 +207,8 @@
 #define __BE64(x)  (x)
 #define __LE64(x)  BS64(x)

-#define PUT_UA16(p, v) PUT_UA16BE(p, v)
-#define PUT_UA32(p, v) PUT_UA32BE(p, v)
-#define PUT_UA64(p, v) PUT_UA64BE(p, v)
-
 #endif // __BYTE_ORDER

-#define BE16(x)  __BE16(x)
-#define LE16(x)  __LE16(x)
-#define BE32(x)  __BE32(x)
-#define LE32(x)  __LE32(x)
-#define BE64(x)  __BE64(x)
-#define LE64(x)  __LE64(x)
-
-#else
-
-extern unsigned short BE16(unsigned short x);
-
-extern unsigned short LE16(unsigned short x);
-
-extern unsigned int BE32(unsigned int x);
-
-extern unsigned int LE32(unsigned int x);
-
-extern unsigned long long BE64(unsigned long long x);
-
-extern unsigned long long LE64(unsigned long long x);
-
-#endif // defined(__BYTE_ORDER)
-
-#if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN)  \
-	&& defined(BS16) && defined(BS32) && defined(BS64) &&!defined(NO_COMPILER_UAA)
-
 #define PUT_UAA64BE(p, v, i)  ( UAA64(p, i) = __BE64(v) )
 #define PUT_UAA32BE(p, v, i)  ( UAA32(p, i) = __BE32(v) )
 #define PUT_UAA16BE(p, v, i)  ( UAA16(p, i) = __BE16(v) )
@ -260,38 +225,57 @@ extern unsigned long long LE64(unsigned long long x);
 #define GET_UAA32LE(p, i)  __LE32(UAA32(p, i))
 #define GET_UAA16LE(p, i)  __LE16(UAA16(p, i))

+#define BE16(x)  __BE16(x)
+#define LE16(x)  __LE16(x)
+#define BE32(x)  __BE32(x)
+#define LE32(x)  __LE32(x)
+#define BE64(x)  __BE64(x)
+#define LE64(x)  __LE64(x)

 #else // ! defined(__BYTE_ORDER)

-extern void PUT_UAA64BE(void* p, unsigned long long v, unsigned int i);
+extern void PUT_UAA64BE(void *p, unsigned long long v, unsigned int i);

-extern void PUT_UAA32BE(void* p, unsigned int v, unsigned int i);
+extern void PUT_UAA32BE(void *p, unsigned int v, unsigned int i);

-extern void PUT_UAA16BE(void* p, unsigned short v, unsigned int i);
+extern void PUT_UAA16BE(void *p, unsigned short v, unsigned int i);


-extern void PUT_UAA64LE(void* p, unsigned long long v, unsigned int i);
+extern void PUT_UAA64LE(void *p, unsigned long long v, unsigned int i);

-extern void PUT_UAA32LE(void* p, unsigned int v, unsigned int i);
+extern void PUT_UAA32LE(void *p, unsigned int v, unsigned int i);

-extern void PUT_UAA16LE(void* p, unsigned short v, unsigned int i);
+extern void PUT_UAA16LE(void *p, unsigned short v, unsigned int i);


-extern unsigned long long GET_UAA64BE(void* p, unsigned int i);
+extern unsigned long long GET_UAA64BE(void *p, unsigned int i);

-extern unsigned int GET_UAA32BE(void* p, unsigned int i);
+extern unsigned int GET_UAA32BE(void *p, unsigned int i);

-extern unsigned short GET_UAA16BE(void* p, unsigned int i);
+extern unsigned short GET_UAA16BE(void *p, unsigned int i);


-extern unsigned long long GET_UAA64LE(void* p, unsigned int i);
+extern unsigned long long GET_UAA64LE(void *p, unsigned int i);

-extern unsigned int GET_UAA32LE(void* p, unsigned int i);
+extern unsigned int GET_UAA32LE(void *p, unsigned int i);

-extern unsigned short GET_UAA16LE(void* p, unsigned int i);
-#endif
+extern unsigned short GET_UAA16LE(void *p, unsigned int i);


+extern unsigned short BE16(unsigned short x);
+
+extern unsigned short LE16(unsigned short x);
+
+extern unsigned int BE32(unsigned int x);
+
+extern unsigned int LE32(unsigned int x);
+
+extern unsigned long long BE64(unsigned long long x);
+
+extern unsigned long long LE64(unsigned long long x);
+
+#endif // defined(__BYTE_ORDER)
+

 #define PUT_UA64BE(p, v)  PUT_UAA64BE(p, v, 0)
 #define PUT_UA32BE(p, v)  PUT_UAA32BE(p, v, 0)
--- a/etc/vlmcsd.kmd
+++ b/etc/vlmcsd.kmd
--- a/floppy/.config-busybox
+++ b/floppy/.config-busybox
--- a/floppy/.config-linux-kernel
+++ b/floppy/.config-linux-kernel
--- a/floppy/.config-linux-kernel-efi
+++ b/floppy/.config-linux-kernel-efi
--- a/floppy/.config-uClibc-ng
+++ b/floppy/.config-uClibc-ng
@ -0,0 +1,254 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 1.0.15 C Library Configuration
+#
+# TARGET_alpha is not set
+# TARGET_arc is not set
+# TARGET_arm is not set
+# TARGET_avr32 is not set
+# TARGET_bfin is not set
+# TARGET_c6x is not set
+# TARGET_cris is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+TARGET_i386=y
+# TARGET_ia64 is not set
+# TARGET_lm32 is not set
+# TARGET_m68k is not set
+# TARGET_metag is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios2 is not set
+# TARGET_or1k is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sparc is not set
+# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="i386"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_386 is not set
+CONFIG_486=y
+# CONFIG_586 is not set
+# CONFIG_686 is not set
+TARGET_SUBARCH="i486"
+
+#
+# Using ELF file format
+#
+ARCH_HAS_DEPRECATED_SYSCALLS=y
+ARCH_LITTLE_ENDIAN=y
+
+#
+# Using Little Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+DO_XSI_MATH=y
+# UCLIBC_HAS_FENV is not set
+# UCLIBC_HAS_LONG_DOUBLE_MATH is not set
+KERNEL_HEADERS="/root/openadk/target_generic-x86_uclibc-ng/usr/include"
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+DOPIC=y
+ARCH_HAS_UCONTEXT=y
+HAVE_SHARED=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+# LDSO_PRELOAD_ENV_SUPPORT is not set
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
+# LDSO_STANDALONE_SUPPORT is not set
+# LDSO_PRELINK_SUPPORT is not set
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+LDSO_SAFE_RUNPATH=y
+LDSO_SEARCH_INTERP_PATH=y
+LDSO_LD_LIBRARY_PATH=y
+LDSO_NO_CLEANUP=y
+UCLIBC_CTOR_DTOR=y
+# LDSO_GNU_HASH_SUPPORT is not set
+# HAS_NO_THREADS is not set
+UCLIBC_HAS_THREADS_NATIVE=y
+UCLIBC_HAS_THREADS=y
+UCLIBC_HAS_TLS=y
+PTHREADS_DEBUG_SUPPORT=y
+UCLIBC_HAS_SYSLOG=y
+UCLIBC_HAS_LFS=y
+MALLOC=y
+# MALLOC_SIMPLE is not set
+# MALLOC_STANDARD is not set
+MALLOC_GLIBC_COMPAT=y
+# UCLIBC_HAS_OBSTACK is not set
+UCLIBC_DYNAMIC_ATEXIT=y
+COMPAT_ATEXIT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_CONTEXT_FUNCS=y
+# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV4_LEGACY=y
+# UCLIBC_STRICT_HEADERS is not set
+# UCLIBC_HAS_STUBS is not set
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UCLIBC_HAS_PTY=y
+ASSUME_DEVPTS=y
+UNIX98PTY_ONLY=y
+UCLIBC_HAS_GETPT=y
+UCLIBC_HAS_LIBUTIL=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
+
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
+# Support various families of functions
+#
+UCLIBC_LINUX_MODULE_26=y
+# UCLIBC_LINUX_MODULE_24 is not set
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_BSD_ERR=y
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+# UCLIBC_NTP_LEGACY is not set
+UCLIBC_SV4_DEPRECATED=y
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_XATTR=y
+# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_CRYPT_IMPL=y
+UCLIBC_HAS_SHA256_CRYPT_IMPL=y
+# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_IPV4=y
+UCLIBC_HAS_IPV6=y
+# UCLIBC_HAS_RPC is not set
+UCLIBC_USE_NETLINK=y
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
+UCLIBC_HAS_BSD_RES_CLOSE=y
+UCLIBC_HAS_COMPAT_RES_STATE=y
+# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
+UCLIBC_HAS_RESOLVER_SUPPORT=y
+UCLIBC_HAS_LIBRESOLV_STUB=y
+UCLIBC_HAS_LIBNSL_STUB=y
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GETOPT_LONG=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+UCLIBC_HAS_ARGP=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+# UCLIBC_HAS_REGEX_OLD is not set
+UCLIBC_HAS_FNMATCH=y
+# UCLIBC_HAS_FNMATCH_OLD is not set
+UCLIBC_HAS_WORDEXP=y
+UCLIBC_HAS_NFTW=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_FTS=y
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+
+#
+# Library Installation Options
+#
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="/usr/"
+MULTILIB_DIR="lib"
+HARDWIRED_ABSPATH=y
+
+#
+# Security options
+#
+# UCLIBC_BUILD_PIE is not set
+UCLIBC_HAS_ARC4RANDOM=y
+# ARC4RANDOM_USES_NODEV is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# Development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DOSTRIP is not set
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+# UCLIBC_HAS_BACKTRACE is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
--- a/floppy144.vfd
+++ b/floppy144.vfd
--- a/src/getifaddrs-musl.c
+++ b/src/getifaddrs-musl.c
@ -152,7 +152,7 @@ static void copy_lladdr(struct sockaddr **r, union sockany *sa, void *addr, size
 static int netlink_msg_to_ifaddr(void *pctx, struct nlmsghdr *h)
 {
 	struct ifaddrs_ctx *ctx = pctx;
-	struct ifaddrs_storage *ifs, *ifs0 = NULL;
+	struct ifaddrs_storage *ifs, *ifs0;
 	struct ifinfomsg *ifi = NLMSG_DATA(h);
 	struct ifaddrmsg *ifa = NLMSG_DATA(h);
 	struct rtattr *rta;
--- a/helpers.c
+++ b/helpers.c
@ -0,0 +1,381 @@
+/*
+ * Helper functions used by other modules
+ */
+
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#ifndef CONFIG
+#define CONFIG "config.h"
+#endif // CONFIG
+#include CONFIG
+
+#ifndef _WIN32
+#include <errno.h>
+#endif // _WIN32
+#ifndef _MSC_VER
+#include <getopt.h>
+#else
+#include "wingetopt.h"
+#endif
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include "helpers.h"
+#include "output.h"
+#include "endian.h"
+#include "shared_globals.h"
+
+
+
+/*
+ *  UCS2 <-> UTF-8 functions
+ *  All functions use little endian UCS2 since we only need it to communicate with Windows via RPC
+ */
+
+// Convert one character from UTF-8 to UCS2
+// Returns 0xffff, if utf-8 evaluates to > 0xfffe (outside basic multilingual pane)
+WCHAR utf8_to_ucs2_char (const unsigned char *input, const unsigned char **end_ptr)
+{
+    *end_ptr = input;
+    if (input[0] == 0)
+        return ~0;
+
+    if (input[0] < 0x80) {
+        *end_ptr = input + 1;
+        return LE16(input[0]);
+    }
+
+    if ((input[0] & 0xE0) == 0xE0) {
+
+    	if (input[1] == 0 || input[2] == 0)
+            return ~0;
+
+    	*end_ptr = input + 3;
+
+    	return
+            LE16((input[0] & 0x0F)<<12 |
+            (input[1] & 0x3F)<<6  |
+            (input[2] & 0x3F));
+    }
+
+    if ((input[0] & 0xC0) == 0xC0) {
+        if (input[1] == 0)
+            return ~0;
+
+        *end_ptr = input + 2;
+
+        return
+            LE16((input[0] & 0x1F)<<6  |
+            (input[1] & 0x3F));
+    }
+    return ~0;
+}
+
+// Convert one character from UCS2 to UTF-8
+// Returns length of UTF-8 char (1, 2 or 3) or -1 on error (UTF-16 outside UCS2)
+// char *utf8 must be large enough to hold 3 bytes
+int ucs2_to_utf8_char (const WCHAR ucs2_le, char *utf8)
+{
+    const WCHAR ucs2 = LE16(ucs2_le);
+
+    if (ucs2 < 0x80) {
+        utf8[0] = (char)ucs2;
+        utf8[1] = '\0';
+        return 1;
+    }
+
+    if (ucs2 >= 0x80  && ucs2 < 0x800) {
+        utf8[0] = (ucs2 >> 6)   | 0xC0;
+        utf8[1] = (ucs2 & 0x3F) | 0x80;
+        utf8[2] = '\0';
+        return 2;
+    }
+
+    if (ucs2 >= 0x800 && ucs2 < 0xFFFF) {
+
+    	if (ucs2 >= 0xD800 && ucs2 <= 0xDFFF) {
+    		/* Ill-formed (UTF-16 ouside of BMP) */
+    		return -1;
+    	}
+
+    	utf8[0] = ((ucs2 >> 12)       ) | 0xE0;
+        utf8[1] = ((ucs2 >> 6 ) & 0x3F) | 0x80;
+        utf8[2] = ((ucs2      ) & 0x3F) | 0x80;
+        utf8[3] = '\0';
+        return 3;
+    }
+
+    return -1;
+}
+
+
+// Converts UTF8 to UCS2. Returns size in bytes of the converted string or -1 on error
+size_t utf8_to_ucs2(WCHAR* const ucs2_le, const char* const utf8, const size_t maxucs2, const size_t maxutf8)
+{
+	const unsigned char* current_utf8 = (unsigned char*)utf8;
+	WCHAR* current_ucs2_le = ucs2_le;
+
+	for (; *current_utf8; current_ucs2_le++)
+	{
+		size_t size = (char*)current_utf8 - utf8;
+
+		if (size >= maxutf8) return (size_t)-1;
+		if (((*current_utf8 & 0xc0) == 0xc0) && (size >= maxutf8 - 1)) return (size_t)-1;
+		if (((*current_utf8 & 0xe0) == 0xe0) && (size >= maxutf8 - 2)) return (size_t)-1;
+		if (current_ucs2_le - ucs2_le >= (intptr_t)maxucs2 - 1) return (size_t)-1;
+
+		*current_ucs2_le = utf8_to_ucs2_char(current_utf8, &current_utf8);
+		current_ucs2_le[1] = 0;
+
+		if (*current_ucs2_le == (WCHAR)-1) return (size_t)-1;
+	}
+	return current_ucs2_le - ucs2_le;
+}
+
+// Converts UCS2 to UTF-8. Return TRUE or FALSE
+BOOL ucs2_to_utf8(const WCHAR* const ucs2_le, char* utf8, size_t maxucs2, size_t maxutf8)
+{
+	char utf8_char[4];
+	const WCHAR* current_ucs2 = ucs2_le;
+	unsigned int index_utf8 = 0;
+
+	for(*utf8 = 0; *current_ucs2; current_ucs2++)
+	{
+		if (current_ucs2 - ucs2_le > (intptr_t)maxucs2) return FALSE;
+		int len = ucs2_to_utf8_char(*current_ucs2, utf8_char);
+		if (index_utf8 + len > maxutf8) return FALSE;
+		strncat(utf8, utf8_char, len);
+		index_utf8+=len;
+	}
+
+	return TRUE;
+}
+
+/* End of UTF-8 <-> UCS2 conversion */
+
+
+// Checks, whether a string is a valid integer number between min and max. Returns TRUE or FALSE. Puts int value in *value
+BOOL stringToInt(const char *const szValue, const unsigned int min, const unsigned int max, unsigned int *const value)
+{
+	char *nextchar;
+
+	errno = 0;
+	long long result = vlmcsd_strtoll(szValue, &nextchar, 10);
+
+	if (errno || result < (long long)min || result > (long long)max || *nextchar)
+	{
+		return FALSE;
+	}
+
+	*value = (unsigned int)result;
+	return TRUE;
+}
+
+
+//Converts a String Guid to a host binary guid in host endianess
+int_fast8_t string2Uuid(const char *const restrict input, GUID *const restrict guid)
+{
+	int i;
+
+	if (strlen(input) < GUID_STRING_LENGTH) return FALSE;
+	if (input[8] != '-' || input[13] != '-' || input[18] != '-' || input[23] != '-') return FALSE;
+
+	for (i = 0; i < GUID_STRING_LENGTH; i++)
+	{
+		if (i == 8 || i == 13 || i == 18 || i == 23) continue;
+
+		const char c = (char)toupper((int)input[i]);
+
+		if (c < '0' || c > 'F' || (c > '9' && c < 'A')) return FALSE;
+	}
+
+	char inputCopy[GUID_STRING_LENGTH + 1];
+	strncpy(inputCopy, input, GUID_STRING_LENGTH + 1);
+	inputCopy[8] = inputCopy[13] = inputCopy[18] = 0;
+
+	hex2bin((BYTE*)&guid->Data1, inputCopy, 8);
+	hex2bin((BYTE*)&guid->Data2, inputCopy + 9, 4);
+	hex2bin((BYTE*)&guid->Data3, inputCopy + 14, 4);
+	hex2bin(guid->Data4, input + 19, 16);
+
+	guid->Data1 =  BE32(guid->Data1);
+	guid->Data2 =  BE16(guid->Data2);
+	guid->Data3 =  BE16(guid->Data3);
+	return TRUE;
+}
+
+
+// convert GUID to little-endian
+void LEGUID(GUID *const restrict out, const GUID* const restrict in)
+{
+	#if __BYTE_ORDER != __LITTLE_ENDIAN
+	out->Data1 = LE32(in->Data1);
+	out->Data2 = LE16(in->Data2);
+	out->Data3 = LE16(in->Data3);
+	memcpy(out->Data4, in->Data4, sizeof(out->Data4));
+	#else
+	memcpy(out, in, sizeof(GUID));
+	#endif
+}
+
+#if !IS_LIBRARY
+//Checks a command line argument if it is numeric and between min and max. Returns the numeric value or exits on error
+__pure unsigned int getOptionArgumentInt(const char o, const unsigned int min, const unsigned int max)
+{
+	unsigned int result;
+
+	if (!stringToInt(optarg, min, max, &result))
+	{
+		printerrorf("Fatal: Option \"-%c\" must be numeric between %u and %u.\n", o, min, max);
+		exit(!0);
+	}
+
+	return result;
+}
+
+// Resets getopt() to start parsing from the beginning
+void optReset(void)
+{
+	#if __minix__ || defined(__BSD__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+	optind = 1;
+	optreset = 1; // Makes newer BSD getopt happy
+	#elif defined(__UCLIBC__) // uClibc headers also define __GLIBC__ so be careful here
+	optind = 0; // uClibc seeks compatibility with GLIBC
+	#elif defined(__GLIBC__)
+	optind = 0; // Makes GLIBC getopt happy
+	#else // Standard for most systems
+	optind = 1;
+	#endif
+}
+#endif // !IS_LIBRARY
+
+#if defined(_WIN32) || defined(USE_MSRPC)
+
+// Returns a static message buffer containing text for a given Win32 error. Not thread safe (same as strerror)
+char* win_strerror(const int message)
+{
+	#define STRERROR_BUFFER_SIZE 256
+	static char buffer[STRERROR_BUFFER_SIZE];
+
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK, NULL, message, 0, buffer, STRERROR_BUFFER_SIZE, NULL);
+	return buffer;
+}
+
+#endif // defined(_WIN32) || defined(USE_MSRPC)
+
+
+/*
+ * parses an address in the form host:[port] in addr
+ * returns host and port in seperate strings
+ */
+void parseAddress(char *const addr, char** szHost, char** szPort)
+{
+	*szHost = addr;
+
+#	ifndef NO_SOCKETS
+	*szPort = (char*)defaultport;
+#	else // NO_SOCKETS
+	*szPort = "1688";
+#	endif // NO_SOCKETS
+
+	char *lastcolon = strrchr(addr, ':');
+	char *firstcolon = strchr(addr, ':');
+	char *closingbracket = strrchr(addr, ']');
+
+	if (*addr == '[' && closingbracket) //Address in brackets
+	{
+		*closingbracket = 0;
+		(*szHost)++;
+
+		if (closingbracket[1] == ':')
+			*szPort = closingbracket + 2;
+	}
+	else if (firstcolon && firstcolon == lastcolon) //IPv4 address or hostname with port
+	{
+		*firstcolon = 0;
+		*szPort = firstcolon + 1;
+	}
+}
+
+
+// Initialize random generator (needs to be done in each thread)
+void randomNumberInit()
+{
+#	if _MSC_VER
+	srand(GetTickCount());
+#	else
+	struct timeval tv;
+	gettimeofday(&tv, NULL);
+	srand((unsigned int)(tv.tv_sec ^ tv.tv_usec));
+#	endif
+}
+
+
+// We always exit immediately if any OOM condition occurs
+__noreturn void OutOfMemory(void)
+{
+	errorout("Fatal: Out of memory");
+	exit(!0);
+}
+
+
+void* vlmcsd_malloc(size_t len)
+{
+	void* buf = malloc(len);
+	if (!buf) OutOfMemory();
+	return buf;
+}
+
+
+/*
+ * Converts hex digits to bytes in big-endian order.
+ * Ignores any non-hex characters
+ */
+void hex2bin(BYTE *const bin, const char *hex, const size_t maxbin)
+{
+	static const char *const hexdigits = "0123456789ABCDEF";
+	char* nextchar;
+	size_t i;
+
+	for (i = 0; (i < 16) && utf8_to_ucs2_char((const unsigned char*)hex, (const unsigned char**)&nextchar) != (WCHAR)-1; hex = nextchar)
+	{
+		const char* pos = strchr(hexdigits, toupper((int)*hex));
+		if (!pos) continue;
+
+		if (!(i & 1)) bin[i >> 1] = 0;
+		bin[i >> 1] |= (char)(pos - hexdigits);
+		if (!(i & 1)) bin[i >> 1] <<= 4;
+		i++;
+		if (i >> 1 > maxbin) break;
+	}
+}
+
+
+__pure BOOL getArgumentBool(int_fast8_t *result, const char *const argument)
+{
+	if (
+		!strncasecmp(argument, "true", 4) ||
+		!strncasecmp(argument, "on", 2) ||
+		!strncasecmp(argument, "yes", 3) ||
+		!strncasecmp(argument, "1", 1)
+	)
+	{
+		*result = TRUE;
+		return TRUE;
+	}
+	else if (
+			!strncasecmp(argument, "false", 5) ||
+			!strncasecmp(argument, "off", 3) ||
+			!strncasecmp(argument, "no", 2) ||
+			!strncasecmp(argument, "0", 1)
+	)
+	{
+		*result = FALSE;
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
--- a/src/helpers.h
+++ b/src/helpers.h
@ -9,10 +9,6 @@
 #include <stdint.h>
 #include "types.h"

-#if __ANDROID__
-#include <sys/syscall.h>
-#endif // __ANDROID__
-
 #define GUID_LE 0
 #define GUID_BE 1
 #define GUID_SWAP 2
@ -20,38 +16,19 @@
 BOOL stringToInt(const char *const szValue, const unsigned int min, const unsigned int max, unsigned int *const value);
 unsigned int getOptionArgumentInt(const char o, const unsigned int min, const unsigned int max);
 void optReset(void);
-__pure DWORD timeSpanString2Seconds(const char *const restrict argument);
-#define timeSpanString2Minutes(x) (timeSpanString2Seconds(x) / 60)
 char* win_strerror(const int message);
 int ucs2_to_utf8_char (const WCHAR ucs2_le, char *utf8);
 size_t utf8_to_ucs2(WCHAR* const ucs2_le, const char* const utf8, const size_t maxucs2, const size_t maxutf8);
 WCHAR utf8_to_ucs2_char (const unsigned char * input, const unsigned char ** end_ptr);
 BOOL ucs2_to_utf8(const WCHAR* const ucs2_le, char* utf8, size_t maxucs2, size_t maxutf8);
-int_fast8_t string2UuidLE(const char *const restrict input, GUID *const restrict guid);
+int_fast8_t string2Uuid(const char *const restrict input, GUID *const restrict guid);
 void randomNumberInit();
+void LEGUID(GUID *const restrict result, const GUID* const restrict guid);
 void parseAddress(char *const addr, char** szHost, char** szPort);
 __noreturn void OutOfMemory(void);
 void* vlmcsd_malloc(size_t len);
 void hex2bin(BYTE *const bin, const char *hex, const size_t maxbin);
-void loadKmsData();
-#if !defined(DATA_FILE) || !defined(NO_SIGHUP)
-void getExeName();
-#endif // !defined(DATA_FILE) || !defined(NO_SIGHUP)
 __pure BOOL getArgumentBool(int_fast8_t *result, const char *const argument);
-char* vlmcsd_strdup(const char* src);

-#if defined(NO_SOCKETS) || IS_LIBRARY
-#define exitOnWarningLevel(x)
-#else // !NO_SOCKETS
-void exitOnWarningLevel(const int_fast8_t level);
-#endif // !NO_SOCKETS
-
-
-#if __ANDROID__ && !defined(USE_THREADS) // Bionic does not wrap these syscalls (intentionally because Google fears, developers don't know how to use it)
-int shmget(key_t key, size_t size, int shmflg);
-void *shmat(int shmid, const void *shmaddr, int shmflg);
-int shmdt(const void *shmaddr);
-int shmctl(int shmid, int cmd, /*struct shmid_ds*/void *buf);
-#endif // __ANDROID__ && !defined(USE_THREADS)

 #endif // HELPERS_H
--- a/src/ifaddrs-android.c
+++ b/src/ifaddrs-android.c
--- a/src/ifaddrs-android.h
+++ b/src/ifaddrs-android.h
--- a/src/ifaddrs-musl.h
+++ b/src/ifaddrs-musl.h
--- a/kms.c
+++ b/kms.c
--- a/src/kms.h
+++ b/src/kms.h
@ -7,11 +7,11 @@
 #include CONFIG

 #if _MSC_VER
-//#include <time.h>
+#include <time.h>
 #else
 #include <sys/time.h>
 #endif // _MSC_VER
-//#include <stdlib.h>
+#include <stdlib.h>
 #include "types.h"
 //
 // REQUEST... types are actually fixed size
@ -54,15 +54,6 @@
 #define ActivationInterval VLActivationInterval
 #define RenewalInterval VLRenewalInterval

-#define MAX_CLIENTS 671
-
-typedef struct
-{
-	GUID Guid[MAX_CLIENTS];
-	int_fast16_t CurrentCount;
-	int_fast16_t MaxCount;
-	int_fast16_t CurrentPosition;
-} ClientList_t, *PClientList_t;

 typedef struct {
 	VERSION_INFO;
@ -80,7 +71,7 @@ typedef struct {
 } /*__packed*/ REQUEST;

 typedef struct {
-	VERSION_INFO;
+	VERSION_INFO;					
 	DWORD PIDSize;					// Size of PIDData in bytes.
 	WCHAR KmsPID[PID_BUFFER_SIZE];	// ePID (must include terminating zero)
 	GUID CMID;						// Client machine id. Must be the same as in request.
@ -228,154 +219,58 @@ typedef union

 typedef BYTE hwid_t[8];

-typedef enum 
-{
-	None = 0,
-	UseNdr64 = 1 << 0,
-	UseForEpid = 1 << 1,
-	MayBeServer = 1 << 2,
-} HostBuildFlag;
-
-typedef struct CsvlkData
-{
-	union
-	{
-		uint64_t EPidOffset;
-		char* EPid;
-	};
-
-	int64_t ReleaseDate;
-	uint32_t GroupId;
-	uint32_t MinKeyId;
-	uint32_t MaxKeyId;
-	uint8_t MinActiveClients;
-	uint8_t Reserved[3];
-
-} CsvlkData_t, *PCsvlkData_t;
-
-typedef struct VlmcsdData
-{
-	union
-	{
-		GUID Guid;
-		uint8_t GuidBytes[16];
-	};
-
-	union
-	{
-		uint64_t NameOffset;
-		char* Name;
-	};
-
-	uint8_t AppIndex;
-	uint8_t KmsIndex;
-	uint8_t ProtocolVersion;
-	uint8_t NCountPolicy;
-	uint8_t IsRetail;
-	uint8_t IsPreview;
-	uint8_t EPidIndex;
-	uint8_t reserved;
-
-} VlmcsdData_t, *PVlmcsdData_t;
-
 typedef struct
 {
-	union
-	{
-		uint64_t Offset;
-		void* Pointer;
-	};
-} DataPointer_t;
+	GUID guid;
+	const char* name;
+	const char* pid;
+	uint8_t AppIndex;
+	uint8_t KmsIndex;
+} KmsIdList;

-#define KMS_OPTIONS_USENDR64 1 << 0
+#define KMS_PARAM_MAJOR AppIndex
+#define KMS_PARAM_REQUIREDCOUNT KmsIndex

-typedef struct HostBuild
-{
-	union
-	{
-		uint64_t DisplayNameOffset;
-		char* DisplayName;
-	};
+#define APP_ID_WINDOWS 0
+#define APP_ID_OFFICE2010 1
+#define APP_ID_OFFICE2013 2

-	int64_t ReleaseDate;
-	int32_t BuildNumber;
-	int32_t PlatformId;
-	HostBuildFlag Flags;
-	uint8_t reserved[4];
+#define EPID_INDEX_WINDOWS APP_ID_WINDOWS
+#define EPID_INDEX_OFFICE2010 APP_ID_OFFICE2010
+#define EPID_INDEX_OFFICE2013 APP_ID_OFFICE2013
+#define EPID_INDEX_OFFICE2016 3

-} HostBuild_t, *PHostBuild_t;
+// Update these numbers in License Manager
+#define KMS_ID_OFFICE2010 0
+#define KMS_ID_OFFICE2013 1
+#define KMS_ID_OFFICE2013_BETA 2
+#define KMS_ID_OFFICE2016 3
+#define KMS_ID_VISTA 4
+#define KMS_ID_WIN7 5
+#define KMS_ID_WIN8_VL 6
+#define KMS_ID_WIN_BETA 7
+#define KMS_ID_WIN8_RETAIL 8
+#define KMS_ID_WIN81_VL 9
+#define KMS_ID_WIN81_RETAIL 10
+#define KMS_ID_WIN2008A 11
+#define KMS_ID_WIN2008B 12
+#define KMS_ID_WIN2008C 13
+#define KMS_ID_WIN2008R2A 14
+#define KMS_ID_WIN2008R2B 15
+#define KMS_ID_WIN2008R2C 16
+#define KMS_ID_WIN2012 17
+#define KMS_ID_WIN2012R2 18
+#define KMS_ID_WIN_SRV_BETA 19
+#define KMS_ID_WIN10_VL 20
+#define KMS_ID_WIN10_RETAIL 21
+#define KMS_ID_WIN2016 22
+#define KMS_ID_WIN10_LTSB2016 23

-typedef struct VlmcsdHeader
-{
-	BYTE Magic[4];
-	VERSION_INFO;
-	uint8_t CsvlkCount;
-	uint8_t Flags;
-	uint8_t Reserved[2];
+#define PWINGUID &AppList[APP_ID_WINDOWS].guid
+#define POFFICE2010GUID &AppList[APP_ID_OFFICE2010].guid
+#define POFFICE2013GUID &AppList[APP_ID_OFFICE2013].guid

-	union
-	{
-		int32_t Counts[5];
-
-		struct
-		{
-			int32_t AppItemCount;
-			int32_t KmsItemCount;
-			int32_t SkuItemCount;
-			int32_t HostBuildCount;
-			int32_t reserved2Counts;
-		};
-	};
-
-	union
-	{
-		DataPointer_t Datapointers[5];
-
-		struct
-		{
-			union
-			{
-				uint64_t AppItemOffset;
-				PVlmcsdData_t AppItemList;
-			};
-
-			union
-			{
-				uint64_t KmsItemOffset;
-				PVlmcsdData_t KmsItemList;
-			};
-
-			union
-			{
-				uint64_t SkuItemOffset;
-				PVlmcsdData_t SkuItemList;
-			};
-
-			union
-			{
-				uint64_t HostBuildOffset;
-				PHostBuild_t HostBuildList;
-			};
-
-			union
-			{
-				uint64_t Reserved2Offset;
-				void* Reserved2List;
-			};
-
-			CsvlkData_t CsvlkData[1];
-		};
-	};
-
-} VlmcsdHeader_t, *PVlmcsdHeader_t;
-
-//#define EPID_INDEX_WINDOWS 0
-//#define EPID_INDEX_OFFICE2010 1
-//#define EPID_INDEX_OFFICE2013 2
-//#define EPID_INDEX_OFFICE2016 3
-//#define EPID_INDEX_WINCHINAGOV 4
-
-typedef HRESULT(__stdcall *RequestCallback_t)(REQUEST* baseRequest, RESPONSE *const baseResponse, BYTE *const hwId, const char* const ipstr);
+typedef BOOL(__stdcall *RequestCallback_t)(const REQUEST *const baseRequest, RESPONSE *const baseResponse, BYTE *const hwId, const char* const ipstr);

 size_t CreateResponseV4(REQUEST_V4 *const Request, BYTE *const response_data, const char* const ipstr);
 size_t CreateResponseV6(REQUEST_V6 *restrict Request, BYTE *const response_data, const char* const ipstr);
@ -383,28 +278,23 @@ BYTE *CreateRequestV4(size_t *size, const REQUEST* requestBase);
 BYTE *CreateRequestV6(size_t *size, const REQUEST* requestBase);
 void randomPidInit();
 void get16RandomBytes(void* ptr);
-RESPONSE_RESULT DecryptResponseV6(RESPONSE_V6* response_v6, int responseSize, BYTE* const response, const BYTE* const rawRequest, BYTE* hwid);
-RESPONSE_RESULT DecryptResponseV4(RESPONSE_V4* response_v4, const int responseSize, BYTE* const rawResponse, const BYTE* const rawRequest);
-void getUnixTimeAsFileTime(FILETIME* ts);
-__pure int64_t fileTimeToUnixTime(FILETIME* ts);
+RESPONSE_RESULT DecryptResponseV6(RESPONSE_V6* Response_v6, int responseSize, BYTE* const response, const BYTE* const request, BYTE* hwid);
+RESPONSE_RESULT DecryptResponseV4(RESPONSE_V4* Response_v4, const int responseSize, BYTE* const response, const BYTE* const request);
+void getUnixTimeAsFileTime(FILETIME *const ts);
+__pure int64_t fileTimeToUnixTime(const FILETIME *const ts);
+const char* getProductNameHE(const GUID *const guid, const KmsIdList *const List, ProdListIndex_t *const i);
+const char* getProductNameLE(const GUID *const guid, const KmsIdList *const List, ProdListIndex_t *const i);
+__pure ProdListIndex_t getExtendedProductListSize();
+__pure ProdListIndex_t getAppListSize(void);

-#ifndef IS_LIBRARY
-int32_t getProductIndex(const GUID* guid, const PVlmcsdData_t list, const int32_t count, char** name, char** ePid);
-#if !defined(NO_INI_FILE)||!defined(NO_VERBOSE_LOG)
-const char* getNextString(const char* s);
-#endif  // !defined(NO_INI_FILE)||!defined(NO_VERBOSE_LOG)
-#endif // IS_LIBRARY
-
-#ifndef NO_STRICT_MODES
-void InitializeClientLists();
-void CleanUpClientLists();
-#endif // !NO_STRICT_MODES
+extern const KmsIdList ProductList[];
+extern const KmsIdList AppList[];
+extern const KmsIdList ExtendedProductList[];

 extern RequestCallback_t CreateResponseBase;

 #ifdef _PEDANTIC
-uint16_t IsValidLcid(const uint16_t lcid);
-uint32_t IsValidHostBuild(const int32_t hostBuild);
+uint16_t IsValidLcid(const uint16_t Lcid);
 #endif // _PEDANTIC

 #endif // __kms_h
--- a/src/libkms-test.c
+++ b/src/libkms-test.c
--- a/src/libkms.c
+++ b/src/libkms.c
@ -13,7 +13,7 @@

 #define EXTERNAL dllexport

-#define DLLVERSION 0x40000
+#define DLLVERSION 0x30002

 #include "libkms.h"
 #include "shared_globals.h"
@ -51,7 +51,7 @@ EXTERNC __declspec(EXTERNAL) char* __cdecl GetErrorMessage()
 	return ErrorMessage;
 }

-EXTERNC __declspec(EXTERNAL)SOCKET __cdecl ConnectToServer(const char* host, const char* port, const int addressFamily)
+EXTERNC __declspec(EXTERNAL) SOCKET __cdecl ConnectToServer(const char* host, const char* port, const int addressFamily)
 {
 	SOCKET sock;
 	*ErrorMessage = 0;
@ -74,13 +74,11 @@ EXTERNC __declspec(EXTERNAL)SOCKET __cdecl ConnectToServer(const char* host, con
 	return sock;
 }

-EXTERNC __declspec(EXTERNAL)RpcStatus __cdecl BindRpc(const SOCKET sock, const int_fast8_t useMultiplexedRpc, const int_fast8_t useRpcNDR64, const int_fast8_t useRpcBTFN, PRpcDiag_t rpcDiag)
+EXTERNC __declspec(EXTERNAL) RpcStatus __cdecl BindRpc(const SOCKET sock, const int_fast8_t useMultiplexedRpc)
 {
 	*ErrorMessage = 0;
 	UseMultiplexedRpc = useMultiplexedRpc;
-	UseClientRpcNDR64 = useRpcNDR64;
-	UseClientRpcBTFN = useRpcBTFN;
-	return rpcBindClient(sock, FALSE, rpcDiag);
+	return rpcBindClient(sock, FALSE);
 }

 EXTERNC __declspec(EXTERNAL) void __cdecl CloseConnection(const SOCKET sock)
@ -89,24 +87,24 @@ EXTERNC __declspec(EXTERNAL) void __cdecl CloseConnection(const SOCKET sock)
 }


-EXTERNC __declspec(EXTERNAL)DWORD __cdecl SendKMSRequest(const SOCKET sock, RESPONSE* baseResponse, REQUEST* baseRequest, RESPONSE_RESULT* result, BYTE *hwid)
+EXTERNC __declspec(EXTERNAL) DWORD __cdecl SendKMSRequest(const SOCKET sock, RESPONSE* baseResponse, REQUEST* baseRequest, RESPONSE_RESULT* result, BYTE *hwid)
 {
 	*ErrorMessage = 0;
 	return SendActivationRequest(sock, baseResponse, baseRequest, result, hwid);
 }

-EXTERNC __declspec(EXTERNAL)int_fast8_t __cdecl IsDisconnected(const SOCKET sock)
+EXTERNC __declspec(EXTERNAL) int_fast8_t __cdecl IsDisconnected(const SOCKET sock)
 {
 	return isDisconnected(sock);
 }


-EXTERNC __declspec(EXTERNAL)DWORD __cdecl StartKmsServer(const int port, RequestCallback_t requestCallback)
+EXTERNC __declspec(EXTERNAL) DWORD __cdecl StartKmsServer(const int port, RequestCallback_t requestCallback)
 {
 #ifndef SIMPLE_SOCKETS
 	char listenAddress[64];

-	if (IsServerStarted) return SOCKET_EALREADY;
+	if (IsServerStarted) return !0;

 #	ifdef _WIN32
 	int error = initializeWinSockets();
@ -122,7 +120,7 @@ EXTERNC __declspec(EXTERNAL)DWORD __cdecl StartKmsServer(const int port, Request
 	if (checkProtocolStack(AF_INET)) { haveIPv4 = TRUE; maxsockets++; }
 	if (checkProtocolStack(AF_INET6)) { haveIPv6 = TRUE; maxsockets++; }

-	if (!maxsockets) return SOCKET_EAFNOSUPPORT;
+	if(!maxsockets) return !0;

 	SocketList = (SOCKET*)vlmcsd_malloc(sizeof(SOCKET) * (size_t)maxsockets);
 	numsockets = 0;
@ -142,7 +140,7 @@ EXTERNC __declspec(EXTERNAL)DWORD __cdecl StartKmsServer(const int port, Request
 	if (!numsockets)
 	{
 		free(SocketList);
-		return SOCKET_EADDRNOTAVAIL;
+		return !0;
 	}

 	IsServerStarted = TRUE;
@ -154,7 +152,7 @@ EXTERNC __declspec(EXTERNAL)DWORD __cdecl StartKmsServer(const int port, Request

 #	else // SIMPLE_SOCKETS

-	if (IsServerStarted) return SOCKET_EALREADY;
+	if (IsServerStarted) return !0;
 	int error;

 #	ifdef _WIN32
@ -167,7 +165,6 @@ EXTERNC __declspec(EXTERNAL)DWORD __cdecl StartKmsServer(const int port, Request

 	CreateResponseBase = requestCallback;
 	error = listenOnAllAddresses();
-	free(defaultport);
 	if (error) return error;

 	IsServerStarted = TRUE;
@ -181,9 +178,9 @@ EXTERNC __declspec(EXTERNAL)DWORD __cdecl StartKmsServer(const int port, Request
 }


-EXTERNC __declspec(EXTERNAL)DWORD __cdecl StopKmsServer()
+EXTERNC __declspec(EXTERNAL) DWORD __cdecl StopKmsServer()
 {
-	if (!IsServerStarted) return VLMCSD_EPERM;
+	if (!IsServerStarted) return !0;

 	closeAllListeningSockets();

--- a/src/libkms.h
+++ b/src/libkms.h
@ -26,7 +26,7 @@ EXTERNC __declspec(EXTERNAL) const char* const __cdecl GetEmulatorVersion();
 EXTERNC __declspec(EXTERNAL) SOCKET __cdecl ConnectToServer(const char* host, const char* port, const int addressFamily);
 EXTERNC __declspec(EXTERNAL) char* __cdecl GetErrorMessage();
 EXTERNC __declspec(EXTERNAL) void __cdecl CloseConnection(const SOCKET sock);
-EXTERNC __declspec(EXTERNAL) RpcStatus __cdecl BindRpc(const SOCKET sock, const int_fast8_t useMultiplexedRpc, const int_fast8_t useRpcNDR64, const int_fast8_t useRpcBTFN, PRpcDiag_t rpcDiag);
+EXTERNC __declspec(EXTERNAL) RpcStatus __cdecl BindRpc(const SOCKET sock, const int_fast8_t useMultiplexedRpc);
 EXTERNC __declspec(EXTERNAL) int_fast8_t __cdecl IsDisconnected(const SOCKET sock);
 //EXTERN_C __declspec(EXTERNAL) unsigned int __cdecl GetRandom32();

--- a/32
+++ b/32
@ -0,0 +1,32 @@
+#!/usr/local/bin/bash
+
+export VLMCSD_VERSION="svn`svnversion`"
+
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-Dragon* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j12"
+REUSEOBJFLAGS="-j12"
+
+CF="-flto=12 -static-libgcc -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CF45="-static-libgcc -pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-Wl,-z,norelro -Wl,--hash-style=sysv -Wl,--build-id=none"
+LFCLANG="-Wl,-z,norelro -Wl,--hash-style=sysv"
+export CC=gcc5
+
+gmake $MAKEFLAGS MULTI_NAME=vlmcsdmulti-DragonFly-x64 PROGRAM_NAME=vlmcsd-DragonFly-x64 CLIENT_NAME=vlmcs-DragonFly-x64 CFLAGS="$CF" LDFLAGS="$LF" allmulti
+
+rm *.o
+
+strip -s --strip-unneeded --remove-section=.eh_frame_hdr --remove-section=.eh_frame --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
+sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+cp -af vlmcsd-DragonFly-x64 /usr/local/sbin/vlmcsd
+cp -af vlmcs-DragonFly-x64 /usr/local/bin/vlmcs
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-Dragon* vlmcs-* root@ubuntu64:x/binaries/DragonFly/intel/
--- a/38
+++ b/38
@ -0,0 +1,38 @@
+#!/usr/local/bin/bash
+
+export VLMCSD_VERSION="svn`svnversion`"
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-Free* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j12"
+REUSEOBJFLAGS="-j12"
+
+CF="-flto=12 -static-libgcc -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none"
+LFCLANG="-Wl,-z,norelro -Wl,--hash-style=gnu"
+
+gmake $MAKEFLAGS allmulti CAT=2 MULTI_NAME=vlmcsdmulti-FreeBSD-10.3-x64-gcc CLIENT_NAME=vlmcs-FreeBSD-10.3-x64-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64-gcc CC=gcc6 CFLAGS="$CF" LDFLAGS="$LF"
+gmake $MAKEFLAGS MULTI_NAME=vlmcsdmulti-FreeBSD-10.3-x64 CLIENT_NAME=vlmcs-FreeBSD-10.3-x64 PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64 CC=clang38 CFLAGS="$CFCLANG" LDFLAGS="$LF" allmulti
+gmake $MAKEFLAGS MULTI_NAME=vlmcsdmulti-FreeBSD-10.3-x86 CLIENT_NAME=vlmcs-FreeBSD-10.3-x86 PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86 CC=clang38 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
+gmake $MAKEFLAGS allmulti CAT=2 MULTI_NAME=vlmcsdmulti-FreeBSD-10.3-x86-gcc CLIENT_NAME=vlmcs-FreeBSD-10.3-x86-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86-gcc CC=gcc6 CFLAGS="$CF -m32 -DCOMPAT_32BIT" LDFLAGS="-L/usr/lib32 -B/usr/lib32 $LF"
+gmake $MAKEFLAGS CAT=2 vlmcsd-FreeBSD-10.3-x64-threads-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64-threads-gcc THREADS=1 CC=gcc6 CFLAGS="$CF" LDFLAGS="-lpthread $LF"
+gmake $MAKEFLAGS vlmcsd-FreeBSD-10.3-x64-threads PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64-threads THREADS=1 CC=clang38 CFLAGS="$CFCLANG" LDFLAGS="-lpthread $LF"
+gmake $MAKEFLAGS vlmcsd-FreeBSD-10.3-x86-threads PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86-threads THREADS=1 CC=clang38 CFLAGS="$CFCLANG -m32" LDFLAGS="-lpthread $LF"
+gmake $MAKEFLAGS CAT=2 vlmcsd-FreeBSD-10.3-x86-threads-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86-threads-gcc THREADS=1 CC=gcc6 CFLAGS="$CF -m32 -DCOMPAT_32BIT" LDFLAGS="-lpthread -L/usr/lib32 -B/usr/lib32 $LF"
+gmake $MAKEFLAGS CRYPTO=openssl_with_aes CLIENT_NAME=vlmcs-FreeBSD-10.3-x64-openssl1.0.1-EXPERIMENTAL PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64-openssl1.0.1-EXPERIMENTAL CC=clang38 CFLAGS="$CFCLANG" LDFLAGS="$LF"
+gmake $MAKEFLAGS CRYPTO=openssl_with_aes CLIENT_NAME=vlmcs-FreeBSD-10.3-x86-openssl1.0.1-EXPERIMENTAL PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86-openssl1.0.1-EXPERIMENTAL CC=clang38 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
+
+rm *.o
+
+strip -s --strip-unneeded --remove-section=.eh_frame_hdr --remove-section=.eh_frame --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
+sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+sudo cp -af vlmcsd-FreeBSD-10.3-x64-gcc /usr/local/sbin/vlmcsd
+sudo cp -af vlmcs-FreeBSD-10.3-x64-gcc /usr/local/bin/vlmcs
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-Free* vlmcs-* root@ubuntu64:x/binaries/FreeBSD/intel/
--- a/38
+++ b/38
@ -0,0 +1,38 @@
+#!/bin/bash
+
+export VLMCSD_VERSION="svn`svnversion`"
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-hurd* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j1"
+
+export CC=gcc
+CF="-flto=jobserver -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-fuse-ld=gold -lresolv -Wl,-z,norelro,--hash-style=gnu,--build-id=none"
+
+make $MAKEFLAGS MULTI_NAME=vlmcsdmulti-hurd-x86-glibc vlmcsdmulti-hurd-x86-glibc PROGRAM_NAME=vlmcsd-hurd-x86-glibc CLIENT_NAME=vlmcs-hurd-x86-glibc CFLAGS="$CF" LDFLAGS="$LF" allmulti
+
+make clean
+
+sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+cp -af vlmcsd-hurd-x86-glibc /usr/local/sbin/vlmcsd
+cp -af vlmcs-hurd-x86-glibc /usr/local/bin/vlmcs
+
+# Copy man pages
+mkdir -p /usr/local/man/man1 2>/dev/null
+mkdir -p /usr/local/man/man5 2>/dev/null
+mkdir -p /usr/local/man/man8 2>/dev/null
+mkdir -p /usr/local/man/man7 2>/dev/null
+cp -af vlmcs.1 vlmcsdmulti.1 /usr/local/man/man1/
+cp -af vlmcsd.7 /usr/local/man/man7/
+cp -af vlmcsd.8 /usr/local/man/man8/
+cp -af vlmcsd.ini.5 /usr/local/man/man5/
+bzip2 -f -9 /usr/local/man/man5/vlmcsd.ini.5 /usr/local/man/man1/vlmcs.1 /usr/local/man/man1/vlmcsdmulti.1 /usr/local/man/man7/vlmcsd.7 /usr/local/man/man8/vlmcsd.8
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-hurd* vlmcs-* root@ubuntu64.internal:x/binaries/Hurd/intel/
+
--- a/46
+++ b/46
@ -0,0 +1,46 @@
+#!/bin/bash
+
+export VLMCSD_VERSION="svn`svnversion`"
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-Free* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j`nproc`"
+
+export CC=gcc
+CF="-flto=jobserver -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-lresolv -Wl,-z,norelro,--hash-style=gnu,--build-id=none"
+
+export PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x64-glibc
+export CLIENT_NAME=vlmcs-FreeBSD-10.1-x64-glibc
+export MULTI_NAME=vlmcsdmulti-FreeBSD-10.1-x64-glibc
+
+make $MAKEFLAGS CFLAGS="$CF -m64" LDFLAGS="$LF" CAT=2 allmulti
+
+cp -af $PROGRAM_NAME /usr/local/sbin/vlmcsd
+cp -af $CLIENT_NAME /usr/local/bin/vlmcs
+
+export PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x86-glibc
+export CLIENT_NAME=vlmcs-FreeBSD-10.1-x86-glibc
+export MULTI_NAME=vlmcsdmulti-FreeBSD-10.1-x86-glibc
+
+make $MAKEFLAGS CFLAGS="$CF -m32" LDFLAGS="$LF" CAT=2 allmulti
+
+sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+# Copy man pages
+mkdir -p /usr/local/man/man1 2>/dev/null
+mkdir -p /usr/local/man/man5 2>/dev/null
+mkdir -p /usr/local/man/man8 2>/dev/null
+mkdir -p /usr/local/man/man7 2>/dev/null
+cp -af vlmcs.1 vlmcsdmulti.1 /usr/local/man/man1/
+cp -af vlmcsd.7 /usr/local/man/man7/
+cp -af vlmcsd.8 /usr/local/man/man8/
+cp -af vlmcsd.ini.5 /usr/local/man/man5/
+bzip2 -f -9 /usr/local/man/man5/vlmcsd.ini.5 /usr/local/man/man1/vlmcs.1 /usr/local/man/man1/vlmcsdmulti.1 /usr/local/man/man7/vlmcsd.7 /usr/local/man/man8/vlmcsd.8
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-Free* vlmcs-* root@ubuntu64.internal:x/binaries/FreeBSD/intel/
+
--- a/2821
+++ b/2821
--- a/23
+++ b/23
@ -0,0 +1,23 @@
+#!/bin/sh
+
+export VLMCSD_VERSION=svn$(ssh root@ubuntu64.internal "cd x; svnversion")
+scp -p make_minix root@ubuntu64.internal:x
+scp -pr root@ubuntu64.internal:x/* .
+
+
+# Compile vlmcsd binaries for Minix 3
+
+SUFFIX=-minix-$(uname -r)-x86
+export CC=clang
+export CFLAGS="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+export LDFLAGS="-Wl,--hash-style=sysv -Wl,-z,norelro -Wl,--build-id=none"
+export PROGRAM_NAME=vlmcsd$SUFFIX
+export CLIENT_NAME=vlmcs$SUFFIX
+export MULTI_NAME=vlmcsdmulti$SUFFIX
+
+gmake clean
+gmake -B allmulti
+
+strip -s --strip-unneeded --remove-section .eh_frame_hdr --remove-section .eh_frame --remove-section .ident --remove-section .note.minix.ident --remove-section .note.netbsd.pax --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag *$SUFFIX
+
+scp -p *$SUFFIX root@ubuntu64.internal:x/binaries/Minix/intel/
--- a/122
+++ b/122
@ -0,0 +1,122 @@
+#!/bin/bash
+
+export VLMCSD_VERSION="svn`svnversion`"
+SMALLCC="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+SMALLLD="-pipe -Wl,--hash-style=sysv -Wl,-z,norelro -Wl,--build-id=none"
+SMALL="$SMALLCC $SMALLLD"
+
+rm -f vlmcsd vlmcs vlmcsdmulti vlmcsd-s390* vlmcsd-sparc64* vlmcsd-mips64* vlmcs-* vlmcsdmulti-*
+
+## IBM S/390
+
+export CFLAGS="$SMALLCC"
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -m31 -mesa -mpacked-stack -msmall-exec"
+export LDFLAGS="$SMALLLD -Wl,--hash-style=gnu"
+export THREADS=0
+export FEATURES=full
+export CC=s390x-linux-gnu-gcc
+export VERBOSE=3
+
+export MULTI_NAME=vlmcsdmulti-s390-glibc
+export CLIENT_NAME=vlmcs-s390-glibc
+export PROGRAM_NAME=vlmcsd-s390-glibc
+
+make -B -j`nproc` allmulti
+
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -m64 -mzarch -mpacked-stack -msmall-exec"
+export MULTI_NAME=vlmcsdmulti-s390x-glibc
+export CLIENT_NAME=vlmcs-s390x-glibc
+export PROGRAM_NAME=vlmcsd-s390x-glibc
+
+make -B -j`nproc` allmulti
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+
+
+## SPARC64
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mcpu=v7"
+export LDFLAGS="$SMALLLD"
+export CC=sparc64-linux-gnu-gcc
+
+export MULTI_NAME=vlmcsdmulti-sparc64v9-glibc
+export CLIENT_NAME=vlmcs-sparc64v9-glibc
+export PROGRAM_NAME=vlmcsd-sparc64v9-glibc
+
+make -B -j`nproc` allmulti
+
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+
+
+## MIPS64 BIG-ENDIAN
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mips64 -mno-mips16"
+export LDFLAGS="$SMALLLD"
+export CC=mips64-linux-gnuabi64-gcc
+
+export MULTI_NAME=vlmcsdmulti-mips64-glibc
+export CLIENT_NAME=vlmcs-mips64-glibc
+export PROGRAM_NAME=vlmcsd-mips64-glibc
+
+make -B -j`nproc` allmulti
+
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mips64 -mmicromips"
+export MULTI_NAME=vlmcsdmulti-mips64mm-glibc
+export CLIENT_NAME=vlmcs-mips64mm-glibc
+export PROGRAM_NAME=vlmcsd-mips64mm-glibc
+
+make -B -j`nproc` allmulti
+
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+
+## MIPS64 LITTLE-ENDIAN
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mips64 -mno-mips16"
+export LDFLAGS="$SMALLLD"
+export CC=mips64el-linux-gnuabi64-gcc
+
+export MULTI_NAME=vlmcsdmulti-mips64el-glibc
+export CLIENT_NAME=vlmcs-mips64el-glibc
+export PROGRAM_NAME=vlmcsd-mips64el-glibc
+
+make -B -j`nproc` allmulti
+
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mips64 -mmicromips"
+export MULTI_NAME=vlmcsdmulti-mips64elmm-glibc
+export CLIENT_NAME=vlmcs-mips64elmm-glibc
+export PROGRAM_NAME=vlmcsd-mips64elmm-glibc
+
+make -B -j`nproc` allmulti
+
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+
+
+if [ "$1" == "nocopy" ]; then
+  exit 0
+fi
+
+mkdir -p /usr/local/man/man1 2>/dev/null
+mkdir -p /usr/local/man/man5 2>/dev/null
+mkdir -p /usr/local/man/man8 2>/dev/null
+mkdir -p /usr/local/man/man7 2>/dev/null
+cp -a vlmcs.1 vlmcsdmulti.1 /usr/local/man/man1/
+cp -a vlmcsd.7 /usr/local/man/man7/
+cp -a vlmcsd.8 /usr/local/man/man8/
+cp -a vlmcsd.ini.5 /usr/local/man/man5/
+pbzip2 -f -9 /usr/local/man/man5/vlmcsd.ini.5 /usr/local/man/man1/vlmcs.1 /usr/local/man/man1/vlmcsdmulti.1 /usr/local/man/man7/vlmcsd.7 /usr/local/man/man8/vlmcsd.8
+
+scp -p vlmcsdmulti-s390-glibc vlmcs-s390-glibc vlmcsd-s390-glibc vlmcsdmulti-s390x-glibc vlmcs-s390x-glibc vlmcsd-s390x-glibc ubuntu64.internal:x/binaries/Linux/s390/glibc
+scp -p vlmcsdmulti-sparc64v9-glibc vlmcs-sparc64v9-glibc vlmcsd-sparc64v9-glibc ubuntu64.internal:x/binaries/Linux/sparc/glibc
+scp -p vlmcsdmulti-mips64-glibc vlmcs-mips64-glibc vlmcsd-mips64-glibc vlmcsdmulti-mips64mm-glibc vlmcs-mips64mm-glibc vlmcsd-mips64mm-glibc ubuntu64.internal:x/binaries/Linux/mips/big-endian/glibc
+scp -p vlmcsdmulti-mips64el-glibc vlmcs-mips64el-glibc vlmcsd-mips64el-glibc vlmcsdmulti-mips64elmm-glibc vlmcs-mips64elmm-glibc vlmcsd-mips64elmm-glibc ubuntu64.internal:x/binaries/Linux/mips/little-endian/glibc
+scp -p -P 2222 vlmcsdmulti-s390-glibc vlmcs-s390-glibc vlmcsd-s390-glibc vlmcsdmulti-s390x-glibc vlmcs-s390x-glibc vlmcsd-s390x-glibc s390:vlmcsd
+scp -p -P 2222 vlmcsdmulti-s390-glibc vlmcsdmulti-s390x-glibc s390:/usr/local/sbin
--- a/34
+++ b/34
@ -0,0 +1,34 @@
+#!/usr/pkg/bin/bash
+
+export VLMCSD_VERSION="svn`svnversion`"
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-NetBSD* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+gmake clean
+
+MAKEFLAGS="-B -j12"
+REUSEOBJFLAGS="-j12"
+
+CF="-flto=12 -static-libgcc -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CF45="-flto=12 -static-libgcc -pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-Wl,-z,norelro -Wl,--hash-style=sysv -Wl,--build-id=none"
+LFCLANG="-Wl,-z,norelro -Wl,--hash-style=sysv"
+
+gmake $MAKEFLAGS CC=/usr/pkg/gcc5/bin/gcc PROGRAM_NAME=vlmcsd-NetBSD-x64 CLIENT_NAME=vlmcs-NetBSD-x64 MULTI_NAME=vlmcsdmulti-NetBSD-x64 allmulti CFLAGS="$CF" LDFLAGS="$LF"
+
+gmake allmulti CC=gcc $MAKEFLAGS CAT=2 MULTI_NAME=vlmcsdmulti-NetBSD-x86 PROGRAM_NAME=vlmcsd-NetBSD-x86 CLIENT_NAME=vlmcs-NetBSD-x86 CFLAGS="$CF45 -m32" LDFLAGS="$LF"
+
+#gmake $MAKEFLAGS CC=clang PROGRAM_NAME=vlmcsd-NetBSD-x64-clang CLIENT_NAME=vlmcs-NetBSD-x64-clang CFLAGS="$CFCLANG" LDFLAGS="$LFCLANG"
+
+rm *.o
+
+strip -s --strip-unneeded -R .ident -R .got -R .note.netbsd.pax -R .gnu.version -R .eh_frame -R .note.gnu.gold-version -R .comment -R .note -R .note.gnu.build-id -R .note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
+#sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+cp -af vlmcsd-NetBSD-x86 /usr/local/sbin/vlmcsd
+cp -af vlmcs-NetBSD-x86 /usr/local/bin/vlmcs
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-Net* vlmcs-* root@ubuntu64:x/binaries/NetBSD/intel/
--- a/34
+++ b/34
@ -0,0 +1,34 @@
+#!/usr/local/bin/bash
+
+export VLMCSD_VERSION="svn`svnversion`"
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-Open* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j12"
+REUSEOBJFLAGS="-j12"
+
+CF="-static-libgcc -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CF45="-static-libgcc -pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-Wl,-z,norelro"
+LFCLANG="-Wl,-z,norelro"
+
+gmake -Bj12 allmulti $MAKEFLAGS CC=egcc MULTI_NAME=vlmcsdmulti-OpenBSD-x64 PROGRAM_NAME=vlmcsd-OpenBSD-x64 CLIENT_NAME=vlmcs-OpenBSD-x64 CFLAGS="$CF" LDFLAGS="$LF"
+
+#gmake allmulti $MAKEFLAGS CAT=2 MULTI_NAME=vlmcsdmulti-OpenBSD-x86 PROGRAM_NAME=vlmcsd-OpenBSD-x86 CLIENT_NAME=vlmcs-OpenBSD-x86 CFLAGS="$CF45 -m32" LDFLAGS="$LF"
+
+#gmake $MAKEFLAGS CC=clang PROGRAM_NAME=vlmcsd-OpenBSD-x64-clang CLIENT_NAME=vlmcs-OpenBSD-x64-clang CFLAGS="$CFCLANG" LDFLAGS="$LFCLANG"
+
+rm *.o
+
+strip -s --strip-unneeded --remove-section=.eh_frame_hdr --remove-section=.eh_frame --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
+#sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+cp -f vlmcsd-OpenBSD-x64 /usr/local/sbin/vlmcsd
+cp -f vlmcs-OpenBSD-x64 /usr/local/bin/vlmcs
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-Open* vlmcs-* root@ubuntu64:x/binaries/OpenBSD/intel/
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`Subproject commit 96200e41ef8b25388b2fa0f78c29133424b2c425`
				`@ -1 +0,0 @@`
				`Subproject commit 4195d04f687973a514e3fb663bd87161afd46697`