update vkd3d-proton

lsteamclient: Generate SteamWorks SDK 1.62 support.
configure.sh: Detect non-silenced podman-docker.
2025-07-27 23:51:56 +03:00 · 2025-06-05 19:21:08 +03:00 · 2025-03-20 18:48:22 +02:00 · 2025-03-20 18:47:59 +02:00 · 2025-02-25 14:40:18 -06:00 · 2025-01-31 10:56:55 -06:00
1253 changed files with 492612 additions and 246187 deletions
--- a/.github/ISSUE_TEMPLATE/compatibility-report.md
+++ b/.github/ISSUE_TEMPLATE/compatibility-report.md
@ -39,7 +39,7 @@ attach the generated $HOME/steam-$APPID.log to this issue report as a file.
 4. Please copy it to your clipboard by pressing `Ctrl+A` and then `Ctrl+C`.
   Then paste it in a [Gist](https://gist.github.com/) and post the link in
   this issue.
-5. Also, please copy the contents of `Help` > `Steam Runtime Information` to
+5. Also, please copy the contents of `Help` > `Steam Runtime Diagnostics` to
   the gist.
 6. Please search for open issues and pull requests by the name of the game and
   find out whether they are relevant and should be referenced above.
--- a/.gitmodules
+++ b/.gitmodules
@ -3,7 +3,7 @@
 	url = ../wine
 [submodule "dxvk"]
 	path = dxvk
-	url = ../dxvk
+	url = https://github.com/doitsujin/dxvk.git
 [submodule "openvr"]
 	path = openvr
 	url = https://github.com/ValveSoftware/openvr
--- a/29
+++ b/29
@ -129,6 +129,7 @@ proton: configure
 	echo "Proton built locally. Use 'install', 'deploy' or 'redist' targets."

 install: configure
+	rm -rf $(STEAM_DIR)/compatibilitytools.d/$(_build_name)/files/ #remove proton's internal files, but preserve user_settings etc from top-level
 	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) install
 	echo "Proton installed to your local Steam installation"

@ -169,8 +170,8 @@ any $(CONTAINERGOALS): configure
 dxvk: | $(BUILD_ROOT)/dxvk/lib/wine/dxvk
 dxvk: | $(BUILD_ROOT)/dxvk/lib64/wine/dxvk
 dxvk: any
-	cp -f $(BUILD_DIR)/dist/dist/lib/wine/dxvk/*.dll $(BUILD_ROOT)/dxvk/lib/wine/dxvk/ && \
-	cp -f $(BUILD_DIR)/dist/dist/lib64/wine/dxvk/*.dll $(BUILD_ROOT)/dxvk/lib64/wine/dxvk/
+	cp -f $(BUILD_DIR)/dist/files/lib/wine/dxvk/*.dll $(BUILD_ROOT)/dxvk/lib/wine/dxvk/ && \
+	cp -f $(BUILD_DIR)/dist/files/lib64/wine/dxvk/*.dll $(BUILD_ROOT)/dxvk/lib64/wine/dxvk/

 dxvk-nvapi: | $(BUILD_ROOT)/dxvk-nvapi/lib/wine/nvapi
 dxvk-nvapi: | $(BUILD_ROOT)/dxvk-nvapi/lib64/wine/nvapi
@ -181,34 +182,34 @@ dxvk-nvapi: any
 vkd3d-proton: | $(BUILD_ROOT)/vkd3d-proton/lib/wine/vkd3d-proton
 vkd3d-proton: | $(BUILD_ROOT)/vkd3d-proton/lib64/wine/vkd3d-proton
 vkd3d-proton: any
-	cp -f $(BUILD_DIR)/dist/dist/lib/wine/vkd3d-proton/*.dll $(BUILD_ROOT)/vkd3d-proton/lib/wine/vkd3d-proton/ && \
-	cp -f $(BUILD_DIR)/dist/dist/lib64/wine/vkd3d-proton/*.dll $(BUILD_ROOT)/vkd3d-proton/lib64/wine/vkd3d-proton/
+	cp -f $(BUILD_DIR)/dist/files/lib/wine/vkd3d-proton/*.dll $(BUILD_ROOT)/vkd3d-proton/lib/wine/vkd3d-proton/ && \
+	cp -f $(BUILD_DIR)/dist/files/lib64/wine/vkd3d-proton/*.dll $(BUILD_ROOT)/vkd3d-proton/lib64/wine/vkd3d-proton/

 lsteamclient: | $(BUILD_ROOT)/lsteamclient/lib/wine/i386-windows
 lsteamclient: | $(BUILD_ROOT)/lsteamclient/lib/wine/i386-unix
 lsteamclient: | $(BUILD_ROOT)/lsteamclient/lib64/wine/x86_64-windows
 lsteamclient: | $(BUILD_ROOT)/lsteamclient/lib64/wine/x86_64-unix
 lsteamclient: any
-	cp -f $(BUILD_DIR)/dist/dist/lib/wine/i386-windows/lsteamclient.dll $(BUILD_ROOT)/lsteamclient/lib/wine/i386-windows/ && \
-	cp -f $(BUILD_DIR)/dist/dist/lib/wine/i386-unix/lsteamclient.dll.so $(BUILD_ROOT)/lsteamclient/lib/wine/i386-unix/ && \
-	cp -f $(BUILD_DIR)/dist/dist/lib64/wine/x86_64-windows/lsteamclient.dll $(BUILD_ROOT)/lsteamclient/lib64/wine/x86_64-windows/ && \
-	cp -f $(BUILD_DIR)/dist/dist/lib64/wine/x86_64-unix/lsteamclient.dll.so $(BUILD_ROOT)/lsteamclient/lib64/wine/x86_64-unix/
+	cp -f $(BUILD_DIR)/dist/files/lib/wine/i386-windows/lsteamclient.dll $(BUILD_ROOT)/lsteamclient/lib/wine/i386-windows/ && \
+	cp -f $(BUILD_DIR)/dist/files/lib/wine/i386-unix/lsteamclient.dll.so $(BUILD_ROOT)/lsteamclient/lib/wine/i386-unix/ && \
+	cp -f $(BUILD_DIR)/dist/files/lib64/wine/x86_64-windows/lsteamclient.dll $(BUILD_ROOT)/lsteamclient/lib64/wine/x86_64-windows/ && \
+	cp -f $(BUILD_DIR)/dist/files/lib64/wine/x86_64-unix/lsteamclient.dll.so $(BUILD_ROOT)/lsteamclient/lib64/wine/x86_64-unix/

 vrclient: | $(BUILD_ROOT)/vrclient/lib/wine/i386-windows
 vrclient: | $(BUILD_ROOT)/vrclient/lib/wine/i386-unix
 vrclient: | $(BUILD_ROOT)/vrclient/lib64/wine/x86_64-windows
 vrclient: | $(BUILD_ROOT)/vrclient/lib64/wine/x86_64-unix
 vrclient: any
-	cp -f $(BUILD_DIR)/dist/dist/lib/wine/i386-windows/vrclient.dll $(BUILD_ROOT)/vrclient/lib/wine/i386-windows/ && \
-	cp -f $(BUILD_DIR)/dist/dist/lib/wine/i386-unix/vrclient.dll.so $(BUILD_ROOT)/vrclient/lib/wine/i386-unix/ && \
-	cp -f $(BUILD_DIR)/dist/dist/lib64/wine/x86_64-windows/vrclient_x64.dll $(BUILD_ROOT)/vrclient/lib64/wine/x86_64-windows/ && \
-	cp -f $(BUILD_DIR)/dist/dist/lib64/wine/x86_64-unix/vrclient_x64.dll.so $(BUILD_ROOT)/vrclient/lib64/wine/x86_64-unix/
+	cp -f $(BUILD_DIR)/dist/files/lib/wine/i386-windows/vrclient.dll $(BUILD_ROOT)/vrclient/lib/wine/i386-windows/ && \
+	cp -f $(BUILD_DIR)/dist/files/lib/wine/i386-unix/vrclient.dll.so $(BUILD_ROOT)/vrclient/lib/wine/i386-unix/ && \
+	cp -f $(BUILD_DIR)/dist/files/lib64/wine/x86_64-windows/vrclient_x64.dll $(BUILD_ROOT)/vrclient/lib64/wine/x86_64-windows/ && \
+	cp -f $(BUILD_DIR)/dist/files/lib64/wine/x86_64-unix/vrclient_x64.dll.so $(BUILD_ROOT)/vrclient/lib64/wine/x86_64-unix/

 wineopenxr: | $(BUILD_ROOT)/wineopenxr/lib64/wine/x86_64-windows
 wineopenxr: | $(BUILD_ROOT)/wineopenxr/lib64/wine/x86_64-unix
 wineopenxr: any
-	cp -f $(BUILD_DIR)/dist/dist/lib64/wine/x86_64-windows/wineopenxr.dll $(BUILD_ROOT)/wineopenxr/lib64/wine/x86_64-windows/ && \
-	cp -f $(BUILD_DIR)/dist/dist/lib64/wine/x86_64-unix/wineopenxr.dll.so $(BUILD_ROOT)/wineopenxr/lib64/wine/x86_64-unix/
+	cp -f $(BUILD_DIR)/dist/files/lib64/wine/x86_64-windows/wineopenxr.dll $(BUILD_ROOT)/wineopenxr/lib64/wine/x86_64-windows/ && \
+	cp -f $(BUILD_DIR)/dist/files/lib64/wine/x86_64-unix/wineopenxr.dll.so $(BUILD_ROOT)/wineopenxr/lib64/wine/x86_64-unix/

 battleye: | $(BUILD_ROOT)/battleye/v1/lib/wine/i386-windows
 battleye: | $(BUILD_ROOT)/battleye/v1/lib/wine/i386-unix
--- a/Makefile.in
+++ b/Makefile.in
@ -25,13 +25,17 @@ SHELL := /bin/bash
 #   BUILD_NAME      - Name of the build for manifests etc.
 #   STEAMRT_IMAGE   - Name of the docker image to use for building

-STEAMRT_IMAGE ?= registry.gitlab.steamos.cloud/proton/sniper/sdk:0.20230905.59202-0
+STEAMRT_IMAGE ?= registry.gitlab.steamos.cloud/proton/sniper/sdk:0.20240307.80401-0
 ifeq ($(SRCDIR),)
 	foo := $(error SRCDIR not set, do not include Makefile.in directly, run ./configure.sh to generate Makefile)
 endif

+SOURCE_DATE_EPOCH ?= $(shell date +%s)
+MFLAGS += BASE_SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH)
+unexport SOURCE_DATE_EPOCH
+
 DST_BASE := $(OBJ)/dist
-DST_DIR := $(DST_BASE)/dist
+DST_DIR := $(DST_BASE)/files
 DST_LIBDIR32 := $(DST_DIR)/lib
 DST_LIBDIR64 := $(DST_DIR)/lib64
 DIST_PREFIX := $(DST_DIR)/share/default_pfx/
@ -72,6 +76,9 @@ $(DST_DIR):
 	mkdir -p $@

 ifeq ($(CONTAINER),1) # inside the container
+BASE_SOURCE_DATE_EPOCH32 := $(BASE_SOURCE_DATE_EPOCH)
+BASE_SOURCE_DATE_EPOCH64 := $(shell expr $(BASE_SOURCE_DATE_EPOCH) - 10)
+
 # all, all-dist and dist are basically synonyms
 .PHONY: all all-dist dist
 all: all-dist | $(DST_DIR)
@ -83,11 +90,13 @@ J = $(patsubst -j%,%,$(filter -j%,$(MAKEFLAGS)))
 include $(SRC)/make/utility.mk
 include $(SRC)/make/rules-source.mk
 include $(SRC)/make/rules-common.mk
+include $(SRC)/make/rules-makedep.mk
 include $(SRC)/make/rules-meson.mk
 include $(SRC)/make/rules-cmake.mk
 include $(SRC)/make/rules-autoconf.mk
 include $(SRC)/make/rules-configure.mk
 include $(SRC)/make/rules-winemaker.mk
+include $(SRC)/make/rules-wine-requests.mk
 include $(SRC)/make/rules-cargo.mk


@ -179,6 +188,7 @@ $(eval $(call rules-meson,gst_base,64))
 ##

 GST_GOOD_MESON_ARGS := \
+	-Dapetag=enabled \
 	-Dauto_features=disabled \
 	-Daudioparsers=enabled \
 	-Dautodetect=enabled \
@ -203,6 +213,22 @@ $(eval $(call rules-source,gst_good,$(SRCDIR)/gstreamer/subprojects/gst-plugins-
 $(eval $(call rules-meson,gst_good,32))
 $(eval $(call rules-meson,gst_good,64))

+##
+## gst-plugins-bad
+##
+
+GST_BAD_MESON_ARGS := \
+	-Dauto_features=disabled \
+	-Dvideoparsers=enabled \
+	-Dhls=enabled \
+	-Dmpegtsdemux=enabled
+
+GST_BAD_DEPENDS = gst_orc gstreamer gst_base
+
+$(eval $(call rules-source,gst_bad,$(SRCDIR)/gstreamer/subprojects/gst-plugins-bad/))
+$(eval $(call rules-meson,gst_bad,32))
+$(eval $(call rules-meson,gst_bad,64))
+
 ##
 ## FFmpeg
 ##
@ -213,6 +239,7 @@ FFMPEG_CONFIGURE_ARGS := \
 	--disable-everything \
 	--disable-programs \
 	--disable-doc \
+	--disable-inline-asm \

 $(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg))
 $(eval $(call rules-configure,ffmpeg,32))
@ -277,21 +304,6 @@ $(eval $(call rules-cmake,spirv-headers,32,CROSS))
 $(eval $(call rules-cmake,spirv-headers,64,CROSS))


-##
-## Vulkan-Loader
-##
-
-VULKAN_LOADER_CMAKE_ARGS = -DUSE_MASM=OFF
-VULKAN_LOADER_CMAKE_ARGS64 = -DVULKAN_HEADERS_INSTALL_DIR=$(VULKAN_HEADERS_DST64)
-VULKAN_LOADER_CMAKE_ARGS32 = -DVULKAN_HEADERS_INSTALL_DIR=$(VULKAN_HEADERS_DST32)
-VULKAN_LOADER_CFLAGS = -DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00 # 0x0A00 is _WIN32_WINNT_WIN10
-VULKAN_LOADER_DEPENDS = vulkan-headers spirv-headers
-
-$(eval $(call rules-source,vulkan-loader,$(SRCDIR)/Vulkan-Loader))
-$(eval $(call rules-cmake,vulkan-loader,32,CROSS))
-$(eval $(call rules-cmake,vulkan-loader,64,CROSS))
-
-
 ##
 ## glslang
 ##
@ -305,24 +317,14 @@ $(eval $(call rules-cmake,glslang,64))
 ## lsteamclient
 ##

-LSTEAMCLIENT_CFLAGS = -Wno-attributes
-LSTEAMCLIENT_CXXFLAGS = -Wno-attributes
-LSTEAMCLIENT_LDFLAGS = -static-libgcc -static-libstdc++ -ldl
-
-LSTEAMCLIENT_WINEMAKER_ARGS = \
-	-DSTEAM_API_EXPORTS \
-	-Dprivate=public \
-	-Dprotected=public
-
 LSTEAMCLIENT_DEPENDS = wine
+LSTEAMCLIENT_LDFLAGS = -static-libgcc -static-libstdc++

 $(eval $(call rules-source,lsteamclient,$(SRCDIR)/lsteamclient))
-$(eval $(call rules-winemaker,lsteamclient,32,lsteamclient.dll))
-$(eval $(call rules-winemaker,lsteamclient,64,lsteamclient.dll))
+$(eval $(call rules-makedep,lsteamclient,32))
+$(eval $(call rules-makedep,lsteamclient,64))


-##
-
 ##
 ## openxr
 ## Note 32-bit is not supported by SteamVR, so we don't build it.
@ -340,13 +342,11 @@ $(eval $(call rules-cmake,openxr,64))
 ## Note 32-bit is not supported by SteamVR, so we don't build it.
 ##

-WINEOPENXR_LDFLAGS = -lopenxr_loader -ldxgi -lvulkan -ldl
-
+WINEOPENXR_LDFLAGS = -lopenxr_loader
 WINEOPENXR_DEPENDS = wine openxr

 $(eval $(call rules-source,wineopenxr,$(SRCDIR)/wineopenxr))
-# $(eval $(call rules-winemaker,wineopenxr,32,wineopenxr.dll))
-$(eval $(call rules-winemaker,wineopenxr,64,wineopenxr.dll))
+$(eval $(call rules-makedep,wineopenxr,64))

 DIST_WINEOPENXR_JSON64 := $(DIST_PREFIX)/drive_c/openxr/wineopenxr64.json
 $(WINEOPENXR_SRC)/wineopenxr64.json: wineopenxr
@ -361,27 +361,27 @@ all-dist: $(DIST_WINEOPENXR_JSON64)
 ## steam.exe
 ##

-STEAMEXE_CFLAGS = -Wno-attributes
-STEAMEXE_CXXFLAGS = -Wno-attributes
-STEAMEXE_LDFLAGS = -L$(STEAMEXE_SRC)/32/ -L$(STEAMEXE_SRC)/64/ -lsteam_api -lshlwapi -lmsi -lole32 -ldl -static-libgcc -static-libstdc++
+STEAMEXE_CPPFLAGS = \
+	-I$(SRC)/lsteamclient/steamworks_sdk_142/ \
+	-I$(SRC)/openvr/headers/ \

-STEAMEXE_WINEMAKER_ARGS = \
-	"-I$(SRC)/lsteamclient/steamworks_sdk_142/" \
-	"-I$(SRC)/openvr/headers/" \
-	"-L$(SRC)/steam_helper/"
+STEAMEXE_LDFLAGS = \
+	-L$(SRC)/steam_helper/32/ \
+	-L$(SRC)/steam_helper/64/ \
+	-lsteam_api

 STEAMEXE_DEPENDS = wine

 $(eval $(call rules-source,steamexe,$(SRCDIR)/steam_helper))
-$(eval $(call rules-winemaker,steamexe,64,steam.exe))
-$(eval $(call rules-winemaker,steamexe,32,steam.exe))
+$(eval $(call rules-makedep,steamexe,64))
+$(eval $(call rules-makedep,steamexe,32))

 $(OBJ)/.steamexe-post-build32:
-	cp $(STEAMEXE_SRC)/32/libsteam_api.so $(DST_LIBDIR32)/
+	cp $(SRC)/steam_helper/32/libsteam_api.so $(DST_LIBDIR32)/
 	touch $@

 $(OBJ)/.steamexe-post-build64:
-	cp $(STEAMEXE_SRC)/64/libsteam_api.so $(DST_LIBDIR64)/
+	cp $(SRC)/steam_helper/64/libsteam_api.so $(DST_LIBDIR64)/
 	touch $@


@ -402,9 +402,15 @@ WINE_SOURCE_ARGS = \
  --exclude dlls/winevulkan/vulkan_thunks.c \
  --exclude dlls/winevulkan/vulkan_thunks.h \
  --exclude dlls/winevulkan/winevulkan.json \
-  --exclude dlls/winevulkan/winevulkan.spec
+  --exclude dlls/winevulkan/winevulkan.spec \
+  --exclude dlls/ntdll/ntsyscalls.h \
+  --exclude dlls/win32u/win32syscalls.h \
+  --exclude include/wine/server_protocol.h \
+  --exclude server/request.h \
+  --exclude server/trace.c \

 WINE_CONFIGURE_ARGS = \
+  --enable-werror \
  --with-mingw \
  --disable-tests

@ -421,10 +427,11 @@ WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d
 $(eval $(call rules-source,wine,$(SRCDIR)/wine))
 $(eval $(call rules-autoconf,wine,32))
 $(eval $(call rules-autoconf,wine,64))
+$(eval $(call rules-wine-requests,wine))

 $(OBJ)/.wine-post-source:
-	cd $(WINE_SRC) && tools/make_requests
 	cd $(WINE_SRC) && dlls/winevulkan/make_vulkan -x vk.xml
+	-cd $(WINE_SRC) && tools/make_specfiles
 	touch $@

 $(OBJ)/.wine-post-build64:
@ -447,30 +454,25 @@ $(OBJ)/.wine-post-build32:
 ## vrclient
 ##

-VRCLIENT_CFLAGS = -Wno-attributes
-VRCLIENT_CXXFLAGS = -Wno-attributes
-VRCLIENT_LDFLAGS = -static-libgcc -static-libstdc++ -ldl
-
-VRCLIENT_WINEMAKER_ARGS = \
-	"-I$(VRCLIENT_SRC)/" \
-	"-I$(VRCLIENT_SRC)/vrclient_x64/"
-
-VRCLIENT_DEPENDS = wine
+VRCLIENT_LDFLAGS = -static-libgcc -static-libstdc++
+VRCLIENT_DEPENDS = vulkan-headers wine

 $(eval $(call rules-source,vrclient,$(SRCDIR)/vrclient_x64))
-$(eval $(call rules-winemaker,vrclient,32,vrclient.dll))
-$(eval $(call rules-winemaker,vrclient,64,vrclient_x64.dll))
-
-$(OBJ)/.vrclient-post-source:
-	mkdir -p $(VRCLIENT_OBJ32) && cp -a $(VRCLIENT_SRC)/vrclient_x64/vrclient_x64.spec $(VRCLIENT_OBJ32)/vrclient.spec
-	mkdir -p $(VRCLIENT_OBJ64) && cp -a $(VRCLIENT_SRC)/vrclient_x64/vrclient_x64.spec $(VRCLIENT_OBJ64)/vrclient_x64.spec
-	touch $@
+$(eval $(call rules-makedep,vrclient,32))
+$(eval $(call rules-makedep,vrclient,64))


 ##
 ## dxvk
 ##

+# wine builds DLLs with the same names, we need to differentiate the timestamps
+DXVK_SOURCE_DATE_EPOCH32 := $(shell expr $(BASE_SOURCE_DATE_EPOCH32) - 1)
+DXVK_SOURCE_DATE_EPOCH64 := $(shell expr $(BASE_SOURCE_DATE_EPOCH64) - 1)
+
+DXVK_SOURCE_ARGS = \
+  --exclude version.h.in \
+
 DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
 DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
 DXVK_DEPENDS = glslang
@ -540,9 +542,13 @@ VKD3D_CONFIGURE_ARGS = \
  --disable-tests \
  --disable-demos \
  --without-ncurses \
+  SONAME_LIBVULKAN=vulkan-1 \

+# LTO is enabled by default, but causes the build to fail. I havent't
+# investigated this yet.
+VKD3D_CFLAGS = -fno-lto
 VKD3D_LDFLAGS = -static-libgcc $(CROSSLDFLAGS)
-VKD3D_DEPENDS = vulkan-loader vulkan-headers spirv-headers
+VKD3D_DEPENDS = vulkan-headers spirv-headers

 $(eval $(call rules-source,vkd3d,$(SRCDIR)/vkd3d))
 $(eval $(call rules-autoconf,vkd3d,32,CROSS))
@ -564,6 +570,10 @@ $(OBJ)/.vkd3d-post-build32:
 ## vkd3d-proton
 ##

+# wine builds DLLs with the same names, we need to differentiate the timestamps
+VKD3D_PROTON_SOURCE_DATE_EPOCH32 := $(shell expr $(BASE_SOURCE_DATE_EPOCH32) - 2)
+VKD3D_PROTON_SOURCE_DATE_EPOCH64 := $(shell expr $(BASE_SOURCE_DATE_EPOCH64) - 2)
+
 VKD3D_PROTON_SOURCE_ARGS = \
  --exclude vkd3d_build.h.in \
  --exclude vkd3d_version.h.in \
@ -599,27 +609,6 @@ $(OBJ)/.vkd3d-proton-post-build64:



-##
-## mediaconv
-##
-
-MEDIACONV_DEPENDS = gst_orc gstreamer gst_base
-
-$(eval $(call rules-source,mediaconv,$(SRCDIR)/media-converter))
-$(eval $(call rules-cargo,mediaconv,32))
-$(eval $(call rules-cargo,mediaconv,64))
-
-$(OBJ)/.mediaconv-post-build64:
-	mkdir -p $(MEDIACONV_DST64)/lib64/gstreamer-1.0/
-	cp -a $(MEDIACONV_OBJ64)/x86_64-unknown-linux-gnu/release/libprotonmediaconverter.so $(MEDIACONV_DST64)/lib64/gstreamer-1.0/
-	touch $@
-
-$(OBJ)/.mediaconv-post-build32:
-	mkdir -p $(MEDIACONV_DST32)/lib/gstreamer-1.0/
-	cp -a $(MEDIACONV_OBJ32)/i686-unknown-linux-gnu/release/libprotonmediaconverter.so $(MEDIACONV_DST32)/lib/gstreamer-1.0/
-	touch $@
-
-
 ##
 ## BattlEye Bridge
 ##
@ -692,23 +681,6 @@ $(OBJ)/.eac-build32:

 endif

-# HACK: we need to order those builds so that timestamps are different between
-# 32 and 64 bit versions of the dlls. Otherwise there's a significant chance for
-# conflict when creating symbol storage. We also have to make sure that projects
-# which build alternative versions of the DLLs do not share the same timestamps.
-#
-# This is a temporary solution that only lowers the chance of conflicts.
-# Binutils 2.42 (not released yet at the time of writing this) will introduce
-# support for SOURCE_DATE_EPOCH which we should use instead.
-$(OBJ)/.wine-build64: $(OBJ)/.wine-build32
-$(OBJ)/.vkd3d-proton-build32: $(OBJ)/.wine-build64
-$(OBJ)/.vkd3d-proton-build64: $(OBJ)/.vkd3d-proton-build32
-$(OBJ)/.dxvk-build32: $(OBJ)/.wine-build64
-$(OBJ)/.dxvk-build64: $(OBJ)/.dxvk-build32
-$(OBJ)/.dxvk-lsteamclient64: $(OBJ)/.dxvk-lsteamclient32
-$(OBJ)/.vkd3d-build64: $(OBJ)/.vkd3d-build32
-# nvapi and vrclient dlls have distinct names for 64 bit versions
-
 ##
 ## Windows Symbol Store creation
 ##
@ -730,6 +702,18 @@ symstore-tarball:
 	$(SYMSTORE_OBJ64)/symstore --skip-managed $(DST_BASE) $(OBJ)/symstore/$(BUILD_NAME)
 	cd $(OBJ)/symstore/$(BUILD_NAME) && zip -r ../$(BUILD_NAME)-symstore.zip . >& /dev/null

+##
+## Media
+##
+
+DIST_MEDIA := $(DST_DIR)/share/media
+$(DIST_MEDIA):
+	mkdir -p $@
+	cp $(SRCDIR)/media/blank.mkv $@
+	cp $(SRCDIR)/media/blank.ptna $@
+
+all-dist: $(DIST_MEDIA)
+
 ##
 ## Fonts
 ##
@ -943,7 +927,7 @@ all-dist: $(DIST_FONTS)
 ## Gecko
 ##

-GECKO_VER := 2.47.3
+GECKO_VER := 2.47.4
 GECKO32_TARBALL := wine-gecko-$(GECKO_VER)-x86.tar.xz
 GECKO64_TARBALL := wine-gecko-$(GECKO_VER)-x86_64.tar.xz
 GECKO64_TARBALL_URL := https://dl.winehq.org/wine/wine-gecko/$(GECKO_VER)/$(GECKO64_TARBALL)
@ -954,11 +938,11 @@ DIST_GECKO64 := $(OBJ)/.gecko-dist64

 $(SRC)/contrib/$(GECKO64_TARBALL):
 	mkdir -p $(dir $@)
-	wget -O $@ $(GECKO64_TARBALL_URL)
+	wget --no-use-server-timestamps -O $@ $(GECKO64_TARBALL_URL) || (rm $@; false)

 $(SRC)/contrib/$(GECKO32_TARBALL):
 	mkdir -p $(dir $@)
-	wget -O $@ $(GECKO32_TARBALL_URL)
+	wget --no-use-server-timestamps -O $@ $(GECKO32_TARBALL_URL) || (rm $@; false)

 $(DIST_GECKO32): $(SRC)/contrib/$(GECKO32_TARBALL)
 	mkdir -p $(DIST_GECKO_DIR)
@ -979,7 +963,7 @@ all-dist: $(DIST_GECKO32) $(DIST_GECKO64)
 ## wine-mono
 ##

-WINEMONO_VER := 8.1.0
+WINEMONO_VER := 9.3.1
 WINEMONO_TARBALL := wine-mono-$(WINEMONO_VER)-x86.tar.xz
 DIST_WINEMONO_DIR := $(DST_DIR)/share/wine/mono
 DIST_WINEMONO := $(OBJ)/.wine-mono-dist
@ -987,7 +971,7 @@ MONO_TARBALL_URL := https://github.com/madewokherd/wine-mono/releases/download/w

 $(SRC)/contrib/$(WINEMONO_TARBALL):
 	mkdir -p $(dir $@)
-	wget -O $@ $(MONO_TARBALL_URL)
+	wget --no-use-server-timestamps -O $@ $(MONO_TARBALL_URL) || (rm $@; false)

 $(DIST_WINEMONO): $(SRC)/contrib/$(WINEMONO_TARBALL)
 	mkdir -p $(DIST_WINEMONO_DIR)
@ -998,6 +982,56 @@ $(DIST_WINEMONO): $(SRC)/contrib/$(WINEMONO_TARBALL)
 all-dist: $(DIST_WINEMONO)


+##
+## xalia
+##
+
+XALIA_VER := 0.4.4
+XALIA_ZIP := xalia-$(XALIA_VER)-net48-mono.zip
+DIST_XALIA_DIR := $(DST_DIR)/share/xalia
+DIST_XALIA := $(OBJ)/.xalia-dist
+XALIA_ZIP_URL := https://github.com/madewokherd/xalia/releases/download/xalia-$(XALIA_VER)/$(XALIA_ZIP)
+
+$(SRC)/contrib/$(XALIA_ZIP):
+	mkdir -p $(dir $@)
+	wget --no-use-server-timestamps -O $@ $(XALIA_ZIP_URL) || (rm $@; false)
+
+$(DIST_XALIA): $(SRC)/contrib/$(XALIA_ZIP)
+	rm -rf $(DIST_XALIA_DIR)
+	mkdir -p $(DIST_XALIA_DIR)
+	unzip $< -d $(DIST_XALIA_DIR)
+	touch $@
+
+all-dist: $(DIST_XALIA)
+
+
+##
+## ICU
+##
+
+ICU_VER := 6.8.2
+DIST_ICU64_DIR := $(DST_DIR)/lib64/icu
+DIST_ICU64 := $(OBJ)/.icu-dist64
+ICU64_TARBALL := icu-$(ICU_VER)-x86_64.tar.xz
+DIST_ICU32_DIR := $(DST_DIR)/lib/icu
+DIST_ICU32 := $(OBJ)/.icu-dist32
+ICU32_TARBALL := icu-$(ICU_VER)-x86.tar.xz
+
+$(DIST_ICU64): $(SRC)/icu/$(ICU64_TARBALL)
+	mkdir -p $(DIST_ICU64_DIR)
+	rm -rf $(DIST_ICU64_DIR)/*.dll
+	tar --no-same-owner -xf $< -C $(DIST_ICU64_DIR)
+	touch $@
+
+$(DIST_ICU32): $(SRC)/icu/$(ICU32_TARBALL)
+	mkdir -p $(DIST_ICU32_DIR)
+	rm -rf $(DIST_ICU32_DIR)/*.dll
+	tar --no-same-owner -xf $< -C $(DIST_ICU32_DIR)
+	touch $@
+
+all-dist: $(DIST_ICU64) $(DIST_ICU32)
+
+
 ##
 ## openvr
 ##
@ -1005,12 +1039,12 @@ all-dist: $(DIST_WINEMONO)
 DIST_OVR32 := $(DST_LIBDIR32)/wine/dxvk/openvr_api_dxvk.dll
 $(DIST_OVR32): $(SRCDIR)/openvr/bin/win32/openvr_api.dll | $(DST_DIR)
 	mkdir -p $(DST_LIBDIR32)/wine/dxvk
-	cp -a $< $@
+	cp -af $< $@

 DIST_OVR64 := $(DST_LIBDIR64)/wine/dxvk/openvr_api_dxvk.dll
 $(DIST_OVR64): $(SRCDIR)/openvr/bin/win64/openvr_api.dll | $(DST_DIR)
 	mkdir -p $(DST_LIBDIR64)/wine/dxvk
-	cp -a $< $@
+	cp -af $< $@

 all-dist: $(DIST_OVR32) $(DIST_OVR64)

@ -1019,7 +1053,7 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
 ## default_pfx
 ##

-default_pfx: wine gst_good gst_libav gst_plugins_rs lsteamclient steamexe vrclient wineopenxr dxvk dxvk-nvapi vkd3d-proton
+default_pfx: wine gst_good gst_bad gst_libav gst_plugins_rs lsteamclient steamexe vrclient wineopenxr dxvk dxvk-nvapi vkd3d-proton
 	find $(DST_LIBDIR32)/wine -type f -execdir chmod a-w '{}' '+'
 	find $(DST_LIBDIR64)/wine -type f -execdir chmod a-w '{}' '+'
 	rm -rf $(abspath $(DIST_PREFIX))
@ -1106,12 +1140,14 @@ all-dist:
 ## make deploy
 ##

+STEAMPIPE_FIXUPS_PY := $(SRCDIR)/steampipe_fixups.py
+
 .PHONY: deploy
 deploy: all
 	mkdir -p $(DEPLOY_DIR) && \
-	rsync --delete --exclude dist --exclude compatibilitytool.vdf -arx $(DST_BASE)/ $(DEPLOY_DIR)
-	tar -C $(DST_DIR) -c . > $(DEPLOY_DIR)/proton_dist.tar
-	@echo "Created deployment archive at "$(DEPLOY_DIR)"/proton_dist.tar"
+	rsync --delete --exclude compatibilitytool.vdf -arx $(DST_BASE)/ $(DEPLOY_DIR)
+	cp -a $(STEAMPIPE_FIXUPS_PY) $(DEPLOY_DIR)
+	python3 $(STEAMPIPE_FIXUPS_PY) process $(DEPLOY_DIR)


 ##
@ -1121,9 +1157,7 @@ deploy: all
 .PHONY: redist
 redist: all
 	mkdir -p $(REDIST_DIR)
-	rsync --delete --exclude dist -arx $(DST_BASE)/ $(REDIST_DIR)
-	tar -C $(DST_DIR) -c . | gzip -c -1 > $(REDIST_DIR)/proton_dist.tar.gz
-	@echo "Created redistribution tarball at "$(REDIST_DIR)"/proton_dist.tar.gz"
+	rsync --delete -arx $(DST_BASE)/ $(REDIST_DIR)


 ##
@ -1191,7 +1225,6 @@ install: all
 	if [ ! -d $(STEAM_DIR) ]; then echo >&2 "!! "$(STEAM_DIR)" does not exist, cannot install"; return 1; fi
 	mkdir -p $(STEAM_DIR)/compatibilitytools.d/$(BUILD_NAME)
 	rsync --delete -arx $(DST_BASE)/* $(STEAM_DIR)/compatibilitytools.d/$(BUILD_NAME)
-	cp -f $(DIST_VERSION) $(STEAM_DIR)/compatibilitytools.d/$(BUILD_NAME)/dist/
 	@echo "Installed Proton to "$(STEAM_DIR)/compatibilitytools.d/$(BUILD_NAME)
 	@echo "You may need to restart Steam to select this tool"

--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 58a00cf85c39ad5ec4dc43a769624e420c06179a
+Subproject commit 8899a91c17ce9618f565f42408b47db1d6e9ccc7
--- a/README.md
+++ b/README.md
@ -218,6 +218,8 @@ need to be explicitly loaded by the debugging tools. For GDB there's a helper
 script `wine/tools/gdbinit.py` (source it) that provides `load-symbol-files`
 (or `lsf` for short) command which loads the symbols for all the mapped files.

+For tips on debugging see [docs/DEBUGGING.md](docs/DEBUGGING.md).
+

 `compile_commands.json`
 -----------------------
@ -284,17 +286,16 @@ the Wine prefix. Removing the option will revert to the previous behavior.
 | :-------------------- | :--------------------------------- | :----------- |
 |                       | `PROTON_LOG`                       | Convenience method for dumping a useful debug log to `$PROTON_LOG_DIR/steam-$APPID.log`. Set to `1` to enable default logging, or set to a string to be appended to the default `WINEDEBUG` channels. |
 |                       | `PROTON_LOG_DIR`                   | Output log files into the directory specified. Defaults to your home directory. |
-|                       | `PROTON_DUMP_DEBUG_COMMANDS`       | When running a game, Proton will write some useful debug scripts for that game into `$PROTON_DEBUG_DIR/proton_$USER/`. |
-|                       | `PROTON_DEBUG_DIR`                 | Root directory for the Proton debug scripts, `/tmp` by default. |
 |                       | `PROTON_WAIT_ATTACH`               | Wait for a debugger to attach to steam.exe before launching the game process. To attach to the game process at startup, debuggers should be set to follow child processes. |
 |                       | `PROTON_CRASH_REPORT_DIR`          | Write crash logs into this directory. Does not clean up old logs, so may eat all your disk space eventually. |
 | `wined3d`             | `PROTON_USE_WINED3D`               | Use OpenGL-based wined3d instead of Vulkan-based DXVK for d3d11, d3d10, and d3d9. |
 | `nod3d11`             | `PROTON_NO_D3D11`                  | Disable `d3d11.dll`, for d3d11 games which can fall back to and run better with d3d9. |
 | `nod3d10`             | `PROTON_NO_D3D10`                  | Disable `d3d10.dll` and `dxgi.dll`, for d3d10 games which can fall back to and run better with d3d9. |
+| `dxvkd3d8`            | `PROTON_DXVK_D3D8`                 | Use DXVK's `d3d8.dll`. |
 | `noesync`             | `PROTON_NO_ESYNC`                  | Do not use eventfd-based in-process synchronization primitives. |
 | `nofsync`             | `PROTON_NO_FSYNC`                  | Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no `FUTEX_WAIT_MULTIPLE` support.) |
 | `noxim`               | `PROTON_NO_XIM`                    | Enabled by default. Do not attempt to use XIM (X Input Methods) support. XIM support is known to cause crashes with libx11 older than version 1.7. |
-| `enablenvapi`         | `PROTON_ENABLE_NVAPI`              | Enable NVIDIA's NVAPI GPU support library. |
+| `disablenvapi`        | `PROTON_DISABLE_NVAPI`             | Disable NVIDIA's NVAPI GPU support library. |
 | `nativevulkanloader`  |                                    | Use the Vulkan loader shipped with the game instead of Proton's built-in Vulkan loader. This breaks VR support, but is required by a few games. |
 | `forcelgadd`          | `PROTON_FORCE_LARGE_ADDRESS_AWARE` | Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. |
 | `heapdelayfree`       | `PROTON_HEAP_DELAY_FREE`           | Delay freeing some memory, to work around application use-after-free bugs. |
@ -308,8 +309,7 @@ the Wine prefix. Removing the option will revert to the previous behavior.
 | `hidenvgpu`           | `PROTON_HIDE_NVIDIA_GPU`           | Force Nvidia GPUs to always be reported as AMD GPUs. Some games require this if they depend on Windows-only Nvidia driver functionality. See also DXVK's nvapiHack config, which only affects reporting from Direct3D. |
 |                       | `WINE_FULLSCREEN_INTEGER_SCALING`  | Enable integer scaling mode, to give sharp pixels when upscaling. |
 | `cmdlineappend:`      |                                    | Append the string after the colon as an argument to the game command. May be specified more than once. Escape commas and backslashes with a backslash. |
-| `nowritewatch`        | `PROTON_NO_WRITE_WATCH`            | Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). |
-| `nosteamffmpeg`       | `PROTON_NO_STEAM_FFMPEG`           | Ignore ffmpeg that ships with Steam. Some videos may not play. |
+| `xalia`               | `PROTON_USE_XALIA`                 | Enable Xalia, a program that can add a gamepad UI for some keyboard/mouse interfaces. |
 | `seccomp`             | `PROTON_USE_SECCOMP`               | **Note: Obsoleted in Proton 5.13.** In older versions, enable seccomp-bpf filter to emulate native syscalls, required for some DRM protections to work. |
 | `d9vk`                | `PROTON_USE_D9VK`                  | **Note: Obsoleted in Proton 5.0.** In older versions, use Vulkan-based DXVK instead of OpenGL-based wined3d for d3d9. |

--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8c1c27d5a9b9de8a17f500053bd08c7ca6bba19c
+Subproject commit 31aa7f634b052d87ede4664053e85f3f4d1d50d3
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 538b2676eaac29565e4f1034a6f8a59ce158213d
--- a/configure.sh
+++ b/configure.sh
@ -64,6 +64,9 @@ check_container_engine() {
    if [[ $inner_uid == *"Permission denied"* ]]; then
        err "The container cannot access files. Are you using SELinux?"
        die "Please read README.md and check your $1 setup works."
+    elif [[ $inner_uid == *"Emulate Docker CLI"* ]]; then
+        err "Detected podman-docker in use without the warning being silenced."
+        die "Please create /etc/containers/nodocker or specify --container-engine=podman."
    elif [ "$inner_uid" -eq 0 ]; then
        # namespace maps the user as root or the build is performed as host's root
        ROOTLESS_CONTAINER=1
--- a/default_pfx.py
+++ b/default_pfx.py
@ -121,10 +121,12 @@ def make_default_pfx(default_pfx_dir, dist_dir):
    local_env = dict(os.environ)

    ld_path = dist_dir + "/lib64:" + dist_dir + "/lib"
+    dll_path = dist_dir + "/lib64/vkd3d:" + dist_dir + "/lib/vkd3d"

    local_env["LD_LIBRARY_PATH"] = ld_path
    local_env["WINEPREFIX"] = default_pfx_dir
    local_env["WINEDEBUG"] = "-all"
+    local_env["WINEDLLPATH"] = dll_path
    runtime_args = []

    subprocess.run(runtime_args + ["/bin/bash", "-c",
--- a/docker/Makefile
+++ b/docker/Makefile
@ -1,4 +1,4 @@
-STEAMRT_VERSION = 0.20230905.59202
+STEAMRT_VERSION = 0.20240307.80401
 STEAMRT_URLBASE = registry.gitlab.steamos.cloud

 PROTONSDK_URLBASE = $(STEAMRT_URLBASE)/proton/sniper/sdk
@ -9,7 +9,7 @@ PROTONSDK_VERSION = $(STEAMRT_VERSION)-0-dev
 # docker caches, so we need something that don't change much
 BASE_IMAGE = $(STEAMRT_URLBASE)/steamrt/sniper/sdk:0.20221017.1

-BINUTILS_VERSION = 2.40
+BINUTILS_VERSION = 2.42
 GCC_VERSION = 10.3.0
 MINGW_VERSION = 9.0.0
 RUST_VERSION = 1.68.0
@ -29,7 +29,7 @@ RUST_SOURCE_x86_64 = rust-$(RUST_VERSION)-x86_64-unknown-linux-gnu.tar.gz
 RUST_SOURCE_i686 = rust-$(RUST_VERSION)-i686-unknown-linux-gnu.tar.gz
 NINJA_SOURCE = ninja-build_$(NINJA_VERSION).orig.tar.gz

-BINUTILS_SHA256 = 0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
+BINUTILS_SHA256 = f6e4d41fd5fc778b06b7891457b3620da5ecea1006c6a4a41ae998109f85a800
 GCC_SHA256 = 64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344
 MINGW_SHA256 = 1929b94b402f5ff4d7d37a9fe88daa9cc55515a6134805c104d1794ae22a4181
 RUST_SHA256_x86_64 = 7be1acdac656d0b0b7e909e5c0d4ddf61c755c203ec26ebafbd306322335b361
--- a/docs/DEBUGGING.md
+++ b/docs/DEBUGGING.md
@ -0,0 +1,186 @@
+Proton Debugging Tips
+=====================
+
+For loading dev builds of games onto a Steam Deck see
+<https://partner.steamgames.com/doc/steamdeck/loadgames>
+
+
+Debug Proton Builds
+-------------------
+
+See [README.md#debugging](../README.md#debugging).
+
+
+Attaching A Debugger
+--------------------
+
+Running GDB and attaching to a running .exe works out of the box:
+
+```
+$ ps | grep Game
+2263566 ?        tsl    0:09 Z:\home\ivyl\.local\share\Steam\steamapps\common\Game\Game.exe
+
+$ gdb
+GNU gdb (GDB) 14.1
+...
+(gdb) attach 2263566
+Attaching to process 2263566
+[New LWP 2263569]
+...
+0x000075dce0cd788d in ?? ()
+```
+
+With Proton Experimental (and >= 9.0-2), GDB should be able to load the symbols right
+away. However, for the most seamless experience you will want to use a
+custom version of GDB with a couple of patches to better integrate with
+Wine.
+
+You can find this fork at https://gitlab.winehq.org/rbernon/binutils-gdb,
+which you can build with `configure && make all-gdb && make install-gdb`.
+Make sure to have python development packages installed, as GDB python
+support will be required.
+
+With this custom GDB you can `source` [Wine's custom unwinder](https://github.com/ValveSoftware/wine/blob/experimental_9.0/tools/gdbunwind.py)
+in your `~/.gdbinit`, and you will get backtraces across PE / unix boundaries.
+
+
+With older Proton you can use `source` [wine's
+gdbinit](https://github.com/ValveSoftware/wine/blob/proton_8.0/tools/gdbinit.py)
+to make `load-symbol-files` command available that uses `/proc/$pid/maps` to
+load the symbols:
+
+
+```
+(gdb) source ~/src/proton/wine/tools/gdbinit.py
+
+(gdb) load-symbol-files
+loading symbols for /home/ivyl/.local/share/Steam/steamapps/common/Proton - Experimental/files/lib64/wine/x86_64-windows/kernelbase.dll
+...
+
+(gdb) bt
+#0  0x000075dce0cd788d in ?? ()
+#1  0x000075dcdf26e842 in futex_wait (timeout=0x0, val=0, addr=0x75dcdd8383e0) at ../src-wine/dlls/ntdll/unix/sync.c:127
+#2  NtWaitForAlertByThreadId (address=<optimized out>, timeout=0x0) at ../src-wine/dlls/ntdll/unix/sync.c:2658
+#3  <signal handler called>
+#4  0x000000017000ebb4 in NtWaitForAlertByThreadId ()
+#5  0x00000001700367f9 in RtlWaitOnAddress (addr=addr@entry=0x4850970, cmp=0x3d12fa9c, cmp@entry=0x3d12fabc, size=size@entry=4, timeout=timeout@entry=0x0) at ../src-wine/dlls/ntdll/sync.c:941
+#6  0x000000017003276a in RtlSleepConditionVariableSRW (variable=0x4850970, lock=0x4850908, timeout=0x0, flags=<optimized out>) at ../src-wine/dlls/ntdll/sync.c:837
+#7  0x000000007b061e41 in SleepConditionVariableSRW (variable=<optimized out>, lock=<optimized out>, timeout=<optimized out>, flags=<optimized out>) at ../src-wine/dlls/kernelbase/sync.c:1064
+#8  0x000000035915c892 in dxvk::condition_variable::wait (lock=..., this=0x4850970) at ../src-dxvk/src/dxvk/../util/log/../thread.h:251
+#9  dxvk::condition_variable::wait<dxvk::DxvkPipelineWorkers::runWorker(dxvk::DxvkPipelinePriority)::<lambda()> > (pred=..., lock=..., this=0x4850970) at ../src-dxvk/src/dxvk/../util/log/../thread.h:257
+#10 dxvk::DxvkPipelineWorkers::runWorker (this=0x48508f0, maxPriority=dxvk::DxvkPipelinePriority::Normal) at ../src-dxvk/src/dxvk/dxvk_pipemanager.cpp:140
+#11 0x00000003591a7781 in std::function<void ()>::operator()() const (this=0x4852ee0) at /usr/x86_64-w64-mingw32/include/c++/10.3.0/bits/std_function.h:622
+#12 dxvk::thread::threadProc (arg=0x4852ed0, arg@entry=<error reading variable: value has been optimized out>) at ../src-dxvk/src/util/thread.cpp:68
+#13 0x000000007b6146ed in BaseThreadInitThunk (unknown=<optimized out>, entry=<optimized out>, arg=<optimized out>) at ../src-wine/dlls/kernel32/thread.c:61
+#14 0x000000017000f1a7 in RtlUserThreadStart ()
+#15 0x0000000000000000 in ?? ()
+```
+
+
+Attaching Before The Program Starts
+-----------------------------------
+
+Launch the software with `PROTON_WAIT_ATTACH=1 %command%` set as the launch
+command in game's properties. Our `steam.exe` shim will then wait for debugger
+and only then exec the proper executable.
+
+Make sure that you follow child processes:
+
+```
+set follow-fork-mode child
+```
+
+
+Getting Shell Inside Of The Steam Runtime
+------------------------------------------
+
+Set your launch options to: `PROTON_LOG=1 STEAM_COMPAT_LAUNCHER_SERVICE=proton
+%command%`
+
+Then in `steam-$GAMEID.log` you should see the following:
+
+```
+Starting program with command-launcher service.
+
+To run commands in the per-app container, use a command like:
+
+/home/ivyl/.local/share/Steam/steamapps/common/SteamLinuxRuntime_sniper/pressure-vessel/bin/steam-runtime-launch-client \
+	--bus-name=:1.307 \
+	--directory='' \
+	-- \
+	bash
+```
+
+After invoking it you end up in a shell with the environment variables,
+including `WINEPREFIX` are set and you can invoke `wine` directly, e.g.:
+
+```
+[ivyl@crabcraft x64]$ wine winedbg
+Wine-dbg> info process
+ pid      threads  executable (all id:s are in hex)
+ 0000028c 1        'start.exe'
+ 0000029c 1        \_ 'winedbg.exe'
+=000002a4 1           \_ 'winedbg.exe'
+ 00000294 2        \_ 'conhost.exe'
+ 00000030 10       'services.exe'
+ 000000e4 6        \_ 'rpcss.exe'
+ 000000b0 3        \_ 'svchost.exe'
+ 00000094 6        \_ 'plugplay.exe'
+ 00000064 9        \_ 'winedevice.exe'
+ 0000003c 8        \_ 'winedevice.exe'
+ 00000020 3        'steam.exe'
+ 00000128 62       \_ 'Game.exe'
+ 000000d0 3        \_ 'explorer.exe'
+ 0000010c 3           \_ 'tabtip.exe'
+```
+
+**NOTE:** If you need a predictable bus name instead of the unique connection
+name (the `:1.307` from example above) you can use `com.steampowered.App1234567`
+where 1234567 is the Steam App ID for the title you are debugging.
+
+You can always use a tool like `qdbus` to list available bus names.
+
+
+Starting A Different Binary
+---------------------------
+
+If you want to start a different binary than the game's default you can use a
+few methods. All of the examples below will use `winecfg`.
+
+### Substitution
+
+You can use the following launch option:
+
+```
+echo "%command%" | sed 's/proton waitforexitandrun .*/proton waitforexitandrun winecfg/' | sh
+```
+
+The full substitution of `proton waitforexitandrun .*` is necessary as the
+original `%command%` is very long and may contain multiple mentions of `proton`
+or the original binary.
+
+### Pressure-Vessel Shell
+
+[Pressure-vessel][pv] allows to spawn an xterm instead of launching Proton. This
+can be accomplished by setting `PRESSURE_VESSEL_SHELL=instead`. The easiest way
+is to set the launch option to:
+
+[pv]: (https://gitlab.steamos.cloud/steamrt/steam-runtime-tools/-/tree/main/pressure-vessel)
+
+`PRESSURE_VESSEL_SHELL=instead %command%`
+
+The original coommand is then contained in `$@`, e.g.:
+
+```
+/home/ivyl/.local/share/Steam/steamapps/common/SteamLinuxRuntime_sniper/pressure-vessel/bin/steam-runtime-launcher-interface-0 container-runtime /home/ivyl/.local/share/Steam/steamapps/common/Proton - Experimental/proton waitforexitandrun /home/ivyl/.local/share/Steam/steamapps/common/Game/Game.exe
+```
+
+From this point you can invoke `proton` script as all the required environment
+variables are set. If you are copying the path from `$@` make sure to escape or
+quote parts that contain spaces.
+
+To start `winecfg` something like this can be entered:
+
+```
+"/home/ivyl/.local/share/Steam/steamapps/common/Proton - Experimental/proton" waitforexitandrun winecfg
+```
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 1b31aa5dbca0749d0737cff02043acb061332fb6
+Subproject commit d96fa54080320e9b63227e76124ffa50a927ced2
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 0a7c48b256cafe6b3fa1db8183f089712c72e9ad
+Subproject commit afb59a8e841b0ad561250327eb6a370b925c5f03
--- a/icu/icu-6.8.2-x86.tar.xz
+++ b/icu/icu-6.8.2-x86.tar.xz
--- a/icu/icu-6.8.2-x86_64.tar.xz
+++ b/icu/icu-6.8.2-x86_64.tar.xz
--- a/lsteamclient/Makefile.in
+++ b/lsteamclient/Makefile.in
@ -0,0 +1,258 @@
+MODULE    = lsteamclient.dll
+UNIXLIB   = lsteamclient.so
+IMPORTS   = user32 ws2_32
+
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DSTEAM_API_EXPORTS -Dprivate=public -Dprotected=public
+
+SOURCES = \
+	steam_input_manual.c \
+	steam_networking_manual.c \
+	steamclient_generated.c \
+	steamclient_main.c \
+	winISteamAppList.c \
+	winISteamApps.c \
+	winISteamAppTicket.c \
+	winISteamClient.c \
+	winISteamController.c \
+	winISteamFriends.c \
+	winISteamGameCoordinator.c \
+	winISteamGameSearch.c \
+	winISteamGameServer.c \
+	winISteamGameServerStats.c \
+	winISteamGameStats.c \
+	winISteamHTMLSurface.c \
+	winISteamHTTP.c \
+	winISteamInput.c \
+	winISteamInventory.c \
+	winISteamMasterServerUpdater.c \
+	winISteamMatchmaking.c \
+	winISteamMatchmakingServers.c \
+	winISteamMusic.c \
+	winISteamMusicRemote.c \
+	winISteamNetworking.c \
+	winISteamNetworkingFakeUDPPort.c \
+	winISteamNetworkingMessages.c \
+	winISteamNetworkingSockets.c \
+	winISteamNetworkingSocketsSerialized.c \
+	winISteamNetworkingUtils.c \
+	winISteamParentalSettings.c \
+	winISteamParties.c \
+	winISteamRemotePlay.c \
+	winISteamRemoteStorage.c \
+	winISteamScreenshots.c \
+	winISteamTimeline.c \
+	winISteamUGC.c \
+	winISteamUnifiedMessages.c \
+	winISteamUser.c \
+	winISteamUserStats.c \
+	winISteamUtils.c \
+	winISteamVideo.c \
+	cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.cpp \
+	cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.cpp \
+	cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.cpp \
+	cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.cpp \
+	cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.cpp \
+	cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.cpp \
+	cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.cpp \
+	cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.cpp \
+	cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.cpp \
+	cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.cpp \
+	cppISteamClient_SteamClient006.cpp \
+	cppISteamClient_SteamClient007.cpp \
+	cppISteamClient_SteamClient008.cpp \
+	cppISteamClient_SteamClient009.cpp \
+	cppISteamClient_SteamClient010.cpp \
+	cppISteamClient_SteamClient011.cpp \
+	cppISteamClient_SteamClient012.cpp \
+	cppISteamClient_SteamClient013.cpp \
+	cppISteamClient_SteamClient014.cpp \
+	cppISteamClient_SteamClient015.cpp \
+	cppISteamClient_SteamClient016.cpp \
+	cppISteamClient_SteamClient017.cpp \
+	cppISteamClient_SteamClient018.cpp \
+	cppISteamClient_SteamClient019.cpp \
+	cppISteamClient_SteamClient020.cpp \
+	cppISteamClient_SteamClient021.cpp \
+	cppISteamController_SteamController003.cpp \
+	cppISteamController_SteamController004.cpp \
+	cppISteamController_SteamController005.cpp \
+	cppISteamController_SteamController006.cpp \
+	cppISteamController_SteamController007.cpp \
+	cppISteamController_SteamController008.cpp \
+	cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.cpp \
+	cppISteamFriends_SteamFriends001.cpp \
+	cppISteamFriends_SteamFriends002.cpp \
+	cppISteamFriends_SteamFriends003.cpp \
+	cppISteamFriends_SteamFriends004.cpp \
+	cppISteamFriends_SteamFriends005.cpp \
+	cppISteamFriends_SteamFriends006.cpp \
+	cppISteamFriends_SteamFriends007.cpp \
+	cppISteamFriends_SteamFriends008.cpp \
+	cppISteamFriends_SteamFriends009.cpp \
+	cppISteamFriends_SteamFriends010.cpp \
+	cppISteamFriends_SteamFriends011.cpp \
+	cppISteamFriends_SteamFriends012.cpp \
+	cppISteamFriends_SteamFriends013.cpp \
+	cppISteamFriends_SteamFriends014.cpp \
+	cppISteamFriends_SteamFriends015.cpp \
+	cppISteamFriends_SteamFriends017.cpp \
+	cppISteamFriends_SteamFriends018.cpp \
+	cppISteamGameCoordinator_SteamGameCoordinator001.cpp \
+	cppISteamGameSearch_SteamMatchGameSearch001.cpp \
+	cppISteamGameServer_SteamGameServer002.cpp \
+	cppISteamGameServer_SteamGameServer003.cpp \
+	cppISteamGameServer_SteamGameServer004.cpp \
+	cppISteamGameServer_SteamGameServer005.cpp \
+	cppISteamGameServer_SteamGameServer008.cpp \
+	cppISteamGameServer_SteamGameServer009.cpp \
+	cppISteamGameServer_SteamGameServer010.cpp \
+	cppISteamGameServer_SteamGameServer011.cpp \
+	cppISteamGameServer_SteamGameServer012.cpp \
+	cppISteamGameServer_SteamGameServer013.cpp \
+	cppISteamGameServer_SteamGameServer014.cpp \
+	cppISteamGameServer_SteamGameServer015.cpp \
+	cppISteamGameServerStats_SteamGameServerStats001.cpp \
+	cppISteamGameStats_SteamGameStats001.cpp \
+	cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.cpp \
+	cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.cpp \
+	cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.cpp \
+	cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.cpp \
+	cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.cpp \
+	cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001.cpp \
+	cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002.cpp \
+	cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003.cpp \
+	cppISteamInput_SteamInput001.cpp \
+	cppISteamInput_SteamInput002.cpp \
+	cppISteamInput_SteamInput005.cpp \
+	cppISteamInput_SteamInput006.cpp \
+	cppISteamInventory_STEAMINVENTORY_INTERFACE_V001.cpp \
+	cppISteamInventory_STEAMINVENTORY_INTERFACE_V002.cpp \
+	cppISteamInventory_STEAMINVENTORY_INTERFACE_V003.cpp \
+	cppISteamMasterServerUpdater_SteamMasterServerUpdater001.cpp \
+	cppISteamMatchmaking_SteamMatchMaking001.cpp \
+	cppISteamMatchmaking_SteamMatchMaking002.cpp \
+	cppISteamMatchmaking_SteamMatchMaking003.cpp \
+	cppISteamMatchmaking_SteamMatchMaking004.cpp \
+	cppISteamMatchmaking_SteamMatchMaking005.cpp \
+	cppISteamMatchmaking_SteamMatchMaking006.cpp \
+	cppISteamMatchmaking_SteamMatchMaking007.cpp \
+	cppISteamMatchmaking_SteamMatchMaking008.cpp \
+	cppISteamMatchmaking_SteamMatchMaking009.cpp \
+	cppISteamMatchmakingServers_SteamMatchMakingServers001.cpp \
+	cppISteamMatchmakingServers_SteamMatchMakingServers002.cpp \
+	cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001.cpp \
+	cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001.cpp \
+	cppISteamNetworking_SteamNetworking001.cpp \
+	cppISteamNetworking_SteamNetworking002.cpp \
+	cppISteamNetworking_SteamNetworking003.cpp \
+	cppISteamNetworking_SteamNetworking004.cpp \
+	cppISteamNetworking_SteamNetworking005.cpp \
+	cppISteamNetworking_SteamNetworking006.cpp \
+	cppISteamNetworkingFakeUDPPort_SteamNetworkingFakeUDPPort001.cpp \
+	cppISteamNetworkingMessages_SteamNetworkingMessages002.cpp \
+	cppISteamNetworkingSockets_SteamNetworkingSockets002.cpp \
+	cppISteamNetworkingSockets_SteamNetworkingSockets004.cpp \
+	cppISteamNetworkingSockets_SteamNetworkingSockets006.cpp \
+	cppISteamNetworkingSockets_SteamNetworkingSockets008.cpp \
+	cppISteamNetworkingSockets_SteamNetworkingSockets009.cpp \
+	cppISteamNetworkingSockets_SteamNetworkingSockets012.cpp \
+	cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002.cpp \
+	cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003.cpp \
+	cppISteamNetworkingUtils_SteamNetworkingUtils001.cpp \
+	cppISteamNetworkingUtils_SteamNetworkingUtils002.cpp \
+	cppISteamNetworkingUtils_SteamNetworkingUtils003.cpp \
+	cppISteamNetworkingUtils_SteamNetworkingUtils004.cpp \
+	cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001.cpp \
+	cppISteamParties_SteamParties002.cpp \
+	cppISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION001.cpp \
+	cppISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION002.cpp \
+	cppISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION003.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014.cpp \
+	cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION016.cpp \
+	cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001.cpp \
+	cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002.cpp \
+	cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003.cpp \
+	cppISteamTimeline_STEAMTIMELINE_INTERFACE_V001.cpp \
+	cppISteamTimeline_STEAMTIMELINE_INTERFACE_V004.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION001.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION002.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION003.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION004.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION005.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION006.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION007.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION008.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION009.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION010.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION012.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION013.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION014.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION015.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION016.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION017.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION018.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION020.cpp \
+	cppISteamUGC_STEAMUGC_INTERFACE_VERSION021.cpp \
+	cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001.cpp \
+	cppISteamUser_SteamUser004.cpp \
+	cppISteamUser_SteamUser005.cpp \
+	cppISteamUser_SteamUser006.cpp \
+	cppISteamUser_SteamUser007.cpp \
+	cppISteamUser_SteamUser008.cpp \
+	cppISteamUser_SteamUser009.cpp \
+	cppISteamUser_SteamUser010.cpp \
+	cppISteamUser_SteamUser011.cpp \
+	cppISteamUser_SteamUser012.cpp \
+	cppISteamUser_SteamUser013.cpp \
+	cppISteamUser_SteamUser014.cpp \
+	cppISteamUser_SteamUser015.cpp \
+	cppISteamUser_SteamUser016.cpp \
+	cppISteamUser_SteamUser017.cpp \
+	cppISteamUser_SteamUser018.cpp \
+	cppISteamUser_SteamUser019.cpp \
+	cppISteamUser_SteamUser020.cpp \
+	cppISteamUser_SteamUser021.cpp \
+	cppISteamUser_SteamUser022.cpp \
+	cppISteamUser_SteamUser023.cpp \
+	cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001.cpp \
+	cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002.cpp \
+	cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003.cpp \
+	cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004.cpp \
+	cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005.cpp \
+	cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006.cpp \
+	cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007.cpp \
+	cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008.cpp \
+	cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009.cpp \
+	cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010.cpp \
+	cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011.cpp \
+	cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION012.cpp \
+	cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION013.cpp \
+	cppISteamUtils_SteamUtils002.cpp \
+	cppISteamUtils_SteamUtils004.cpp \
+	cppISteamUtils_SteamUtils005.cpp \
+	cppISteamUtils_SteamUtils006.cpp \
+	cppISteamUtils_SteamUtils007.cpp \
+	cppISteamUtils_SteamUtils008.cpp \
+	cppISteamUtils_SteamUtils009.cpp \
+	cppISteamUtils_SteamUtils010.cpp \
+	cppISteamVideo_STEAMVIDEO_INTERFACE_V001.cpp \
+	cppISteamVideo_STEAMVIDEO_INTERFACE_V002.cpp \
+	cppISteamVideo_STEAMVIDEO_INTERFACE_V007.cpp \
+	unix_steam_input_manual.cpp \
+	unix_steam_networking_manual.cpp \
+	unix_steam_utils_manual.cpp \
+	unixlib.cpp \
+	unixlib_generated.cpp \
--- a/lsteamclient/cb_converters.dat
+++ b/lsteamclient/cb_converters.dat
@ -1,157 +0,0 @@
-case 0x00100098: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_MicroTxnAuthorizationResponse_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c0201: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_LobbyCreated_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c145b: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RequestPlayersForGameProgressCallback_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x0038145c: win_msg->m_cubParam = 64; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RequestPlayersForGameResultCallback_t_64((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x0014145d: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RequestPlayersForGameFinalResultCallback_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x0014145e: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SubmitPlayerResultResultCallback_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c145f: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_EndGameResultCallback_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x011414b5: win_msg->m_cubParam = 280; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_JoinPartyCallback_t_280((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c14b6: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_CreateBeaconCallback_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x0110051b: win_msg->m_cubParam = 280; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageFileShareResult_t_280((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x0010051d: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStoragePublishFileResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c051f: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageDeletePublishedFileResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x019c0520: win_msg->m_cubParam = 416; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateUserPublishedFilesResult_t_416((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c0521: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageSubscribePublishedFileResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x02640522: win_msg->m_cubParam = 616; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateUserSubscribedFilesResult_t_616((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c0523: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUnsubscribePublishedFileResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00100524: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUpdatePublishedFileResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x01200525: win_msg->m_cubParam = 296; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageDownloadUGCResult_t_296((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x26140526: win_msg->m_cubParam = 9760; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedFileDetailsResult_t_9760((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x026c0527: win_msg->m_cubParam = 624; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateWorkshopFilesResult_t_624((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x001c0528: win_msg->m_cubParam = 32; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedItemVoteDetailsResult_t_32((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c052c: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUpdateUserPublishedItemVoteResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x0010052d: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUserVoteDetails_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x019c052e: win_msg->m_cubParam = 416; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x0010052f: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageSetUserPublishedFileActionResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00140532: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStoragePublishedFileUpdated_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x001c0452: win_msg->m_cubParam = 32; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_LeaderboardScoreUploaded_t_32((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c0457: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_LeaderboardUGCSet_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00140458: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_PS3TrophiesInstalled_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x002403ff: win_msg->m_cubParam = 40; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_FileDetailsResult_t_40((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00180835: win_msg->m_cubParam = 32; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTTPRequestCompleted_t_32((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c0836: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTTPRequestHeadersReceived_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00140837: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTTPRequestDataReceived_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00200af3: win_msg->m_cubParam = 40; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamInputConfigurationLoaded_t_40((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00180af4: win_msg->m_cubParam = 32; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamInputGamepadSlotChange_t_32((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x26280d4a: win_msg->m_cubParam = 9784; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamUGCRequestUGCDetailsResult_t_9784((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00100d4b: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_CreateItemResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c0d4d: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_ItemInstalled_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00100d4e: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_DownloadItemResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00140d54: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_AddUGCDependencyResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00140d55: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoveUGCDependencyResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00100d56: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_AddAppDependencyResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00100d57: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoveAppDependencyResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00940d58: win_msg->m_cubParam = 152; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_GetAppDependenciesResult_t_152((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c0d59: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_DeleteItemResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#ifdef __i386__
-case 0x00301196: win_msg->m_cubParam = 48; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_NeedsPaint_t_48((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x00341196: win_msg->m_cubParam = 56; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_NeedsPaint_t_56((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __i386__
-case 0x00141197: win_msg->m_cubParam = 20; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_StartRequest_t_20((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x00201197: win_msg->m_cubParam = 40; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_StartRequest_t_40((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __i386__
-case 0x00181199: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_URLChanged_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x00241199: win_msg->m_cubParam = 48; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_URLChanged_t_48((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __i386__
-case 0x000c119a: win_msg->m_cubParam = 12; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_FinishedRequest_t_12((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x0014119a: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_FinishedRequest_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __i386__
-case 0x0008119b: win_msg->m_cubParam = 8; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_OpenLinkInNewTab_t_8((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x000c119b: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_OpenLinkInNewTab_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __i386__
-case 0x0008119c: win_msg->m_cubParam = 8; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_ChangedTitle_t_8((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x000c119c: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_ChangedTitle_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __i386__
-case 0x001411a1: win_msg->m_cubParam = 20; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_LinkAtPosition_t_20((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x001811a1: win_msg->m_cubParam = 32; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_LinkAtPosition_t_32((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __i386__
-case 0x000811a2: win_msg->m_cubParam = 8; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_JSAlert_t_8((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x000c11a2: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_JSAlert_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __i386__
-case 0x000811a3: win_msg->m_cubParam = 8; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_JSConfirm_t_8((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x000c11a3: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_JSConfirm_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __i386__
-case 0x000c11a4: win_msg->m_cubParam = 12; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_FileOpenDialog_t_12((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x001411a4: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_FileOpenDialog_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __i386__
-case 0x001c11a9: win_msg->m_cubParam = 28; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_NewWindow_t_28((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x002011a9: win_msg->m_cubParam = 40; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_NewWindow_t_40((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __i386__
-case 0x000811ab: win_msg->m_cubParam = 8; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_StatusText_t_8((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x000c11ab: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_StatusText_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __i386__
-case 0x000811ac: win_msg->m_cubParam = 8; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_ShowToolTip_t_8((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x000c11ac: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_ShowToolTip_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __i386__
-case 0x000811ad: win_msg->m_cubParam = 8; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_UpdateToolTip_t_8((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x000c11ad: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_UpdateToolTip_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-case 0x00141260: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamInventoryStartPurchaseResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x02c004c5: win_msg->m_cubParam = 712; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamNetConnectionStatusChangedCallback_t_712((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x002000d1: win_msg->m_cubParam = 40; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_GSReputation_t_40((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x01180517: win_msg->m_cubParam = 288; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageAppSyncProgress_t_288((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x024004c5: win_msg->m_cubParam = 584; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamNetConnectionStatusChangedCallback_t_584((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00140835: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTTPRequestCompleted_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#ifdef __i386__
-case 0x001011a5: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_ComboNeedsPaint_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x001411a5: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_ComboNeedsPaint_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __i386__
-case 0x001811a9: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_NewWindow_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-#ifdef __x86_64__
-case 0x001c11a9: win_msg->m_cubParam = 32; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_NewWindow_t_32((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-#endif
-case 0x26240d4a: win_msg->m_cubParam = 9776; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamUGCRequestUGCDetailsResult_t_9776((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c051b: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageFileShareResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x26200d4a: win_msg->m_cubParam = 9768; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamUGCRequestUGCDetailsResult_t_9768((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x26100526: win_msg->m_cubParam = 9752; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedFileDetailsResult_t_9752((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c051d: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStoragePublishFileResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x000c0524: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUpdatePublishedFileResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x02640527: win_msg->m_cubParam = 616; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateWorkshopFilesResult_t_616((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x250c0526: win_msg->m_cubParam = 9496; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedFileDetailsResult_t_9496((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x06c4051e: win_msg->m_cubParam = 1744; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedFileDetailsResult_t_1744((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x0020051c: win_msg->m_cubParam = 40; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageDownloadUGCResult_t_40((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
--- a/lsteamclient/cb_converters.h
+++ b/lsteamclient/cb_converters.h
@ -1,404 +0,0 @@
-struct MicroTxnAuthorizationResponse_t;
-struct winMicroTxnAuthorizationResponse_t_24;
-extern void cb_MicroTxnAuthorizationResponse_t_24(const struct MicroTxnAuthorizationResponse_t *l, struct winMicroTxnAuthorizationResponse_t_24 *w);
-
-struct LobbyCreated_t;
-struct winLobbyCreated_t_16;
-extern void cb_LobbyCreated_t_16(const struct LobbyCreated_t *l, struct winLobbyCreated_t_16 *w);
-
-struct RequestPlayersForGameProgressCallback_t;
-struct winRequestPlayersForGameProgressCallback_t_16;
-extern void cb_RequestPlayersForGameProgressCallback_t_16(const struct RequestPlayersForGameProgressCallback_t *l, struct winRequestPlayersForGameProgressCallback_t_16 *w);
-
-struct RequestPlayersForGameResultCallback_t;
-struct winRequestPlayersForGameResultCallback_t_64;
-extern void cb_RequestPlayersForGameResultCallback_t_64(const struct RequestPlayersForGameResultCallback_t *l, struct winRequestPlayersForGameResultCallback_t_64 *w);
-
-struct RequestPlayersForGameFinalResultCallback_t;
-struct winRequestPlayersForGameFinalResultCallback_t_24;
-extern void cb_RequestPlayersForGameFinalResultCallback_t_24(const struct RequestPlayersForGameFinalResultCallback_t *l, struct winRequestPlayersForGameFinalResultCallback_t_24 *w);
-
-struct SubmitPlayerResultResultCallback_t;
-struct winSubmitPlayerResultResultCallback_t_24;
-extern void cb_SubmitPlayerResultResultCallback_t_24(const struct SubmitPlayerResultResultCallback_t *l, struct winSubmitPlayerResultResultCallback_t_24 *w);
-
-struct EndGameResultCallback_t;
-struct winEndGameResultCallback_t_16;
-extern void cb_EndGameResultCallback_t_16(const struct EndGameResultCallback_t *l, struct winEndGameResultCallback_t_16 *w);
-
-struct JoinPartyCallback_t;
-struct winJoinPartyCallback_t_280;
-extern void cb_JoinPartyCallback_t_280(const struct JoinPartyCallback_t *l, struct winJoinPartyCallback_t_280 *w);
-
-struct CreateBeaconCallback_t;
-struct winCreateBeaconCallback_t_16;
-extern void cb_CreateBeaconCallback_t_16(const struct CreateBeaconCallback_t *l, struct winCreateBeaconCallback_t_16 *w);
-
-struct RemoteStorageFileShareResult_t;
-struct winRemoteStorageFileShareResult_t_280;
-extern void cb_RemoteStorageFileShareResult_t_280(const struct RemoteStorageFileShareResult_t *l, struct winRemoteStorageFileShareResult_t_280 *w);
-
-struct RemoteStoragePublishFileResult_t;
-struct winRemoteStoragePublishFileResult_t_24;
-extern void cb_RemoteStoragePublishFileResult_t_24(const struct RemoteStoragePublishFileResult_t *l, struct winRemoteStoragePublishFileResult_t_24 *w);
-
-struct RemoteStorageDeletePublishedFileResult_t;
-struct winRemoteStorageDeletePublishedFileResult_t_16;
-extern void cb_RemoteStorageDeletePublishedFileResult_t_16(const struct RemoteStorageDeletePublishedFileResult_t *l, struct winRemoteStorageDeletePublishedFileResult_t_16 *w);
-
-struct RemoteStorageEnumerateUserPublishedFilesResult_t;
-struct winRemoteStorageEnumerateUserPublishedFilesResult_t_416;
-extern void cb_RemoteStorageEnumerateUserPublishedFilesResult_t_416(const struct RemoteStorageEnumerateUserPublishedFilesResult_t *l, struct winRemoteStorageEnumerateUserPublishedFilesResult_t_416 *w);
-
-struct RemoteStorageSubscribePublishedFileResult_t;
-struct winRemoteStorageSubscribePublishedFileResult_t_16;
-extern void cb_RemoteStorageSubscribePublishedFileResult_t_16(const struct RemoteStorageSubscribePublishedFileResult_t *l, struct winRemoteStorageSubscribePublishedFileResult_t_16 *w);
-
-struct RemoteStorageEnumerateUserSubscribedFilesResult_t;
-struct winRemoteStorageEnumerateUserSubscribedFilesResult_t_616;
-extern void cb_RemoteStorageEnumerateUserSubscribedFilesResult_t_616(const struct RemoteStorageEnumerateUserSubscribedFilesResult_t *l, struct winRemoteStorageEnumerateUserSubscribedFilesResult_t_616 *w);
-
-struct RemoteStorageUnsubscribePublishedFileResult_t;
-struct winRemoteStorageUnsubscribePublishedFileResult_t_16;
-extern void cb_RemoteStorageUnsubscribePublishedFileResult_t_16(const struct RemoteStorageUnsubscribePublishedFileResult_t *l, struct winRemoteStorageUnsubscribePublishedFileResult_t_16 *w);
-
-struct RemoteStorageUpdatePublishedFileResult_t;
-struct winRemoteStorageUpdatePublishedFileResult_t_24;
-extern void cb_RemoteStorageUpdatePublishedFileResult_t_24(const struct RemoteStorageUpdatePublishedFileResult_t *l, struct winRemoteStorageUpdatePublishedFileResult_t_24 *w);
-
-struct RemoteStorageDownloadUGCResult_t;
-struct winRemoteStorageDownloadUGCResult_t_296;
-extern void cb_RemoteStorageDownloadUGCResult_t_296(const struct RemoteStorageDownloadUGCResult_t *l, struct winRemoteStorageDownloadUGCResult_t_296 *w);
-
-struct RemoteStorageGetPublishedFileDetailsResult_t;
-struct winRemoteStorageGetPublishedFileDetailsResult_t_9760;
-extern void cb_RemoteStorageGetPublishedFileDetailsResult_t_9760(const struct RemoteStorageGetPublishedFileDetailsResult_t *l, struct winRemoteStorageGetPublishedFileDetailsResult_t_9760 *w);
-
-struct RemoteStorageEnumerateWorkshopFilesResult_t;
-struct winRemoteStorageEnumerateWorkshopFilesResult_t_624;
-extern void cb_RemoteStorageEnumerateWorkshopFilesResult_t_624(const struct RemoteStorageEnumerateWorkshopFilesResult_t *l, struct winRemoteStorageEnumerateWorkshopFilesResult_t_624 *w);
-
-struct RemoteStorageGetPublishedItemVoteDetailsResult_t;
-struct winRemoteStorageGetPublishedItemVoteDetailsResult_t_32;
-extern void cb_RemoteStorageGetPublishedItemVoteDetailsResult_t_32(const struct RemoteStorageGetPublishedItemVoteDetailsResult_t *l, struct winRemoteStorageGetPublishedItemVoteDetailsResult_t_32 *w);
-
-struct RemoteStorageUpdateUserPublishedItemVoteResult_t;
-struct winRemoteStorageUpdateUserPublishedItemVoteResult_t_16;
-extern void cb_RemoteStorageUpdateUserPublishedItemVoteResult_t_16(const struct RemoteStorageUpdateUserPublishedItemVoteResult_t *l, struct winRemoteStorageUpdateUserPublishedItemVoteResult_t_16 *w);
-
-struct RemoteStorageUserVoteDetails_t;
-struct winRemoteStorageUserVoteDetails_t_24;
-extern void cb_RemoteStorageUserVoteDetails_t_24(const struct RemoteStorageUserVoteDetails_t *l, struct winRemoteStorageUserVoteDetails_t_24 *w);
-
-struct RemoteStorageEnumerateUserSharedWorkshopFilesResult_t;
-struct winRemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416;
-extern void cb_RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416(const struct RemoteStorageEnumerateUserSharedWorkshopFilesResult_t *l, struct winRemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416 *w);
-
-struct RemoteStorageSetUserPublishedFileActionResult_t;
-struct winRemoteStorageSetUserPublishedFileActionResult_t_24;
-extern void cb_RemoteStorageSetUserPublishedFileActionResult_t_24(const struct RemoteStorageSetUserPublishedFileActionResult_t *l, struct winRemoteStorageSetUserPublishedFileActionResult_t_24 *w);
-
-struct RemoteStoragePublishedFileUpdated_t;
-struct winRemoteStoragePublishedFileUpdated_t_24;
-extern void cb_RemoteStoragePublishedFileUpdated_t_24(const struct RemoteStoragePublishedFileUpdated_t *l, struct winRemoteStoragePublishedFileUpdated_t_24 *w);
-
-struct LeaderboardScoreUploaded_t;
-struct winLeaderboardScoreUploaded_t_32;
-extern void cb_LeaderboardScoreUploaded_t_32(const struct LeaderboardScoreUploaded_t *l, struct winLeaderboardScoreUploaded_t_32 *w);
-
-struct LeaderboardUGCSet_t;
-struct winLeaderboardUGCSet_t_16;
-extern void cb_LeaderboardUGCSet_t_16(const struct LeaderboardUGCSet_t *l, struct winLeaderboardUGCSet_t_16 *w);
-
-struct PS3TrophiesInstalled_t;
-struct winPS3TrophiesInstalled_t_24;
-extern void cb_PS3TrophiesInstalled_t_24(const struct PS3TrophiesInstalled_t *l, struct winPS3TrophiesInstalled_t_24 *w);
-
-struct FileDetailsResult_t;
-struct winFileDetailsResult_t_40;
-extern void cb_FileDetailsResult_t_40(const struct FileDetailsResult_t *l, struct winFileDetailsResult_t_40 *w);
-
-struct HTTPRequestCompleted_t;
-struct winHTTPRequestCompleted_t_32;
-extern void cb_HTTPRequestCompleted_t_32(const struct HTTPRequestCompleted_t *l, struct winHTTPRequestCompleted_t_32 *w);
-
-struct HTTPRequestHeadersReceived_t;
-struct winHTTPRequestHeadersReceived_t_16;
-extern void cb_HTTPRequestHeadersReceived_t_16(const struct HTTPRequestHeadersReceived_t *l, struct winHTTPRequestHeadersReceived_t_16 *w);
-
-struct HTTPRequestDataReceived_t;
-struct winHTTPRequestDataReceived_t_24;
-extern void cb_HTTPRequestDataReceived_t_24(const struct HTTPRequestDataReceived_t *l, struct winHTTPRequestDataReceived_t_24 *w);
-
-struct SteamInputConfigurationLoaded_t;
-struct winSteamInputConfigurationLoaded_t_40;
-extern void cb_SteamInputConfigurationLoaded_t_40(const struct SteamInputConfigurationLoaded_t *l, struct winSteamInputConfigurationLoaded_t_40 *w);
-
-struct SteamInputGamepadSlotChange_t;
-struct winSteamInputGamepadSlotChange_t_32;
-extern void cb_SteamInputGamepadSlotChange_t_32(const struct SteamInputGamepadSlotChange_t *l, struct winSteamInputGamepadSlotChange_t_32 *w);
-
-struct SteamUGCRequestUGCDetailsResult_t;
-struct winSteamUGCRequestUGCDetailsResult_t_9784;
-extern void cb_SteamUGCRequestUGCDetailsResult_t_9784(const struct SteamUGCRequestUGCDetailsResult_t *l, struct winSteamUGCRequestUGCDetailsResult_t_9784 *w);
-
-struct CreateItemResult_t;
-struct winCreateItemResult_t_24;
-extern void cb_CreateItemResult_t_24(const struct CreateItemResult_t *l, struct winCreateItemResult_t_24 *w);
-
-struct ItemInstalled_t;
-struct winItemInstalled_t_16;
-extern void cb_ItemInstalled_t_16(const struct ItemInstalled_t *l, struct winItemInstalled_t_16 *w);
-
-struct DownloadItemResult_t;
-struct winDownloadItemResult_t_24;
-extern void cb_DownloadItemResult_t_24(const struct DownloadItemResult_t *l, struct winDownloadItemResult_t_24 *w);
-
-struct AddUGCDependencyResult_t;
-struct winAddUGCDependencyResult_t_24;
-extern void cb_AddUGCDependencyResult_t_24(const struct AddUGCDependencyResult_t *l, struct winAddUGCDependencyResult_t_24 *w);
-
-struct RemoveUGCDependencyResult_t;
-struct winRemoveUGCDependencyResult_t_24;
-extern void cb_RemoveUGCDependencyResult_t_24(const struct RemoveUGCDependencyResult_t *l, struct winRemoveUGCDependencyResult_t_24 *w);
-
-struct AddAppDependencyResult_t;
-struct winAddAppDependencyResult_t_24;
-extern void cb_AddAppDependencyResult_t_24(const struct AddAppDependencyResult_t *l, struct winAddAppDependencyResult_t_24 *w);
-
-struct RemoveAppDependencyResult_t;
-struct winRemoveAppDependencyResult_t_24;
-extern void cb_RemoveAppDependencyResult_t_24(const struct RemoveAppDependencyResult_t *l, struct winRemoveAppDependencyResult_t_24 *w);
-
-struct GetAppDependenciesResult_t;
-struct winGetAppDependenciesResult_t_152;
-extern void cb_GetAppDependenciesResult_t_152(const struct GetAppDependenciesResult_t *l, struct winGetAppDependenciesResult_t_152 *w);
-
-struct DeleteItemResult_t;
-struct winDeleteItemResult_t_16;
-extern void cb_DeleteItemResult_t_16(const struct DeleteItemResult_t *l, struct winDeleteItemResult_t_16 *w);
-
-struct HTML_NeedsPaint_t;
-#ifdef __i386__
-struct winHTML_NeedsPaint_t_48;
-extern void cb_HTML_NeedsPaint_t_48(const struct HTML_NeedsPaint_t *l, struct winHTML_NeedsPaint_t_48 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_NeedsPaint_t_56;
-extern void cb_HTML_NeedsPaint_t_56(const struct HTML_NeedsPaint_t *l, struct winHTML_NeedsPaint_t_56 *w);
-#endif
-
-struct HTML_StartRequest_t;
-#ifdef __i386__
-struct winHTML_StartRequest_t_20;
-extern void cb_HTML_StartRequest_t_20(const struct HTML_StartRequest_t *l, struct winHTML_StartRequest_t_20 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_StartRequest_t_40;
-extern void cb_HTML_StartRequest_t_40(const struct HTML_StartRequest_t *l, struct winHTML_StartRequest_t_40 *w);
-#endif
-
-struct HTML_URLChanged_t;
-#ifdef __i386__
-struct winHTML_URLChanged_t_24;
-extern void cb_HTML_URLChanged_t_24(const struct HTML_URLChanged_t *l, struct winHTML_URLChanged_t_24 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_URLChanged_t_48;
-extern void cb_HTML_URLChanged_t_48(const struct HTML_URLChanged_t *l, struct winHTML_URLChanged_t_48 *w);
-#endif
-
-struct HTML_FinishedRequest_t;
-#ifdef __i386__
-struct winHTML_FinishedRequest_t_12;
-extern void cb_HTML_FinishedRequest_t_12(const struct HTML_FinishedRequest_t *l, struct winHTML_FinishedRequest_t_12 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_FinishedRequest_t_24;
-extern void cb_HTML_FinishedRequest_t_24(const struct HTML_FinishedRequest_t *l, struct winHTML_FinishedRequest_t_24 *w);
-#endif
-
-struct HTML_OpenLinkInNewTab_t;
-#ifdef __i386__
-struct winHTML_OpenLinkInNewTab_t_8;
-extern void cb_HTML_OpenLinkInNewTab_t_8(const struct HTML_OpenLinkInNewTab_t *l, struct winHTML_OpenLinkInNewTab_t_8 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_OpenLinkInNewTab_t_16;
-extern void cb_HTML_OpenLinkInNewTab_t_16(const struct HTML_OpenLinkInNewTab_t *l, struct winHTML_OpenLinkInNewTab_t_16 *w);
-#endif
-
-struct HTML_ChangedTitle_t;
-#ifdef __i386__
-struct winHTML_ChangedTitle_t_8;
-extern void cb_HTML_ChangedTitle_t_8(const struct HTML_ChangedTitle_t *l, struct winHTML_ChangedTitle_t_8 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_ChangedTitle_t_16;
-extern void cb_HTML_ChangedTitle_t_16(const struct HTML_ChangedTitle_t *l, struct winHTML_ChangedTitle_t_16 *w);
-#endif
-
-struct HTML_LinkAtPosition_t;
-#ifdef __i386__
-struct winHTML_LinkAtPosition_t_20;
-extern void cb_HTML_LinkAtPosition_t_20(const struct HTML_LinkAtPosition_t *l, struct winHTML_LinkAtPosition_t_20 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_LinkAtPosition_t_32;
-extern void cb_HTML_LinkAtPosition_t_32(const struct HTML_LinkAtPosition_t *l, struct winHTML_LinkAtPosition_t_32 *w);
-#endif
-
-struct HTML_JSAlert_t;
-#ifdef __i386__
-struct winHTML_JSAlert_t_8;
-extern void cb_HTML_JSAlert_t_8(const struct HTML_JSAlert_t *l, struct winHTML_JSAlert_t_8 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_JSAlert_t_16;
-extern void cb_HTML_JSAlert_t_16(const struct HTML_JSAlert_t *l, struct winHTML_JSAlert_t_16 *w);
-#endif
-
-struct HTML_JSConfirm_t;
-#ifdef __i386__
-struct winHTML_JSConfirm_t_8;
-extern void cb_HTML_JSConfirm_t_8(const struct HTML_JSConfirm_t *l, struct winHTML_JSConfirm_t_8 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_JSConfirm_t_16;
-extern void cb_HTML_JSConfirm_t_16(const struct HTML_JSConfirm_t *l, struct winHTML_JSConfirm_t_16 *w);
-#endif
-
-struct HTML_FileOpenDialog_t;
-#ifdef __i386__
-struct winHTML_FileOpenDialog_t_12;
-extern void cb_HTML_FileOpenDialog_t_12(const struct HTML_FileOpenDialog_t *l, struct winHTML_FileOpenDialog_t_12 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_FileOpenDialog_t_24;
-extern void cb_HTML_FileOpenDialog_t_24(const struct HTML_FileOpenDialog_t *l, struct winHTML_FileOpenDialog_t_24 *w);
-#endif
-
-struct HTML_NewWindow_t;
-#ifdef __i386__
-struct winHTML_NewWindow_t_28;
-extern void cb_HTML_NewWindow_t_28(const struct HTML_NewWindow_t *l, struct winHTML_NewWindow_t_28 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_NewWindow_t_40;
-extern void cb_HTML_NewWindow_t_40(const struct HTML_NewWindow_t *l, struct winHTML_NewWindow_t_40 *w);
-#endif
-
-struct HTML_StatusText_t;
-#ifdef __i386__
-struct winHTML_StatusText_t_8;
-extern void cb_HTML_StatusText_t_8(const struct HTML_StatusText_t *l, struct winHTML_StatusText_t_8 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_StatusText_t_16;
-extern void cb_HTML_StatusText_t_16(const struct HTML_StatusText_t *l, struct winHTML_StatusText_t_16 *w);
-#endif
-
-struct HTML_ShowToolTip_t;
-#ifdef __i386__
-struct winHTML_ShowToolTip_t_8;
-extern void cb_HTML_ShowToolTip_t_8(const struct HTML_ShowToolTip_t *l, struct winHTML_ShowToolTip_t_8 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_ShowToolTip_t_16;
-extern void cb_HTML_ShowToolTip_t_16(const struct HTML_ShowToolTip_t *l, struct winHTML_ShowToolTip_t_16 *w);
-#endif
-
-struct HTML_UpdateToolTip_t;
-#ifdef __i386__
-struct winHTML_UpdateToolTip_t_8;
-extern void cb_HTML_UpdateToolTip_t_8(const struct HTML_UpdateToolTip_t *l, struct winHTML_UpdateToolTip_t_8 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_UpdateToolTip_t_16;
-extern void cb_HTML_UpdateToolTip_t_16(const struct HTML_UpdateToolTip_t *l, struct winHTML_UpdateToolTip_t_16 *w);
-#endif
-
-struct SteamInventoryStartPurchaseResult_t;
-struct winSteamInventoryStartPurchaseResult_t_24;
-extern void cb_SteamInventoryStartPurchaseResult_t_24(const struct SteamInventoryStartPurchaseResult_t *l, struct winSteamInventoryStartPurchaseResult_t_24 *w);
-
-struct SteamNetConnectionStatusChangedCallback_t;
-struct winSteamNetConnectionStatusChangedCallback_t_712;
-extern void cb_SteamNetConnectionStatusChangedCallback_t_712(const struct SteamNetConnectionStatusChangedCallback_t *l, struct winSteamNetConnectionStatusChangedCallback_t_712 *w);
-
-struct GSReputation_t;
-struct winGSReputation_t_40;
-extern void cb_GSReputation_t_40(const struct GSReputation_t *l, struct winGSReputation_t_40 *w);
-
-struct RemoteStorageAppSyncProgress_t;
-struct winRemoteStorageAppSyncProgress_t_288;
-extern void cb_RemoteStorageAppSyncProgress_t_288(const struct RemoteStorageAppSyncProgress_t *l, struct winRemoteStorageAppSyncProgress_t_288 *w);
-
-struct SteamNetConnectionStatusChangedCallback_t;
-struct winSteamNetConnectionStatusChangedCallback_t_584;
-extern void cb_SteamNetConnectionStatusChangedCallback_t_584(const struct SteamNetConnectionStatusChangedCallback_t *l, struct winSteamNetConnectionStatusChangedCallback_t_584 *w);
-
-struct HTTPRequestCompleted_t;
-struct winHTTPRequestCompleted_t_24;
-extern void cb_HTTPRequestCompleted_t_24(const struct HTTPRequestCompleted_t *l, struct winHTTPRequestCompleted_t_24 *w);
-
-struct HTML_ComboNeedsPaint_t;
-#ifdef __i386__
-struct winHTML_ComboNeedsPaint_t_16;
-extern void cb_HTML_ComboNeedsPaint_t_16(const struct HTML_ComboNeedsPaint_t *l, struct winHTML_ComboNeedsPaint_t_16 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_ComboNeedsPaint_t_24;
-extern void cb_HTML_ComboNeedsPaint_t_24(const struct HTML_ComboNeedsPaint_t *l, struct winHTML_ComboNeedsPaint_t_24 *w);
-#endif
-
-struct HTML_NewWindow_t;
-#ifdef __i386__
-struct winHTML_NewWindow_t_24;
-extern void cb_HTML_NewWindow_t_24(const struct HTML_NewWindow_t *l, struct winHTML_NewWindow_t_24 *w);
-#endif
-#ifdef __x86_64__
-struct winHTML_NewWindow_t_32;
-extern void cb_HTML_NewWindow_t_32(const struct HTML_NewWindow_t *l, struct winHTML_NewWindow_t_32 *w);
-#endif
-
-struct SteamUGCRequestUGCDetailsResult_t;
-struct winSteamUGCRequestUGCDetailsResult_t_9776;
-extern void cb_SteamUGCRequestUGCDetailsResult_t_9776(const struct SteamUGCRequestUGCDetailsResult_t *l, struct winSteamUGCRequestUGCDetailsResult_t_9776 *w);
-
-struct RemoteStorageFileShareResult_t;
-struct winRemoteStorageFileShareResult_t_16;
-extern void cb_RemoteStorageFileShareResult_t_16(const struct RemoteStorageFileShareResult_t *l, struct winRemoteStorageFileShareResult_t_16 *w);
-
-struct SteamUGCRequestUGCDetailsResult_t;
-struct winSteamUGCRequestUGCDetailsResult_t_9768;
-extern void cb_SteamUGCRequestUGCDetailsResult_t_9768(const struct SteamUGCRequestUGCDetailsResult_t *l, struct winSteamUGCRequestUGCDetailsResult_t_9768 *w);
-
-struct RemoteStorageGetPublishedFileDetailsResult_t;
-struct winRemoteStorageGetPublishedFileDetailsResult_t_9752;
-extern void cb_RemoteStorageGetPublishedFileDetailsResult_t_9752(const struct RemoteStorageGetPublishedFileDetailsResult_t *l, struct winRemoteStorageGetPublishedFileDetailsResult_t_9752 *w);
-
-struct RemoteStoragePublishFileResult_t;
-struct winRemoteStoragePublishFileResult_t_16;
-extern void cb_RemoteStoragePublishFileResult_t_16(const struct RemoteStoragePublishFileResult_t *l, struct winRemoteStoragePublishFileResult_t_16 *w);
-
-struct RemoteStorageUpdatePublishedFileResult_t;
-struct winRemoteStorageUpdatePublishedFileResult_t_16;
-extern void cb_RemoteStorageUpdatePublishedFileResult_t_16(const struct RemoteStorageUpdatePublishedFileResult_t *l, struct winRemoteStorageUpdatePublishedFileResult_t_16 *w);
-
-struct RemoteStorageEnumerateWorkshopFilesResult_t;
-struct winRemoteStorageEnumerateWorkshopFilesResult_t_616;
-extern void cb_RemoteStorageEnumerateWorkshopFilesResult_t_616(const struct RemoteStorageEnumerateWorkshopFilesResult_t *l, struct winRemoteStorageEnumerateWorkshopFilesResult_t_616 *w);
-
-struct RemoteStorageGetPublishedFileDetailsResult_t;
-struct winRemoteStorageGetPublishedFileDetailsResult_t_9496;
-extern void cb_RemoteStorageGetPublishedFileDetailsResult_t_9496(const struct RemoteStorageGetPublishedFileDetailsResult_t *l, struct winRemoteStorageGetPublishedFileDetailsResult_t_9496 *w);
-
-struct RemoteStorageGetPublishedFileDetailsResult_t;
-struct winRemoteStorageGetPublishedFileDetailsResult_t_1744;
-extern void cb_RemoteStorageGetPublishedFileDetailsResult_t_1744(const struct RemoteStorageGetPublishedFileDetailsResult_t *l, struct winRemoteStorageGetPublishedFileDetailsResult_t_1744 *w);
-
-struct RemoteStorageDownloadUGCResult_t;
-struct winRemoteStorageDownloadUGCResult_t_40;
-extern void cb_RemoteStorageDownloadUGCResult_t_40(const struct RemoteStorageDownloadUGCResult_t *l, struct winRemoteStorageDownloadUGCResult_t_40 *w);
-
--- a/lsteamclient/cb_getapi_sizes.dat
+++ b/lsteamclient/cb_getapi_sizes.dat
@ -1,268 +0,0 @@
-#ifdef __i386__
-case 152: /* MicroTxnAuthorizationResponse_t_24 */
-    return 16;
-case 209: /* GSReputation_t_40 */
-    return 32;
-case 513: /* LobbyCreated_t_16 */
-    return 12;
-case 1023: /* FileDetailsResult_t_40 */
-    return 36;
-case 1106: /* LeaderboardScoreUploaded_t_32 */
-    return 28;
-case 1111: /* LeaderboardUGCSet_t_16 */
-    return 12;
-case 1112: /* PS3TrophiesInstalled_t_24 */
-    return 20;
-case 1221: /* SteamNetConnectionStatusChangedCallback_t_712 */
-    return 704;
-case 1303: /* RemoteStorageAppSyncProgress_t_288 */
-    return 280;
-case 1307: /* RemoteStorageFileShareResult_t_280 */
-    return 272;
-case 1308: /* RemoteStorageDownloadUGCResult_t_40 */
-    return 32;
-case 1309: /* RemoteStoragePublishFileResult_t_24 */
-    return 16;
-case 1310: /* RemoteStorageGetPublishedFileDetailsResult_t_1744 */
-    return 1732;
-case 1311: /* RemoteStorageDeletePublishedFileResult_t_16 */
-    return 12;
-case 1312: /* RemoteStorageEnumerateUserPublishedFilesResult_t_416 */
-    return 412;
-case 1313: /* RemoteStorageSubscribePublishedFileResult_t_16 */
-    return 12;
-case 1314: /* RemoteStorageEnumerateUserSubscribedFilesResult_t_616 */
-    return 612;
-case 1315: /* RemoteStorageUnsubscribePublishedFileResult_t_16 */
-    return 12;
-case 1316: /* RemoteStorageUpdatePublishedFileResult_t_24 */
-    return 16;
-case 1317: /* RemoteStorageDownloadUGCResult_t_296 */
-    return 288;
-case 1318: /* RemoteStorageGetPublishedFileDetailsResult_t_9760 */
-    return 9748;
-case 1319: /* RemoteStorageEnumerateWorkshopFilesResult_t_624 */
-    return 620;
-case 1320: /* RemoteStorageGetPublishedItemVoteDetailsResult_t_32 */
-    return 28;
-case 1324: /* RemoteStorageUpdateUserPublishedItemVoteResult_t_16 */
-    return 12;
-case 1325: /* RemoteStorageUserVoteDetails_t_24 */
-    return 16;
-case 1326: /* RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416 */
-    return 412;
-case 1327: /* RemoteStorageSetUserPublishedFileActionResult_t_24 */
-    return 16;
-case 1330: /* RemoteStoragePublishedFileUpdated_t_24 */
-    return 20;
-case 2101: /* HTTPRequestCompleted_t_32 */
-    return 24;
-case 2102: /* HTTPRequestHeadersReceived_t_16 */
-    return 12;
-case 2103: /* HTTPRequestDataReceived_t_24 */
-    return 20;
-case 2803: /* SteamInputConfigurationLoaded_t_40 */
-    return 32;
-case 2804: /* SteamInputGamepadSlotChange_t_32 */
-    return 24;
-case 3402: /* SteamUGCRequestUGCDetailsResult_t_9784 */
-    return 9768;
-case 3403: /* CreateItemResult_t_24 */
-    return 16;
-case 3405: /* ItemInstalled_t_16 */
-    return 12;
-case 3406: /* DownloadItemResult_t_24 */
-    return 16;
-case 3412: /* AddUGCDependencyResult_t_24 */
-    return 20;
-case 3413: /* RemoveUGCDependencyResult_t_24 */
-    return 20;
-case 3414: /* AddAppDependencyResult_t_24 */
-    return 16;
-case 3415: /* RemoveAppDependencyResult_t_24 */
-    return 16;
-case 3416: /* GetAppDependenciesResult_t_152 */
-    return 148;
-case 3417: /* DeleteItemResult_t_16 */
-    return 12;
-case 4502: /* HTML_NeedsPaint_t_48 */
-    return 48;
-case 4503: /* HTML_StartRequest_t_20 */
-    return 20;
-case 4505: /* HTML_URLChanged_t_24 */
-    return 24;
-case 4506: /* HTML_FinishedRequest_t_12 */
-    return 12;
-case 4507: /* HTML_OpenLinkInNewTab_t_8 */
-    return 8;
-case 4508: /* HTML_ChangedTitle_t_8 */
-    return 8;
-case 4513: /* HTML_LinkAtPosition_t_20 */
-    return 20;
-case 4514: /* HTML_JSAlert_t_8 */
-    return 8;
-case 4515: /* HTML_JSConfirm_t_8 */
-    return 8;
-case 4516: /* HTML_FileOpenDialog_t_12 */
-    return 12;
-case 4517: /* HTML_ComboNeedsPaint_t_16 */
-    return 16;
-case 4521: /* HTML_NewWindow_t_28 */
-    return 28;
-case 4523: /* HTML_StatusText_t_8 */
-    return 8;
-case 4524: /* HTML_ShowToolTip_t_8 */
-    return 8;
-case 4525: /* HTML_UpdateToolTip_t_8 */
-    return 8;
-case 4704: /* SteamInventoryStartPurchaseResult_t_24 */
-    return 20;
-case 5211: /* RequestPlayersForGameProgressCallback_t_16 */
-    return 12;
-case 5212: /* RequestPlayersForGameResultCallback_t_64 */
-    return 56;
-case 5213: /* RequestPlayersForGameFinalResultCallback_t_24 */
-    return 20;
-case 5214: /* SubmitPlayerResultResultCallback_t_24 */
-    return 20;
-case 5215: /* EndGameResultCallback_t_16 */
-    return 12;
-case 5301: /* JoinPartyCallback_t_280 */
-    return 276;
-case 5302: /* CreateBeaconCallback_t_16 */
-    return 12;
-#endif
-#ifdef __x86_64__
-case 152: /* MicroTxnAuthorizationResponse_t_24 */
-    return 16;
-case 209: /* GSReputation_t_40 */
-    return 32;
-case 513: /* LobbyCreated_t_16 */
-    return 12;
-case 1023: /* FileDetailsResult_t_40 */
-    return 36;
-case 1106: /* LeaderboardScoreUploaded_t_32 */
-    return 28;
-case 1111: /* LeaderboardUGCSet_t_16 */
-    return 12;
-case 1112: /* PS3TrophiesInstalled_t_24 */
-    return 20;
-case 1221: /* SteamNetConnectionStatusChangedCallback_t_712 */
-    return 704;
-case 1303: /* RemoteStorageAppSyncProgress_t_288 */
-    return 280;
-case 1307: /* RemoteStorageFileShareResult_t_280 */
-    return 272;
-case 1308: /* RemoteStorageDownloadUGCResult_t_40 */
-    return 32;
-case 1309: /* RemoteStoragePublishFileResult_t_24 */
-    return 16;
-case 1310: /* RemoteStorageGetPublishedFileDetailsResult_t_1744 */
-    return 1732;
-case 1311: /* RemoteStorageDeletePublishedFileResult_t_16 */
-    return 12;
-case 1312: /* RemoteStorageEnumerateUserPublishedFilesResult_t_416 */
-    return 412;
-case 1313: /* RemoteStorageSubscribePublishedFileResult_t_16 */
-    return 12;
-case 1314: /* RemoteStorageEnumerateUserSubscribedFilesResult_t_616 */
-    return 612;
-case 1315: /* RemoteStorageUnsubscribePublishedFileResult_t_16 */
-    return 12;
-case 1316: /* RemoteStorageUpdatePublishedFileResult_t_24 */
-    return 16;
-case 1317: /* RemoteStorageDownloadUGCResult_t_296 */
-    return 288;
-case 1318: /* RemoteStorageGetPublishedFileDetailsResult_t_9760 */
-    return 9748;
-case 1319: /* RemoteStorageEnumerateWorkshopFilesResult_t_624 */
-    return 620;
-case 1320: /* RemoteStorageGetPublishedItemVoteDetailsResult_t_32 */
-    return 28;
-case 1324: /* RemoteStorageUpdateUserPublishedItemVoteResult_t_16 */
-    return 12;
-case 1325: /* RemoteStorageUserVoteDetails_t_24 */
-    return 16;
-case 1326: /* RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416 */
-    return 412;
-case 1327: /* RemoteStorageSetUserPublishedFileActionResult_t_24 */
-    return 16;
-case 1330: /* RemoteStoragePublishedFileUpdated_t_24 */
-    return 20;
-case 2101: /* HTTPRequestCompleted_t_32 */
-    return 24;
-case 2102: /* HTTPRequestHeadersReceived_t_16 */
-    return 12;
-case 2103: /* HTTPRequestDataReceived_t_24 */
-    return 20;
-case 2803: /* SteamInputConfigurationLoaded_t_40 */
-    return 32;
-case 2804: /* SteamInputGamepadSlotChange_t_32 */
-    return 24;
-case 3402: /* SteamUGCRequestUGCDetailsResult_t_9784 */
-    return 9768;
-case 3403: /* CreateItemResult_t_24 */
-    return 16;
-case 3405: /* ItemInstalled_t_16 */
-    return 12;
-case 3406: /* DownloadItemResult_t_24 */
-    return 16;
-case 3412: /* AddUGCDependencyResult_t_24 */
-    return 20;
-case 3413: /* RemoveUGCDependencyResult_t_24 */
-    return 20;
-case 3414: /* AddAppDependencyResult_t_24 */
-    return 16;
-case 3415: /* RemoveAppDependencyResult_t_24 */
-    return 16;
-case 3416: /* GetAppDependenciesResult_t_152 */
-    return 148;
-case 3417: /* DeleteItemResult_t_16 */
-    return 12;
-case 4502: /* HTML_NeedsPaint_t_56 */
-    return 52;
-case 4503: /* HTML_StartRequest_t_40 */
-    return 32;
-case 4505: /* HTML_URLChanged_t_48 */
-    return 36;
-case 4506: /* HTML_FinishedRequest_t_24 */
-    return 20;
-case 4507: /* HTML_OpenLinkInNewTab_t_16 */
-    return 12;
-case 4508: /* HTML_ChangedTitle_t_16 */
-    return 12;
-case 4513: /* HTML_LinkAtPosition_t_32 */
-    return 24;
-case 4514: /* HTML_JSAlert_t_16 */
-    return 12;
-case 4515: /* HTML_JSConfirm_t_16 */
-    return 12;
-case 4516: /* HTML_FileOpenDialog_t_24 */
-    return 20;
-case 4517: /* HTML_ComboNeedsPaint_t_24 */
-    return 20;
-case 4521: /* HTML_NewWindow_t_40 */
-    return 32;
-case 4523: /* HTML_StatusText_t_16 */
-    return 12;
-case 4524: /* HTML_ShowToolTip_t_16 */
-    return 12;
-case 4525: /* HTML_UpdateToolTip_t_16 */
-    return 12;
-case 4704: /* SteamInventoryStartPurchaseResult_t_24 */
-    return 20;
-case 5211: /* RequestPlayersForGameProgressCallback_t_16 */
-    return 12;
-case 5212: /* RequestPlayersForGameResultCallback_t_64 */
-    return 56;
-case 5213: /* RequestPlayersForGameFinalResultCallback_t_24 */
-    return 20;
-case 5214: /* SubmitPlayerResultResultCallback_t_24 */
-    return 20;
-case 5215: /* EndGameResultCallback_t_16 */
-    return 12;
-case 5301: /* JoinPartyCallback_t_280 */
-    return 276;
-case 5302: /* CreateBeaconCallback_t_16 */
-    return 12;
-#endif
--- a/lsteamclient/cb_getapi_table.dat
+++ b/lsteamclient/cb_getapi_table.dat
@ -1,818 +0,0 @@
-#ifdef __i386__
-case 152:
-    switch(callback_len){
-    default:
-    case 24: cb_MicroTxnAuthorizationResponse_t_24(lin_callback, callback); break;
-    }
-    break;
-case 209:
-    switch(callback_len){
-    default:
-    case 40: cb_GSReputation_t_40(lin_callback, callback); break;
-    }
-    break;
-case 513:
-    switch(callback_len){
-    default:
-    case 16: cb_LobbyCreated_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1023:
-    switch(callback_len){
-    default:
-    case 40: cb_FileDetailsResult_t_40(lin_callback, callback); break;
-    }
-    break;
-case 1106:
-    switch(callback_len){
-    default:
-    case 32: cb_LeaderboardScoreUploaded_t_32(lin_callback, callback); break;
-    }
-    break;
-case 1111:
-    switch(callback_len){
-    default:
-    case 16: cb_LeaderboardUGCSet_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1112:
-    switch(callback_len){
-    default:
-    case 24: cb_PS3TrophiesInstalled_t_24(lin_callback, callback); break;
-    }
-    break;
-case 1221:
-    switch(callback_len){
-    default:
-    case 712: cb_SteamNetConnectionStatusChangedCallback_t_712(lin_callback, callback); break;
-    case 584: cb_SteamNetConnectionStatusChangedCallback_t_584(lin_callback, callback); break;
-    }
-    break;
-case 1303:
-    switch(callback_len){
-    default:
-    case 288: cb_RemoteStorageAppSyncProgress_t_288(lin_callback, callback); break;
-    }
-    break;
-case 1307:
-    switch(callback_len){
-    default:
-    case 280: cb_RemoteStorageFileShareResult_t_280(lin_callback, callback); break;
-    case 16: cb_RemoteStorageFileShareResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1308:
-    switch(callback_len){
-    default:
-    case 40: cb_RemoteStorageDownloadUGCResult_t_40(lin_callback, callback); break;
-    }
-    break;
-case 1309:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoteStoragePublishFileResult_t_24(lin_callback, callback); break;
-    case 16: cb_RemoteStoragePublishFileResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1310:
-    switch(callback_len){
-    default:
-    case 1744: cb_RemoteStorageGetPublishedFileDetailsResult_t_1744(lin_callback, callback); break;
-    }
-    break;
-case 1311:
-    switch(callback_len){
-    default:
-    case 16: cb_RemoteStorageDeletePublishedFileResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1312:
-    switch(callback_len){
-    default:
-    case 416: cb_RemoteStorageEnumerateUserPublishedFilesResult_t_416(lin_callback, callback); break;
-    }
-    break;
-case 1313:
-    switch(callback_len){
-    default:
-    case 16: cb_RemoteStorageSubscribePublishedFileResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1314:
-    switch(callback_len){
-    default:
-    case 616: cb_RemoteStorageEnumerateUserSubscribedFilesResult_t_616(lin_callback, callback); break;
-    }
-    break;
-case 1315:
-    switch(callback_len){
-    default:
-    case 16: cb_RemoteStorageUnsubscribePublishedFileResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1316:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoteStorageUpdatePublishedFileResult_t_24(lin_callback, callback); break;
-    case 16: cb_RemoteStorageUpdatePublishedFileResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1317:
-    switch(callback_len){
-    default:
-    case 296: cb_RemoteStorageDownloadUGCResult_t_296(lin_callback, callback); break;
-    }
-    break;
-case 1318:
-    switch(callback_len){
-    default:
-    case 9760: cb_RemoteStorageGetPublishedFileDetailsResult_t_9760(lin_callback, callback); break;
-    case 9752: cb_RemoteStorageGetPublishedFileDetailsResult_t_9752(lin_callback, callback); break;
-    case 9496: cb_RemoteStorageGetPublishedFileDetailsResult_t_9496(lin_callback, callback); break;
-    }
-    break;
-case 1319:
-    switch(callback_len){
-    default:
-    case 624: cb_RemoteStorageEnumerateWorkshopFilesResult_t_624(lin_callback, callback); break;
-    case 616: cb_RemoteStorageEnumerateWorkshopFilesResult_t_616(lin_callback, callback); break;
-    }
-    break;
-case 1320:
-    switch(callback_len){
-    default:
-    case 32: cb_RemoteStorageGetPublishedItemVoteDetailsResult_t_32(lin_callback, callback); break;
-    }
-    break;
-case 1324:
-    switch(callback_len){
-    default:
-    case 16: cb_RemoteStorageUpdateUserPublishedItemVoteResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1325:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoteStorageUserVoteDetails_t_24(lin_callback, callback); break;
-    }
-    break;
-case 1326:
-    switch(callback_len){
-    default:
-    case 416: cb_RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416(lin_callback, callback); break;
-    }
-    break;
-case 1327:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoteStorageSetUserPublishedFileActionResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 1330:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoteStoragePublishedFileUpdated_t_24(lin_callback, callback); break;
-    }
-    break;
-case 2101:
-    switch(callback_len){
-    default:
-    case 32: cb_HTTPRequestCompleted_t_32(lin_callback, callback); break;
-    case 24: cb_HTTPRequestCompleted_t_24(lin_callback, callback); break;
-    }
-    break;
-case 2102:
-    switch(callback_len){
-    default:
-    case 16: cb_HTTPRequestHeadersReceived_t_16(lin_callback, callback); break;
-    }
-    break;
-case 2103:
-    switch(callback_len){
-    default:
-    case 24: cb_HTTPRequestDataReceived_t_24(lin_callback, callback); break;
-    }
-    break;
-case 2803:
-    switch(callback_len){
-    default:
-    case 40: cb_SteamInputConfigurationLoaded_t_40(lin_callback, callback); break;
-    }
-    break;
-case 2804:
-    switch(callback_len){
-    default:
-    case 32: cb_SteamInputGamepadSlotChange_t_32(lin_callback, callback); break;
-    }
-    break;
-case 3402:
-    switch(callback_len){
-    default:
-    case 9784: cb_SteamUGCRequestUGCDetailsResult_t_9784(lin_callback, callback); break;
-    case 9776: cb_SteamUGCRequestUGCDetailsResult_t_9776(lin_callback, callback); break;
-    case 9768: cb_SteamUGCRequestUGCDetailsResult_t_9768(lin_callback, callback); break;
-    }
-    break;
-case 3403:
-    switch(callback_len){
-    default:
-    case 24: cb_CreateItemResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3405:
-    switch(callback_len){
-    default:
-    case 16: cb_ItemInstalled_t_16(lin_callback, callback); break;
-    }
-    break;
-case 3406:
-    switch(callback_len){
-    default:
-    case 24: cb_DownloadItemResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3412:
-    switch(callback_len){
-    default:
-    case 24: cb_AddUGCDependencyResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3413:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoveUGCDependencyResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3414:
-    switch(callback_len){
-    default:
-    case 24: cb_AddAppDependencyResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3415:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoveAppDependencyResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3416:
-    switch(callback_len){
-    default:
-    case 152: cb_GetAppDependenciesResult_t_152(lin_callback, callback); break;
-    }
-    break;
-case 3417:
-    switch(callback_len){
-    default:
-    case 16: cb_DeleteItemResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 4502:
-    switch(callback_len){
-    default:
-    case 48: cb_HTML_NeedsPaint_t_48(lin_callback, callback); break;
-    }
-    break;
-case 4503:
-    switch(callback_len){
-    default:
-    case 20: cb_HTML_StartRequest_t_20(lin_callback, callback); break;
-    }
-    break;
-case 4505:
-    switch(callback_len){
-    default:
-    case 24: cb_HTML_URLChanged_t_24(lin_callback, callback); break;
-    }
-    break;
-case 4506:
-    switch(callback_len){
-    default:
-    case 12: cb_HTML_FinishedRequest_t_12(lin_callback, callback); break;
-    }
-    break;
-case 4507:
-    switch(callback_len){
-    default:
-    case 8: cb_HTML_OpenLinkInNewTab_t_8(lin_callback, callback); break;
-    }
-    break;
-case 4508:
-    switch(callback_len){
-    default:
-    case 8: cb_HTML_ChangedTitle_t_8(lin_callback, callback); break;
-    }
-    break;
-case 4513:
-    switch(callback_len){
-    default:
-    case 20: cb_HTML_LinkAtPosition_t_20(lin_callback, callback); break;
-    }
-    break;
-case 4514:
-    switch(callback_len){
-    default:
-    case 8: cb_HTML_JSAlert_t_8(lin_callback, callback); break;
-    }
-    break;
-case 4515:
-    switch(callback_len){
-    default:
-    case 8: cb_HTML_JSConfirm_t_8(lin_callback, callback); break;
-    }
-    break;
-case 4516:
-    switch(callback_len){
-    default:
-    case 12: cb_HTML_FileOpenDialog_t_12(lin_callback, callback); break;
-    }
-    break;
-case 4517:
-    switch(callback_len){
-    default:
-    case 16: cb_HTML_ComboNeedsPaint_t_16(lin_callback, callback); break;
-    }
-    break;
-case 4521:
-    switch(callback_len){
-    default:
-    case 28: cb_HTML_NewWindow_t_28(lin_callback, callback); break;
-    case 24: cb_HTML_NewWindow_t_24(lin_callback, callback); break;
-    }
-    break;
-case 4523:
-    switch(callback_len){
-    default:
-    case 8: cb_HTML_StatusText_t_8(lin_callback, callback); break;
-    }
-    break;
-case 4524:
-    switch(callback_len){
-    default:
-    case 8: cb_HTML_ShowToolTip_t_8(lin_callback, callback); break;
-    }
-    break;
-case 4525:
-    switch(callback_len){
-    default:
-    case 8: cb_HTML_UpdateToolTip_t_8(lin_callback, callback); break;
-    }
-    break;
-case 4704:
-    switch(callback_len){
-    default:
-    case 24: cb_SteamInventoryStartPurchaseResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 5211:
-    switch(callback_len){
-    default:
-    case 16: cb_RequestPlayersForGameProgressCallback_t_16(lin_callback, callback); break;
-    }
-    break;
-case 5212:
-    switch(callback_len){
-    default:
-    case 64: cb_RequestPlayersForGameResultCallback_t_64(lin_callback, callback); break;
-    }
-    break;
-case 5213:
-    switch(callback_len){
-    default:
-    case 24: cb_RequestPlayersForGameFinalResultCallback_t_24(lin_callback, callback); break;
-    }
-    break;
-case 5214:
-    switch(callback_len){
-    default:
-    case 24: cb_SubmitPlayerResultResultCallback_t_24(lin_callback, callback); break;
-    }
-    break;
-case 5215:
-    switch(callback_len){
-    default:
-    case 16: cb_EndGameResultCallback_t_16(lin_callback, callback); break;
-    }
-    break;
-case 5301:
-    switch(callback_len){
-    default:
-    case 280: cb_JoinPartyCallback_t_280(lin_callback, callback); break;
-    }
-    break;
-case 5302:
-    switch(callback_len){
-    default:
-    case 16: cb_CreateBeaconCallback_t_16(lin_callback, callback); break;
-    }
-    break;
-#endif
-#ifdef __x86_64__
-case 152:
-    switch(callback_len){
-    default:
-    case 24: cb_MicroTxnAuthorizationResponse_t_24(lin_callback, callback); break;
-    }
-    break;
-case 209:
-    switch(callback_len){
-    default:
-    case 40: cb_GSReputation_t_40(lin_callback, callback); break;
-    }
-    break;
-case 513:
-    switch(callback_len){
-    default:
-    case 16: cb_LobbyCreated_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1023:
-    switch(callback_len){
-    default:
-    case 40: cb_FileDetailsResult_t_40(lin_callback, callback); break;
-    }
-    break;
-case 1106:
-    switch(callback_len){
-    default:
-    case 32: cb_LeaderboardScoreUploaded_t_32(lin_callback, callback); break;
-    }
-    break;
-case 1111:
-    switch(callback_len){
-    default:
-    case 16: cb_LeaderboardUGCSet_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1112:
-    switch(callback_len){
-    default:
-    case 24: cb_PS3TrophiesInstalled_t_24(lin_callback, callback); break;
-    }
-    break;
-case 1221:
-    switch(callback_len){
-    default:
-    case 712: cb_SteamNetConnectionStatusChangedCallback_t_712(lin_callback, callback); break;
-    case 584: cb_SteamNetConnectionStatusChangedCallback_t_584(lin_callback, callback); break;
-    }
-    break;
-case 1303:
-    switch(callback_len){
-    default:
-    case 288: cb_RemoteStorageAppSyncProgress_t_288(lin_callback, callback); break;
-    }
-    break;
-case 1307:
-    switch(callback_len){
-    default:
-    case 280: cb_RemoteStorageFileShareResult_t_280(lin_callback, callback); break;
-    case 16: cb_RemoteStorageFileShareResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1308:
-    switch(callback_len){
-    default:
-    case 40: cb_RemoteStorageDownloadUGCResult_t_40(lin_callback, callback); break;
-    }
-    break;
-case 1309:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoteStoragePublishFileResult_t_24(lin_callback, callback); break;
-    case 16: cb_RemoteStoragePublishFileResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1310:
-    switch(callback_len){
-    default:
-    case 1744: cb_RemoteStorageGetPublishedFileDetailsResult_t_1744(lin_callback, callback); break;
-    }
-    break;
-case 1311:
-    switch(callback_len){
-    default:
-    case 16: cb_RemoteStorageDeletePublishedFileResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1312:
-    switch(callback_len){
-    default:
-    case 416: cb_RemoteStorageEnumerateUserPublishedFilesResult_t_416(lin_callback, callback); break;
-    }
-    break;
-case 1313:
-    switch(callback_len){
-    default:
-    case 16: cb_RemoteStorageSubscribePublishedFileResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1314:
-    switch(callback_len){
-    default:
-    case 616: cb_RemoteStorageEnumerateUserSubscribedFilesResult_t_616(lin_callback, callback); break;
-    }
-    break;
-case 1315:
-    switch(callback_len){
-    default:
-    case 16: cb_RemoteStorageUnsubscribePublishedFileResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1316:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoteStorageUpdatePublishedFileResult_t_24(lin_callback, callback); break;
-    case 16: cb_RemoteStorageUpdatePublishedFileResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1317:
-    switch(callback_len){
-    default:
-    case 296: cb_RemoteStorageDownloadUGCResult_t_296(lin_callback, callback); break;
-    }
-    break;
-case 1318:
-    switch(callback_len){
-    default:
-    case 9760: cb_RemoteStorageGetPublishedFileDetailsResult_t_9760(lin_callback, callback); break;
-    case 9752: cb_RemoteStorageGetPublishedFileDetailsResult_t_9752(lin_callback, callback); break;
-    case 9496: cb_RemoteStorageGetPublishedFileDetailsResult_t_9496(lin_callback, callback); break;
-    }
-    break;
-case 1319:
-    switch(callback_len){
-    default:
-    case 624: cb_RemoteStorageEnumerateWorkshopFilesResult_t_624(lin_callback, callback); break;
-    case 616: cb_RemoteStorageEnumerateWorkshopFilesResult_t_616(lin_callback, callback); break;
-    }
-    break;
-case 1320:
-    switch(callback_len){
-    default:
-    case 32: cb_RemoteStorageGetPublishedItemVoteDetailsResult_t_32(lin_callback, callback); break;
-    }
-    break;
-case 1324:
-    switch(callback_len){
-    default:
-    case 16: cb_RemoteStorageUpdateUserPublishedItemVoteResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1325:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoteStorageUserVoteDetails_t_24(lin_callback, callback); break;
-    }
-    break;
-case 1326:
-    switch(callback_len){
-    default:
-    case 416: cb_RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416(lin_callback, callback); break;
-    }
-    break;
-case 1327:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoteStorageSetUserPublishedFileActionResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 1330:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoteStoragePublishedFileUpdated_t_24(lin_callback, callback); break;
-    }
-    break;
-case 2101:
-    switch(callback_len){
-    default:
-    case 32: cb_HTTPRequestCompleted_t_32(lin_callback, callback); break;
-    case 24: cb_HTTPRequestCompleted_t_24(lin_callback, callback); break;
-    }
-    break;
-case 2102:
-    switch(callback_len){
-    default:
-    case 16: cb_HTTPRequestHeadersReceived_t_16(lin_callback, callback); break;
-    }
-    break;
-case 2103:
-    switch(callback_len){
-    default:
-    case 24: cb_HTTPRequestDataReceived_t_24(lin_callback, callback); break;
-    }
-    break;
-case 2803:
-    switch(callback_len){
-    default:
-    case 40: cb_SteamInputConfigurationLoaded_t_40(lin_callback, callback); break;
-    }
-    break;
-case 2804:
-    switch(callback_len){
-    default:
-    case 32: cb_SteamInputGamepadSlotChange_t_32(lin_callback, callback); break;
-    }
-    break;
-case 3402:
-    switch(callback_len){
-    default:
-    case 9784: cb_SteamUGCRequestUGCDetailsResult_t_9784(lin_callback, callback); break;
-    case 9776: cb_SteamUGCRequestUGCDetailsResult_t_9776(lin_callback, callback); break;
-    case 9768: cb_SteamUGCRequestUGCDetailsResult_t_9768(lin_callback, callback); break;
-    }
-    break;
-case 3403:
-    switch(callback_len){
-    default:
-    case 24: cb_CreateItemResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3405:
-    switch(callback_len){
-    default:
-    case 16: cb_ItemInstalled_t_16(lin_callback, callback); break;
-    }
-    break;
-case 3406:
-    switch(callback_len){
-    default:
-    case 24: cb_DownloadItemResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3412:
-    switch(callback_len){
-    default:
-    case 24: cb_AddUGCDependencyResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3413:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoveUGCDependencyResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3414:
-    switch(callback_len){
-    default:
-    case 24: cb_AddAppDependencyResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3415:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoveAppDependencyResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3416:
-    switch(callback_len){
-    default:
-    case 152: cb_GetAppDependenciesResult_t_152(lin_callback, callback); break;
-    }
-    break;
-case 3417:
-    switch(callback_len){
-    default:
-    case 16: cb_DeleteItemResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 4502:
-    switch(callback_len){
-    default:
-    case 56: cb_HTML_NeedsPaint_t_56(lin_callback, callback); break;
-    }
-    break;
-case 4503:
-    switch(callback_len){
-    default:
-    case 40: cb_HTML_StartRequest_t_40(lin_callback, callback); break;
-    }
-    break;
-case 4505:
-    switch(callback_len){
-    default:
-    case 48: cb_HTML_URLChanged_t_48(lin_callback, callback); break;
-    }
-    break;
-case 4506:
-    switch(callback_len){
-    default:
-    case 24: cb_HTML_FinishedRequest_t_24(lin_callback, callback); break;
-    }
-    break;
-case 4507:
-    switch(callback_len){
-    default:
-    case 16: cb_HTML_OpenLinkInNewTab_t_16(lin_callback, callback); break;
-    }
-    break;
-case 4508:
-    switch(callback_len){
-    default:
-    case 16: cb_HTML_ChangedTitle_t_16(lin_callback, callback); break;
-    }
-    break;
-case 4513:
-    switch(callback_len){
-    default:
-    case 32: cb_HTML_LinkAtPosition_t_32(lin_callback, callback); break;
-    }
-    break;
-case 4514:
-    switch(callback_len){
-    default:
-    case 16: cb_HTML_JSAlert_t_16(lin_callback, callback); break;
-    }
-    break;
-case 4515:
-    switch(callback_len){
-    default:
-    case 16: cb_HTML_JSConfirm_t_16(lin_callback, callback); break;
-    }
-    break;
-case 4516:
-    switch(callback_len){
-    default:
-    case 24: cb_HTML_FileOpenDialog_t_24(lin_callback, callback); break;
-    }
-    break;
-case 4517:
-    switch(callback_len){
-    default:
-    case 24: cb_HTML_ComboNeedsPaint_t_24(lin_callback, callback); break;
-    }
-    break;
-case 4521:
-    switch(callback_len){
-    default:
-    case 40: cb_HTML_NewWindow_t_40(lin_callback, callback); break;
-    case 32: cb_HTML_NewWindow_t_32(lin_callback, callback); break;
-    }
-    break;
-case 4523:
-    switch(callback_len){
-    default:
-    case 16: cb_HTML_StatusText_t_16(lin_callback, callback); break;
-    }
-    break;
-case 4524:
-    switch(callback_len){
-    default:
-    case 16: cb_HTML_ShowToolTip_t_16(lin_callback, callback); break;
-    }
-    break;
-case 4525:
-    switch(callback_len){
-    default:
-    case 16: cb_HTML_UpdateToolTip_t_16(lin_callback, callback); break;
-    }
-    break;
-case 4704:
-    switch(callback_len){
-    default:
-    case 24: cb_SteamInventoryStartPurchaseResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 5211:
-    switch(callback_len){
-    default:
-    case 16: cb_RequestPlayersForGameProgressCallback_t_16(lin_callback, callback); break;
-    }
-    break;
-case 5212:
-    switch(callback_len){
-    default:
-    case 64: cb_RequestPlayersForGameResultCallback_t_64(lin_callback, callback); break;
-    }
-    break;
-case 5213:
-    switch(callback_len){
-    default:
-    case 24: cb_RequestPlayersForGameFinalResultCallback_t_24(lin_callback, callback); break;
-    }
-    break;
-case 5214:
-    switch(callback_len){
-    default:
-    case 24: cb_SubmitPlayerResultResultCallback_t_24(lin_callback, callback); break;
-    }
-    break;
-case 5215:
-    switch(callback_len){
-    default:
-    case 16: cb_EndGameResultCallback_t_16(lin_callback, callback); break;
-    }
-    break;
-case 5301:
-    switch(callback_len){
-    default:
-    case 280: cb_JoinPartyCallback_t_280(lin_callback, callback); break;
-    }
-    break;
-case 5302:
-    switch(callback_len){
-    default:
-    case 16: cb_CreateBeaconCallback_t_16(lin_callback, callback); break;
-    }
-    break;
-#endif
--- a/lsteamclient/cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.cpp
@ -1,42 +1,48 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_158/steam_api.h"
-#include "steamworks_sdk_158/steamnetworkingtypes.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_158
-#include "struct_converters.h"
-#include "cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.h"
-uint32 cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetNumInstalledApps(void *linux_side)
+
+NTSTATUS ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetNumInstalledApps( void *args )
 {
-    return ((ISteamAppList*)linux_side)->GetNumInstalledApps();
+    struct ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetNumInstalledApps_params *params = (struct ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetNumInstalledApps_params *)args;
+    struct u_ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *iface = (struct u_ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *)params->linux_side;
+    params->_ret = iface->GetNumInstalledApps(  );
+    return 0;
 }

-uint32 cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetInstalledApps(void *linux_side, AppId_t * pvecAppID, uint32 unMaxAppIDs)
+NTSTATUS ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetInstalledApps( void *args )
 {
-    return ((ISteamAppList*)linux_side)->GetInstalledApps((AppId_t *)pvecAppID, (uint32)unMaxAppIDs);
+    struct ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetInstalledApps_params *params = (struct ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetInstalledApps_params *)args;
+    struct u_ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *iface = (struct u_ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *)params->linux_side;
+    params->_ret = iface->GetInstalledApps( params->pvecAppID, params->unMaxAppIDs );
+    return 0;
 }

-int cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppName(void *linux_side, AppId_t nAppID, char * pchName, int cchNameMax)
+NTSTATUS ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppName( void *args )
 {
-    return ((ISteamAppList*)linux_side)->GetAppName((AppId_t)nAppID, (char *)pchName, (int)cchNameMax);
+    struct ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppName_params *params = (struct ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppName_params *)args;
+    struct u_ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *iface = (struct u_ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *)params->linux_side;
+    params->_ret = iface->GetAppName( params->nAppID, params->pchName, params->cchNameMax );
+    return 0;
 }

-int cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppInstallDir(void *linux_side, AppId_t nAppID, char * pchDirectory, int cchNameMax)
+NTSTATUS ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppInstallDir( void *args )
 {
-    return ((ISteamAppList*)linux_side)->GetAppInstallDir((AppId_t)nAppID, (char *)pchDirectory, (int)cchNameMax);
+    struct ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppInstallDir_params *params = (struct ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppInstallDir_params *)args;
+    struct u_ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *iface = (struct u_ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *)params->linux_side;
+    params->_ret = iface->GetAppInstallDir( params->nAppID, params->pchDirectory, params->cchNameMax );
+    params->_ret = steamclient_unix_path_to_dos_path( params->_ret, params->pchDirectory, params->pchDirectory, params->cchNameMax, 0 );
+    return 0;
 }

-int cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppBuildId(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppBuildId( void *args )
 {
-    return ((ISteamAppList*)linux_side)->GetAppBuildId((AppId_t)nAppID);
+    struct ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppBuildId_params *params = (struct ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppBuildId_params *)args;
+    struct u_ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *iface = (struct u_ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *)params->linux_side;
+    params->_ret = iface->GetAppBuildId( params->nAppID );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.h
@ -1,5 +0,0 @@
-extern uint32 cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetNumInstalledApps(void *);
-extern uint32 cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetInstalledApps(void *, AppId_t *, uint32);
-extern int cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppName(void *, AppId_t, char *, int);
-extern int cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppInstallDir(void *, AppId_t, char *, int);
-extern int cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppBuildId(void *, AppId_t);
--- a/lsteamclient/cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.cpp
@ -1,23 +1,15 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_158/steam_api.h"
-#include "steamworks_sdk_158/steamnetworkingtypes.h"
-#include "steamworks_sdk_158/isteamappticket.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_158
-#include "struct_converters.h"
-#include "cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.h"
-uint32 cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001_GetAppOwnershipTicketData(void *linux_side, uint32 nAppID, void * pvBuffer, uint32 cbBufferLength, uint32 * piAppId, uint32 * piSteamId, uint32 * piSignature, uint32 * pcbSignature)
+
+NTSTATUS ISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001_GetAppOwnershipTicketData( void *args )
 {
-    return ((ISteamAppTicket*)linux_side)->GetAppOwnershipTicketData((uint32)nAppID, (void *)pvBuffer, (uint32)cbBufferLength, (uint32 *)piAppId, (uint32 *)piSteamId, (uint32 *)piSignature, (uint32 *)pcbSignature);
+    struct ISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001_GetAppOwnershipTicketData_params *params = (struct ISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001_GetAppOwnershipTicketData_params *)args;
+    struct u_ISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001 *iface = (struct u_ISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001 *)params->linux_side;
+    params->_ret = iface->GetAppOwnershipTicketData( params->nAppID, params->pvBuffer, params->cbBufferLength, params->piAppId, params->piSteamId, params->piSignature, params->pcbSignature );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.h
@ -1 +0,0 @@
-extern uint32 cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001_GetAppOwnershipTicketData(void *, uint32, void *, uint32, uint32 *, uint32 *, uint32 *, uint32 *);
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.cpp
@ -1,21 +1,15 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_100/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_100
-#include "struct_converters.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.h"
-int cppISteamApps_STEAMAPPS_INTERFACE_VERSION001_GetAppData(void *linux_side, AppId_t nAppID, const char * pchKey, char * pchValue, int cchValueMax)
+
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION001_GetAppData( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAppData((AppId_t)nAppID, (const char *)pchKey, (char *)pchValue, (int)cchValueMax);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION001_GetAppData_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION001_GetAppData_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION001 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION001 *)params->linux_side;
+    params->_ret = iface->GetAppData( params->nAppID, params->pchKey, params->pchValue, params->cchValueMax );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.h
@ -1 +0,0 @@
-extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION001_GetAppData(void *, AppId_t, const char *, char *, int);
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.cpp
@ -1,51 +1,63 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_103/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_103
-#include "struct_converters.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.h"
-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribed(void *linux_side)
+
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribed( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribed();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribed_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribed_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION002 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION002 *)params->linux_side;
+    params->_ret = iface->BIsSubscribed(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsLowViolence(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsLowViolence( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsLowViolence();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsLowViolence_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsLowViolence_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION002 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION002 *)params->linux_side;
+    params->_ret = iface->BIsLowViolence(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsCybercafe(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsCybercafe( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsCybercafe();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsCybercafe_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsCybercafe_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION002 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION002 *)params->linux_side;
+    params->_ret = iface->BIsCybercafe(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsVACBanned(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsVACBanned( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsVACBanned();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsVACBanned_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsVACBanned_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION002 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION002 *)params->linux_side;
+    params->_ret = iface->BIsVACBanned(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetCurrentGameLanguage(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetCurrentGameLanguage( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetCurrentGameLanguage();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetCurrentGameLanguage_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetCurrentGameLanguage_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION002 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION002 *)params->linux_side;
+    params->_ret = iface->GetCurrentGameLanguage(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetAvailableGameLanguages(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetAvailableGameLanguages( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAvailableGameLanguages();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetAvailableGameLanguages_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetAvailableGameLanguages_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION002 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION002 *)params->linux_side;
+    params->_ret = iface->GetAvailableGameLanguages(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribedApp(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribedApp( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribedApp((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribedApp_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribedApp_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION002 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION002 *)params->linux_side;
+    params->_ret = iface->BIsSubscribedApp( params->appID );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.h
@ -1,7 +0,0 @@
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribed(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsLowViolence(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsCybercafe(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsVACBanned(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetCurrentGameLanguage(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetAvailableGameLanguages(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribedApp(void *, AppId_t);
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.cpp
@ -1,56 +1,71 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_111/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_111
-#include "struct_converters.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.h"
-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribed(void *linux_side)
+
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribed( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribed();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribed_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribed_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *)params->linux_side;
+    params->_ret = iface->BIsSubscribed(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsLowViolence(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsLowViolence( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsLowViolence();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsLowViolence_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsLowViolence_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *)params->linux_side;
+    params->_ret = iface->BIsLowViolence(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsCybercafe(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsCybercafe( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsCybercafe();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsCybercafe_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsCybercafe_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *)params->linux_side;
+    params->_ret = iface->BIsCybercafe(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsVACBanned(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsVACBanned( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsVACBanned();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsVACBanned_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsVACBanned_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *)params->linux_side;
+    params->_ret = iface->BIsVACBanned(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetCurrentGameLanguage(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetCurrentGameLanguage( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetCurrentGameLanguage();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetCurrentGameLanguage_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetCurrentGameLanguage_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *)params->linux_side;
+    params->_ret = iface->GetCurrentGameLanguage(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetAvailableGameLanguages(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetAvailableGameLanguages( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAvailableGameLanguages();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetAvailableGameLanguages_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetAvailableGameLanguages_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *)params->linux_side;
+    params->_ret = iface->GetAvailableGameLanguages(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribedApp(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribedApp( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribedApp((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribedApp_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribedApp_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *)params->linux_side;
+    params->_ret = iface->BIsSubscribedApp( params->appID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsDlcInstalled(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsDlcInstalled( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsDlcInstalled((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsDlcInstalled_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsDlcInstalled_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION003 *)params->linux_side;
+    params->_ret = iface->BIsDlcInstalled( params->appID );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.h
@ -1,8 +0,0 @@
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribed(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsLowViolence(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsCybercafe(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsVACBanned(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetCurrentGameLanguage(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetAvailableGameLanguages(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribedApp(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsDlcInstalled(void *, AppId_t);
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.cpp
@ -1,86 +1,119 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_117/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_117
-#include "struct_converters.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.h"
-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribed(void *linux_side)
+
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribed( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribed();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribed_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribed_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *)params->linux_side;
+    params->_ret = iface->BIsSubscribed(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsLowViolence(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsLowViolence( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsLowViolence();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsLowViolence_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsLowViolence_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *)params->linux_side;
+    params->_ret = iface->BIsLowViolence(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsCybercafe(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsCybercafe( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsCybercafe();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsCybercafe_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsCybercafe_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *)params->linux_side;
+    params->_ret = iface->BIsCybercafe(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsVACBanned(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsVACBanned( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsVACBanned();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsVACBanned_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsVACBanned_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *)params->linux_side;
+    params->_ret = iface->BIsVACBanned(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetCurrentGameLanguage(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetCurrentGameLanguage( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetCurrentGameLanguage();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetCurrentGameLanguage_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetCurrentGameLanguage_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *)params->linux_side;
+    params->_ret = iface->GetCurrentGameLanguage(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetAvailableGameLanguages(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetAvailableGameLanguages( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAvailableGameLanguages();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetAvailableGameLanguages_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetAvailableGameLanguages_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *)params->linux_side;
+    params->_ret = iface->GetAvailableGameLanguages(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribedApp(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribedApp( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribedApp((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribedApp_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribedApp_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *)params->linux_side;
+    params->_ret = iface->BIsSubscribedApp( params->appID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsDlcInstalled(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsDlcInstalled( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsDlcInstalled((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsDlcInstalled_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsDlcInstalled_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *)params->linux_side;
+    params->_ret = iface->BIsDlcInstalled( params->appID );
+    return 0;
 }

-uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetEarliestPurchaseUnixTime(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetEarliestPurchaseUnixTime( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetEarliestPurchaseUnixTime((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetEarliestPurchaseUnixTime_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetEarliestPurchaseUnixTime_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *)params->linux_side;
+    params->_ret = iface->GetEarliestPurchaseUnixTime( params->nAppID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribedFromFreeWeekend(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribedFromFreeWeekend( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribedFromFreeWeekend();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribedFromFreeWeekend_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribedFromFreeWeekend_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *)params->linux_side;
+    params->_ret = iface->BIsSubscribedFromFreeWeekend(  );
+    return 0;
 }

-int cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetDLCCount(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetDLCCount( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetDLCCount();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetDLCCount_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetDLCCount_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *)params->linux_side;
+    params->_ret = iface->GetDLCCount(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BGetDLCDataByIndex(void *linux_side, int iDLC, AppId_t * pAppID, bool * pbAvailable, char * pchName, int cchNameBufferSize)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BGetDLCDataByIndex( void *args )
 {
-    return ((ISteamApps*)linux_side)->BGetDLCDataByIndex((int)iDLC, (AppId_t *)pAppID, (bool *)pbAvailable, (char *)pchName, (int)cchNameBufferSize);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BGetDLCDataByIndex_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BGetDLCDataByIndex_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *)params->linux_side;
+    params->_ret = iface->BGetDLCDataByIndex( params->iDLC, params->pAppID, params->pbAvailable, params->pchName, params->cchNameBufferSize );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_InstallDLC(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_InstallDLC( void *args )
 {
-    ((ISteamApps*)linux_side)->InstallDLC((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_InstallDLC_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_InstallDLC_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *)params->linux_side;
+    iface->InstallDLC( params->nAppID );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_UninstallDLC(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_UninstallDLC( void *args )
 {
-    ((ISteamApps*)linux_side)->UninstallDLC((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_UninstallDLC_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION004_UninstallDLC_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION004 *)params->linux_side;
+    iface->UninstallDLC( params->nAppID );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.h
@ -1,14 +0,0 @@
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribed(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsLowViolence(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsCybercafe(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsVACBanned(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetCurrentGameLanguage(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetAvailableGameLanguages(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribedApp(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsDlcInstalled(void *, AppId_t);
-extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetEarliestPurchaseUnixTime(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribedFromFreeWeekend(void *);
-extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetDLCCount(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BGetDLCDataByIndex(void *, int, AppId_t *, bool *, char *, int);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_InstallDLC(void *, AppId_t);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_UninstallDLC(void *, AppId_t);
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.cpp
@ -1,116 +1,168 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_125/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_125
-#include "struct_converters.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.h"
-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribed(void *linux_side)
+
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribed( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribed();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribed_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribed_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->BIsSubscribed(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsLowViolence(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsLowViolence( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsLowViolence();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsLowViolence_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsLowViolence_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->BIsLowViolence(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsCybercafe(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsCybercafe( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsCybercafe();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsCybercafe_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsCybercafe_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->BIsCybercafe(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsVACBanned(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsVACBanned( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsVACBanned();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsVACBanned_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsVACBanned_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->BIsVACBanned(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetCurrentGameLanguage(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetCurrentGameLanguage( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetCurrentGameLanguage();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetCurrentGameLanguage_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetCurrentGameLanguage_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->GetCurrentGameLanguage(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAvailableGameLanguages(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAvailableGameLanguages( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAvailableGameLanguages();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAvailableGameLanguages_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAvailableGameLanguages_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->GetAvailableGameLanguages(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribedApp(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribedApp( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribedApp((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribedApp_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribedApp_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->BIsSubscribedApp( params->appID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsDlcInstalled(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsDlcInstalled( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsDlcInstalled((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsDlcInstalled_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsDlcInstalled_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->BIsDlcInstalled( params->appID );
+    return 0;
 }

-uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetEarliestPurchaseUnixTime(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetEarliestPurchaseUnixTime( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetEarliestPurchaseUnixTime((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetEarliestPurchaseUnixTime_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetEarliestPurchaseUnixTime_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->GetEarliestPurchaseUnixTime( params->nAppID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribedFromFreeWeekend(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribedFromFreeWeekend( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribedFromFreeWeekend();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribedFromFreeWeekend_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribedFromFreeWeekend_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->BIsSubscribedFromFreeWeekend(  );
+    return 0;
 }

-int cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetDLCCount(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetDLCCount( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetDLCCount();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetDLCCount_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetDLCCount_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->GetDLCCount(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BGetDLCDataByIndex(void *linux_side, int iDLC, AppId_t * pAppID, bool * pbAvailable, char * pchName, int cchNameBufferSize)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BGetDLCDataByIndex( void *args )
 {
-    return ((ISteamApps*)linux_side)->BGetDLCDataByIndex((int)iDLC, (AppId_t *)pAppID, (bool *)pbAvailable, (char *)pchName, (int)cchNameBufferSize);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BGetDLCDataByIndex_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BGetDLCDataByIndex_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->BGetDLCDataByIndex( params->iDLC, params->pAppID, params->pbAvailable, params->pchName, params->cchNameBufferSize );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_InstallDLC(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_InstallDLC( void *args )
 {
-    ((ISteamApps*)linux_side)->InstallDLC((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_InstallDLC_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_InstallDLC_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    iface->InstallDLC( params->nAppID );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_UninstallDLC(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_UninstallDLC( void *args )
 {
-    ((ISteamApps*)linux_side)->UninstallDLC((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_UninstallDLC_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_UninstallDLC_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    iface->UninstallDLC( params->nAppID );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_RequestAppProofOfPurchaseKey(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_RequestAppProofOfPurchaseKey( void *args )
 {
-    ((ISteamApps*)linux_side)->RequestAppProofOfPurchaseKey((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_RequestAppProofOfPurchaseKey_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_RequestAppProofOfPurchaseKey_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    iface->RequestAppProofOfPurchaseKey( params->nAppID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetCurrentBetaName(void *linux_side, char * pchName, int cchNameBufferSize)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetCurrentBetaName( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetCurrentBetaName((char *)pchName, (int)cchNameBufferSize);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetCurrentBetaName_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetCurrentBetaName_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->GetCurrentBetaName( params->pchName, params->cchNameBufferSize );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_MarkContentCorrupt(void *linux_side, bool bMissingFilesOnly)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_MarkContentCorrupt( void *args )
 {
-    return ((ISteamApps*)linux_side)->MarkContentCorrupt((bool)bMissingFilesOnly);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_MarkContentCorrupt_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_MarkContentCorrupt_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->MarkContentCorrupt( params->bMissingFilesOnly );
+    return 0;
 }

-uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetInstalledDepots(void *linux_side, DepotId_t * pvecDepots, uint32 cMaxDepots)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetInstalledDepots( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetInstalledDepots((DepotId_t *)pvecDepots, (uint32)cMaxDepots);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetInstalledDepots_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetInstalledDepots_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->GetInstalledDepots( params->pvecDepots, params->cMaxDepots );
+    return 0;
 }

-uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAppInstallDir(void *linux_side, AppId_t appID, char * pchFolder, uint32 cchFolderBufferSize)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAppInstallDir( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAppInstallDir((AppId_t)appID, (char *)pchFolder, (uint32)cchFolderBufferSize);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAppInstallDir_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAppInstallDir_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->GetAppInstallDir( params->appID, params->pchFolder, params->cchFolderBufferSize );
+    params->_ret = steamclient_unix_path_to_dos_path( params->_ret, params->pchFolder, params->pchFolder, params->cchFolderBufferSize, 0 );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsAppInstalled(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsAppInstalled( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsAppInstalled((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsAppInstalled_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsAppInstalled_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION005 *)params->linux_side;
+    params->_ret = iface->BIsAppInstalled( params->appID );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.h
@ -1,20 +0,0 @@
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribed(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsLowViolence(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsCybercafe(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsVACBanned(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetCurrentGameLanguage(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAvailableGameLanguages(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribedApp(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsDlcInstalled(void *, AppId_t);
-extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetEarliestPurchaseUnixTime(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribedFromFreeWeekend(void *);
-extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetDLCCount(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BGetDLCDataByIndex(void *, int, AppId_t *, bool *, char *, int);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_InstallDLC(void *, AppId_t);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_UninstallDLC(void *, AppId_t);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_RequestAppProofOfPurchaseKey(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetCurrentBetaName(void *, char *, int);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_MarkContentCorrupt(void *, bool);
-extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetInstalledDepots(void *, DepotId_t *, uint32);
-extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAppInstallDir(void *, AppId_t, char *, uint32);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsAppInstalled(void *, AppId_t);
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.cpp
@ -1,126 +1,184 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_131/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_131
-#include "struct_converters.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.h"
-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribed(void *linux_side)
+
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribed( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribed();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribed_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribed_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->BIsSubscribed(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsLowViolence(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsLowViolence( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsLowViolence();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsLowViolence_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsLowViolence_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->BIsLowViolence(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsCybercafe(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsCybercafe( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsCybercafe();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsCybercafe_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsCybercafe_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->BIsCybercafe(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsVACBanned(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsVACBanned( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsVACBanned();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsVACBanned_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsVACBanned_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->BIsVACBanned(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetCurrentGameLanguage(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetCurrentGameLanguage( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetCurrentGameLanguage();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetCurrentGameLanguage_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetCurrentGameLanguage_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->GetCurrentGameLanguage(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAvailableGameLanguages(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAvailableGameLanguages( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAvailableGameLanguages();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAvailableGameLanguages_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAvailableGameLanguages_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->GetAvailableGameLanguages(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribedApp(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribedApp( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribedApp((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribedApp_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribedApp_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->BIsSubscribedApp( params->appID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsDlcInstalled(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsDlcInstalled( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsDlcInstalled((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsDlcInstalled_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsDlcInstalled_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->BIsDlcInstalled( params->appID );
+    return 0;
 }

-uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetEarliestPurchaseUnixTime(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetEarliestPurchaseUnixTime( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetEarliestPurchaseUnixTime((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetEarliestPurchaseUnixTime_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetEarliestPurchaseUnixTime_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->GetEarliestPurchaseUnixTime( params->nAppID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribedFromFreeWeekend(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribedFromFreeWeekend( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribedFromFreeWeekend();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribedFromFreeWeekend_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribedFromFreeWeekend_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->BIsSubscribedFromFreeWeekend(  );
+    return 0;
 }

-int cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetDLCCount(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetDLCCount( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetDLCCount();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetDLCCount_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetDLCCount_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->GetDLCCount(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BGetDLCDataByIndex(void *linux_side, int iDLC, AppId_t * pAppID, bool * pbAvailable, char * pchName, int cchNameBufferSize)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BGetDLCDataByIndex( void *args )
 {
-    return ((ISteamApps*)linux_side)->BGetDLCDataByIndex((int)iDLC, (AppId_t *)pAppID, (bool *)pbAvailable, (char *)pchName, (int)cchNameBufferSize);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BGetDLCDataByIndex_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BGetDLCDataByIndex_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->BGetDLCDataByIndex( params->iDLC, params->pAppID, params->pbAvailable, params->pchName, params->cchNameBufferSize );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_InstallDLC(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_InstallDLC( void *args )
 {
-    ((ISteamApps*)linux_side)->InstallDLC((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_InstallDLC_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_InstallDLC_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    iface->InstallDLC( params->nAppID );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_UninstallDLC(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_UninstallDLC( void *args )
 {
-    ((ISteamApps*)linux_side)->UninstallDLC((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_UninstallDLC_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_UninstallDLC_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    iface->UninstallDLC( params->nAppID );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_RequestAppProofOfPurchaseKey(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_RequestAppProofOfPurchaseKey( void *args )
 {
-    ((ISteamApps*)linux_side)->RequestAppProofOfPurchaseKey((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_RequestAppProofOfPurchaseKey_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_RequestAppProofOfPurchaseKey_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    iface->RequestAppProofOfPurchaseKey( params->nAppID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetCurrentBetaName(void *linux_side, char * pchName, int cchNameBufferSize)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetCurrentBetaName( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetCurrentBetaName((char *)pchName, (int)cchNameBufferSize);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetCurrentBetaName_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetCurrentBetaName_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->GetCurrentBetaName( params->pchName, params->cchNameBufferSize );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_MarkContentCorrupt(void *linux_side, bool bMissingFilesOnly)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_MarkContentCorrupt( void *args )
 {
-    return ((ISteamApps*)linux_side)->MarkContentCorrupt((bool)bMissingFilesOnly);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_MarkContentCorrupt_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_MarkContentCorrupt_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->MarkContentCorrupt( params->bMissingFilesOnly );
+    return 0;
 }

-uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetInstalledDepots(void *linux_side, AppId_t appID, DepotId_t * pvecDepots, uint32 cMaxDepots)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetInstalledDepots( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetInstalledDepots((AppId_t)appID, (DepotId_t *)pvecDepots, (uint32)cMaxDepots);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetInstalledDepots_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetInstalledDepots_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->GetInstalledDepots( params->appID, params->pvecDepots, params->cMaxDepots );
+    return 0;
 }

-uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppInstallDir(void *linux_side, AppId_t appID, char * pchFolder, uint32 cchFolderBufferSize)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppInstallDir( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAppInstallDir((AppId_t)appID, (char *)pchFolder, (uint32)cchFolderBufferSize);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppInstallDir_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppInstallDir_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->GetAppInstallDir( params->appID, params->pchFolder, params->cchFolderBufferSize );
+    params->_ret = steamclient_unix_path_to_dos_path( params->_ret, params->pchFolder, params->pchFolder, params->cchFolderBufferSize, 0 );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsAppInstalled(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsAppInstalled( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsAppInstalled((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsAppInstalled_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsAppInstalled_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->BIsAppInstalled( params->appID );
+    return 0;
 }

-CSteamID cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppOwner(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppOwner( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAppOwner();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppOwner_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppOwner_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    *params->_ret = iface->GetAppOwner(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetLaunchQueryParam(void *linux_side, const char * pchKey)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetLaunchQueryParam( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetLaunchQueryParam((const char *)pchKey);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetLaunchQueryParam_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetLaunchQueryParam_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION006 *)params->linux_side;
+    params->_ret = iface->GetLaunchQueryParam( params->pchKey );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.h
@ -1,22 +0,0 @@
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribed(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsLowViolence(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsCybercafe(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsVACBanned(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetCurrentGameLanguage(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAvailableGameLanguages(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribedApp(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsDlcInstalled(void *, AppId_t);
-extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetEarliestPurchaseUnixTime(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribedFromFreeWeekend(void *);
-extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetDLCCount(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BGetDLCDataByIndex(void *, int, AppId_t *, bool *, char *, int);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_InstallDLC(void *, AppId_t);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_UninstallDLC(void *, AppId_t);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_RequestAppProofOfPurchaseKey(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetCurrentBetaName(void *, char *, int);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_MarkContentCorrupt(void *, bool);
-extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetInstalledDepots(void *, AppId_t, DepotId_t *, uint32);
-extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppInstallDir(void *, AppId_t, char *, uint32);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsAppInstalled(void *, AppId_t);
-extern CSteamID cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppOwner(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetLaunchQueryParam(void *, const char *);
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.cpp
@ -1,136 +1,200 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_136/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_136
-#include "struct_converters.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.h"
-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribed(void *linux_side)
+
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribed( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribed();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribed_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribed_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->BIsSubscribed(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsLowViolence(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsLowViolence( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsLowViolence();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsLowViolence_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsLowViolence_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->BIsLowViolence(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsCybercafe(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsCybercafe( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsCybercafe();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsCybercafe_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsCybercafe_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->BIsCybercafe(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsVACBanned(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsVACBanned( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsVACBanned();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsVACBanned_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsVACBanned_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->BIsVACBanned(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetCurrentGameLanguage(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetCurrentGameLanguage( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetCurrentGameLanguage();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetCurrentGameLanguage_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetCurrentGameLanguage_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->GetCurrentGameLanguage(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAvailableGameLanguages(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAvailableGameLanguages( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAvailableGameLanguages();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAvailableGameLanguages_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAvailableGameLanguages_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->GetAvailableGameLanguages(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribedApp(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribedApp( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribedApp((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribedApp_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribedApp_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->BIsSubscribedApp( params->appID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsDlcInstalled(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsDlcInstalled( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsDlcInstalled((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsDlcInstalled_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsDlcInstalled_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->BIsDlcInstalled( params->appID );
+    return 0;
 }

-uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetEarliestPurchaseUnixTime(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetEarliestPurchaseUnixTime( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetEarliestPurchaseUnixTime((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetEarliestPurchaseUnixTime_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetEarliestPurchaseUnixTime_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->GetEarliestPurchaseUnixTime( params->nAppID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribedFromFreeWeekend(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribedFromFreeWeekend( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribedFromFreeWeekend();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribedFromFreeWeekend_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribedFromFreeWeekend_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->BIsSubscribedFromFreeWeekend(  );
+    return 0;
 }

-int cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDLCCount(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDLCCount( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetDLCCount();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDLCCount_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDLCCount_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->GetDLCCount(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BGetDLCDataByIndex(void *linux_side, int iDLC, AppId_t * pAppID, bool * pbAvailable, char * pchName, int cchNameBufferSize)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BGetDLCDataByIndex( void *args )
 {
-    return ((ISteamApps*)linux_side)->BGetDLCDataByIndex((int)iDLC, (AppId_t *)pAppID, (bool *)pbAvailable, (char *)pchName, (int)cchNameBufferSize);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BGetDLCDataByIndex_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BGetDLCDataByIndex_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->BGetDLCDataByIndex( params->iDLC, params->pAppID, params->pbAvailable, params->pchName, params->cchNameBufferSize );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_InstallDLC(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_InstallDLC( void *args )
 {
-    ((ISteamApps*)linux_side)->InstallDLC((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_InstallDLC_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_InstallDLC_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    iface->InstallDLC( params->nAppID );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_UninstallDLC(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_UninstallDLC( void *args )
 {
-    ((ISteamApps*)linux_side)->UninstallDLC((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_UninstallDLC_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_UninstallDLC_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    iface->UninstallDLC( params->nAppID );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_RequestAppProofOfPurchaseKey(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_RequestAppProofOfPurchaseKey( void *args )
 {
-    ((ISteamApps*)linux_side)->RequestAppProofOfPurchaseKey((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_RequestAppProofOfPurchaseKey_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_RequestAppProofOfPurchaseKey_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    iface->RequestAppProofOfPurchaseKey( params->nAppID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetCurrentBetaName(void *linux_side, char * pchName, int cchNameBufferSize)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetCurrentBetaName( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetCurrentBetaName((char *)pchName, (int)cchNameBufferSize);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetCurrentBetaName_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetCurrentBetaName_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->GetCurrentBetaName( params->pchName, params->cchNameBufferSize );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_MarkContentCorrupt(void *linux_side, bool bMissingFilesOnly)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_MarkContentCorrupt( void *args )
 {
-    return ((ISteamApps*)linux_side)->MarkContentCorrupt((bool)bMissingFilesOnly);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_MarkContentCorrupt_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_MarkContentCorrupt_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->MarkContentCorrupt( params->bMissingFilesOnly );
+    return 0;
 }

-uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetInstalledDepots(void *linux_side, AppId_t appID, DepotId_t * pvecDepots, uint32 cMaxDepots)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetInstalledDepots( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetInstalledDepots((AppId_t)appID, (DepotId_t *)pvecDepots, (uint32)cMaxDepots);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetInstalledDepots_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetInstalledDepots_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->GetInstalledDepots( params->appID, params->pvecDepots, params->cMaxDepots );
+    return 0;
 }

-uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppInstallDir(void *linux_side, AppId_t appID, char * pchFolder, uint32 cchFolderBufferSize)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppInstallDir( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAppInstallDir((AppId_t)appID, (char *)pchFolder, (uint32)cchFolderBufferSize);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppInstallDir_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppInstallDir_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->GetAppInstallDir( params->appID, params->pchFolder, params->cchFolderBufferSize );
+    params->_ret = steamclient_unix_path_to_dos_path( params->_ret, params->pchFolder, params->pchFolder, params->cchFolderBufferSize, 0 );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsAppInstalled(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsAppInstalled( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsAppInstalled((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsAppInstalled_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsAppInstalled_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->BIsAppInstalled( params->appID );
+    return 0;
 }

-CSteamID cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppOwner(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppOwner( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAppOwner();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppOwner_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppOwner_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    *params->_ret = iface->GetAppOwner(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetLaunchQueryParam(void *linux_side, const char * pchKey)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetLaunchQueryParam( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetLaunchQueryParam((const char *)pchKey);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetLaunchQueryParam_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetLaunchQueryParam_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->GetLaunchQueryParam( params->pchKey );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDlcDownloadProgress(void *linux_side, AppId_t nAppID, uint64 * punBytesDownloaded, uint64 * punBytesTotal)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDlcDownloadProgress( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetDlcDownloadProgress((AppId_t)nAppID, (uint64 *)punBytesDownloaded, (uint64 *)punBytesTotal);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDlcDownloadProgress_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDlcDownloadProgress_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->GetDlcDownloadProgress( params->nAppID, params->punBytesDownloaded, params->punBytesTotal );
+    return 0;
 }

-int cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppBuildId(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppBuildId( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAppBuildId();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppBuildId_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppBuildId_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION007 *)params->linux_side;
+    params->_ret = iface->GetAppBuildId(  );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.h
@ -1,24 +0,0 @@
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribed(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsLowViolence(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsCybercafe(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsVACBanned(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetCurrentGameLanguage(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAvailableGameLanguages(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribedApp(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsDlcInstalled(void *, AppId_t);
-extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetEarliestPurchaseUnixTime(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribedFromFreeWeekend(void *);
-extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDLCCount(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BGetDLCDataByIndex(void *, int, AppId_t *, bool *, char *, int);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_InstallDLC(void *, AppId_t);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_UninstallDLC(void *, AppId_t);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_RequestAppProofOfPurchaseKey(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetCurrentBetaName(void *, char *, int);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_MarkContentCorrupt(void *, bool);
-extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetInstalledDepots(void *, AppId_t, DepotId_t *, uint32);
-extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppInstallDir(void *, AppId_t, char *, uint32);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsAppInstalled(void *, AppId_t);
-extern CSteamID cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppOwner(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetLaunchQueryParam(void *, const char *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDlcDownloadProgress(void *, AppId_t, uint64 *, uint64 *);
-extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppBuildId(void *);
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.cpp
@ -1,167 +1,274 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_158/steam_api.h"
-#include "steamworks_sdk_158/steamnetworkingtypes.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_158
-#include "struct_converters.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.h"
-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribed(void *linux_side)
+
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribed( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribed();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribed_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribed_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->BIsSubscribed(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsLowViolence(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsLowViolence( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsLowViolence();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsLowViolence_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsLowViolence_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->BIsLowViolence(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsCybercafe(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsCybercafe( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsCybercafe();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsCybercafe_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsCybercafe_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->BIsCybercafe(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsVACBanned(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsVACBanned( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsVACBanned();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsVACBanned_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsVACBanned_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->BIsVACBanned(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetCurrentGameLanguage(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetCurrentGameLanguage( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetCurrentGameLanguage();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetCurrentGameLanguage_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetCurrentGameLanguage_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->GetCurrentGameLanguage(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAvailableGameLanguages(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAvailableGameLanguages( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAvailableGameLanguages();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAvailableGameLanguages_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAvailableGameLanguages_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->GetAvailableGameLanguages(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedApp(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedApp( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribedApp((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedApp_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedApp_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->BIsSubscribedApp( params->appID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsDlcInstalled(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsDlcInstalled( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsDlcInstalled((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsDlcInstalled_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsDlcInstalled_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->BIsDlcInstalled( params->appID );
+    return 0;
 }

-uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetEarliestPurchaseUnixTime(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetEarliestPurchaseUnixTime( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetEarliestPurchaseUnixTime((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetEarliestPurchaseUnixTime_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetEarliestPurchaseUnixTime_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->GetEarliestPurchaseUnixTime( params->nAppID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFreeWeekend(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFreeWeekend( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribedFromFreeWeekend();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFreeWeekend_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFreeWeekend_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->BIsSubscribedFromFreeWeekend(  );
+    return 0;
 }

-int cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetDLCCount(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetDLCCount( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetDLCCount();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetDLCCount_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetDLCCount_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->GetDLCCount(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BGetDLCDataByIndex(void *linux_side, int iDLC, AppId_t * pAppID, bool * pbAvailable, char * pchName, int cchNameBufferSize)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BGetDLCDataByIndex( void *args )
 {
-    return ((ISteamApps*)linux_side)->BGetDLCDataByIndex((int)iDLC, (AppId_t *)pAppID, (bool *)pbAvailable, (char *)pchName, (int)cchNameBufferSize);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BGetDLCDataByIndex_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BGetDLCDataByIndex_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->BGetDLCDataByIndex( params->iDLC, params->pAppID, params->pbAvailable, params->pchName, params->cchNameBufferSize );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_InstallDLC(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_InstallDLC( void *args )
 {
-    ((ISteamApps*)linux_side)->InstallDLC((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_InstallDLC_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_InstallDLC_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    iface->InstallDLC( params->nAppID );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_UninstallDLC(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_UninstallDLC( void *args )
 {
-    ((ISteamApps*)linux_side)->UninstallDLC((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_UninstallDLC_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_UninstallDLC_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    iface->UninstallDLC( params->nAppID );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAppProofOfPurchaseKey(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAppProofOfPurchaseKey( void *args )
 {
-    ((ISteamApps*)linux_side)->RequestAppProofOfPurchaseKey((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAppProofOfPurchaseKey_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAppProofOfPurchaseKey_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    iface->RequestAppProofOfPurchaseKey( params->nAppID );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetCurrentBetaName(void *linux_side, char * pchName, int cchNameBufferSize)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetCurrentBetaName( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetCurrentBetaName((char *)pchName, (int)cchNameBufferSize);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetCurrentBetaName_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetCurrentBetaName_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->GetCurrentBetaName( params->pchName, params->cchNameBufferSize );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_MarkContentCorrupt(void *linux_side, bool bMissingFilesOnly)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_MarkContentCorrupt( void *args )
 {
-    return ((ISteamApps*)linux_side)->MarkContentCorrupt((bool)bMissingFilesOnly);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_MarkContentCorrupt_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_MarkContentCorrupt_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->MarkContentCorrupt( params->bMissingFilesOnly );
+    return 0;
 }

-uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetInstalledDepots(void *linux_side, AppId_t appID, DepotId_t * pvecDepots, uint32 cMaxDepots)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetInstalledDepots( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetInstalledDepots((AppId_t)appID, (DepotId_t *)pvecDepots, (uint32)cMaxDepots);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetInstalledDepots_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetInstalledDepots_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->GetInstalledDepots( params->appID, params->pvecDepots, params->cMaxDepots );
+    return 0;
 }

-uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppInstallDir(void *linux_side, AppId_t appID, char * pchFolder, uint32 cchFolderBufferSize)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppInstallDir( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAppInstallDir((AppId_t)appID, (char *)pchFolder, (uint32)cchFolderBufferSize);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppInstallDir_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppInstallDir_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->GetAppInstallDir( params->appID, params->pchFolder, params->cchFolderBufferSize );
+    params->_ret = steamclient_unix_path_to_dos_path( params->_ret, params->pchFolder, params->pchFolder, params->cchFolderBufferSize, 0 );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsAppInstalled(void *linux_side, AppId_t appID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsAppInstalled( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsAppInstalled((AppId_t)appID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsAppInstalled_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsAppInstalled_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->BIsAppInstalled( params->appID );
+    return 0;
 }

-CSteamID cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppOwner(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppOwner( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAppOwner();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppOwner_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppOwner_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    *params->_ret = iface->GetAppOwner(  );
+    return 0;
 }

-const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchQueryParam(void *linux_side, const char * pchKey)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchQueryParam( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetLaunchQueryParam((const char *)pchKey);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchQueryParam_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchQueryParam_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->GetLaunchQueryParam( params->pchKey );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetDlcDownloadProgress(void *linux_side, AppId_t nAppID, uint64 * punBytesDownloaded, uint64 * punBytesTotal)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetDlcDownloadProgress( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetDlcDownloadProgress((AppId_t)nAppID, (uint64 *)punBytesDownloaded, (uint64 *)punBytesTotal);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetDlcDownloadProgress_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetDlcDownloadProgress_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->GetDlcDownloadProgress( params->nAppID, params->punBytesDownloaded, params->punBytesTotal );
+    return 0;
 }

-int cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppBuildId(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppBuildId( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetAppBuildId();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppBuildId_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppBuildId_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->GetAppBuildId(  );
+    return 0;
 }

-void cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAllProofOfPurchaseKeys(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAllProofOfPurchaseKeys( void *args )
 {
-    ((ISteamApps*)linux_side)->RequestAllProofOfPurchaseKeys();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAllProofOfPurchaseKeys_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAllProofOfPurchaseKeys_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    iface->RequestAllProofOfPurchaseKeys(  );
+    return 0;
 }

-SteamAPICall_t cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetFileDetails(void *linux_side, const char * pszFileName)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetFileDetails( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetFileDetails((const char *)pszFileName);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetFileDetails_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetFileDetails_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    char *u_pszFileName = steamclient_dos_to_unix_path( params->pszFileName, 0 );
+    params->_ret = iface->GetFileDetails( u_pszFileName );
+    steamclient_free_path( u_pszFileName );
+    return 0;
 }

-int cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchCommandLine(void *linux_side, char * pszCommandLine, int cubCommandLine)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchCommandLine( void *args )
 {
-    return ((ISteamApps*)linux_side)->GetLaunchCommandLine((char *)pszCommandLine, (int)cubCommandLine);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchCommandLine_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchCommandLine_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->GetLaunchCommandLine( params->pszCommandLine, params->cubCommandLine );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFamilySharing(void *linux_side)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFamilySharing( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsSubscribedFromFamilySharing();
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFamilySharing_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFamilySharing_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->BIsSubscribedFromFamilySharing(  );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsTimedTrial(void *linux_side, uint32 * punSecondsAllowed, uint32 * punSecondsPlayed)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsTimedTrial( void *args )
 {
-    return ((ISteamApps*)linux_side)->BIsTimedTrial((uint32 *)punSecondsAllowed, (uint32 *)punSecondsPlayed);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsTimedTrial_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsTimedTrial_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->BIsTimedTrial( params->punSecondsAllowed, params->punSecondsPlayed );
+    return 0;
 }

-bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_SetDlcContext(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_SetDlcContext( void *args )
 {
-    return ((ISteamApps*)linux_side)->SetDlcContext((AppId_t)nAppID);
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_SetDlcContext_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_SetDlcContext_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->SetDlcContext( params->nAppID );
+    return 0;
 }

-#ifdef __cplusplus
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetNumBetas( void *args )
+{
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetNumBetas_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetNumBetas_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->GetNumBetas( params->pnAvailable, params->pnPrivate );
+    return 0;
 }
-#endif
+
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetBetaInfo( void *args )
+{
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetBetaInfo_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetBetaInfo_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->GetBetaInfo( params->iBetaIndex, params->punFlags, params->punBuildID, params->pchBetaName, params->cchBetaName, params->pchDescription, params->cchDescription );
+    return 0;
+}
+
+NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_SetActiveBeta( void *args )
+{
+    struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_SetActiveBeta_params *params = (struct ISteamApps_STEAMAPPS_INTERFACE_VERSION008_SetActiveBeta_params *)args;
+    struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *iface = (struct u_ISteamApps_STEAMAPPS_INTERFACE_VERSION008 *)params->linux_side;
+    params->_ret = iface->SetActiveBeta( params->pchBetaName );
+    return 0;
+}
+
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.h
@ -1,30 +0,0 @@
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribed(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsLowViolence(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsCybercafe(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsVACBanned(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetCurrentGameLanguage(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAvailableGameLanguages(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedApp(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsDlcInstalled(void *, AppId_t);
-extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetEarliestPurchaseUnixTime(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFreeWeekend(void *);
-extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetDLCCount(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BGetDLCDataByIndex(void *, int, AppId_t *, bool *, char *, int);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_InstallDLC(void *, AppId_t);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_UninstallDLC(void *, AppId_t);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAppProofOfPurchaseKey(void *, AppId_t);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetCurrentBetaName(void *, char *, int);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_MarkContentCorrupt(void *, bool);
-extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetInstalledDepots(void *, AppId_t, DepotId_t *, uint32);
-extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppInstallDir(void *, AppId_t, char *, uint32);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsAppInstalled(void *, AppId_t);
-extern CSteamID cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppOwner(void *);
-extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchQueryParam(void *, const char *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetDlcDownloadProgress(void *, AppId_t, uint64 *, uint64 *);
-extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppBuildId(void *);
-extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAllProofOfPurchaseKeys(void *);
-extern SteamAPICall_t cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetFileDetails(void *, const char *);
-extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchCommandLine(void *, char *, int);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFamilySharing(void *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsTimedTrial(void *, uint32 *, uint32 *);
-extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_SetDlcContext(void *, AppId_t);
--- a/lsteamclient/cppISteamClient_SteamClient006.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient006.cpp
@ -1,121 +1,175 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_099y/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_099y
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient006.h"
-HSteamPipe cppISteamClient_SteamClient006_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient006_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient006_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient006_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient006_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient006_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient006_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient006_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient006_CreateGlobalUser(void *linux_side, HSteamPipe * phSteamPipe)
+NTSTATUS ISteamClient_SteamClient006_CreateGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateGlobalUser((HSteamPipe *)phSteamPipe);
+    struct ISteamClient_SteamClient006_CreateGlobalUser_params *params = (struct ISteamClient_SteamClient006_CreateGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->CreateGlobalUser( params->phSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient006_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient006_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient006_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient006_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient006_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe)
+NTSTATUS ISteamClient_SteamClient006_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe);
+    struct ISteamClient_SteamClient006_CreateLocalUser_params *params = (struct ISteamClient_SteamClient006_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe );
+    return 0;
 }

-void cppISteamClient_SteamClient006_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient006_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient006_ReleaseUser_params *params = (struct ISteamClient_SteamClient006_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient006_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient006_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient006_GetISteamUser_params *params = (struct ISteamClient_SteamClient006_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient006_GetIVAC(void *linux_side, HSteamUser hSteamUser)
+NTSTATUS ISteamClient_SteamClient006_GetIVAC( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIVAC((HSteamUser)hSteamUser);
+    struct ISteamClient_SteamClient006_GetIVAC_params *params = (struct ISteamClient_SteamClient006_GetIVAC_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->GetIVAC( params->hSteamUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient006_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient006_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient006_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient006_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient006_SetLocalIPBinding(void *linux_side, uint32 unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient006_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient006_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient006_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-const char * cppISteamClient_SteamClient006_GetUniverseName(void *linux_side, EUniverse eUniverse)
+NTSTATUS ISteamClient_SteamClient006_GetUniverseName( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetUniverseName((EUniverse)eUniverse);
+    struct ISteamClient_SteamClient006_GetUniverseName_params *params = (struct ISteamClient_SteamClient006_GetUniverseName_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->GetUniverseName( params->eUniverse );
+    return 0;
 }

-void *cppISteamClient_SteamClient006_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient006_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient006_GetISteamFriends_params *params = (struct ISteamClient_SteamClient006_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient006_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient006_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient006_GetISteamUtils_params *params = (struct ISteamClient_SteamClient006_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient006_GetISteamBilling(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient006_GetISteamBilling( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamBilling((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient006_GetISteamBilling_params *params = (struct ISteamClient_SteamClient006_GetISteamBilling_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->GetISteamBilling( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient006_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient006_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient006_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient006_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient006_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient006_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient006_GetISteamApps_params *params = (struct ISteamClient_SteamClient006_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient006_GetISteamContentServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient006_GetISteamContentServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamContentServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient006_GetISteamContentServer_params *params = (struct ISteamClient_SteamClient006_GetISteamContentServer_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->GetISteamContentServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient006_GetISteamMasterServerUpdater(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient006_GetISteamMasterServerUpdater( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMasterServerUpdater((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient006_GetISteamMasterServerUpdater_params *params = (struct ISteamClient_SteamClient006_GetISteamMasterServerUpdater_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->GetISteamMasterServerUpdater( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient006_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient006_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient006_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient006_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient006_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient006_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient006_RunFrame_params *params = (struct ISteamClient_SteamClient006_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient006_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient006_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient006_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient006_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient006 *iface = (struct u_ISteamClient_SteamClient006 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient006.h
+++ b/lsteamclient/cppISteamClient_SteamClient006.h
@ -1,21 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient006_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient006_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient006_CreateGlobalUser(void *, HSteamPipe *);
-extern HSteamUser cppISteamClient_SteamClient006_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient006_CreateLocalUser(void *, HSteamPipe *);
-extern void cppISteamClient_SteamClient006_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient006_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient006_GetIVAC(void *, HSteamUser);
-extern void *cppISteamClient_SteamClient006_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient006_SetLocalIPBinding(void *, uint32, uint16);
-extern const char * cppISteamClient_SteamClient006_GetUniverseName(void *, EUniverse);
-extern void *cppISteamClient_SteamClient006_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient006_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient006_GetISteamBilling(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient006_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient006_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient006_GetISteamContentServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient006_GetISteamMasterServerUpdater(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient006_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient006_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient006_GetIPCCallCount(void *);
--- a/lsteamclient/cppISteamClient_SteamClient007.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient007.cpp
@ -1,127 +1,184 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_103/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_103
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient007.h"
-HSteamPipe cppISteamClient_SteamClient007_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient007_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient007_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient007_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient007_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient007_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient007_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient007_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient007_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient007_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient007_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient007_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient007_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe)
+NTSTATUS ISteamClient_SteamClient007_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe);
+    struct ISteamClient_SteamClient007_CreateLocalUser_params *params = (struct ISteamClient_SteamClient007_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe );
+    return 0;
 }

-void cppISteamClient_SteamClient007_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient007_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient007_ReleaseUser_params *params = (struct ISteamClient_SteamClient007_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient007_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient007_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient007_GetISteamUser_params *params = (struct ISteamClient_SteamClient007_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient007_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient007_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient007_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient007_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient007_SetLocalIPBinding(void *linux_side, uint32 unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient007_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient007_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient007_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-void *cppISteamClient_SteamClient007_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient007_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient007_GetISteamFriends_params *params = (struct ISteamClient_SteamClient007_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient007_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient007_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient007_GetISteamUtils_params *params = (struct ISteamClient_SteamClient007_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient007_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient007_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient007_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient007_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient007_GetISteamContentServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient007_GetISteamContentServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamContentServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient007_GetISteamContentServer_params *params = (struct ISteamClient_SteamClient007_GetISteamContentServer_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->GetISteamContentServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient007_GetISteamMasterServerUpdater(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient007_GetISteamMasterServerUpdater( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMasterServerUpdater((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient007_GetISteamMasterServerUpdater_params *params = (struct ISteamClient_SteamClient007_GetISteamMasterServerUpdater_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->GetISteamMasterServerUpdater( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient007_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient007_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient007_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient007_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient007_GetISteamGenericInterface(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient007_GetISteamGenericInterface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient007_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient007_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient007_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient007_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient007_RunFrame_params *params = (struct ISteamClient_SteamClient007_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient007_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient007_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient007_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient007_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-void *cppISteamClient_SteamClient007_GetISteamUserStats(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient007_GetISteamUserStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient007_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient007_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient007_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient007_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient007_GetISteamApps_params *params = (struct ISteamClient_SteamClient007_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient007_GetISteamNetworking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient007_GetISteamNetworking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient007_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient007_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient007_SetWarningMessageHook(void *linux_side, SteamAPIWarningMessageHook_t pFunction)
+NTSTATUS ISteamClient_SteamClient007_SetWarningMessageHook( void *args )
 {
-    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
-    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
+    struct ISteamClient_SteamClient007_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient007_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
 }

-void *cppISteamClient_SteamClient007_GetISteamRemoteStorage(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient007_GetISteamRemoteStorage( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient007_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient007_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient007 *iface = (struct u_ISteamClient_SteamClient007 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient007.h
+++ b/lsteamclient/cppISteamClient_SteamClient007.h
@ -1,22 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient007_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient007_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient007_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient007_CreateLocalUser(void *, HSteamPipe *);
-extern void cppISteamClient_SteamClient007_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient007_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient007_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient007_SetLocalIPBinding(void *, uint32, uint16);
-extern void *cppISteamClient_SteamClient007_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient007_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient007_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient007_GetISteamContentServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient007_GetISteamMasterServerUpdater(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient007_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient007_GetISteamGenericInterface(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient007_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient007_GetIPCCallCount(void *);
-extern void *cppISteamClient_SteamClient007_GetISteamUserStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient007_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient007_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient007_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
-extern void *cppISteamClient_SteamClient007_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
--- a/lsteamclient/cppISteamClient_SteamClient008.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient008.cpp
@ -1,122 +1,176 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_107/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_107
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient008.h"
-HSteamPipe cppISteamClient_SteamClient008_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient008_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient008_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient008_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient008_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient008_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient008_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient008_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient008_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient008_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient008_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient008_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient008_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe, EAccountType eAccountType)
+NTSTATUS ISteamClient_SteamClient008_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
+    struct ISteamClient_SteamClient008_CreateLocalUser_params *params = (struct ISteamClient_SteamClient008_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe, params->eAccountType );
+    return 0;
 }

-void cppISteamClient_SteamClient008_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient008_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient008_ReleaseUser_params *params = (struct ISteamClient_SteamClient008_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient008_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient008_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient008_GetISteamUser_params *params = (struct ISteamClient_SteamClient008_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient008_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient008_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient008_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient008_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient008_SetLocalIPBinding(void *linux_side, uint32 unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient008_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient008_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient008_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-void *cppISteamClient_SteamClient008_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient008_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient008_GetISteamFriends_params *params = (struct ISteamClient_SteamClient008_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient008_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient008_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient008_GetISteamUtils_params *params = (struct ISteamClient_SteamClient008_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient008_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient008_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient008_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient008_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient008_GetISteamMasterServerUpdater(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient008_GetISteamMasterServerUpdater( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMasterServerUpdater((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient008_GetISteamMasterServerUpdater_params *params = (struct ISteamClient_SteamClient008_GetISteamMasterServerUpdater_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->GetISteamMasterServerUpdater( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient008_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient008_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient008_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient008_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient008_GetISteamGenericInterface(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient008_GetISteamGenericInterface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient008_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient008_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient008_GetISteamUserStats(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient008_GetISteamUserStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient008_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient008_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient008_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient008_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient008_GetISteamApps_params *params = (struct ISteamClient_SteamClient008_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient008_GetISteamNetworking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient008_GetISteamNetworking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient008_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient008_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient008_GetISteamRemoteStorage(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient008_GetISteamRemoteStorage( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient008_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient008_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient008_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient008_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient008_RunFrame_params *params = (struct ISteamClient_SteamClient008_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient008_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient008_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient008_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient008_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-void cppISteamClient_SteamClient008_SetWarningMessageHook(void *linux_side, SteamAPIWarningMessageHook_t pFunction)
+NTSTATUS ISteamClient_SteamClient008_SetWarningMessageHook( void *args )
 {
-    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
-    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
+    struct ISteamClient_SteamClient008_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient008_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient008 *iface = (struct u_ISteamClient_SteamClient008 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient008.h
+++ b/lsteamclient/cppISteamClient_SteamClient008.h
@ -1,21 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient008_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient008_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient008_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient008_CreateLocalUser(void *, HSteamPipe *, EAccountType);
-extern void cppISteamClient_SteamClient008_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient008_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient008_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient008_SetLocalIPBinding(void *, uint32, uint16);
-extern void *cppISteamClient_SteamClient008_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient008_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient008_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient008_GetISteamMasterServerUpdater(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient008_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient008_GetISteamGenericInterface(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient008_GetISteamUserStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient008_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient008_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient008_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient008_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient008_GetIPCCallCount(void *);
-extern void cppISteamClient_SteamClient008_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
--- a/lsteamclient/cppISteamClient_SteamClient009.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient009.cpp
@ -1,127 +1,184 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_111/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_111
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient009.h"
-HSteamPipe cppISteamClient_SteamClient009_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient009_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient009_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient009_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient009_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient009_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient009_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient009_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient009_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient009_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient009_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient009_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient009_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe, EAccountType eAccountType)
+NTSTATUS ISteamClient_SteamClient009_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
+    struct ISteamClient_SteamClient009_CreateLocalUser_params *params = (struct ISteamClient_SteamClient009_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe, params->eAccountType );
+    return 0;
 }

-void cppISteamClient_SteamClient009_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient009_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient009_ReleaseUser_params *params = (struct ISteamClient_SteamClient009_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient009_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient009_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient009_GetISteamUser_params *params = (struct ISteamClient_SteamClient009_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient009_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient009_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient009_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient009_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient009_SetLocalIPBinding(void *linux_side, uint32 unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient009_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient009_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient009_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-void *cppISteamClient_SteamClient009_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient009_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient009_GetISteamFriends_params *params = (struct ISteamClient_SteamClient009_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient009_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient009_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient009_GetISteamUtils_params *params = (struct ISteamClient_SteamClient009_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient009_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient009_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient009_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient009_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient009_GetISteamMasterServerUpdater(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient009_GetISteamMasterServerUpdater( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMasterServerUpdater((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient009_GetISteamMasterServerUpdater_params *params = (struct ISteamClient_SteamClient009_GetISteamMasterServerUpdater_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->GetISteamMasterServerUpdater( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient009_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient009_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient009_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient009_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient009_GetISteamGenericInterface(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient009_GetISteamGenericInterface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient009_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient009_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient009_GetISteamUserStats(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient009_GetISteamUserStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient009_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient009_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient009_GetISteamGameServerStats(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient009_GetISteamGameServerStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServerStats((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient009_GetISteamGameServerStats_params *params = (struct ISteamClient_SteamClient009_GetISteamGameServerStats_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServerStats( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient009_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient009_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient009_GetISteamApps_params *params = (struct ISteamClient_SteamClient009_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient009_GetISteamNetworking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient009_GetISteamNetworking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient009_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient009_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient009_GetISteamRemoteStorage(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient009_GetISteamRemoteStorage( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient009_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient009_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient009_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient009_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient009_RunFrame_params *params = (struct ISteamClient_SteamClient009_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient009_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient009_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient009_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient009_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-void cppISteamClient_SteamClient009_SetWarningMessageHook(void *linux_side, SteamAPIWarningMessageHook_t pFunction)
+NTSTATUS ISteamClient_SteamClient009_SetWarningMessageHook( void *args )
 {
-    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
-    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
+    struct ISteamClient_SteamClient009_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient009_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient009 *iface = (struct u_ISteamClient_SteamClient009 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient009.h
+++ b/lsteamclient/cppISteamClient_SteamClient009.h
@ -1,22 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient009_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient009_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient009_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient009_CreateLocalUser(void *, HSteamPipe *, EAccountType);
-extern void cppISteamClient_SteamClient009_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient009_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient009_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient009_SetLocalIPBinding(void *, uint32, uint16);
-extern void *cppISteamClient_SteamClient009_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient009_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient009_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient009_GetISteamMasterServerUpdater(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient009_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient009_GetISteamGenericInterface(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient009_GetISteamUserStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient009_GetISteamGameServerStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient009_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient009_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient009_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient009_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient009_GetIPCCallCount(void *);
-extern void cppISteamClient_SteamClient009_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
--- a/lsteamclient/cppISteamClient_SteamClient010.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient010.cpp
@ -1,137 +1,200 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_115/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_115
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient010.h"
-HSteamPipe cppISteamClient_SteamClient010_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient010_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient010_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient010_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient010_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient010_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient010_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient010_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient010_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient010_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient010_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient010_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient010_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe, EAccountType eAccountType)
+NTSTATUS ISteamClient_SteamClient010_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
+    struct ISteamClient_SteamClient010_CreateLocalUser_params *params = (struct ISteamClient_SteamClient010_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe, params->eAccountType );
+    return 0;
 }

-void cppISteamClient_SteamClient010_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient010_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient010_ReleaseUser_params *params = (struct ISteamClient_SteamClient010_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient010_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient010_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient010_GetISteamUser_params *params = (struct ISteamClient_SteamClient010_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient010_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient010_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient010_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient010_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient010_SetLocalIPBinding(void *linux_side, uint32 unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient010_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient010_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient010_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-void *cppISteamClient_SteamClient010_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient010_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient010_GetISteamFriends_params *params = (struct ISteamClient_SteamClient010_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient010_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient010_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient010_GetISteamUtils_params *params = (struct ISteamClient_SteamClient010_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient010_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient010_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient010_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient010_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient010_GetISteamMasterServerUpdater(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient010_GetISteamMasterServerUpdater( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMasterServerUpdater((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient010_GetISteamMasterServerUpdater_params *params = (struct ISteamClient_SteamClient010_GetISteamMasterServerUpdater_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetISteamMasterServerUpdater( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient010_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient010_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient010_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient010_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient010_GetISteamGenericInterface(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient010_GetISteamGenericInterface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient010_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient010_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient010_GetISteamUserStats(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient010_GetISteamUserStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient010_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient010_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient010_GetISteamGameServerStats(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient010_GetISteamGameServerStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServerStats((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient010_GetISteamGameServerStats_params *params = (struct ISteamClient_SteamClient010_GetISteamGameServerStats_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServerStats( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient010_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient010_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient010_GetISteamApps_params *params = (struct ISteamClient_SteamClient010_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient010_GetISteamNetworking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient010_GetISteamNetworking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient010_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient010_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient010_GetISteamRemoteStorage(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient010_GetISteamRemoteStorage( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient010_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient010_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient010_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient010_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient010_RunFrame_params *params = (struct ISteamClient_SteamClient010_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient010_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient010_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient010_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient010_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-void cppISteamClient_SteamClient010_SetWarningMessageHook(void *linux_side, SteamAPIWarningMessageHook_t pFunction)
+NTSTATUS ISteamClient_SteamClient010_SetWarningMessageHook( void *args )
 {
-    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
-    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
+    struct ISteamClient_SteamClient010_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient010_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
 }

-bool cppISteamClient_SteamClient010_BShutdownIfAllPipesClosed(void *linux_side)
+NTSTATUS ISteamClient_SteamClient010_BShutdownIfAllPipesClosed( void *args )
 {
-    return after_shutdown(((ISteamClient*)linux_side)->BShutdownIfAllPipesClosed());
+    struct ISteamClient_SteamClient010_BShutdownIfAllPipesClosed_params *params = (struct ISteamClient_SteamClient010_BShutdownIfAllPipesClosed_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->BShutdownIfAllPipesClosed(  );
+    return 0;
 }

-void *cppISteamClient_SteamClient010_GetISteamHTTP(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient010_GetISteamHTTP( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTTP((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient010_GetISteamHTTP_params *params = (struct ISteamClient_SteamClient010_GetISteamHTTP_params *)args;
+    struct u_ISteamClient_SteamClient010 *iface = (struct u_ISteamClient_SteamClient010 *)params->linux_side;
+    params->_ret = iface->GetISteamHTTP( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient010.h
+++ b/lsteamclient/cppISteamClient_SteamClient010.h
@ -1,24 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient010_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient010_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient010_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient010_CreateLocalUser(void *, HSteamPipe *, EAccountType);
-extern void cppISteamClient_SteamClient010_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient010_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient010_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient010_SetLocalIPBinding(void *, uint32, uint16);
-extern void *cppISteamClient_SteamClient010_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient010_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient010_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient010_GetISteamMasterServerUpdater(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient010_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient010_GetISteamGenericInterface(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient010_GetISteamUserStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient010_GetISteamGameServerStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient010_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient010_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient010_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient010_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient010_GetIPCCallCount(void *);
-extern void cppISteamClient_SteamClient010_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
-extern bool cppISteamClient_SteamClient010_BShutdownIfAllPipesClosed(void *);
-extern void *cppISteamClient_SteamClient010_GetISteamHTTP(void *, HSteamUser, HSteamPipe, const char *);
--- a/lsteamclient/cppISteamClient_SteamClient011.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient011.cpp
@ -1,142 +1,208 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_116/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_116
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient011.h"
-HSteamPipe cppISteamClient_SteamClient011_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient011_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient011_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient011_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient011_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient011_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient011_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient011_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient011_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient011_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient011_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient011_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient011_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe, EAccountType eAccountType)
+NTSTATUS ISteamClient_SteamClient011_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
+    struct ISteamClient_SteamClient011_CreateLocalUser_params *params = (struct ISteamClient_SteamClient011_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe, params->eAccountType );
+    return 0;
 }

-void cppISteamClient_SteamClient011_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient011_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient011_ReleaseUser_params *params = (struct ISteamClient_SteamClient011_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient011_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamUser_params *params = (struct ISteamClient_SteamClient011_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient011_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient011_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient011_SetLocalIPBinding(void *linux_side, uint32 unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient011_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient011_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient011_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-void *cppISteamClient_SteamClient011_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamFriends_params *params = (struct ISteamClient_SteamClient011_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient011_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamUtils_params *params = (struct ISteamClient_SteamClient011_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient011_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient011_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient011_GetISteamMasterServerUpdater(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamMasterServerUpdater( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMasterServerUpdater((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamMasterServerUpdater_params *params = (struct ISteamClient_SteamClient011_GetISteamMasterServerUpdater_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamMasterServerUpdater( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient011_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient011_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient011_GetISteamGenericInterface(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamGenericInterface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient011_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient011_GetISteamUserStats(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamUserStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient011_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient011_GetISteamGameServerStats(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamGameServerStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServerStats((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamGameServerStats_params *params = (struct ISteamClient_SteamClient011_GetISteamGameServerStats_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServerStats( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient011_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamApps_params *params = (struct ISteamClient_SteamClient011_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient011_GetISteamNetworking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamNetworking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient011_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient011_GetISteamRemoteStorage(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamRemoteStorage( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient011_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient011_GetISteamScreenshots(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamScreenshots( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamScreenshots((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamScreenshots_params *params = (struct ISteamClient_SteamClient011_GetISteamScreenshots_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamScreenshots( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient011_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient011_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient011_RunFrame_params *params = (struct ISteamClient_SteamClient011_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient011_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient011_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient011_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient011_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-void cppISteamClient_SteamClient011_SetWarningMessageHook(void *linux_side, SteamAPIWarningMessageHook_t pFunction)
+NTSTATUS ISteamClient_SteamClient011_SetWarningMessageHook( void *args )
 {
-    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
-    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
+    struct ISteamClient_SteamClient011_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient011_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
 }

-bool cppISteamClient_SteamClient011_BShutdownIfAllPipesClosed(void *linux_side)
+NTSTATUS ISteamClient_SteamClient011_BShutdownIfAllPipesClosed( void *args )
 {
-    return after_shutdown(((ISteamClient*)linux_side)->BShutdownIfAllPipesClosed());
+    struct ISteamClient_SteamClient011_BShutdownIfAllPipesClosed_params *params = (struct ISteamClient_SteamClient011_BShutdownIfAllPipesClosed_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->BShutdownIfAllPipesClosed(  );
+    return 0;
 }

-void *cppISteamClient_SteamClient011_GetISteamHTTP(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient011_GetISteamHTTP( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTTP((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient011_GetISteamHTTP_params *params = (struct ISteamClient_SteamClient011_GetISteamHTTP_params *)args;
+    struct u_ISteamClient_SteamClient011 *iface = (struct u_ISteamClient_SteamClient011 *)params->linux_side;
+    params->_ret = iface->GetISteamHTTP( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient011.h
+++ b/lsteamclient/cppISteamClient_SteamClient011.h
@ -1,25 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient011_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient011_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient011_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient011_CreateLocalUser(void *, HSteamPipe *, EAccountType);
-extern void cppISteamClient_SteamClient011_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient011_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient011_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient011_SetLocalIPBinding(void *, uint32, uint16);
-extern void *cppISteamClient_SteamClient011_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient011_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient011_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient011_GetISteamMasterServerUpdater(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient011_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient011_GetISteamGenericInterface(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient011_GetISteamUserStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient011_GetISteamGameServerStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient011_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient011_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient011_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient011_GetISteamScreenshots(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient011_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient011_GetIPCCallCount(void *);
-extern void cppISteamClient_SteamClient011_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
-extern bool cppISteamClient_SteamClient011_BShutdownIfAllPipesClosed(void *);
-extern void *cppISteamClient_SteamClient011_GetISteamHTTP(void *, HSteamUser, HSteamPipe, const char *);
--- a/lsteamclient/cppISteamClient_SteamClient012.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient012.cpp
@ -1,152 +1,224 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_128/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_128
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient012.h"
-HSteamPipe cppISteamClient_SteamClient012_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient012_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient012_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient012_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient012_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient012_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient012_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient012_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient012_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient012_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient012_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient012_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient012_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe, EAccountType eAccountType)
+NTSTATUS ISteamClient_SteamClient012_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
+    struct ISteamClient_SteamClient012_CreateLocalUser_params *params = (struct ISteamClient_SteamClient012_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe, params->eAccountType );
+    return 0;
 }

-void cppISteamClient_SteamClient012_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient012_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient012_ReleaseUser_params *params = (struct ISteamClient_SteamClient012_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamUser_params *params = (struct ISteamClient_SteamClient012_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient012_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient012_SetLocalIPBinding(void *linux_side, uint32 unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient012_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient012_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient012_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamFriends_params *params = (struct ISteamClient_SteamClient012_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamUtils_params *params = (struct ISteamClient_SteamClient012_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient012_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient012_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient012_GetISteamGenericInterface(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamGenericInterface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient012_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamUserStats(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamUserStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient012_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamGameServerStats(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamGameServerStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServerStats((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamGameServerStats_params *params = (struct ISteamClient_SteamClient012_GetISteamGameServerStats_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServerStats( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamApps_params *params = (struct ISteamClient_SteamClient012_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamNetworking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamNetworking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient012_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamRemoteStorage(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamRemoteStorage( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient012_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamScreenshots(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamScreenshots( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamScreenshots((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamScreenshots_params *params = (struct ISteamClient_SteamClient012_GetISteamScreenshots_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamScreenshots( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient012_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient012_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient012_RunFrame_params *params = (struct ISteamClient_SteamClient012_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient012_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient012_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient012_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient012_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-void cppISteamClient_SteamClient012_SetWarningMessageHook(void *linux_side, SteamAPIWarningMessageHook_t pFunction)
+NTSTATUS ISteamClient_SteamClient012_SetWarningMessageHook( void *args )
 {
-    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
-    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
+    struct ISteamClient_SteamClient012_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient012_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
 }

-bool cppISteamClient_SteamClient012_BShutdownIfAllPipesClosed(void *linux_side)
+NTSTATUS ISteamClient_SteamClient012_BShutdownIfAllPipesClosed( void *args )
 {
-    return after_shutdown(((ISteamClient*)linux_side)->BShutdownIfAllPipesClosed());
+    struct ISteamClient_SteamClient012_BShutdownIfAllPipesClosed_params *params = (struct ISteamClient_SteamClient012_BShutdownIfAllPipesClosed_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->BShutdownIfAllPipesClosed(  );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamHTTP(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamHTTP( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTTP((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamHTTP_params *params = (struct ISteamClient_SteamClient012_GetISteamHTTP_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamHTTP( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamUnifiedMessages(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamUnifiedMessages( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUnifiedMessages((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamUnifiedMessages_params *params = (struct ISteamClient_SteamClient012_GetISteamUnifiedMessages_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamUnifiedMessages( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamController(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamController( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamController((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamController_params *params = (struct ISteamClient_SteamClient012_GetISteamController_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamController( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient012_GetISteamUGC(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient012_GetISteamUGC( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUGC((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient012_GetISteamUGC_params *params = (struct ISteamClient_SteamClient012_GetISteamUGC_params *)args;
+    struct u_ISteamClient_SteamClient012 *iface = (struct u_ISteamClient_SteamClient012 *)params->linux_side;
+    params->_ret = iface->GetISteamUGC( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient012.h
+++ b/lsteamclient/cppISteamClient_SteamClient012.h
@ -1,27 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient012_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient012_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient012_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient012_CreateLocalUser(void *, HSteamPipe *, EAccountType);
-extern void cppISteamClient_SteamClient012_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient012_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient012_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient012_SetLocalIPBinding(void *, uint32, uint16);
-extern void *cppISteamClient_SteamClient012_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient012_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient012_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient012_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient012_GetISteamGenericInterface(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient012_GetISteamUserStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient012_GetISteamGameServerStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient012_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient012_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient012_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient012_GetISteamScreenshots(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient012_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient012_GetIPCCallCount(void *);
-extern void cppISteamClient_SteamClient012_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
-extern bool cppISteamClient_SteamClient012_BShutdownIfAllPipesClosed(void *);
-extern void *cppISteamClient_SteamClient012_GetISteamHTTP(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient012_GetISteamUnifiedMessages(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient012_GetISteamController(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient012_GetISteamUGC(void *, HSteamUser, HSteamPipe, const char *);
--- a/lsteamclient/cppISteamClient_SteamClient013.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient013.cpp
@ -1,167 +1,248 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_128x/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_128x
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient013.h"
-HSteamPipe cppISteamClient_SteamClient013_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient013_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient013_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient013_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient013_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient013_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient013_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient013_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient013_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient013_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient013_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient013_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient013_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe, EAccountType eAccountType)
+NTSTATUS ISteamClient_SteamClient013_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
+    struct ISteamClient_SteamClient013_CreateLocalUser_params *params = (struct ISteamClient_SteamClient013_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe, params->eAccountType );
+    return 0;
 }

-void cppISteamClient_SteamClient013_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient013_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient013_ReleaseUser_params *params = (struct ISteamClient_SteamClient013_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamUser_params *params = (struct ISteamClient_SteamClient013_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient013_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient013_SetLocalIPBinding(void *linux_side, uint32 unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient013_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient013_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient013_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamFriends_params *params = (struct ISteamClient_SteamClient013_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamUtils_params *params = (struct ISteamClient_SteamClient013_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient013_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient013_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient013_GetISteamGenericInterface(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamGenericInterface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient013_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamUserStats(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamUserStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient013_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamGameServerStats(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamGameServerStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServerStats((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamGameServerStats_params *params = (struct ISteamClient_SteamClient013_GetISteamGameServerStats_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServerStats( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamApps_params *params = (struct ISteamClient_SteamClient013_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamNetworking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamNetworking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient013_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamRemoteStorage(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamRemoteStorage( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient013_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamScreenshots(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamScreenshots( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamScreenshots((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamScreenshots_params *params = (struct ISteamClient_SteamClient013_GetISteamScreenshots_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamScreenshots( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient013_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient013_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient013_RunFrame_params *params = (struct ISteamClient_SteamClient013_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient013_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient013_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient013_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient013_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-void cppISteamClient_SteamClient013_SetWarningMessageHook(void *linux_side, SteamAPIWarningMessageHook_t pFunction)
+NTSTATUS ISteamClient_SteamClient013_SetWarningMessageHook( void *args )
 {
-    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
-    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
+    struct ISteamClient_SteamClient013_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient013_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
 }

-bool cppISteamClient_SteamClient013_BShutdownIfAllPipesClosed(void *linux_side)
+NTSTATUS ISteamClient_SteamClient013_BShutdownIfAllPipesClosed( void *args )
 {
-    return after_shutdown(((ISteamClient*)linux_side)->BShutdownIfAllPipesClosed());
+    struct ISteamClient_SteamClient013_BShutdownIfAllPipesClosed_params *params = (struct ISteamClient_SteamClient013_BShutdownIfAllPipesClosed_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->BShutdownIfAllPipesClosed(  );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamHTTP(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamHTTP( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTTP((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamHTTP_params *params = (struct ISteamClient_SteamClient013_GetISteamHTTP_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamHTTP( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamUnifiedMessages(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamUnifiedMessages( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUnifiedMessages((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamUnifiedMessages_params *params = (struct ISteamClient_SteamClient013_GetISteamUnifiedMessages_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamUnifiedMessages( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamController(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamController( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamController((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamController_params *params = (struct ISteamClient_SteamClient013_GetISteamController_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamController( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamUGC(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamUGC( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUGC((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamUGC_params *params = (struct ISteamClient_SteamClient013_GetISteamUGC_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamUGC( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient013_GetISteamInventory(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamInventory( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamInventory((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamInventory_params *params = (struct ISteamClient_SteamClient013_GetISteamInventory_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamInventory( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient013_GetISteamVideo(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamVideo( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamVideo((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamVideo_params *params = (struct ISteamClient_SteamClient013_GetISteamVideo_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamVideo( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient013_GetISteamAppList(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient013_GetISteamAppList( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamAppList((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient013_GetISteamAppList_params *params = (struct ISteamClient_SteamClient013_GetISteamAppList_params *)args;
+    struct u_ISteamClient_SteamClient013 *iface = (struct u_ISteamClient_SteamClient013 *)params->linux_side;
+    params->_ret = iface->GetISteamAppList( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient013.h
+++ b/lsteamclient/cppISteamClient_SteamClient013.h
@ -1,30 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient013_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient013_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient013_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient013_CreateLocalUser(void *, HSteamPipe *, EAccountType);
-extern void cppISteamClient_SteamClient013_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient013_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient013_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient013_SetLocalIPBinding(void *, uint32, uint16);
-extern void *cppISteamClient_SteamClient013_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient013_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient013_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient013_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient013_GetISteamGenericInterface(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient013_GetISteamUserStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient013_GetISteamGameServerStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient013_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient013_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient013_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient013_GetISteamScreenshots(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient013_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient013_GetIPCCallCount(void *);
-extern void cppISteamClient_SteamClient013_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
-extern bool cppISteamClient_SteamClient013_BShutdownIfAllPipesClosed(void *);
-extern void *cppISteamClient_SteamClient013_GetISteamHTTP(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient013_GetISteamUnifiedMessages(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient013_GetISteamController(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient013_GetISteamUGC(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient013_GetISteamInventory(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient013_GetISteamVideo(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient013_GetISteamAppList(void *, HSteamUser, HSteamPipe, const char *);
--- a/lsteamclient/cppISteamClient_SteamClient014.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient014.cpp
@ -1,162 +1,240 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_129a/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_129a
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient014.h"
-HSteamPipe cppISteamClient_SteamClient014_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient014_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient014_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient014_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient014_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient014_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient014_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient014_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient014_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient014_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient014_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient014_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient014_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe, EAccountType eAccountType)
+NTSTATUS ISteamClient_SteamClient014_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
+    struct ISteamClient_SteamClient014_CreateLocalUser_params *params = (struct ISteamClient_SteamClient014_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe, params->eAccountType );
+    return 0;
 }

-void cppISteamClient_SteamClient014_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient014_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient014_ReleaseUser_params *params = (struct ISteamClient_SteamClient014_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamUser_params *params = (struct ISteamClient_SteamClient014_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient014_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient014_SetLocalIPBinding(void *linux_side, uint32 unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient014_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient014_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient014_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamFriends_params *params = (struct ISteamClient_SteamClient014_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamUtils_params *params = (struct ISteamClient_SteamClient014_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient014_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient014_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient014_GetISteamGenericInterface(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamGenericInterface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient014_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamUserStats(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamUserStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient014_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamGameServerStats(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamGameServerStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServerStats((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamGameServerStats_params *params = (struct ISteamClient_SteamClient014_GetISteamGameServerStats_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServerStats( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamApps_params *params = (struct ISteamClient_SteamClient014_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamNetworking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamNetworking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient014_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamRemoteStorage(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamRemoteStorage( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient014_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamScreenshots(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamScreenshots( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamScreenshots((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamScreenshots_params *params = (struct ISteamClient_SteamClient014_GetISteamScreenshots_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamScreenshots( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient014_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient014_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient014_RunFrame_params *params = (struct ISteamClient_SteamClient014_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient014_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient014_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient014_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient014_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-void cppISteamClient_SteamClient014_SetWarningMessageHook(void *linux_side, SteamAPIWarningMessageHook_t pFunction)
+NTSTATUS ISteamClient_SteamClient014_SetWarningMessageHook( void *args )
 {
-    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
-    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
+    struct ISteamClient_SteamClient014_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient014_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
 }

-bool cppISteamClient_SteamClient014_BShutdownIfAllPipesClosed(void *linux_side)
+NTSTATUS ISteamClient_SteamClient014_BShutdownIfAllPipesClosed( void *args )
 {
-    return after_shutdown(((ISteamClient*)linux_side)->BShutdownIfAllPipesClosed());
+    struct ISteamClient_SteamClient014_BShutdownIfAllPipesClosed_params *params = (struct ISteamClient_SteamClient014_BShutdownIfAllPipesClosed_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->BShutdownIfAllPipesClosed(  );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamHTTP(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamHTTP( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTTP((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamHTTP_params *params = (struct ISteamClient_SteamClient014_GetISteamHTTP_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamHTTP( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamUnifiedMessages(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamUnifiedMessages( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUnifiedMessages((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamUnifiedMessages_params *params = (struct ISteamClient_SteamClient014_GetISteamUnifiedMessages_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamUnifiedMessages( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamController(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamController( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamController((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamController_params *params = (struct ISteamClient_SteamClient014_GetISteamController_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamController( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamUGC(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamUGC( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUGC((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamUGC_params *params = (struct ISteamClient_SteamClient014_GetISteamUGC_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamUGC( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamAppList(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamAppList( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamAppList((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamAppList_params *params = (struct ISteamClient_SteamClient014_GetISteamAppList_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamAppList( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient014_GetISteamMusic(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient014_GetISteamMusic( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMusic((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient014_GetISteamMusic_params *params = (struct ISteamClient_SteamClient014_GetISteamMusic_params *)args;
+    struct u_ISteamClient_SteamClient014 *iface = (struct u_ISteamClient_SteamClient014 *)params->linux_side;
+    params->_ret = iface->GetISteamMusic( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient014.h
+++ b/lsteamclient/cppISteamClient_SteamClient014.h
@ -1,29 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient014_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient014_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient014_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient014_CreateLocalUser(void *, HSteamPipe *, EAccountType);
-extern void cppISteamClient_SteamClient014_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient014_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient014_SetLocalIPBinding(void *, uint32, uint16);
-extern void *cppISteamClient_SteamClient014_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient014_GetISteamGenericInterface(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamUserStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamGameServerStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamScreenshots(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient014_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient014_GetIPCCallCount(void *);
-extern void cppISteamClient_SteamClient014_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
-extern bool cppISteamClient_SteamClient014_BShutdownIfAllPipesClosed(void *);
-extern void *cppISteamClient_SteamClient014_GetISteamHTTP(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamUnifiedMessages(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamController(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamUGC(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamAppList(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient014_GetISteamMusic(void *, HSteamUser, HSteamPipe, const char *);
--- a/lsteamclient/cppISteamClient_SteamClient015.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient015.cpp
@ -1,167 +1,248 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_130/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_130
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient015.h"
-HSteamPipe cppISteamClient_SteamClient015_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient015_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient015_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient015_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient015_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient015_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient015_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient015_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient015_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient015_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient015_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient015_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient015_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe, EAccountType eAccountType)
+NTSTATUS ISteamClient_SteamClient015_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
+    struct ISteamClient_SteamClient015_CreateLocalUser_params *params = (struct ISteamClient_SteamClient015_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe, params->eAccountType );
+    return 0;
 }

-void cppISteamClient_SteamClient015_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient015_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient015_ReleaseUser_params *params = (struct ISteamClient_SteamClient015_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamUser_params *params = (struct ISteamClient_SteamClient015_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient015_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient015_SetLocalIPBinding(void *linux_side, uint32 unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient015_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient015_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient015_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamFriends_params *params = (struct ISteamClient_SteamClient015_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamUtils_params *params = (struct ISteamClient_SteamClient015_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient015_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient015_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient015_GetISteamGenericInterface(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamGenericInterface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient015_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamUserStats(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamUserStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient015_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamGameServerStats(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamGameServerStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServerStats((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamGameServerStats_params *params = (struct ISteamClient_SteamClient015_GetISteamGameServerStats_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServerStats( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamApps_params *params = (struct ISteamClient_SteamClient015_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamNetworking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamNetworking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient015_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamRemoteStorage(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamRemoteStorage( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient015_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamScreenshots(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamScreenshots( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamScreenshots((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamScreenshots_params *params = (struct ISteamClient_SteamClient015_GetISteamScreenshots_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamScreenshots( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient015_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient015_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient015_RunFrame_params *params = (struct ISteamClient_SteamClient015_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient015_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient015_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient015_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient015_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-void cppISteamClient_SteamClient015_SetWarningMessageHook(void *linux_side, SteamAPIWarningMessageHook_t pFunction)
+NTSTATUS ISteamClient_SteamClient015_SetWarningMessageHook( void *args )
 {
-    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
-    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
+    struct ISteamClient_SteamClient015_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient015_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
 }

-bool cppISteamClient_SteamClient015_BShutdownIfAllPipesClosed(void *linux_side)
+NTSTATUS ISteamClient_SteamClient015_BShutdownIfAllPipesClosed( void *args )
 {
-    return after_shutdown(((ISteamClient*)linux_side)->BShutdownIfAllPipesClosed());
+    struct ISteamClient_SteamClient015_BShutdownIfAllPipesClosed_params *params = (struct ISteamClient_SteamClient015_BShutdownIfAllPipesClosed_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->BShutdownIfAllPipesClosed(  );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamHTTP(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamHTTP( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTTP((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamHTTP_params *params = (struct ISteamClient_SteamClient015_GetISteamHTTP_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamHTTP( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamUnifiedMessages(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamUnifiedMessages( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUnifiedMessages((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamUnifiedMessages_params *params = (struct ISteamClient_SteamClient015_GetISteamUnifiedMessages_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamUnifiedMessages( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamController(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamController( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamController((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamController_params *params = (struct ISteamClient_SteamClient015_GetISteamController_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamController( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamUGC(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamUGC( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUGC((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamUGC_params *params = (struct ISteamClient_SteamClient015_GetISteamUGC_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamUGC( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamAppList(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamAppList( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamAppList((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamAppList_params *params = (struct ISteamClient_SteamClient015_GetISteamAppList_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamAppList( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamMusic(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamMusic( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMusic((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamMusic_params *params = (struct ISteamClient_SteamClient015_GetISteamMusic_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamMusic( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient015_GetISteamMusicRemote(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient015_GetISteamMusicRemote( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMusicRemote((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient015_GetISteamMusicRemote_params *params = (struct ISteamClient_SteamClient015_GetISteamMusicRemote_params *)args;
+    struct u_ISteamClient_SteamClient015 *iface = (struct u_ISteamClient_SteamClient015 *)params->linux_side;
+    params->_ret = iface->GetISteamMusicRemote( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient015.h
+++ b/lsteamclient/cppISteamClient_SteamClient015.h
@ -1,30 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient015_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient015_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient015_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient015_CreateLocalUser(void *, HSteamPipe *, EAccountType);
-extern void cppISteamClient_SteamClient015_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient015_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient015_SetLocalIPBinding(void *, uint32, uint16);
-extern void *cppISteamClient_SteamClient015_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient015_GetISteamGenericInterface(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamUserStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamGameServerStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamScreenshots(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient015_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient015_GetIPCCallCount(void *);
-extern void cppISteamClient_SteamClient015_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
-extern bool cppISteamClient_SteamClient015_BShutdownIfAllPipesClosed(void *);
-extern void *cppISteamClient_SteamClient015_GetISteamHTTP(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamUnifiedMessages(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamController(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamUGC(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamAppList(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamMusic(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient015_GetISteamMusicRemote(void *, HSteamUser, HSteamPipe, const char *);
--- a/lsteamclient/cppISteamClient_SteamClient016.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient016.cpp
@ -1,188 +1,283 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_131/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_131
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient016.h"
-HSteamPipe cppISteamClient_SteamClient016_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient016_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient016_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient016_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient016_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient016_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient016_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient016_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient016_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient016_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient016_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient016_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient016_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe, EAccountType eAccountType)
+NTSTATUS ISteamClient_SteamClient016_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
+    struct ISteamClient_SteamClient016_CreateLocalUser_params *params = (struct ISteamClient_SteamClient016_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe, params->eAccountType );
+    return 0;
 }

-void cppISteamClient_SteamClient016_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient016_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient016_ReleaseUser_params *params = (struct ISteamClient_SteamClient016_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamUser_params *params = (struct ISteamClient_SteamClient016_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient016_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient016_SetLocalIPBinding(void *linux_side, uint32 unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient016_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient016_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient016_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamFriends_params *params = (struct ISteamClient_SteamClient016_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamUtils_params *params = (struct ISteamClient_SteamClient016_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient016_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient016_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient016_GetISteamGenericInterface(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamGenericInterface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient016_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamUserStats(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamUserStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient016_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamGameServerStats(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamGameServerStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServerStats((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamGameServerStats_params *params = (struct ISteamClient_SteamClient016_GetISteamGameServerStats_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServerStats( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamApps_params *params = (struct ISteamClient_SteamClient016_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamNetworking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamNetworking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient016_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamRemoteStorage(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamRemoteStorage( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient016_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamScreenshots(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamScreenshots( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamScreenshots((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamScreenshots_params *params = (struct ISteamClient_SteamClient016_GetISteamScreenshots_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamScreenshots( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient016_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient016_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient016_RunFrame_params *params = (struct ISteamClient_SteamClient016_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient016_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient016_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient016_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient016_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-void cppISteamClient_SteamClient016_SetWarningMessageHook(void *linux_side, SteamAPIWarningMessageHook_t pFunction)
+NTSTATUS ISteamClient_SteamClient016_SetWarningMessageHook( void *args )
 {
-    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
-    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
+    struct ISteamClient_SteamClient016_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient016_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
 }

-bool cppISteamClient_SteamClient016_BShutdownIfAllPipesClosed(void *linux_side)
+NTSTATUS ISteamClient_SteamClient016_BShutdownIfAllPipesClosed( void *args )
 {
-    return after_shutdown(((ISteamClient*)linux_side)->BShutdownIfAllPipesClosed());
+    struct ISteamClient_SteamClient016_BShutdownIfAllPipesClosed_params *params = (struct ISteamClient_SteamClient016_BShutdownIfAllPipesClosed_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->BShutdownIfAllPipesClosed(  );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamHTTP(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamHTTP( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTTP((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamHTTP_params *params = (struct ISteamClient_SteamClient016_GetISteamHTTP_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamHTTP( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamUnifiedMessages(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamUnifiedMessages( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUnifiedMessages((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamUnifiedMessages_params *params = (struct ISteamClient_SteamClient016_GetISteamUnifiedMessages_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamUnifiedMessages( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamController(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamController( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamController((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamController_params *params = (struct ISteamClient_SteamClient016_GetISteamController_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamController( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamUGC(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamUGC( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUGC((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamUGC_params *params = (struct ISteamClient_SteamClient016_GetISteamUGC_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamUGC( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamAppList(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamAppList( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamAppList((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamAppList_params *params = (struct ISteamClient_SteamClient016_GetISteamAppList_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamAppList( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamMusic(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamMusic( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMusic((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamMusic_params *params = (struct ISteamClient_SteamClient016_GetISteamMusic_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamMusic( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamMusicRemote(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamMusicRemote( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMusicRemote((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamMusicRemote_params *params = (struct ISteamClient_SteamClient016_GetISteamMusicRemote_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamMusicRemote( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient016_GetISteamHTMLSurface(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient016_GetISteamHTMLSurface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTMLSurface((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient016_GetISteamHTMLSurface_params *params = (struct ISteamClient_SteamClient016_GetISteamHTMLSurface_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    params->_ret = iface->GetISteamHTMLSurface( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess(void *linux_side, SteamAPI_PostAPIResultInProcess_t func)
+NTSTATUS ISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess( void *args )
 {
-    ((ISteamClient*)linux_side)->Set_SteamAPI_CPostAPIResultInProcess((SteamAPI_PostAPIResultInProcess_t)func);
+    struct ISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    void (*U_CDECL u_func)(uint64_t, void *, uint32_t, int32_t) = manual_convert_Set_SteamAPI_CPostAPIResultInProcess_func( params->func );
+    iface->Set_SteamAPI_CPostAPIResultInProcess( u_func );
+    return 0;
 }

-void cppISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess(void *linux_side, SteamAPI_PostAPIResultInProcess_t func)
+NTSTATUS ISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess( void *args )
 {
-    ((ISteamClient*)linux_side)->Remove_SteamAPI_CPostAPIResultInProcess((SteamAPI_PostAPIResultInProcess_t)func);
+    struct ISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    void (*U_CDECL u_func)(uint64_t, void *, uint32_t, int32_t) = manual_convert_Remove_SteamAPI_CPostAPIResultInProcess_func( params->func );
+    iface->Remove_SteamAPI_CPostAPIResultInProcess( u_func );
+    return 0;
 }

-void cppISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *linux_side, SteamAPI_CheckCallbackRegistered_t func)
+NTSTATUS ISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess( void *args )
 {
-    func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t((void*)func);
-    ((ISteamClient*)linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess((SteamAPI_CheckCallbackRegistered_t)func);
+    struct ISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params = (struct ISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *)args;
+    struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
+    uint32_t (*U_CDECL u_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func );
+    iface->Set_SteamAPI_CCheckCallbackRegisteredInProcess( u_func );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient016.h
+++ b/lsteamclient/cppISteamClient_SteamClient016.h
@ -1,34 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient016_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient016_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient016_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient016_CreateLocalUser(void *, HSteamPipe *, EAccountType);
-extern void cppISteamClient_SteamClient016_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient016_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient016_SetLocalIPBinding(void *, uint32, uint16);
-extern void *cppISteamClient_SteamClient016_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient016_GetISteamGenericInterface(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamUserStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamGameServerStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamScreenshots(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient016_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient016_GetIPCCallCount(void *);
-extern void cppISteamClient_SteamClient016_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
-extern bool cppISteamClient_SteamClient016_BShutdownIfAllPipesClosed(void *);
-extern void *cppISteamClient_SteamClient016_GetISteamHTTP(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamUnifiedMessages(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamController(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamUGC(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamAppList(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamMusic(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamMusicRemote(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient016_GetISteamHTMLSurface(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess(void *, SteamAPI_PostAPIResultInProcess_t);
-extern void cppISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess(void *, SteamAPI_PostAPIResultInProcess_t);
-extern void cppISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *, SteamAPI_CheckCallbackRegistered_t);
--- a/lsteamclient/cppISteamClient_SteamClient017.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient017.cpp
@ -1,203 +1,307 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_142/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_142
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient017.h"
-HSteamPipe cppISteamClient_SteamClient017_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient017_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient017_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient017_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient017_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient017_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient017_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient017_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient017_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient017_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient017_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient017_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient017_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe, EAccountType eAccountType)
+NTSTATUS ISteamClient_SteamClient017_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
+    struct ISteamClient_SteamClient017_CreateLocalUser_params *params = (struct ISteamClient_SteamClient017_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe, params->eAccountType );
+    return 0;
 }

-void cppISteamClient_SteamClient017_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient017_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient017_ReleaseUser_params *params = (struct ISteamClient_SteamClient017_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamUser_params *params = (struct ISteamClient_SteamClient017_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient017_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient017_SetLocalIPBinding(void *linux_side, uint32 unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient017_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient017_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient017_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamFriends_params *params = (struct ISteamClient_SteamClient017_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamUtils_params *params = (struct ISteamClient_SteamClient017_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient017_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient017_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient017_GetISteamGenericInterface(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamGenericInterface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient017_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamUserStats(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamUserStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient017_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamGameServerStats(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamGameServerStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServerStats((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamGameServerStats_params *params = (struct ISteamClient_SteamClient017_GetISteamGameServerStats_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServerStats( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamApps_params *params = (struct ISteamClient_SteamClient017_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamNetworking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamNetworking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient017_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamRemoteStorage(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamRemoteStorage( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient017_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamScreenshots(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamScreenshots( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamScreenshots((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamScreenshots_params *params = (struct ISteamClient_SteamClient017_GetISteamScreenshots_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamScreenshots( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient017_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient017_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient017_RunFrame_params *params = (struct ISteamClient_SteamClient017_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient017_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient017_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient017_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient017_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-void cppISteamClient_SteamClient017_SetWarningMessageHook(void *linux_side, SteamAPIWarningMessageHook_t pFunction)
+NTSTATUS ISteamClient_SteamClient017_SetWarningMessageHook( void *args )
 {
-    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
-    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
+    struct ISteamClient_SteamClient017_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient017_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
 }

-bool cppISteamClient_SteamClient017_BShutdownIfAllPipesClosed(void *linux_side)
+NTSTATUS ISteamClient_SteamClient017_BShutdownIfAllPipesClosed( void *args )
 {
-    return after_shutdown(((ISteamClient*)linux_side)->BShutdownIfAllPipesClosed());
+    struct ISteamClient_SteamClient017_BShutdownIfAllPipesClosed_params *params = (struct ISteamClient_SteamClient017_BShutdownIfAllPipesClosed_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->BShutdownIfAllPipesClosed(  );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamHTTP(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamHTTP( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTTP((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamHTTP_params *params = (struct ISteamClient_SteamClient017_GetISteamHTTP_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamHTTP( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient017_DEPRECATED_GetISteamUnifiedMessages(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_DEPRECATED_GetISteamUnifiedMessages( void *args )
 {
-    return ((ISteamClient*)linux_side)->DEPRECATED_GetISteamUnifiedMessages((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_DEPRECATED_GetISteamUnifiedMessages_params *params = (struct ISteamClient_SteamClient017_DEPRECATED_GetISteamUnifiedMessages_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->DEPRECATED_GetISteamUnifiedMessages( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamController(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamController( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamController((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamController_params *params = (struct ISteamClient_SteamClient017_GetISteamController_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamController( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamUGC(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamUGC( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUGC((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamUGC_params *params = (struct ISteamClient_SteamClient017_GetISteamUGC_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamUGC( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamAppList(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamAppList( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamAppList((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamAppList_params *params = (struct ISteamClient_SteamClient017_GetISteamAppList_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamAppList( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamMusic(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamMusic( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMusic((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamMusic_params *params = (struct ISteamClient_SteamClient017_GetISteamMusic_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamMusic( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamMusicRemote(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamMusicRemote( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMusicRemote((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamMusicRemote_params *params = (struct ISteamClient_SteamClient017_GetISteamMusicRemote_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamMusicRemote( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamHTMLSurface(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamHTMLSurface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTMLSurface((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamHTMLSurface_params *params = (struct ISteamClient_SteamClient017_GetISteamHTMLSurface_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamHTMLSurface( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(void *linux_side, void * _a)
+NTSTATUS ISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void *args )
 {
-    ((ISteamClient*)linux_side)->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess((void (*)())_a);
+    struct ISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( u__a );
+    return 0;
 }

-void cppISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(void *linux_side, void * _a)
+NTSTATUS ISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void *args )
 {
-    ((ISteamClient*)linux_side)->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess((void (*)())_a);
+    struct ISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( u__a );
+    return 0;
 }

-void cppISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *linux_side, SteamAPI_CheckCallbackRegistered_t func)
+NTSTATUS ISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess( void *args )
 {
-    func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t((void*)func);
-    ((ISteamClient*)linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess((SteamAPI_CheckCallbackRegistered_t)func);
+    struct ISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params = (struct ISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    uint32_t (*U_CDECL u_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func );
+    iface->Set_SteamAPI_CCheckCallbackRegisteredInProcess( u_func );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamInventory(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamInventory( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamInventory((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamInventory_params *params = (struct ISteamClient_SteamClient017_GetISteamInventory_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamInventory( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamVideo(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamVideo( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamVideo((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamVideo_params *params = (struct ISteamClient_SteamClient017_GetISteamVideo_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamVideo( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient017_GetISteamParentalSettings(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient017_GetISteamParentalSettings( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamParentalSettings((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient017_GetISteamParentalSettings_params *params = (struct ISteamClient_SteamClient017_GetISteamParentalSettings_params *)args;
+    struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
+    params->_ret = iface->GetISteamParentalSettings( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient017.h
+++ b/lsteamclient/cppISteamClient_SteamClient017.h
@ -1,37 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient017_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient017_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient017_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient017_CreateLocalUser(void *, HSteamPipe *, EAccountType);
-extern void cppISteamClient_SteamClient017_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient017_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient017_SetLocalIPBinding(void *, uint32, uint16);
-extern void *cppISteamClient_SteamClient017_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient017_GetISteamGenericInterface(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamUserStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamGameServerStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamScreenshots(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient017_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient017_GetIPCCallCount(void *);
-extern void cppISteamClient_SteamClient017_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
-extern bool cppISteamClient_SteamClient017_BShutdownIfAllPipesClosed(void *);
-extern void *cppISteamClient_SteamClient017_GetISteamHTTP(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient017_DEPRECATED_GetISteamUnifiedMessages(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamController(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamUGC(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamAppList(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamMusic(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamMusicRemote(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamHTMLSurface(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(void *, void *);
-extern void cppISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(void *, void *);
-extern void cppISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *, SteamAPI_CheckCallbackRegistered_t);
-extern void *cppISteamClient_SteamClient017_GetISteamInventory(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamVideo(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient017_GetISteamParentalSettings(void *, HSteamUser, HSteamPipe, const char *);
--- a/lsteamclient/cppISteamClient_SteamClient018.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient018.cpp
@ -1,219 +1,331 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_145/steam_api.h"
-#include "steamworks_sdk_145/steamnetworkingtypes.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_145
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient018.h"
-HSteamPipe cppISteamClient_SteamClient018_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient018_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient018_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient018_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient018_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient018_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient018_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient018_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient018_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient018_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient018_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient018_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient018_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe, EAccountType eAccountType)
+NTSTATUS ISteamClient_SteamClient018_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
+    struct ISteamClient_SteamClient018_CreateLocalUser_params *params = (struct ISteamClient_SteamClient018_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe, params->eAccountType );
+    return 0;
 }

-void cppISteamClient_SteamClient018_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient018_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient018_ReleaseUser_params *params = (struct ISteamClient_SteamClient018_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamUser_params *params = (struct ISteamClient_SteamClient018_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient018_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient018_SetLocalIPBinding(void *linux_side, uint32 unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient018_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient018_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient018_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamFriends_params *params = (struct ISteamClient_SteamClient018_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamUtils_params *params = (struct ISteamClient_SteamClient018_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient018_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient018_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient018_GetISteamGenericInterface(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamGenericInterface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient018_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamUserStats(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamUserStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient018_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamGameServerStats(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamGameServerStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServerStats((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamGameServerStats_params *params = (struct ISteamClient_SteamClient018_GetISteamGameServerStats_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServerStats( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamApps_params *params = (struct ISteamClient_SteamClient018_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamNetworking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamNetworking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient018_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamRemoteStorage(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamRemoteStorage( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient018_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamScreenshots(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamScreenshots( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamScreenshots((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamScreenshots_params *params = (struct ISteamClient_SteamClient018_GetISteamScreenshots_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamScreenshots( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamGameSearch(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamGameSearch( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameSearch((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamGameSearch_params *params = (struct ISteamClient_SteamClient018_GetISteamGameSearch_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamGameSearch( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient018_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient018_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient018_RunFrame_params *params = (struct ISteamClient_SteamClient018_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient018_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient018_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient018_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient018_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-void cppISteamClient_SteamClient018_SetWarningMessageHook(void *linux_side, SteamAPIWarningMessageHook_t pFunction)
+NTSTATUS ISteamClient_SteamClient018_SetWarningMessageHook( void *args )
 {
-    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
-    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
+    struct ISteamClient_SteamClient018_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient018_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
 }

-bool cppISteamClient_SteamClient018_BShutdownIfAllPipesClosed(void *linux_side)
+NTSTATUS ISteamClient_SteamClient018_BShutdownIfAllPipesClosed( void *args )
 {
-    return after_shutdown(((ISteamClient*)linux_side)->BShutdownIfAllPipesClosed());
+    struct ISteamClient_SteamClient018_BShutdownIfAllPipesClosed_params *params = (struct ISteamClient_SteamClient018_BShutdownIfAllPipesClosed_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->BShutdownIfAllPipesClosed(  );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamHTTP(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamHTTP( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTTP((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamHTTP_params *params = (struct ISteamClient_SteamClient018_GetISteamHTTP_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamHTTP( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient018_DEPRECATED_GetISteamUnifiedMessages(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_DEPRECATED_GetISteamUnifiedMessages( void *args )
 {
-    return ((ISteamClient*)linux_side)->DEPRECATED_GetISteamUnifiedMessages((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_DEPRECATED_GetISteamUnifiedMessages_params *params = (struct ISteamClient_SteamClient018_DEPRECATED_GetISteamUnifiedMessages_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->DEPRECATED_GetISteamUnifiedMessages( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamController(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamController( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamController((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamController_params *params = (struct ISteamClient_SteamClient018_GetISteamController_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamController( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamUGC(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamUGC( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUGC((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamUGC_params *params = (struct ISteamClient_SteamClient018_GetISteamUGC_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamUGC( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamAppList(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamAppList( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamAppList((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamAppList_params *params = (struct ISteamClient_SteamClient018_GetISteamAppList_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamAppList( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamMusic(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamMusic( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMusic((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamMusic_params *params = (struct ISteamClient_SteamClient018_GetISteamMusic_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamMusic( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamMusicRemote(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamMusicRemote( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMusicRemote((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamMusicRemote_params *params = (struct ISteamClient_SteamClient018_GetISteamMusicRemote_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamMusicRemote( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamHTMLSurface(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamHTMLSurface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTMLSurface((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamHTMLSurface_params *params = (struct ISteamClient_SteamClient018_GetISteamHTMLSurface_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamHTMLSurface( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(void *linux_side, void * _a)
+NTSTATUS ISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void *args )
 {
-    ((ISteamClient*)linux_side)->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess((void (*)())_a);
+    struct ISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( u__a );
+    return 0;
 }

-void cppISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(void *linux_side, void * _a)
+NTSTATUS ISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void *args )
 {
-    ((ISteamClient*)linux_side)->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess((void (*)())_a);
+    struct ISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( u__a );
+    return 0;
 }

-void cppISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *linux_side, SteamAPI_CheckCallbackRegistered_t func)
+NTSTATUS ISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess( void *args )
 {
-    func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t((void*)func);
-    ((ISteamClient*)linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess((SteamAPI_CheckCallbackRegistered_t)func);
+    struct ISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params = (struct ISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    uint32_t (*U_CDECL u_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func );
+    iface->Set_SteamAPI_CCheckCallbackRegisteredInProcess( u_func );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamInventory(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamInventory( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamInventory((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamInventory_params *params = (struct ISteamClient_SteamClient018_GetISteamInventory_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamInventory( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamVideo(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamVideo( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamVideo((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamVideo_params *params = (struct ISteamClient_SteamClient018_GetISteamVideo_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamVideo( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamParentalSettings(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamParentalSettings( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamParentalSettings((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamParentalSettings_params *params = (struct ISteamClient_SteamClient018_GetISteamParentalSettings_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamParentalSettings( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamInput(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamInput( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamInput((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamInput_params *params = (struct ISteamClient_SteamClient018_GetISteamInput_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamInput( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient018_GetISteamParties(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient018_GetISteamParties( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamParties((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient018_GetISteamParties_params *params = (struct ISteamClient_SteamClient018_GetISteamParties_params *)args;
+    struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
+    params->_ret = iface->GetISteamParties( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient018.h
+++ b/lsteamclient/cppISteamClient_SteamClient018.h
@ -1,40 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient018_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient018_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient018_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient018_CreateLocalUser(void *, HSteamPipe *, EAccountType);
-extern void cppISteamClient_SteamClient018_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient018_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient018_SetLocalIPBinding(void *, uint32, uint16);
-extern void *cppISteamClient_SteamClient018_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient018_GetISteamGenericInterface(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamUserStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamGameServerStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamScreenshots(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamGameSearch(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient018_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient018_GetIPCCallCount(void *);
-extern void cppISteamClient_SteamClient018_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
-extern bool cppISteamClient_SteamClient018_BShutdownIfAllPipesClosed(void *);
-extern void *cppISteamClient_SteamClient018_GetISteamHTTP(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient018_DEPRECATED_GetISteamUnifiedMessages(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamController(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamUGC(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamAppList(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamMusic(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamMusicRemote(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamHTMLSurface(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(void *, void *);
-extern void cppISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(void *, void *);
-extern void cppISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *, SteamAPI_CheckCallbackRegistered_t);
-extern void *cppISteamClient_SteamClient018_GetISteamInventory(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamVideo(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamParentalSettings(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamInput(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient018_GetISteamParties(void *, HSteamUser, HSteamPipe, const char *);
--- a/lsteamclient/cppISteamClient_SteamClient019.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient019.cpp
@ -1,224 +1,339 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_146/steam_api.h"
-#include "steamworks_sdk_146/steamnetworkingtypes.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_146
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient019.h"
-HSteamPipe cppISteamClient_SteamClient019_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient019_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient019_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient019_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient019_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient019_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient019_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient019_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient019_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient019_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient019_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient019_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient019_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe, EAccountType eAccountType)
+NTSTATUS ISteamClient_SteamClient019_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
+    struct ISteamClient_SteamClient019_CreateLocalUser_params *params = (struct ISteamClient_SteamClient019_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe, params->eAccountType );
+    return 0;
 }

-void cppISteamClient_SteamClient019_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient019_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient019_ReleaseUser_params *params = (struct ISteamClient_SteamClient019_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamUser_params *params = (struct ISteamClient_SteamClient019_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient019_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient019_SetLocalIPBinding(void *linux_side, uint32 unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient019_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient019_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient019_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamFriends_params *params = (struct ISteamClient_SteamClient019_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamUtils_params *params = (struct ISteamClient_SteamClient019_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient019_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient019_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient019_GetISteamGenericInterface(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamGenericInterface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient019_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamUserStats(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamUserStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient019_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamGameServerStats(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamGameServerStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServerStats((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamGameServerStats_params *params = (struct ISteamClient_SteamClient019_GetISteamGameServerStats_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServerStats( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamApps_params *params = (struct ISteamClient_SteamClient019_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamNetworking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamNetworking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient019_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamRemoteStorage(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamRemoteStorage( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient019_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamScreenshots(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamScreenshots( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamScreenshots((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamScreenshots_params *params = (struct ISteamClient_SteamClient019_GetISteamScreenshots_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamScreenshots( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamGameSearch(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamGameSearch( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameSearch((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamGameSearch_params *params = (struct ISteamClient_SteamClient019_GetISteamGameSearch_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamGameSearch( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient019_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient019_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient019_RunFrame_params *params = (struct ISteamClient_SteamClient019_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient019_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient019_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient019_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient019_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-void cppISteamClient_SteamClient019_SetWarningMessageHook(void *linux_side, SteamAPIWarningMessageHook_t pFunction)
+NTSTATUS ISteamClient_SteamClient019_SetWarningMessageHook( void *args )
 {
-    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
-    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
+    struct ISteamClient_SteamClient019_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient019_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
 }

-bool cppISteamClient_SteamClient019_BShutdownIfAllPipesClosed(void *linux_side)
+NTSTATUS ISteamClient_SteamClient019_BShutdownIfAllPipesClosed( void *args )
 {
-    return after_shutdown(((ISteamClient*)linux_side)->BShutdownIfAllPipesClosed());
+    struct ISteamClient_SteamClient019_BShutdownIfAllPipesClosed_params *params = (struct ISteamClient_SteamClient019_BShutdownIfAllPipesClosed_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->BShutdownIfAllPipesClosed(  );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamHTTP(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamHTTP( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTTP((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamHTTP_params *params = (struct ISteamClient_SteamClient019_GetISteamHTTP_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamHTTP( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient019_DEPRECATED_GetISteamUnifiedMessages(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_DEPRECATED_GetISteamUnifiedMessages( void *args )
 {
-    return ((ISteamClient*)linux_side)->DEPRECATED_GetISteamUnifiedMessages((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_DEPRECATED_GetISteamUnifiedMessages_params *params = (struct ISteamClient_SteamClient019_DEPRECATED_GetISteamUnifiedMessages_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->DEPRECATED_GetISteamUnifiedMessages( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamController(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamController( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamController((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamController_params *params = (struct ISteamClient_SteamClient019_GetISteamController_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamController( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamUGC(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamUGC( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUGC((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamUGC_params *params = (struct ISteamClient_SteamClient019_GetISteamUGC_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamUGC( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamAppList(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamAppList( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamAppList((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamAppList_params *params = (struct ISteamClient_SteamClient019_GetISteamAppList_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamAppList( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamMusic(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamMusic( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMusic((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamMusic_params *params = (struct ISteamClient_SteamClient019_GetISteamMusic_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamMusic( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamMusicRemote(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamMusicRemote( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMusicRemote((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamMusicRemote_params *params = (struct ISteamClient_SteamClient019_GetISteamMusicRemote_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamMusicRemote( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamHTMLSurface(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamHTMLSurface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTMLSurface((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamHTMLSurface_params *params = (struct ISteamClient_SteamClient019_GetISteamHTMLSurface_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamHTMLSurface( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(void *linux_side, void * _a)
+NTSTATUS ISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void *args )
 {
-    ((ISteamClient*)linux_side)->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess((void (*)())_a);
+    struct ISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( u__a );
+    return 0;
 }

-void cppISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(void *linux_side, void * _a)
+NTSTATUS ISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void *args )
 {
-    ((ISteamClient*)linux_side)->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess((void (*)())_a);
+    struct ISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( u__a );
+    return 0;
 }

-void cppISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *linux_side, SteamAPI_CheckCallbackRegistered_t func)
+NTSTATUS ISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess( void *args )
 {
-    func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t((void*)func);
-    ((ISteamClient*)linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess((SteamAPI_CheckCallbackRegistered_t)func);
+    struct ISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params = (struct ISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    uint32_t (*U_CDECL u_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func );
+    iface->Set_SteamAPI_CCheckCallbackRegisteredInProcess( u_func );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamInventory(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamInventory( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamInventory((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamInventory_params *params = (struct ISteamClient_SteamClient019_GetISteamInventory_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamInventory( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamVideo(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamVideo( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamVideo((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamVideo_params *params = (struct ISteamClient_SteamClient019_GetISteamVideo_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamVideo( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamParentalSettings(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamParentalSettings( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamParentalSettings((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamParentalSettings_params *params = (struct ISteamClient_SteamClient019_GetISteamParentalSettings_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamParentalSettings( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamInput(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamInput( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamInput((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamInput_params *params = (struct ISteamClient_SteamClient019_GetISteamInput_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamInput( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamParties(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamParties( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamParties((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamParties_params *params = (struct ISteamClient_SteamClient019_GetISteamParties_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamParties( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient019_GetISteamRemotePlay(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient019_GetISteamRemotePlay( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemotePlay((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient019_GetISteamRemotePlay_params *params = (struct ISteamClient_SteamClient019_GetISteamRemotePlay_params *)args;
+    struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
+    params->_ret = iface->GetISteamRemotePlay( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient019.h
+++ b/lsteamclient/cppISteamClient_SteamClient019.h
@ -1,41 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient019_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient019_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient019_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient019_CreateLocalUser(void *, HSteamPipe *, EAccountType);
-extern void cppISteamClient_SteamClient019_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient019_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient019_SetLocalIPBinding(void *, uint32, uint16);
-extern void *cppISteamClient_SteamClient019_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient019_GetISteamGenericInterface(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamUserStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamGameServerStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamScreenshots(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamGameSearch(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient019_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient019_GetIPCCallCount(void *);
-extern void cppISteamClient_SteamClient019_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
-extern bool cppISteamClient_SteamClient019_BShutdownIfAllPipesClosed(void *);
-extern void *cppISteamClient_SteamClient019_GetISteamHTTP(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient019_DEPRECATED_GetISteamUnifiedMessages(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamController(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamUGC(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamAppList(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamMusic(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamMusicRemote(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamHTMLSurface(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(void *, void *);
-extern void cppISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(void *, void *);
-extern void cppISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *, SteamAPI_CheckCallbackRegistered_t);
-extern void *cppISteamClient_SteamClient019_GetISteamInventory(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamVideo(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamParentalSettings(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamInput(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamParties(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient019_GetISteamRemotePlay(void *, HSteamUser, HSteamPipe, const char *);
--- a/lsteamclient/cppISteamClient_SteamClient020.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient020.cpp
@ -1,229 +1,338 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_158/steam_api.h"
-#include "steamworks_sdk_158/steamnetworkingtypes.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_158
-#include "struct_converters.h"
-#include "cppISteamClient_SteamClient020.h"
-HSteamPipe cppISteamClient_SteamClient020_CreateSteamPipe(void *linux_side)
+
+NTSTATUS ISteamClient_SteamClient020_CreateSteamPipe( void *args )
 {
-    return after_steam_pipe_create(((ISteamClient*)linux_side)->CreateSteamPipe());
+    struct ISteamClient_SteamClient020_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient020_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
 }

-bool cppISteamClient_SteamClient020_BReleaseSteamPipe(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient020_BReleaseSteamPipe( void *args )
 {
-    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient020_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient020_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient020_ConnectToGlobalUser(void *linux_side, HSteamPipe hSteamPipe)
+NTSTATUS ISteamClient_SteamClient020_ConnectToGlobalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
+    struct ISteamClient_SteamClient020_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient020_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
 }

-HSteamUser cppISteamClient_SteamClient020_CreateLocalUser(void *linux_side, HSteamPipe * phSteamPipe, EAccountType eAccountType)
+NTSTATUS ISteamClient_SteamClient020_CreateLocalUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
+    struct ISteamClient_SteamClient020_CreateLocalUser_params *params = (struct ISteamClient_SteamClient020_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe, params->eAccountType );
+    return 0;
 }

-void cppISteamClient_SteamClient020_ReleaseUser(void *linux_side, HSteamPipe hSteamPipe, HSteamUser hUser)
+NTSTATUS ISteamClient_SteamClient020_ReleaseUser( void *args )
 {
-    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
+    struct ISteamClient_SteamClient020_ReleaseUser_params *params = (struct ISteamClient_SteamClient020_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamUser(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamUser( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamUser_params *params = (struct ISteamClient_SteamClient020_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamGameServer(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamGameServer( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient020_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient020_SetLocalIPBinding(void *linux_side, const SteamIPAddress_t * unIP, uint16 usPort)
+NTSTATUS ISteamClient_SteamClient020_SetLocalIPBinding( void *args )
 {
-    ((ISteamClient*)linux_side)->SetLocalIPBinding(*unIP, (uint16)usPort);
+    struct ISteamClient_SteamClient020_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient020_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamFriends(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamFriends( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamFriends_params *params = (struct ISteamClient_SteamClient020_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamUtils(void *linux_side, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamUtils( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamUtils_params *params = (struct ISteamClient_SteamClient020_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamMatchmaking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamMatchmaking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient020_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamMatchmakingServers(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamMatchmakingServers( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient020_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient020_GetISteamGenericInterface(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamGenericInterface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient020_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamUserStats(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamUserStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient020_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamGameServerStats(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamGameServerStats( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameServerStats((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamGameServerStats_params *params = (struct ISteamClient_SteamClient020_GetISteamGameServerStats_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServerStats( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamApps(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamApps( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamApps_params *params = (struct ISteamClient_SteamClient020_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamNetworking(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamNetworking( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient020_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamRemoteStorage(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamRemoteStorage( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient020_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamScreenshots(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamScreenshots( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamScreenshots((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamScreenshots_params *params = (struct ISteamClient_SteamClient020_GetISteamScreenshots_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamScreenshots( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamGameSearch(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamGameSearch( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamGameSearch((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamGameSearch_params *params = (struct ISteamClient_SteamClient020_GetISteamGameSearch_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamGameSearch( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient020_RunFrame(void *linux_side)
+NTSTATUS ISteamClient_SteamClient020_RunFrame( void *args )
 {
-    ((ISteamClient*)linux_side)->RunFrame();
+    struct ISteamClient_SteamClient020_RunFrame_params *params = (struct ISteamClient_SteamClient020_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-uint32 cppISteamClient_SteamClient020_GetIPCCallCount(void *linux_side)
+NTSTATUS ISteamClient_SteamClient020_GetIPCCallCount( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetIPCCallCount();
+    struct ISteamClient_SteamClient020_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient020_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
 }

-void cppISteamClient_SteamClient020_SetWarningMessageHook(void *linux_side, SteamAPIWarningMessageHook_t pFunction)
+NTSTATUS ISteamClient_SteamClient020_SetWarningMessageHook( void *args )
 {
-    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
-    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
+    struct ISteamClient_SteamClient020_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient020_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
 }

-bool cppISteamClient_SteamClient020_BShutdownIfAllPipesClosed(void *linux_side)
+NTSTATUS ISteamClient_SteamClient020_BShutdownIfAllPipesClosed( void *args )
 {
-    return after_shutdown(((ISteamClient*)linux_side)->BShutdownIfAllPipesClosed());
+    struct ISteamClient_SteamClient020_BShutdownIfAllPipesClosed_params *params = (struct ISteamClient_SteamClient020_BShutdownIfAllPipesClosed_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->BShutdownIfAllPipesClosed(  );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamHTTP(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamHTTP( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTTP((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamHTTP_params *params = (struct ISteamClient_SteamClient020_GetISteamHTTP_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamHTTP( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void * cppISteamClient_SteamClient020_DEPRECATED_GetISteamUnifiedMessages(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_DEPRECATED_GetISteamUnifiedMessages( void *args )
 {
-    return ((ISteamClient*)linux_side)->DEPRECATED_GetISteamUnifiedMessages((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_DEPRECATED_GetISteamUnifiedMessages_params *params = (struct ISteamClient_SteamClient020_DEPRECATED_GetISteamUnifiedMessages_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->DEPRECATED_GetISteamUnifiedMessages( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamController(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamController( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamController((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamController_params *params = (struct ISteamClient_SteamClient020_GetISteamController_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamController( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamUGC(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamUGC( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamUGC((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamUGC_params *params = (struct ISteamClient_SteamClient020_GetISteamUGC_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamUGC( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamAppList(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamAppList( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamAppList((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamAppList_params *params = (struct ISteamClient_SteamClient020_GetISteamAppList_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamAppList( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamMusic(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamMusic( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMusic((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamMusic_params *params = (struct ISteamClient_SteamClient020_GetISteamMusic_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamMusic( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamMusicRemote(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamMusicRemote( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamMusicRemote((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamMusicRemote_params *params = (struct ISteamClient_SteamClient020_GetISteamMusicRemote_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamMusicRemote( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamHTMLSurface(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamHTMLSurface( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamHTMLSurface((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamHTMLSurface_params *params = (struct ISteamClient_SteamClient020_GetISteamHTMLSurface_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamHTMLSurface( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void cppISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(void *linux_side, void * _a)
+NTSTATUS ISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void *args )
 {
-    ((ISteamClient*)linux_side)->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess((void (*)())_a);
+    struct ISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( u__a );
+    return 0;
 }

-void cppISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(void *linux_side, void * _a)
+NTSTATUS ISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void *args )
 {
-    ((ISteamClient*)linux_side)->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess((void (*)())_a);
+    struct ISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( u__a );
+    return 0;
 }

-void cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *linux_side, SteamAPI_CheckCallbackRegistered_t func)
+NTSTATUS ISteamClient_SteamClient020_GetISteamInventory( void *args )
 {
-    func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t((void*)func);
-    ((ISteamClient*)linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess((SteamAPI_CheckCallbackRegistered_t)func);
+    struct ISteamClient_SteamClient020_GetISteamInventory_params *params = (struct ISteamClient_SteamClient020_GetISteamInventory_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamInventory( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamInventory(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamVideo( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamInventory((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamVideo_params *params = (struct ISteamClient_SteamClient020_GetISteamVideo_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamVideo( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamVideo(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamParentalSettings( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamVideo((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamParentalSettings_params *params = (struct ISteamClient_SteamClient020_GetISteamParentalSettings_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamParentalSettings( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamParentalSettings(void *linux_side, HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamInput( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamParentalSettings((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamInput_params *params = (struct ISteamClient_SteamClient020_GetISteamInput_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamInput( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamInput(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamParties( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamInput((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamParties_params *params = (struct ISteamClient_SteamClient020_GetISteamParties_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamParties( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamParties(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_GetISteamRemotePlay( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamParties((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_GetISteamRemotePlay_params *params = (struct ISteamClient_SteamClient020_GetISteamRemotePlay_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    params->_ret = iface->GetISteamRemotePlay( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
 }

-void *cppISteamClient_SteamClient020_GetISteamRemotePlay(void *linux_side, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char * pchVersion)
+NTSTATUS ISteamClient_SteamClient020_DestroyAllInterfaces( void *args )
 {
-    return ((ISteamClient*)linux_side)->GetISteamRemotePlay((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
+    struct ISteamClient_SteamClient020_DestroyAllInterfaces_params *params = (struct ISteamClient_SteamClient020_DestroyAllInterfaces_params *)args;
+    struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
+    iface->DestroyAllInterfaces(  );
+    return 0;
 }

-void cppISteamClient_SteamClient020_DestroyAllInterfaces(void *linux_side)
-{
-    ((ISteamClient*)linux_side)->DestroyAllInterfaces();
-}
-
-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamClient_SteamClient020.h
+++ b/lsteamclient/cppISteamClient_SteamClient020.h
@ -1,42 +0,0 @@
-extern HSteamPipe cppISteamClient_SteamClient020_CreateSteamPipe(void *);
-extern bool cppISteamClient_SteamClient020_BReleaseSteamPipe(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient020_ConnectToGlobalUser(void *, HSteamPipe);
-extern HSteamUser cppISteamClient_SteamClient020_CreateLocalUser(void *, HSteamPipe *, EAccountType);
-extern void cppISteamClient_SteamClient020_ReleaseUser(void *, HSteamPipe, HSteamUser);
-extern void *cppISteamClient_SteamClient020_GetISteamUser(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamGameServer(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient020_SetLocalIPBinding(void *, const SteamIPAddress_t *, uint16);
-extern void *cppISteamClient_SteamClient020_GetISteamFriends(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamUtils(void *, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamMatchmaking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient020_GetISteamGenericInterface(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamUserStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamGameServerStats(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamApps(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamScreenshots(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamGameSearch(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient020_RunFrame(void *);
-extern uint32 cppISteamClient_SteamClient020_GetIPCCallCount(void *);
-extern void cppISteamClient_SteamClient020_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
-extern bool cppISteamClient_SteamClient020_BShutdownIfAllPipesClosed(void *);
-extern void *cppISteamClient_SteamClient020_GetISteamHTTP(void *, HSteamUser, HSteamPipe, const char *);
-extern void * cppISteamClient_SteamClient020_DEPRECATED_GetISteamUnifiedMessages(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamController(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamUGC(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamAppList(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamMusic(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamMusicRemote(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamHTMLSurface(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(void *, void *);
-extern void cppISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(void *, void *);
-extern void cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *, SteamAPI_CheckCallbackRegistered_t);
-extern void *cppISteamClient_SteamClient020_GetISteamInventory(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamVideo(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamParentalSettings(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamInput(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamParties(void *, HSteamUser, HSteamPipe, const char *);
-extern void *cppISteamClient_SteamClient020_GetISteamRemotePlay(void *, HSteamUser, HSteamPipe, const char *);
-extern void cppISteamClient_SteamClient020_DestroyAllInterfaces(void *);
--- a/lsteamclient/cppISteamClient_SteamClient021.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient021.cpp
@ -0,0 +1,322 @@
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
+#endif
+
+NTSTATUS ISteamClient_SteamClient021_CreateSteamPipe( void *args )
+{
+    struct ISteamClient_SteamClient021_CreateSteamPipe_params *params = (struct ISteamClient_SteamClient021_CreateSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->CreateSteamPipe(  );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_BReleaseSteamPipe( void *args )
+{
+    struct ISteamClient_SteamClient021_BReleaseSteamPipe_params *params = (struct ISteamClient_SteamClient021_BReleaseSteamPipe_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->BReleaseSteamPipe( params->hSteamPipe );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_ConnectToGlobalUser( void *args )
+{
+    struct ISteamClient_SteamClient021_ConnectToGlobalUser_params *params = (struct ISteamClient_SteamClient021_ConnectToGlobalUser_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->ConnectToGlobalUser( params->hSteamPipe );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_CreateLocalUser( void *args )
+{
+    struct ISteamClient_SteamClient021_CreateLocalUser_params *params = (struct ISteamClient_SteamClient021_CreateLocalUser_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->CreateLocalUser( params->phSteamPipe, params->eAccountType );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_ReleaseUser( void *args )
+{
+    struct ISteamClient_SteamClient021_ReleaseUser_params *params = (struct ISteamClient_SteamClient021_ReleaseUser_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    iface->ReleaseUser( params->hSteamPipe, params->hUser );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamUser( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamUser_params *params = (struct ISteamClient_SteamClient021_GetISteamUser_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamUser( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamGameServer( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamGameServer_params *params = (struct ISteamClient_SteamClient021_GetISteamGameServer_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServer( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_SetLocalIPBinding( void *args )
+{
+    struct ISteamClient_SteamClient021_SetLocalIPBinding_params *params = (struct ISteamClient_SteamClient021_SetLocalIPBinding_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    iface->SetLocalIPBinding( params->unIP, params->usPort );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamFriends( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamFriends_params *params = (struct ISteamClient_SteamClient021_GetISteamFriends_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamFriends( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamUtils( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamUtils_params *params = (struct ISteamClient_SteamClient021_GetISteamUtils_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamUtils( params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamMatchmaking( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamMatchmaking_params *params = (struct ISteamClient_SteamClient021_GetISteamMatchmaking_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmaking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamMatchmakingServers( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamMatchmakingServers_params *params = (struct ISteamClient_SteamClient021_GetISteamMatchmakingServers_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamMatchmakingServers( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamGenericInterface( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamGenericInterface_params *params = (struct ISteamClient_SteamClient021_GetISteamGenericInterface_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamGenericInterface( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamUserStats( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamUserStats_params *params = (struct ISteamClient_SteamClient021_GetISteamUserStats_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamUserStats( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamGameServerStats( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamGameServerStats_params *params = (struct ISteamClient_SteamClient021_GetISteamGameServerStats_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamGameServerStats( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamApps( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamApps_params *params = (struct ISteamClient_SteamClient021_GetISteamApps_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamApps( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamNetworking( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamNetworking_params *params = (struct ISteamClient_SteamClient021_GetISteamNetworking_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamNetworking( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamRemoteStorage( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamRemoteStorage_params *params = (struct ISteamClient_SteamClient021_GetISteamRemoteStorage_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamRemoteStorage( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamScreenshots( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamScreenshots_params *params = (struct ISteamClient_SteamClient021_GetISteamScreenshots_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamScreenshots( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamGameSearch( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamGameSearch_params *params = (struct ISteamClient_SteamClient021_GetISteamGameSearch_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamGameSearch( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_RunFrame( void *args )
+{
+    struct ISteamClient_SteamClient021_RunFrame_params *params = (struct ISteamClient_SteamClient021_RunFrame_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetIPCCallCount( void *args )
+{
+    struct ISteamClient_SteamClient021_GetIPCCallCount_params *params = (struct ISteamClient_SteamClient021_GetIPCCallCount_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetIPCCallCount(  );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_SetWarningMessageHook( void *args )
+{
+    struct ISteamClient_SteamClient021_SetWarningMessageHook_params *params = (struct ISteamClient_SteamClient021_SetWarningMessageHook_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    void (*U_CDECL u_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction );
+    iface->SetWarningMessageHook( u_pFunction );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_BShutdownIfAllPipesClosed( void *args )
+{
+    struct ISteamClient_SteamClient021_BShutdownIfAllPipesClosed_params *params = (struct ISteamClient_SteamClient021_BShutdownIfAllPipesClosed_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->BShutdownIfAllPipesClosed(  );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamHTTP( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamHTTP_params *params = (struct ISteamClient_SteamClient021_GetISteamHTTP_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamHTTP( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamController( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamController_params *params = (struct ISteamClient_SteamClient021_GetISteamController_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamController( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamUGC( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamUGC_params *params = (struct ISteamClient_SteamClient021_GetISteamUGC_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamUGC( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamMusic( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamMusic_params *params = (struct ISteamClient_SteamClient021_GetISteamMusic_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamMusic( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamMusicRemote( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamMusicRemote_params *params = (struct ISteamClient_SteamClient021_GetISteamMusicRemote_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamMusicRemote( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamHTMLSurface( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamHTMLSurface_params *params = (struct ISteamClient_SteamClient021_GetISteamHTMLSurface_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamHTMLSurface( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void *args )
+{
+    struct ISteamClient_SteamClient021_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient021_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( u__a );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void *args )
+{
+    struct ISteamClient_SteamClient021_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient021_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( u__a );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamInventory( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamInventory_params *params = (struct ISteamClient_SteamClient021_GetISteamInventory_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamInventory( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamVideo( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamVideo_params *params = (struct ISteamClient_SteamClient021_GetISteamVideo_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamVideo( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamParentalSettings( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamParentalSettings_params *params = (struct ISteamClient_SteamClient021_GetISteamParentalSettings_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamParentalSettings( params->hSteamuser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamInput( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamInput_params *params = (struct ISteamClient_SteamClient021_GetISteamInput_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamInput( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamParties( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamParties_params *params = (struct ISteamClient_SteamClient021_GetISteamParties_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamParties( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_GetISteamRemotePlay( void *args )
+{
+    struct ISteamClient_SteamClient021_GetISteamRemotePlay_params *params = (struct ISteamClient_SteamClient021_GetISteamRemotePlay_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    params->_ret = iface->GetISteamRemotePlay( params->hSteamUser, params->hSteamPipe, params->pchVersion );
+    return 0;
+}
+
+NTSTATUS ISteamClient_SteamClient021_DestroyAllInterfaces( void *args )
+{
+    struct ISteamClient_SteamClient021_DestroyAllInterfaces_params *params = (struct ISteamClient_SteamClient021_DestroyAllInterfaces_params *)args;
+    struct u_ISteamClient_SteamClient021 *iface = (struct u_ISteamClient_SteamClient021 *)params->linux_side;
+    iface->DestroyAllInterfaces(  );
+    return 0;
+}
+
--- a/lsteamclient/cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.cpp
+++ b/lsteamclient/cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.cpp
@ -1,46 +1,57 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_134/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_134
-#include "struct_converters.h"
-#include "cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.h"
-bool cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_Init(void *linux_side, const char * pchAbsolutePathToControllerConfigVDF)
+
+NTSTATUS ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_Init( void *args )
 {
-    return ((ISteamController*)linux_side)->Init((const char *)pchAbsolutePathToControllerConfigVDF);
+    struct ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_Init_params *params = (struct ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_Init_params *)args;
+    struct u_ISteamController_STEAMCONTROLLER_INTERFACE_VERSION *iface = (struct u_ISteamController_STEAMCONTROLLER_INTERFACE_VERSION *)params->linux_side;
+    char *u_pchAbsolutePathToControllerConfigVDF = steamclient_dos_to_unix_path( params->pchAbsolutePathToControllerConfigVDF, 0 );
+    params->_ret = iface->Init( u_pchAbsolutePathToControllerConfigVDF );
+    steamclient_free_path( u_pchAbsolutePathToControllerConfigVDF );
+    return 0;
 }

-bool cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_Shutdown(void *linux_side)
+NTSTATUS ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_Shutdown( void *args )
 {
-    return ((ISteamController*)linux_side)->Shutdown();
+    struct ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_Shutdown_params *params = (struct ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_Shutdown_params *)args;
+    struct u_ISteamController_STEAMCONTROLLER_INTERFACE_VERSION *iface = (struct u_ISteamController_STEAMCONTROLLER_INTERFACE_VERSION *)params->linux_side;
+    params->_ret = iface->Shutdown(  );
+    return 0;
 }

-void cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_RunFrame(void *linux_side)
+NTSTATUS ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_RunFrame( void *args )
 {
-    ((ISteamController*)linux_side)->RunFrame();
+    struct ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_RunFrame_params *params = (struct ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_RunFrame_params *)args;
+    struct u_ISteamController_STEAMCONTROLLER_INTERFACE_VERSION *iface = (struct u_ISteamController_STEAMCONTROLLER_INTERFACE_VERSION *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-bool cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_GetControllerState(void *linux_side, uint32 unControllerIndex, SteamControllerState001_t * pState)
+NTSTATUS ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_GetControllerState( void *args )
 {
-    return ((ISteamController*)linux_side)->GetControllerState((uint32)unControllerIndex, (SteamControllerState001_t *)pState);
+    struct ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_GetControllerState_params *params = (struct ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_GetControllerState_params *)args;
+    struct u_ISteamController_STEAMCONTROLLER_INTERFACE_VERSION *iface = (struct u_ISteamController_STEAMCONTROLLER_INTERFACE_VERSION *)params->linux_side;
+    params->_ret = iface->GetControllerState( params->unControllerIndex, params->pState );
+    return 0;
 }

-void cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_TriggerHapticPulse(void *linux_side, uint32 unControllerIndex, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec)
+NTSTATUS ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_TriggerHapticPulse( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerHapticPulse((uint32)unControllerIndex, (ESteamControllerPad)eTargetPad, (unsigned short)usDurationMicroSec);
+    struct ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_TriggerHapticPulse_params *params = (struct ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_TriggerHapticPulse_params *)args;
+    struct u_ISteamController_STEAMCONTROLLER_INTERFACE_VERSION *iface = (struct u_ISteamController_STEAMCONTROLLER_INTERFACE_VERSION *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerIndex, params->eTargetPad, params->usDurationMicroSec );
+    return 0;
 }

-void cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_SetOverrideMode(void *linux_side, const char * pchMode)
+NTSTATUS ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_SetOverrideMode( void *args )
 {
-    ((ISteamController*)linux_side)->SetOverrideMode((const char *)pchMode);
+    struct ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_SetOverrideMode_params *params = (struct ISteamController_STEAMCONTROLLER_INTERFACE_VERSION_SetOverrideMode_params *)args;
+    struct u_ISteamController_STEAMCONTROLLER_INTERFACE_VERSION *iface = (struct u_ISteamController_STEAMCONTROLLER_INTERFACE_VERSION *)params->linux_side;
+    iface->SetOverrideMode( params->pchMode );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.h
+++ b/lsteamclient/cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.h
@ -1,6 +0,0 @@
-extern bool cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_Init(void *, const char *);
-extern bool cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_Shutdown(void *);
-extern void cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_RunFrame(void *);
-extern bool cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_GetControllerState(void *, uint32, SteamControllerState001_t *);
-extern void cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_TriggerHapticPulse(void *, uint32, ESteamControllerPad, unsigned short);
-extern void cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_SetOverrideMode(void *, const char *);
--- a/lsteamclient/cppISteamController_SteamController003.cpp
+++ b/lsteamclient/cppISteamController_SteamController003.cpp
@ -1,101 +1,143 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_137/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_137
-#include "struct_converters.h"
-#include "cppISteamController_SteamController003.h"
-bool cppISteamController_SteamController003_Init(void *linux_side)
+
+NTSTATUS ISteamController_SteamController003_Init( void *args )
 {
-    return ((ISteamController*)linux_side)->Init();
+    struct ISteamController_SteamController003_Init_params *params = (struct ISteamController_SteamController003_Init_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    params->_ret = iface->Init(  );
+    return 0;
 }

-bool cppISteamController_SteamController003_Shutdown(void *linux_side)
+NTSTATUS ISteamController_SteamController003_Shutdown( void *args )
 {
-    return ((ISteamController*)linux_side)->Shutdown();
+    struct ISteamController_SteamController003_Shutdown_params *params = (struct ISteamController_SteamController003_Shutdown_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    params->_ret = iface->Shutdown(  );
+    return 0;
 }

-void cppISteamController_SteamController003_RunFrame(void *linux_side)
+NTSTATUS ISteamController_SteamController003_RunFrame( void *args )
 {
-    ((ISteamController*)linux_side)->RunFrame();
+    struct ISteamController_SteamController003_RunFrame_params *params = (struct ISteamController_SteamController003_RunFrame_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-int cppISteamController_SteamController003_GetConnectedControllers(void *linux_side, ControllerHandle_t * handlesOut)
+NTSTATUS ISteamController_SteamController003_GetConnectedControllers( void *args )
 {
-    return ((ISteamController*)linux_side)->GetConnectedControllers((ControllerHandle_t *)handlesOut);
+    struct ISteamController_SteamController003_GetConnectedControllers_params *params = (struct ISteamController_SteamController003_GetConnectedControllers_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    params->_ret = iface->GetConnectedControllers( params->handlesOut );
+    return 0;
 }

-bool cppISteamController_SteamController003_ShowBindingPanel(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController003_ShowBindingPanel( void *args )
 {
-    return ((ISteamController*)linux_side)->ShowBindingPanel((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController003_ShowBindingPanel_params *params = (struct ISteamController_SteamController003_ShowBindingPanel_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    params->_ret = iface->ShowBindingPanel( params->controllerHandle );
+    return 0;
 }

-ControllerActionSetHandle_t cppISteamController_SteamController003_GetActionSetHandle(void *linux_side, const char * pszActionSetName)
+NTSTATUS ISteamController_SteamController003_GetActionSetHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetActionSetHandle((const char *)pszActionSetName);
+    struct ISteamController_SteamController003_GetActionSetHandle_params *params = (struct ISteamController_SteamController003_GetActionSetHandle_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    params->_ret = iface->GetActionSetHandle( params->pszActionSetName );
+    return 0;
 }

-void cppISteamController_SteamController003_ActivateActionSet(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle)
+NTSTATUS ISteamController_SteamController003_ActivateActionSet( void *args )
 {
-    ((ISteamController*)linux_side)->ActivateActionSet((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle);
+    struct ISteamController_SteamController003_ActivateActionSet_params *params = (struct ISteamController_SteamController003_ActivateActionSet_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    iface->ActivateActionSet( params->controllerHandle, params->actionSetHandle );
+    return 0;
 }

-ControllerActionSetHandle_t cppISteamController_SteamController003_GetCurrentActionSet(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController003_GetCurrentActionSet( void *args )
 {
-    return ((ISteamController*)linux_side)->GetCurrentActionSet((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController003_GetCurrentActionSet_params *params = (struct ISteamController_SteamController003_GetCurrentActionSet_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    params->_ret = iface->GetCurrentActionSet( params->controllerHandle );
+    return 0;
 }

-ControllerDigitalActionHandle_t cppISteamController_SteamController003_GetDigitalActionHandle(void *linux_side, const char * pszActionName)
+NTSTATUS ISteamController_SteamController003_GetDigitalActionHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionHandle((const char *)pszActionName);
+    struct ISteamController_SteamController003_GetDigitalActionHandle_params *params = (struct ISteamController_SteamController003_GetDigitalActionHandle_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    params->_ret = iface->GetDigitalActionHandle( params->pszActionName );
+    return 0;
 }

-ControllerDigitalActionData_t cppISteamController_SteamController003_GetDigitalActionData(void *linux_side, ControllerHandle_t controllerHandle, ControllerDigitalActionHandle_t digitalActionHandle)
+NTSTATUS ISteamController_SteamController003_GetDigitalActionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionData((ControllerHandle_t)controllerHandle, (ControllerDigitalActionHandle_t)digitalActionHandle);
+    struct ISteamController_SteamController003_GetDigitalActionData_params *params = (struct ISteamController_SteamController003_GetDigitalActionData_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    *params->_ret = iface->GetDigitalActionData( params->controllerHandle, params->digitalActionHandle );
+    return 0;
 }

-int cppISteamController_SteamController003_GetDigitalActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle, ControllerDigitalActionHandle_t digitalActionHandle, EControllerActionOrigin * originsOut)
+NTSTATUS ISteamController_SteamController003_GetDigitalActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionOrigins((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle, (ControllerDigitalActionHandle_t)digitalActionHandle, (EControllerActionOrigin *)originsOut);
+    struct ISteamController_SteamController003_GetDigitalActionOrigins_params *params = (struct ISteamController_SteamController003_GetDigitalActionOrigins_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    params->_ret = iface->GetDigitalActionOrigins( params->controllerHandle, params->actionSetHandle, params->digitalActionHandle, params->originsOut );
+    return 0;
 }

-ControllerAnalogActionHandle_t cppISteamController_SteamController003_GetAnalogActionHandle(void *linux_side, const char * pszActionName)
+NTSTATUS ISteamController_SteamController003_GetAnalogActionHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionHandle((const char *)pszActionName);
+    struct ISteamController_SteamController003_GetAnalogActionHandle_params *params = (struct ISteamController_SteamController003_GetAnalogActionHandle_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    params->_ret = iface->GetAnalogActionHandle( params->pszActionName );
+    return 0;
 }

-ControllerAnalogActionData_t cppISteamController_SteamController003_GetAnalogActionData(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t analogActionHandle)
+NTSTATUS ISteamController_SteamController003_GetAnalogActionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionData((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)analogActionHandle);
+    struct ISteamController_SteamController003_GetAnalogActionData_params *params = (struct ISteamController_SteamController003_GetAnalogActionData_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    *params->_ret = iface->GetAnalogActionData( params->controllerHandle, params->analogActionHandle );
+    return 0;
 }

-int cppISteamController_SteamController003_GetAnalogActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle, ControllerAnalogActionHandle_t analogActionHandle, EControllerActionOrigin * originsOut)
+NTSTATUS ISteamController_SteamController003_GetAnalogActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionOrigins((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle, (ControllerAnalogActionHandle_t)analogActionHandle, (EControllerActionOrigin *)originsOut);
+    struct ISteamController_SteamController003_GetAnalogActionOrigins_params *params = (struct ISteamController_SteamController003_GetAnalogActionOrigins_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    params->_ret = iface->GetAnalogActionOrigins( params->controllerHandle, params->actionSetHandle, params->analogActionHandle, params->originsOut );
+    return 0;
 }

-void cppISteamController_SteamController003_StopAnalogActionMomentum(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t eAction)
+NTSTATUS ISteamController_SteamController003_StopAnalogActionMomentum( void *args )
 {
-    ((ISteamController*)linux_side)->StopAnalogActionMomentum((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)eAction);
+    struct ISteamController_SteamController003_StopAnalogActionMomentum_params *params = (struct ISteamController_SteamController003_StopAnalogActionMomentum_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    iface->StopAnalogActionMomentum( params->controllerHandle, params->eAction );
+    return 0;
 }

-void cppISteamController_SteamController003_TriggerHapticPulse(void *linux_side, ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec)
+NTSTATUS ISteamController_SteamController003_TriggerHapticPulse( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerHapticPulse((ControllerHandle_t)controllerHandle, (ESteamControllerPad)eTargetPad, (unsigned short)usDurationMicroSec);
+    struct ISteamController_SteamController003_TriggerHapticPulse_params *params = (struct ISteamController_SteamController003_TriggerHapticPulse_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    iface->TriggerHapticPulse( params->controllerHandle, params->eTargetPad, params->usDurationMicroSec );
+    return 0;
 }

-void cppISteamController_SteamController003_TriggerRepeatedHapticPulse(void *linux_side, ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec, unsigned short usOffMicroSec, unsigned short unRepeat, unsigned int nFlags)
+NTSTATUS ISteamController_SteamController003_TriggerRepeatedHapticPulse( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerRepeatedHapticPulse((ControllerHandle_t)controllerHandle, (ESteamControllerPad)eTargetPad, (unsigned short)usDurationMicroSec, (unsigned short)usOffMicroSec, (unsigned short)unRepeat, (unsigned int)nFlags);
+    struct ISteamController_SteamController003_TriggerRepeatedHapticPulse_params *params = (struct ISteamController_SteamController003_TriggerRepeatedHapticPulse_params *)args;
+    struct u_ISteamController_SteamController003 *iface = (struct u_ISteamController_SteamController003 *)params->linux_side;
+    iface->TriggerRepeatedHapticPulse( params->controllerHandle, params->eTargetPad, params->usDurationMicroSec, params->usOffMicroSec, params->unRepeat, params->nFlags );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamController_SteamController003.h
+++ b/lsteamclient/cppISteamController_SteamController003.h
@ -1,17 +0,0 @@
-extern bool cppISteamController_SteamController003_Init(void *);
-extern bool cppISteamController_SteamController003_Shutdown(void *);
-extern void cppISteamController_SteamController003_RunFrame(void *);
-extern int cppISteamController_SteamController003_GetConnectedControllers(void *, ControllerHandle_t *);
-extern bool cppISteamController_SteamController003_ShowBindingPanel(void *, ControllerHandle_t);
-extern ControllerActionSetHandle_t cppISteamController_SteamController003_GetActionSetHandle(void *, const char *);
-extern void cppISteamController_SteamController003_ActivateActionSet(void *, ControllerHandle_t, ControllerActionSetHandle_t);
-extern ControllerActionSetHandle_t cppISteamController_SteamController003_GetCurrentActionSet(void *, ControllerHandle_t);
-extern ControllerDigitalActionHandle_t cppISteamController_SteamController003_GetDigitalActionHandle(void *, const char *);
-extern ControllerDigitalActionData_t cppISteamController_SteamController003_GetDigitalActionData(void *, ControllerHandle_t, ControllerDigitalActionHandle_t);
-extern int cppISteamController_SteamController003_GetDigitalActionOrigins(void *, ControllerHandle_t, ControllerActionSetHandle_t, ControllerDigitalActionHandle_t, EControllerActionOrigin *);
-extern ControllerAnalogActionHandle_t cppISteamController_SteamController003_GetAnalogActionHandle(void *, const char *);
-extern ControllerAnalogActionData_t cppISteamController_SteamController003_GetAnalogActionData(void *, ControllerHandle_t, ControllerAnalogActionHandle_t);
-extern int cppISteamController_SteamController003_GetAnalogActionOrigins(void *, ControllerHandle_t, ControllerActionSetHandle_t, ControllerAnalogActionHandle_t, EControllerActionOrigin *);
-extern void cppISteamController_SteamController003_StopAnalogActionMomentum(void *, ControllerHandle_t, ControllerAnalogActionHandle_t);
-extern void cppISteamController_SteamController003_TriggerHapticPulse(void *, ControllerHandle_t, ESteamControllerPad, unsigned short);
-extern void cppISteamController_SteamController003_TriggerRepeatedHapticPulse(void *, ControllerHandle_t, ESteamControllerPad, unsigned short, unsigned short, unsigned short, unsigned int);
--- a/lsteamclient/cppISteamController_SteamController004.cpp
+++ b/lsteamclient/cppISteamController_SteamController004.cpp
@ -1,126 +1,183 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_138a/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_138a
-#include "struct_converters.h"
-#include "cppISteamController_SteamController004.h"
-bool cppISteamController_SteamController004_Init(void *linux_side)
+
+NTSTATUS ISteamController_SteamController004_Init( void *args )
 {
-    return ((ISteamController*)linux_side)->Init();
+    struct ISteamController_SteamController004_Init_params *params = (struct ISteamController_SteamController004_Init_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    params->_ret = iface->Init(  );
+    return 0;
 }

-bool cppISteamController_SteamController004_Shutdown(void *linux_side)
+NTSTATUS ISteamController_SteamController004_Shutdown( void *args )
 {
-    return ((ISteamController*)linux_side)->Shutdown();
+    struct ISteamController_SteamController004_Shutdown_params *params = (struct ISteamController_SteamController004_Shutdown_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    params->_ret = iface->Shutdown(  );
+    return 0;
 }

-void cppISteamController_SteamController004_RunFrame(void *linux_side)
+NTSTATUS ISteamController_SteamController004_RunFrame( void *args )
 {
-    ((ISteamController*)linux_side)->RunFrame();
+    struct ISteamController_SteamController004_RunFrame_params *params = (struct ISteamController_SteamController004_RunFrame_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-int cppISteamController_SteamController004_GetConnectedControllers(void *linux_side, ControllerHandle_t * handlesOut)
+NTSTATUS ISteamController_SteamController004_GetConnectedControllers( void *args )
 {
-    return ((ISteamController*)linux_side)->GetConnectedControllers((ControllerHandle_t *)handlesOut);
+    struct ISteamController_SteamController004_GetConnectedControllers_params *params = (struct ISteamController_SteamController004_GetConnectedControllers_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    params->_ret = iface->GetConnectedControllers( params->handlesOut );
+    return 0;
 }

-bool cppISteamController_SteamController004_ShowBindingPanel(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController004_ShowBindingPanel( void *args )
 {
-    return ((ISteamController*)linux_side)->ShowBindingPanel((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController004_ShowBindingPanel_params *params = (struct ISteamController_SteamController004_ShowBindingPanel_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    params->_ret = iface->ShowBindingPanel( params->controllerHandle );
+    return 0;
 }

-ControllerActionSetHandle_t cppISteamController_SteamController004_GetActionSetHandle(void *linux_side, const char * pszActionSetName)
+NTSTATUS ISteamController_SteamController004_GetActionSetHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetActionSetHandle((const char *)pszActionSetName);
+    struct ISteamController_SteamController004_GetActionSetHandle_params *params = (struct ISteamController_SteamController004_GetActionSetHandle_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    params->_ret = iface->GetActionSetHandle( params->pszActionSetName );
+    return 0;
 }

-void cppISteamController_SteamController004_ActivateActionSet(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle)
+NTSTATUS ISteamController_SteamController004_ActivateActionSet( void *args )
 {
-    ((ISteamController*)linux_side)->ActivateActionSet((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle);
+    struct ISteamController_SteamController004_ActivateActionSet_params *params = (struct ISteamController_SteamController004_ActivateActionSet_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    iface->ActivateActionSet( params->controllerHandle, params->actionSetHandle );
+    return 0;
 }

-ControllerActionSetHandle_t cppISteamController_SteamController004_GetCurrentActionSet(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController004_GetCurrentActionSet( void *args )
 {
-    return ((ISteamController*)linux_side)->GetCurrentActionSet((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController004_GetCurrentActionSet_params *params = (struct ISteamController_SteamController004_GetCurrentActionSet_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    params->_ret = iface->GetCurrentActionSet( params->controllerHandle );
+    return 0;
 }

-ControllerDigitalActionHandle_t cppISteamController_SteamController004_GetDigitalActionHandle(void *linux_side, const char * pszActionName)
+NTSTATUS ISteamController_SteamController004_GetDigitalActionHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionHandle((const char *)pszActionName);
+    struct ISteamController_SteamController004_GetDigitalActionHandle_params *params = (struct ISteamController_SteamController004_GetDigitalActionHandle_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    params->_ret = iface->GetDigitalActionHandle( params->pszActionName );
+    return 0;
 }

-ControllerDigitalActionData_t cppISteamController_SteamController004_GetDigitalActionData(void *linux_side, ControllerHandle_t controllerHandle, ControllerDigitalActionHandle_t digitalActionHandle)
+NTSTATUS ISteamController_SteamController004_GetDigitalActionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionData((ControllerHandle_t)controllerHandle, (ControllerDigitalActionHandle_t)digitalActionHandle);
+    struct ISteamController_SteamController004_GetDigitalActionData_params *params = (struct ISteamController_SteamController004_GetDigitalActionData_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    *params->_ret = iface->GetDigitalActionData( params->controllerHandle, params->digitalActionHandle );
+    return 0;
 }

-int cppISteamController_SteamController004_GetDigitalActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle, ControllerDigitalActionHandle_t digitalActionHandle, EControllerActionOrigin * originsOut)
+NTSTATUS ISteamController_SteamController004_GetDigitalActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionOrigins((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle, (ControllerDigitalActionHandle_t)digitalActionHandle, (EControllerActionOrigin *)originsOut);
+    struct ISteamController_SteamController004_GetDigitalActionOrigins_params *params = (struct ISteamController_SteamController004_GetDigitalActionOrigins_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    params->_ret = iface->GetDigitalActionOrigins( params->controllerHandle, params->actionSetHandle, params->digitalActionHandle, params->originsOut );
+    return 0;
 }

-ControllerAnalogActionHandle_t cppISteamController_SteamController004_GetAnalogActionHandle(void *linux_side, const char * pszActionName)
+NTSTATUS ISteamController_SteamController004_GetAnalogActionHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionHandle((const char *)pszActionName);
+    struct ISteamController_SteamController004_GetAnalogActionHandle_params *params = (struct ISteamController_SteamController004_GetAnalogActionHandle_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    params->_ret = iface->GetAnalogActionHandle( params->pszActionName );
+    return 0;
 }

-ControllerAnalogActionData_t cppISteamController_SteamController004_GetAnalogActionData(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t analogActionHandle)
+NTSTATUS ISteamController_SteamController004_GetAnalogActionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionData((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)analogActionHandle);
+    struct ISteamController_SteamController004_GetAnalogActionData_params *params = (struct ISteamController_SteamController004_GetAnalogActionData_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    *params->_ret = iface->GetAnalogActionData( params->controllerHandle, params->analogActionHandle );
+    return 0;
 }

-int cppISteamController_SteamController004_GetAnalogActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle, ControllerAnalogActionHandle_t analogActionHandle, EControllerActionOrigin * originsOut)
+NTSTATUS ISteamController_SteamController004_GetAnalogActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionOrigins((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle, (ControllerAnalogActionHandle_t)analogActionHandle, (EControllerActionOrigin *)originsOut);
+    struct ISteamController_SteamController004_GetAnalogActionOrigins_params *params = (struct ISteamController_SteamController004_GetAnalogActionOrigins_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    params->_ret = iface->GetAnalogActionOrigins( params->controllerHandle, params->actionSetHandle, params->analogActionHandle, params->originsOut );
+    return 0;
 }

-void cppISteamController_SteamController004_StopAnalogActionMomentum(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t eAction)
+NTSTATUS ISteamController_SteamController004_StopAnalogActionMomentum( void *args )
 {
-    ((ISteamController*)linux_side)->StopAnalogActionMomentum((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)eAction);
+    struct ISteamController_SteamController004_StopAnalogActionMomentum_params *params = (struct ISteamController_SteamController004_StopAnalogActionMomentum_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    iface->StopAnalogActionMomentum( params->controllerHandle, params->eAction );
+    return 0;
 }

-void cppISteamController_SteamController004_TriggerHapticPulse(void *linux_side, ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec)
+NTSTATUS ISteamController_SteamController004_TriggerHapticPulse( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerHapticPulse((ControllerHandle_t)controllerHandle, (ESteamControllerPad)eTargetPad, (unsigned short)usDurationMicroSec);
+    struct ISteamController_SteamController004_TriggerHapticPulse_params *params = (struct ISteamController_SteamController004_TriggerHapticPulse_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    iface->TriggerHapticPulse( params->controllerHandle, params->eTargetPad, params->usDurationMicroSec );
+    return 0;
 }

-void cppISteamController_SteamController004_TriggerRepeatedHapticPulse(void *linux_side, ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec, unsigned short usOffMicroSec, unsigned short unRepeat, unsigned int nFlags)
+NTSTATUS ISteamController_SteamController004_TriggerRepeatedHapticPulse( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerRepeatedHapticPulse((ControllerHandle_t)controllerHandle, (ESteamControllerPad)eTargetPad, (unsigned short)usDurationMicroSec, (unsigned short)usOffMicroSec, (unsigned short)unRepeat, (unsigned int)nFlags);
+    struct ISteamController_SteamController004_TriggerRepeatedHapticPulse_params *params = (struct ISteamController_SteamController004_TriggerRepeatedHapticPulse_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    iface->TriggerRepeatedHapticPulse( params->controllerHandle, params->eTargetPad, params->usDurationMicroSec, params->usOffMicroSec, params->unRepeat, params->nFlags );
+    return 0;
 }

-int cppISteamController_SteamController004_GetGamepadIndexForController(void *linux_side, ControllerHandle_t ulControllerHandle)
+NTSTATUS ISteamController_SteamController004_GetGamepadIndexForController( void *args )
 {
-    return ((ISteamController*)linux_side)->GetGamepadIndexForController((ControllerHandle_t)ulControllerHandle);
+    struct ISteamController_SteamController004_GetGamepadIndexForController_params *params = (struct ISteamController_SteamController004_GetGamepadIndexForController_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    params->_ret = iface->GetGamepadIndexForController( params->ulControllerHandle );
+    return 0;
 }

-ControllerHandle_t cppISteamController_SteamController004_GetControllerForGamepadIndex(void *linux_side, int nIndex)
+NTSTATUS ISteamController_SteamController004_GetControllerForGamepadIndex( void *args )
 {
-    return ((ISteamController*)linux_side)->GetControllerForGamepadIndex((int)nIndex);
+    struct ISteamController_SteamController004_GetControllerForGamepadIndex_params *params = (struct ISteamController_SteamController004_GetControllerForGamepadIndex_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    params->_ret = iface->GetControllerForGamepadIndex( params->nIndex );
+    return 0;
 }

-ControllerMotionData_t cppISteamController_SteamController004_GetMotionData(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController004_GetMotionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetMotionData((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController004_GetMotionData_params *params = (struct ISteamController_SteamController004_GetMotionData_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    *params->_ret = iface->GetMotionData( params->controllerHandle );
+    return 0;
 }

-bool cppISteamController_SteamController004_ShowDigitalActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerDigitalActionHandle_t digitalActionHandle, float flScale, float flXPosition, float flYPosition)
+NTSTATUS ISteamController_SteamController004_ShowDigitalActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->ShowDigitalActionOrigins((ControllerHandle_t)controllerHandle, (ControllerDigitalActionHandle_t)digitalActionHandle, (float)flScale, (float)flXPosition, (float)flYPosition);
+    struct ISteamController_SteamController004_ShowDigitalActionOrigins_params *params = (struct ISteamController_SteamController004_ShowDigitalActionOrigins_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    params->_ret = iface->ShowDigitalActionOrigins( params->controllerHandle, params->digitalActionHandle, params->flScale, params->flXPosition, params->flYPosition );
+    return 0;
 }

-bool cppISteamController_SteamController004_ShowAnalogActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t analogActionHandle, float flScale, float flXPosition, float flYPosition)
+NTSTATUS ISteamController_SteamController004_ShowAnalogActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->ShowAnalogActionOrigins((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)analogActionHandle, (float)flScale, (float)flXPosition, (float)flYPosition);
+    struct ISteamController_SteamController004_ShowAnalogActionOrigins_params *params = (struct ISteamController_SteamController004_ShowAnalogActionOrigins_params *)args;
+    struct u_ISteamController_SteamController004 *iface = (struct u_ISteamController_SteamController004 *)params->linux_side;
+    params->_ret = iface->ShowAnalogActionOrigins( params->controllerHandle, params->analogActionHandle, params->flScale, params->flXPosition, params->flYPosition );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamController_SteamController004.h
+++ b/lsteamclient/cppISteamController_SteamController004.h
@ -1,22 +0,0 @@
-extern bool cppISteamController_SteamController004_Init(void *);
-extern bool cppISteamController_SteamController004_Shutdown(void *);
-extern void cppISteamController_SteamController004_RunFrame(void *);
-extern int cppISteamController_SteamController004_GetConnectedControllers(void *, ControllerHandle_t *);
-extern bool cppISteamController_SteamController004_ShowBindingPanel(void *, ControllerHandle_t);
-extern ControllerActionSetHandle_t cppISteamController_SteamController004_GetActionSetHandle(void *, const char *);
-extern void cppISteamController_SteamController004_ActivateActionSet(void *, ControllerHandle_t, ControllerActionSetHandle_t);
-extern ControllerActionSetHandle_t cppISteamController_SteamController004_GetCurrentActionSet(void *, ControllerHandle_t);
-extern ControllerDigitalActionHandle_t cppISteamController_SteamController004_GetDigitalActionHandle(void *, const char *);
-extern ControllerDigitalActionData_t cppISteamController_SteamController004_GetDigitalActionData(void *, ControllerHandle_t, ControllerDigitalActionHandle_t);
-extern int cppISteamController_SteamController004_GetDigitalActionOrigins(void *, ControllerHandle_t, ControllerActionSetHandle_t, ControllerDigitalActionHandle_t, EControllerActionOrigin *);
-extern ControllerAnalogActionHandle_t cppISteamController_SteamController004_GetAnalogActionHandle(void *, const char *);
-extern ControllerAnalogActionData_t cppISteamController_SteamController004_GetAnalogActionData(void *, ControllerHandle_t, ControllerAnalogActionHandle_t);
-extern int cppISteamController_SteamController004_GetAnalogActionOrigins(void *, ControllerHandle_t, ControllerActionSetHandle_t, ControllerAnalogActionHandle_t, EControllerActionOrigin *);
-extern void cppISteamController_SteamController004_StopAnalogActionMomentum(void *, ControllerHandle_t, ControllerAnalogActionHandle_t);
-extern void cppISteamController_SteamController004_TriggerHapticPulse(void *, ControllerHandle_t, ESteamControllerPad, unsigned short);
-extern void cppISteamController_SteamController004_TriggerRepeatedHapticPulse(void *, ControllerHandle_t, ESteamControllerPad, unsigned short, unsigned short, unsigned short, unsigned int);
-extern int cppISteamController_SteamController004_GetGamepadIndexForController(void *, ControllerHandle_t);
-extern ControllerHandle_t cppISteamController_SteamController004_GetControllerForGamepadIndex(void *, int);
-extern ControllerMotionData_t cppISteamController_SteamController004_GetMotionData(void *, ControllerHandle_t);
-extern bool cppISteamController_SteamController004_ShowDigitalActionOrigins(void *, ControllerHandle_t, ControllerDigitalActionHandle_t, float, float, float);
-extern bool cppISteamController_SteamController004_ShowAnalogActionOrigins(void *, ControllerHandle_t, ControllerAnalogActionHandle_t, float, float, float);
--- a/lsteamclient/cppISteamController_SteamController005.cpp
+++ b/lsteamclient/cppISteamController_SteamController005.cpp
@ -1,141 +1,207 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_141/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_141
-#include "struct_converters.h"
-#include "cppISteamController_SteamController005.h"
-bool cppISteamController_SteamController005_Init(void *linux_side)
+
+NTSTATUS ISteamController_SteamController005_Init( void *args )
 {
-    return ((ISteamController*)linux_side)->Init();
+    struct ISteamController_SteamController005_Init_params *params = (struct ISteamController_SteamController005_Init_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->Init(  );
+    return 0;
 }

-bool cppISteamController_SteamController005_Shutdown(void *linux_side)
+NTSTATUS ISteamController_SteamController005_Shutdown( void *args )
 {
-    return ((ISteamController*)linux_side)->Shutdown();
+    struct ISteamController_SteamController005_Shutdown_params *params = (struct ISteamController_SteamController005_Shutdown_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->Shutdown(  );
+    return 0;
 }

-void cppISteamController_SteamController005_RunFrame(void *linux_side)
+NTSTATUS ISteamController_SteamController005_RunFrame( void *args )
 {
-    ((ISteamController*)linux_side)->RunFrame();
+    struct ISteamController_SteamController005_RunFrame_params *params = (struct ISteamController_SteamController005_RunFrame_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-int cppISteamController_SteamController005_GetConnectedControllers(void *linux_side, ControllerHandle_t * handlesOut)
+NTSTATUS ISteamController_SteamController005_GetConnectedControllers( void *args )
 {
-    return ((ISteamController*)linux_side)->GetConnectedControllers((ControllerHandle_t *)handlesOut);
+    struct ISteamController_SteamController005_GetConnectedControllers_params *params = (struct ISteamController_SteamController005_GetConnectedControllers_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->GetConnectedControllers( params->handlesOut );
+    return 0;
 }

-bool cppISteamController_SteamController005_ShowBindingPanel(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController005_ShowBindingPanel( void *args )
 {
-    return ((ISteamController*)linux_side)->ShowBindingPanel((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController005_ShowBindingPanel_params *params = (struct ISteamController_SteamController005_ShowBindingPanel_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->ShowBindingPanel( params->controllerHandle );
+    return 0;
 }

-ControllerActionSetHandle_t cppISteamController_SteamController005_GetActionSetHandle(void *linux_side, const char * pszActionSetName)
+NTSTATUS ISteamController_SteamController005_GetActionSetHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetActionSetHandle((const char *)pszActionSetName);
+    struct ISteamController_SteamController005_GetActionSetHandle_params *params = (struct ISteamController_SteamController005_GetActionSetHandle_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->GetActionSetHandle( params->pszActionSetName );
+    return 0;
 }

-void cppISteamController_SteamController005_ActivateActionSet(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle)
+NTSTATUS ISteamController_SteamController005_ActivateActionSet( void *args )
 {
-    ((ISteamController*)linux_side)->ActivateActionSet((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle);
+    struct ISteamController_SteamController005_ActivateActionSet_params *params = (struct ISteamController_SteamController005_ActivateActionSet_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    iface->ActivateActionSet( params->controllerHandle, params->actionSetHandle );
+    return 0;
 }

-ControllerActionSetHandle_t cppISteamController_SteamController005_GetCurrentActionSet(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController005_GetCurrentActionSet( void *args )
 {
-    return ((ISteamController*)linux_side)->GetCurrentActionSet((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController005_GetCurrentActionSet_params *params = (struct ISteamController_SteamController005_GetCurrentActionSet_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->GetCurrentActionSet( params->controllerHandle );
+    return 0;
 }

-ControllerDigitalActionHandle_t cppISteamController_SteamController005_GetDigitalActionHandle(void *linux_side, const char * pszActionName)
+NTSTATUS ISteamController_SteamController005_GetDigitalActionHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionHandle((const char *)pszActionName);
+    struct ISteamController_SteamController005_GetDigitalActionHandle_params *params = (struct ISteamController_SteamController005_GetDigitalActionHandle_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->GetDigitalActionHandle( params->pszActionName );
+    return 0;
 }

-ControllerDigitalActionData_t cppISteamController_SteamController005_GetDigitalActionData(void *linux_side, ControllerHandle_t controllerHandle, ControllerDigitalActionHandle_t digitalActionHandle)
+NTSTATUS ISteamController_SteamController005_GetDigitalActionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionData((ControllerHandle_t)controllerHandle, (ControllerDigitalActionHandle_t)digitalActionHandle);
+    struct ISteamController_SteamController005_GetDigitalActionData_params *params = (struct ISteamController_SteamController005_GetDigitalActionData_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    *params->_ret = iface->GetDigitalActionData( params->controllerHandle, params->digitalActionHandle );
+    return 0;
 }

-int cppISteamController_SteamController005_GetDigitalActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle, ControllerDigitalActionHandle_t digitalActionHandle, EControllerActionOrigin * originsOut)
+NTSTATUS ISteamController_SteamController005_GetDigitalActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionOrigins((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle, (ControllerDigitalActionHandle_t)digitalActionHandle, (EControllerActionOrigin *)originsOut);
+    struct ISteamController_SteamController005_GetDigitalActionOrigins_params *params = (struct ISteamController_SteamController005_GetDigitalActionOrigins_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->GetDigitalActionOrigins( params->controllerHandle, params->actionSetHandle, params->digitalActionHandle, params->originsOut );
+    return 0;
 }

-ControllerAnalogActionHandle_t cppISteamController_SteamController005_GetAnalogActionHandle(void *linux_side, const char * pszActionName)
+NTSTATUS ISteamController_SteamController005_GetAnalogActionHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionHandle((const char *)pszActionName);
+    struct ISteamController_SteamController005_GetAnalogActionHandle_params *params = (struct ISteamController_SteamController005_GetAnalogActionHandle_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->GetAnalogActionHandle( params->pszActionName );
+    return 0;
 }

-ControllerAnalogActionData_t cppISteamController_SteamController005_GetAnalogActionData(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t analogActionHandle)
+NTSTATUS ISteamController_SteamController005_GetAnalogActionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionData((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)analogActionHandle);
+    struct ISteamController_SteamController005_GetAnalogActionData_params *params = (struct ISteamController_SteamController005_GetAnalogActionData_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    *params->_ret = iface->GetAnalogActionData( params->controllerHandle, params->analogActionHandle );
+    return 0;
 }

-int cppISteamController_SteamController005_GetAnalogActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle, ControllerAnalogActionHandle_t analogActionHandle, EControllerActionOrigin * originsOut)
+NTSTATUS ISteamController_SteamController005_GetAnalogActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionOrigins((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle, (ControllerAnalogActionHandle_t)analogActionHandle, (EControllerActionOrigin *)originsOut);
+    struct ISteamController_SteamController005_GetAnalogActionOrigins_params *params = (struct ISteamController_SteamController005_GetAnalogActionOrigins_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->GetAnalogActionOrigins( params->controllerHandle, params->actionSetHandle, params->analogActionHandle, params->originsOut );
+    return 0;
 }

-void cppISteamController_SteamController005_StopAnalogActionMomentum(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t eAction)
+NTSTATUS ISteamController_SteamController005_StopAnalogActionMomentum( void *args )
 {
-    ((ISteamController*)linux_side)->StopAnalogActionMomentum((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)eAction);
+    struct ISteamController_SteamController005_StopAnalogActionMomentum_params *params = (struct ISteamController_SteamController005_StopAnalogActionMomentum_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    iface->StopAnalogActionMomentum( params->controllerHandle, params->eAction );
+    return 0;
 }

-void cppISteamController_SteamController005_TriggerHapticPulse(void *linux_side, ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec)
+NTSTATUS ISteamController_SteamController005_TriggerHapticPulse( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerHapticPulse((ControllerHandle_t)controllerHandle, (ESteamControllerPad)eTargetPad, (unsigned short)usDurationMicroSec);
+    struct ISteamController_SteamController005_TriggerHapticPulse_params *params = (struct ISteamController_SteamController005_TriggerHapticPulse_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    iface->TriggerHapticPulse( params->controllerHandle, params->eTargetPad, params->usDurationMicroSec );
+    return 0;
 }

-void cppISteamController_SteamController005_TriggerRepeatedHapticPulse(void *linux_side, ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec, unsigned short usOffMicroSec, unsigned short unRepeat, unsigned int nFlags)
+NTSTATUS ISteamController_SteamController005_TriggerRepeatedHapticPulse( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerRepeatedHapticPulse((ControllerHandle_t)controllerHandle, (ESteamControllerPad)eTargetPad, (unsigned short)usDurationMicroSec, (unsigned short)usOffMicroSec, (unsigned short)unRepeat, (unsigned int)nFlags);
+    struct ISteamController_SteamController005_TriggerRepeatedHapticPulse_params *params = (struct ISteamController_SteamController005_TriggerRepeatedHapticPulse_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    iface->TriggerRepeatedHapticPulse( params->controllerHandle, params->eTargetPad, params->usDurationMicroSec, params->usOffMicroSec, params->unRepeat, params->nFlags );
+    return 0;
 }

-void cppISteamController_SteamController005_TriggerVibration(void *linux_side, ControllerHandle_t controllerHandle, unsigned short usLeftSpeed, unsigned short usRightSpeed)
+NTSTATUS ISteamController_SteamController005_TriggerVibration( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerVibration((ControllerHandle_t)controllerHandle, (unsigned short)usLeftSpeed, (unsigned short)usRightSpeed);
+    struct ISteamController_SteamController005_TriggerVibration_params *params = (struct ISteamController_SteamController005_TriggerVibration_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    iface->TriggerVibration( params->controllerHandle, params->usLeftSpeed, params->usRightSpeed );
+    return 0;
 }

-void cppISteamController_SteamController005_SetLEDColor(void *linux_side, ControllerHandle_t controllerHandle, uint8 nColorR, uint8 nColorG, uint8 nColorB, unsigned int nFlags)
+NTSTATUS ISteamController_SteamController005_SetLEDColor( void *args )
 {
-    ((ISteamController*)linux_side)->SetLEDColor((ControllerHandle_t)controllerHandle, (uint8)nColorR, (uint8)nColorG, (uint8)nColorB, (unsigned int)nFlags);
+    struct ISteamController_SteamController005_SetLEDColor_params *params = (struct ISteamController_SteamController005_SetLEDColor_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    iface->SetLEDColor( params->controllerHandle, params->nColorR, params->nColorG, params->nColorB, params->nFlags );
+    return 0;
 }

-int cppISteamController_SteamController005_GetGamepadIndexForController(void *linux_side, ControllerHandle_t ulControllerHandle)
+NTSTATUS ISteamController_SteamController005_GetGamepadIndexForController( void *args )
 {
-    return ((ISteamController*)linux_side)->GetGamepadIndexForController((ControllerHandle_t)ulControllerHandle);
+    struct ISteamController_SteamController005_GetGamepadIndexForController_params *params = (struct ISteamController_SteamController005_GetGamepadIndexForController_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->GetGamepadIndexForController( params->ulControllerHandle );
+    return 0;
 }

-ControllerHandle_t cppISteamController_SteamController005_GetControllerForGamepadIndex(void *linux_side, int nIndex)
+NTSTATUS ISteamController_SteamController005_GetControllerForGamepadIndex( void *args )
 {
-    return ((ISteamController*)linux_side)->GetControllerForGamepadIndex((int)nIndex);
+    struct ISteamController_SteamController005_GetControllerForGamepadIndex_params *params = (struct ISteamController_SteamController005_GetControllerForGamepadIndex_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->GetControllerForGamepadIndex( params->nIndex );
+    return 0;
 }

-ControllerMotionData_t cppISteamController_SteamController005_GetMotionData(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController005_GetMotionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetMotionData((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController005_GetMotionData_params *params = (struct ISteamController_SteamController005_GetMotionData_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    *params->_ret = iface->GetMotionData( params->controllerHandle );
+    return 0;
 }

-bool cppISteamController_SteamController005_ShowDigitalActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerDigitalActionHandle_t digitalActionHandle, float flScale, float flXPosition, float flYPosition)
+NTSTATUS ISteamController_SteamController005_ShowDigitalActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->ShowDigitalActionOrigins((ControllerHandle_t)controllerHandle, (ControllerDigitalActionHandle_t)digitalActionHandle, (float)flScale, (float)flXPosition, (float)flYPosition);
+    struct ISteamController_SteamController005_ShowDigitalActionOrigins_params *params = (struct ISteamController_SteamController005_ShowDigitalActionOrigins_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->ShowDigitalActionOrigins( params->controllerHandle, params->digitalActionHandle, params->flScale, params->flXPosition, params->flYPosition );
+    return 0;
 }

-bool cppISteamController_SteamController005_ShowAnalogActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t analogActionHandle, float flScale, float flXPosition, float flYPosition)
+NTSTATUS ISteamController_SteamController005_ShowAnalogActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->ShowAnalogActionOrigins((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)analogActionHandle, (float)flScale, (float)flXPosition, (float)flYPosition);
+    struct ISteamController_SteamController005_ShowAnalogActionOrigins_params *params = (struct ISteamController_SteamController005_ShowAnalogActionOrigins_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->ShowAnalogActionOrigins( params->controllerHandle, params->analogActionHandle, params->flScale, params->flXPosition, params->flYPosition );
+    return 0;
 }

-const char * cppISteamController_SteamController005_GetStringForActionOrigin(void *linux_side, EControllerActionOrigin eOrigin)
+NTSTATUS ISteamController_SteamController005_GetStringForActionOrigin( void *args )
 {
-    return ((ISteamController*)linux_side)->GetStringForActionOrigin((EControllerActionOrigin)eOrigin);
+    struct ISteamController_SteamController005_GetStringForActionOrigin_params *params = (struct ISteamController_SteamController005_GetStringForActionOrigin_params *)args;
+    struct u_ISteamController_SteamController005 *iface = (struct u_ISteamController_SteamController005 *)params->linux_side;
+    params->_ret = iface->GetStringForActionOrigin( params->eOrigin );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamController_SteamController005.h
+++ b/lsteamclient/cppISteamController_SteamController005.h
@ -1,26 +0,0 @@
-extern bool cppISteamController_SteamController005_Init(void *);
-extern bool cppISteamController_SteamController005_Shutdown(void *);
-extern void cppISteamController_SteamController005_RunFrame(void *);
-extern int cppISteamController_SteamController005_GetConnectedControllers(void *, ControllerHandle_t *);
-extern bool cppISteamController_SteamController005_ShowBindingPanel(void *, ControllerHandle_t);
-extern ControllerActionSetHandle_t cppISteamController_SteamController005_GetActionSetHandle(void *, const char *);
-extern void cppISteamController_SteamController005_ActivateActionSet(void *, ControllerHandle_t, ControllerActionSetHandle_t);
-extern ControllerActionSetHandle_t cppISteamController_SteamController005_GetCurrentActionSet(void *, ControllerHandle_t);
-extern ControllerDigitalActionHandle_t cppISteamController_SteamController005_GetDigitalActionHandle(void *, const char *);
-extern ControllerDigitalActionData_t cppISteamController_SteamController005_GetDigitalActionData(void *, ControllerHandle_t, ControllerDigitalActionHandle_t);
-extern int cppISteamController_SteamController005_GetDigitalActionOrigins(void *, ControllerHandle_t, ControllerActionSetHandle_t, ControllerDigitalActionHandle_t, EControllerActionOrigin *);
-extern ControllerAnalogActionHandle_t cppISteamController_SteamController005_GetAnalogActionHandle(void *, const char *);
-extern ControllerAnalogActionData_t cppISteamController_SteamController005_GetAnalogActionData(void *, ControllerHandle_t, ControllerAnalogActionHandle_t);
-extern int cppISteamController_SteamController005_GetAnalogActionOrigins(void *, ControllerHandle_t, ControllerActionSetHandle_t, ControllerAnalogActionHandle_t, EControllerActionOrigin *);
-extern void cppISteamController_SteamController005_StopAnalogActionMomentum(void *, ControllerHandle_t, ControllerAnalogActionHandle_t);
-extern void cppISteamController_SteamController005_TriggerHapticPulse(void *, ControllerHandle_t, ESteamControllerPad, unsigned short);
-extern void cppISteamController_SteamController005_TriggerRepeatedHapticPulse(void *, ControllerHandle_t, ESteamControllerPad, unsigned short, unsigned short, unsigned short, unsigned int);
-extern void cppISteamController_SteamController005_TriggerVibration(void *, ControllerHandle_t, unsigned short, unsigned short);
-extern void cppISteamController_SteamController005_SetLEDColor(void *, ControllerHandle_t, uint8, uint8, uint8, unsigned int);
-extern int cppISteamController_SteamController005_GetGamepadIndexForController(void *, ControllerHandle_t);
-extern ControllerHandle_t cppISteamController_SteamController005_GetControllerForGamepadIndex(void *, int);
-extern ControllerMotionData_t cppISteamController_SteamController005_GetMotionData(void *, ControllerHandle_t);
-extern bool cppISteamController_SteamController005_ShowDigitalActionOrigins(void *, ControllerHandle_t, ControllerDigitalActionHandle_t, float, float, float);
-extern bool cppISteamController_SteamController005_ShowAnalogActionOrigins(void *, ControllerHandle_t, ControllerAnalogActionHandle_t, float, float, float);
-extern const char * cppISteamController_SteamController005_GetStringForActionOrigin(void *, EControllerActionOrigin);
-extern const char * cppISteamController_SteamController005_GetGlyphForActionOrigin(void *, EControllerActionOrigin);
--- a/lsteamclient/cppISteamController_SteamController006.cpp
+++ b/lsteamclient/cppISteamController_SteamController006.cpp
@ -1,166 +1,247 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_142/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_142
-#include "struct_converters.h"
-#include "cppISteamController_SteamController006.h"
-bool cppISteamController_SteamController006_Init(void *linux_side)
+
+NTSTATUS ISteamController_SteamController006_Init( void *args )
 {
-    return ((ISteamController*)linux_side)->Init();
+    struct ISteamController_SteamController006_Init_params *params = (struct ISteamController_SteamController006_Init_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->Init(  );
+    return 0;
 }

-bool cppISteamController_SteamController006_Shutdown(void *linux_side)
+NTSTATUS ISteamController_SteamController006_Shutdown( void *args )
 {
-    return ((ISteamController*)linux_side)->Shutdown();
+    struct ISteamController_SteamController006_Shutdown_params *params = (struct ISteamController_SteamController006_Shutdown_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->Shutdown(  );
+    return 0;
 }

-void cppISteamController_SteamController006_RunFrame(void *linux_side)
+NTSTATUS ISteamController_SteamController006_RunFrame( void *args )
 {
-    ((ISteamController*)linux_side)->RunFrame();
+    struct ISteamController_SteamController006_RunFrame_params *params = (struct ISteamController_SteamController006_RunFrame_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-int cppISteamController_SteamController006_GetConnectedControllers(void *linux_side, ControllerHandle_t * handlesOut)
+NTSTATUS ISteamController_SteamController006_GetConnectedControllers( void *args )
 {
-    return ((ISteamController*)linux_side)->GetConnectedControllers((ControllerHandle_t *)handlesOut);
+    struct ISteamController_SteamController006_GetConnectedControllers_params *params = (struct ISteamController_SteamController006_GetConnectedControllers_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->GetConnectedControllers( params->handlesOut );
+    return 0;
 }

-bool cppISteamController_SteamController006_ShowBindingPanel(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController006_ShowBindingPanel( void *args )
 {
-    return ((ISteamController*)linux_side)->ShowBindingPanel((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController006_ShowBindingPanel_params *params = (struct ISteamController_SteamController006_ShowBindingPanel_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->ShowBindingPanel( params->controllerHandle );
+    return 0;
 }

-ControllerActionSetHandle_t cppISteamController_SteamController006_GetActionSetHandle(void *linux_side, const char * pszActionSetName)
+NTSTATUS ISteamController_SteamController006_GetActionSetHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetActionSetHandle((const char *)pszActionSetName);
+    struct ISteamController_SteamController006_GetActionSetHandle_params *params = (struct ISteamController_SteamController006_GetActionSetHandle_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->GetActionSetHandle( params->pszActionSetName );
+    return 0;
 }

-void cppISteamController_SteamController006_ActivateActionSet(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle)
+NTSTATUS ISteamController_SteamController006_ActivateActionSet( void *args )
 {
-    ((ISteamController*)linux_side)->ActivateActionSet((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle);
+    struct ISteamController_SteamController006_ActivateActionSet_params *params = (struct ISteamController_SteamController006_ActivateActionSet_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    iface->ActivateActionSet( params->controllerHandle, params->actionSetHandle );
+    return 0;
 }

-ControllerActionSetHandle_t cppISteamController_SteamController006_GetCurrentActionSet(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController006_GetCurrentActionSet( void *args )
 {
-    return ((ISteamController*)linux_side)->GetCurrentActionSet((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController006_GetCurrentActionSet_params *params = (struct ISteamController_SteamController006_GetCurrentActionSet_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->GetCurrentActionSet( params->controllerHandle );
+    return 0;
 }

-void cppISteamController_SteamController006_ActivateActionSetLayer(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetLayerHandle)
+NTSTATUS ISteamController_SteamController006_ActivateActionSetLayer( void *args )
 {
-    ((ISteamController*)linux_side)->ActivateActionSetLayer((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetLayerHandle);
+    struct ISteamController_SteamController006_ActivateActionSetLayer_params *params = (struct ISteamController_SteamController006_ActivateActionSetLayer_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    iface->ActivateActionSetLayer( params->controllerHandle, params->actionSetLayerHandle );
+    return 0;
 }

-void cppISteamController_SteamController006_DeactivateActionSetLayer(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetLayerHandle)
+NTSTATUS ISteamController_SteamController006_DeactivateActionSetLayer( void *args )
 {
-    ((ISteamController*)linux_side)->DeactivateActionSetLayer((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetLayerHandle);
+    struct ISteamController_SteamController006_DeactivateActionSetLayer_params *params = (struct ISteamController_SteamController006_DeactivateActionSetLayer_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    iface->DeactivateActionSetLayer( params->controllerHandle, params->actionSetLayerHandle );
+    return 0;
 }

-void cppISteamController_SteamController006_DeactivateAllActionSetLayers(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController006_DeactivateAllActionSetLayers( void *args )
 {
-    ((ISteamController*)linux_side)->DeactivateAllActionSetLayers((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController006_DeactivateAllActionSetLayers_params *params = (struct ISteamController_SteamController006_DeactivateAllActionSetLayers_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    iface->DeactivateAllActionSetLayers( params->controllerHandle );
+    return 0;
 }

-int cppISteamController_SteamController006_GetActiveActionSetLayers(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t * handlesOut)
+NTSTATUS ISteamController_SteamController006_GetActiveActionSetLayers( void *args )
 {
-    return ((ISteamController*)linux_side)->GetActiveActionSetLayers((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t *)handlesOut);
+    struct ISteamController_SteamController006_GetActiveActionSetLayers_params *params = (struct ISteamController_SteamController006_GetActiveActionSetLayers_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->GetActiveActionSetLayers( params->controllerHandle, params->handlesOut );
+    return 0;
 }

-ControllerDigitalActionHandle_t cppISteamController_SteamController006_GetDigitalActionHandle(void *linux_side, const char * pszActionName)
+NTSTATUS ISteamController_SteamController006_GetDigitalActionHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionHandle((const char *)pszActionName);
+    struct ISteamController_SteamController006_GetDigitalActionHandle_params *params = (struct ISteamController_SteamController006_GetDigitalActionHandle_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->GetDigitalActionHandle( params->pszActionName );
+    return 0;
 }

-ControllerDigitalActionData_t cppISteamController_SteamController006_GetDigitalActionData(void *linux_side, ControllerHandle_t controllerHandle, ControllerDigitalActionHandle_t digitalActionHandle)
+NTSTATUS ISteamController_SteamController006_GetDigitalActionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionData((ControllerHandle_t)controllerHandle, (ControllerDigitalActionHandle_t)digitalActionHandle);
+    struct ISteamController_SteamController006_GetDigitalActionData_params *params = (struct ISteamController_SteamController006_GetDigitalActionData_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    *params->_ret = iface->GetDigitalActionData( params->controllerHandle, params->digitalActionHandle );
+    return 0;
 }

-int cppISteamController_SteamController006_GetDigitalActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle, ControllerDigitalActionHandle_t digitalActionHandle, EControllerActionOrigin * originsOut)
+NTSTATUS ISteamController_SteamController006_GetDigitalActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionOrigins((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle, (ControllerDigitalActionHandle_t)digitalActionHandle, (EControllerActionOrigin *)originsOut);
+    struct ISteamController_SteamController006_GetDigitalActionOrigins_params *params = (struct ISteamController_SteamController006_GetDigitalActionOrigins_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->GetDigitalActionOrigins( params->controllerHandle, params->actionSetHandle, params->digitalActionHandle, params->originsOut );
+    return 0;
 }

-ControllerAnalogActionHandle_t cppISteamController_SteamController006_GetAnalogActionHandle(void *linux_side, const char * pszActionName)
+NTSTATUS ISteamController_SteamController006_GetAnalogActionHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionHandle((const char *)pszActionName);
+    struct ISteamController_SteamController006_GetAnalogActionHandle_params *params = (struct ISteamController_SteamController006_GetAnalogActionHandle_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->GetAnalogActionHandle( params->pszActionName );
+    return 0;
 }

-ControllerAnalogActionData_t cppISteamController_SteamController006_GetAnalogActionData(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t analogActionHandle)
+NTSTATUS ISteamController_SteamController006_GetAnalogActionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionData((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)analogActionHandle);
+    struct ISteamController_SteamController006_GetAnalogActionData_params *params = (struct ISteamController_SteamController006_GetAnalogActionData_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    *params->_ret = iface->GetAnalogActionData( params->controllerHandle, params->analogActionHandle );
+    return 0;
 }

-int cppISteamController_SteamController006_GetAnalogActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle, ControllerAnalogActionHandle_t analogActionHandle, EControllerActionOrigin * originsOut)
+NTSTATUS ISteamController_SteamController006_GetAnalogActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionOrigins((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle, (ControllerAnalogActionHandle_t)analogActionHandle, (EControllerActionOrigin *)originsOut);
+    struct ISteamController_SteamController006_GetAnalogActionOrigins_params *params = (struct ISteamController_SteamController006_GetAnalogActionOrigins_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->GetAnalogActionOrigins( params->controllerHandle, params->actionSetHandle, params->analogActionHandle, params->originsOut );
+    return 0;
 }

-void cppISteamController_SteamController006_StopAnalogActionMomentum(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t eAction)
+NTSTATUS ISteamController_SteamController006_StopAnalogActionMomentum( void *args )
 {
-    ((ISteamController*)linux_side)->StopAnalogActionMomentum((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)eAction);
+    struct ISteamController_SteamController006_StopAnalogActionMomentum_params *params = (struct ISteamController_SteamController006_StopAnalogActionMomentum_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    iface->StopAnalogActionMomentum( params->controllerHandle, params->eAction );
+    return 0;
 }

-void cppISteamController_SteamController006_TriggerHapticPulse(void *linux_side, ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec)
+NTSTATUS ISteamController_SteamController006_TriggerHapticPulse( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerHapticPulse((ControllerHandle_t)controllerHandle, (ESteamControllerPad)eTargetPad, (unsigned short)usDurationMicroSec);
+    struct ISteamController_SteamController006_TriggerHapticPulse_params *params = (struct ISteamController_SteamController006_TriggerHapticPulse_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    iface->TriggerHapticPulse( params->controllerHandle, params->eTargetPad, params->usDurationMicroSec );
+    return 0;
 }

-void cppISteamController_SteamController006_TriggerRepeatedHapticPulse(void *linux_side, ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec, unsigned short usOffMicroSec, unsigned short unRepeat, unsigned int nFlags)
+NTSTATUS ISteamController_SteamController006_TriggerRepeatedHapticPulse( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerRepeatedHapticPulse((ControllerHandle_t)controllerHandle, (ESteamControllerPad)eTargetPad, (unsigned short)usDurationMicroSec, (unsigned short)usOffMicroSec, (unsigned short)unRepeat, (unsigned int)nFlags);
+    struct ISteamController_SteamController006_TriggerRepeatedHapticPulse_params *params = (struct ISteamController_SteamController006_TriggerRepeatedHapticPulse_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    iface->TriggerRepeatedHapticPulse( params->controllerHandle, params->eTargetPad, params->usDurationMicroSec, params->usOffMicroSec, params->unRepeat, params->nFlags );
+    return 0;
 }

-void cppISteamController_SteamController006_TriggerVibration(void *linux_side, ControllerHandle_t controllerHandle, unsigned short usLeftSpeed, unsigned short usRightSpeed)
+NTSTATUS ISteamController_SteamController006_TriggerVibration( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerVibration((ControllerHandle_t)controllerHandle, (unsigned short)usLeftSpeed, (unsigned short)usRightSpeed);
+    struct ISteamController_SteamController006_TriggerVibration_params *params = (struct ISteamController_SteamController006_TriggerVibration_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    iface->TriggerVibration( params->controllerHandle, params->usLeftSpeed, params->usRightSpeed );
+    return 0;
 }

-void cppISteamController_SteamController006_SetLEDColor(void *linux_side, ControllerHandle_t controllerHandle, uint8 nColorR, uint8 nColorG, uint8 nColorB, unsigned int nFlags)
+NTSTATUS ISteamController_SteamController006_SetLEDColor( void *args )
 {
-    ((ISteamController*)linux_side)->SetLEDColor((ControllerHandle_t)controllerHandle, (uint8)nColorR, (uint8)nColorG, (uint8)nColorB, (unsigned int)nFlags);
+    struct ISteamController_SteamController006_SetLEDColor_params *params = (struct ISteamController_SteamController006_SetLEDColor_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    iface->SetLEDColor( params->controllerHandle, params->nColorR, params->nColorG, params->nColorB, params->nFlags );
+    return 0;
 }

-int cppISteamController_SteamController006_GetGamepadIndexForController(void *linux_side, ControllerHandle_t ulControllerHandle)
+NTSTATUS ISteamController_SteamController006_GetGamepadIndexForController( void *args )
 {
-    return ((ISteamController*)linux_side)->GetGamepadIndexForController((ControllerHandle_t)ulControllerHandle);
+    struct ISteamController_SteamController006_GetGamepadIndexForController_params *params = (struct ISteamController_SteamController006_GetGamepadIndexForController_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->GetGamepadIndexForController( params->ulControllerHandle );
+    return 0;
 }

-ControllerHandle_t cppISteamController_SteamController006_GetControllerForGamepadIndex(void *linux_side, int nIndex)
+NTSTATUS ISteamController_SteamController006_GetControllerForGamepadIndex( void *args )
 {
-    return ((ISteamController*)linux_side)->GetControllerForGamepadIndex((int)nIndex);
+    struct ISteamController_SteamController006_GetControllerForGamepadIndex_params *params = (struct ISteamController_SteamController006_GetControllerForGamepadIndex_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->GetControllerForGamepadIndex( params->nIndex );
+    return 0;
 }

-ControllerMotionData_t cppISteamController_SteamController006_GetMotionData(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController006_GetMotionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetMotionData((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController006_GetMotionData_params *params = (struct ISteamController_SteamController006_GetMotionData_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    *params->_ret = iface->GetMotionData( params->controllerHandle );
+    return 0;
 }

-bool cppISteamController_SteamController006_ShowDigitalActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerDigitalActionHandle_t digitalActionHandle, float flScale, float flXPosition, float flYPosition)
+NTSTATUS ISteamController_SteamController006_ShowDigitalActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->ShowDigitalActionOrigins((ControllerHandle_t)controllerHandle, (ControllerDigitalActionHandle_t)digitalActionHandle, (float)flScale, (float)flXPosition, (float)flYPosition);
+    struct ISteamController_SteamController006_ShowDigitalActionOrigins_params *params = (struct ISteamController_SteamController006_ShowDigitalActionOrigins_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->ShowDigitalActionOrigins( params->controllerHandle, params->digitalActionHandle, params->flScale, params->flXPosition, params->flYPosition );
+    return 0;
 }

-bool cppISteamController_SteamController006_ShowAnalogActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t analogActionHandle, float flScale, float flXPosition, float flYPosition)
+NTSTATUS ISteamController_SteamController006_ShowAnalogActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->ShowAnalogActionOrigins((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)analogActionHandle, (float)flScale, (float)flXPosition, (float)flYPosition);
+    struct ISteamController_SteamController006_ShowAnalogActionOrigins_params *params = (struct ISteamController_SteamController006_ShowAnalogActionOrigins_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->ShowAnalogActionOrigins( params->controllerHandle, params->analogActionHandle, params->flScale, params->flXPosition, params->flYPosition );
+    return 0;
 }

-const char * cppISteamController_SteamController006_GetStringForActionOrigin(void *linux_side, EControllerActionOrigin eOrigin)
+NTSTATUS ISteamController_SteamController006_GetStringForActionOrigin( void *args )
 {
-    return ((ISteamController*)linux_side)->GetStringForActionOrigin((EControllerActionOrigin)eOrigin);
+    struct ISteamController_SteamController006_GetStringForActionOrigin_params *params = (struct ISteamController_SteamController006_GetStringForActionOrigin_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->GetStringForActionOrigin( params->eOrigin );
+    return 0;
 }

-ESteamInputType cppISteamController_SteamController006_GetInputTypeForHandle(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController006_GetInputTypeForHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetInputTypeForHandle((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController006_GetInputTypeForHandle_params *params = (struct ISteamController_SteamController006_GetInputTypeForHandle_params *)args;
+    struct u_ISteamController_SteamController006 *iface = (struct u_ISteamController_SteamController006 *)params->linux_side;
+    params->_ret = iface->GetInputTypeForHandle( params->controllerHandle );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamController_SteamController006.h
+++ b/lsteamclient/cppISteamController_SteamController006.h
@ -1,31 +0,0 @@
-extern bool cppISteamController_SteamController006_Init(void *);
-extern bool cppISteamController_SteamController006_Shutdown(void *);
-extern void cppISteamController_SteamController006_RunFrame(void *);
-extern int cppISteamController_SteamController006_GetConnectedControllers(void *, ControllerHandle_t *);
-extern bool cppISteamController_SteamController006_ShowBindingPanel(void *, ControllerHandle_t);
-extern ControllerActionSetHandle_t cppISteamController_SteamController006_GetActionSetHandle(void *, const char *);
-extern void cppISteamController_SteamController006_ActivateActionSet(void *, ControllerHandle_t, ControllerActionSetHandle_t);
-extern ControllerActionSetHandle_t cppISteamController_SteamController006_GetCurrentActionSet(void *, ControllerHandle_t);
-extern void cppISteamController_SteamController006_ActivateActionSetLayer(void *, ControllerHandle_t, ControllerActionSetHandle_t);
-extern void cppISteamController_SteamController006_DeactivateActionSetLayer(void *, ControllerHandle_t, ControllerActionSetHandle_t);
-extern void cppISteamController_SteamController006_DeactivateAllActionSetLayers(void *, ControllerHandle_t);
-extern int cppISteamController_SteamController006_GetActiveActionSetLayers(void *, ControllerHandle_t, ControllerActionSetHandle_t *);
-extern ControllerDigitalActionHandle_t cppISteamController_SteamController006_GetDigitalActionHandle(void *, const char *);
-extern ControllerDigitalActionData_t cppISteamController_SteamController006_GetDigitalActionData(void *, ControllerHandle_t, ControllerDigitalActionHandle_t);
-extern int cppISteamController_SteamController006_GetDigitalActionOrigins(void *, ControllerHandle_t, ControllerActionSetHandle_t, ControllerDigitalActionHandle_t, EControllerActionOrigin *);
-extern ControllerAnalogActionHandle_t cppISteamController_SteamController006_GetAnalogActionHandle(void *, const char *);
-extern ControllerAnalogActionData_t cppISteamController_SteamController006_GetAnalogActionData(void *, ControllerHandle_t, ControllerAnalogActionHandle_t);
-extern int cppISteamController_SteamController006_GetAnalogActionOrigins(void *, ControllerHandle_t, ControllerActionSetHandle_t, ControllerAnalogActionHandle_t, EControllerActionOrigin *);
-extern void cppISteamController_SteamController006_StopAnalogActionMomentum(void *, ControllerHandle_t, ControllerAnalogActionHandle_t);
-extern void cppISteamController_SteamController006_TriggerHapticPulse(void *, ControllerHandle_t, ESteamControllerPad, unsigned short);
-extern void cppISteamController_SteamController006_TriggerRepeatedHapticPulse(void *, ControllerHandle_t, ESteamControllerPad, unsigned short, unsigned short, unsigned short, unsigned int);
-extern void cppISteamController_SteamController006_TriggerVibration(void *, ControllerHandle_t, unsigned short, unsigned short);
-extern void cppISteamController_SteamController006_SetLEDColor(void *, ControllerHandle_t, uint8, uint8, uint8, unsigned int);
-extern int cppISteamController_SteamController006_GetGamepadIndexForController(void *, ControllerHandle_t);
-extern ControllerHandle_t cppISteamController_SteamController006_GetControllerForGamepadIndex(void *, int);
-extern ControllerMotionData_t cppISteamController_SteamController006_GetMotionData(void *, ControllerHandle_t);
-extern bool cppISteamController_SteamController006_ShowDigitalActionOrigins(void *, ControllerHandle_t, ControllerDigitalActionHandle_t, float, float, float);
-extern bool cppISteamController_SteamController006_ShowAnalogActionOrigins(void *, ControllerHandle_t, ControllerAnalogActionHandle_t, float, float, float);
-extern const char * cppISteamController_SteamController006_GetStringForActionOrigin(void *, EControllerActionOrigin);
-extern const char * cppISteamController_SteamController006_GetGlyphForActionOrigin(void *, EControllerActionOrigin);
-extern ESteamInputType cppISteamController_SteamController006_GetInputTypeForHandle(void *, ControllerHandle_t);
--- a/lsteamclient/cppISteamController_SteamController007.cpp
+++ b/lsteamclient/cppISteamController_SteamController007.cpp
@ -1,177 +1,263 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_150/steam_api.h"
-#include "steamworks_sdk_150/steamnetworkingtypes.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_150
-#include "struct_converters.h"
-#include "cppISteamController_SteamController007.h"
-bool cppISteamController_SteamController007_Init(void *linux_side)
+
+NTSTATUS ISteamController_SteamController007_Init( void *args )
 {
-    return ((ISteamController*)linux_side)->Init();
+    struct ISteamController_SteamController007_Init_params *params = (struct ISteamController_SteamController007_Init_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->Init(  );
+    return 0;
 }

-bool cppISteamController_SteamController007_Shutdown(void *linux_side)
+NTSTATUS ISteamController_SteamController007_Shutdown( void *args )
 {
-    return ((ISteamController*)linux_side)->Shutdown();
+    struct ISteamController_SteamController007_Shutdown_params *params = (struct ISteamController_SteamController007_Shutdown_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->Shutdown(  );
+    return 0;
 }

-void cppISteamController_SteamController007_RunFrame(void *linux_side)
+NTSTATUS ISteamController_SteamController007_RunFrame( void *args )
 {
-    ((ISteamController*)linux_side)->RunFrame();
+    struct ISteamController_SteamController007_RunFrame_params *params = (struct ISteamController_SteamController007_RunFrame_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-int cppISteamController_SteamController007_GetConnectedControllers(void *linux_side, ControllerHandle_t * handlesOut)
+NTSTATUS ISteamController_SteamController007_GetConnectedControllers( void *args )
 {
-    return ((ISteamController*)linux_side)->GetConnectedControllers((ControllerHandle_t *)handlesOut);
+    struct ISteamController_SteamController007_GetConnectedControllers_params *params = (struct ISteamController_SteamController007_GetConnectedControllers_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetConnectedControllers( params->handlesOut );
+    return 0;
 }

-ControllerActionSetHandle_t cppISteamController_SteamController007_GetActionSetHandle(void *linux_side, const char * pszActionSetName)
+NTSTATUS ISteamController_SteamController007_GetActionSetHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetActionSetHandle((const char *)pszActionSetName);
+    struct ISteamController_SteamController007_GetActionSetHandle_params *params = (struct ISteamController_SteamController007_GetActionSetHandle_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetActionSetHandle( params->pszActionSetName );
+    return 0;
 }

-void cppISteamController_SteamController007_ActivateActionSet(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle)
+NTSTATUS ISteamController_SteamController007_ActivateActionSet( void *args )
 {
-    ((ISteamController*)linux_side)->ActivateActionSet((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle);
+    struct ISteamController_SteamController007_ActivateActionSet_params *params = (struct ISteamController_SteamController007_ActivateActionSet_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    iface->ActivateActionSet( params->controllerHandle, params->actionSetHandle );
+    return 0;
 }

-ControllerActionSetHandle_t cppISteamController_SteamController007_GetCurrentActionSet(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController007_GetCurrentActionSet( void *args )
 {
-    return ((ISteamController*)linux_side)->GetCurrentActionSet((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController007_GetCurrentActionSet_params *params = (struct ISteamController_SteamController007_GetCurrentActionSet_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetCurrentActionSet( params->controllerHandle );
+    return 0;
 }

-void cppISteamController_SteamController007_ActivateActionSetLayer(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetLayerHandle)
+NTSTATUS ISteamController_SteamController007_ActivateActionSetLayer( void *args )
 {
-    ((ISteamController*)linux_side)->ActivateActionSetLayer((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetLayerHandle);
+    struct ISteamController_SteamController007_ActivateActionSetLayer_params *params = (struct ISteamController_SteamController007_ActivateActionSetLayer_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    iface->ActivateActionSetLayer( params->controllerHandle, params->actionSetLayerHandle );
+    return 0;
 }

-void cppISteamController_SteamController007_DeactivateActionSetLayer(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetLayerHandle)
+NTSTATUS ISteamController_SteamController007_DeactivateActionSetLayer( void *args )
 {
-    ((ISteamController*)linux_side)->DeactivateActionSetLayer((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetLayerHandle);
+    struct ISteamController_SteamController007_DeactivateActionSetLayer_params *params = (struct ISteamController_SteamController007_DeactivateActionSetLayer_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    iface->DeactivateActionSetLayer( params->controllerHandle, params->actionSetLayerHandle );
+    return 0;
 }

-void cppISteamController_SteamController007_DeactivateAllActionSetLayers(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController007_DeactivateAllActionSetLayers( void *args )
 {
-    ((ISteamController*)linux_side)->DeactivateAllActionSetLayers((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController007_DeactivateAllActionSetLayers_params *params = (struct ISteamController_SteamController007_DeactivateAllActionSetLayers_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    iface->DeactivateAllActionSetLayers( params->controllerHandle );
+    return 0;
 }

-int cppISteamController_SteamController007_GetActiveActionSetLayers(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t * handlesOut)
+NTSTATUS ISteamController_SteamController007_GetActiveActionSetLayers( void *args )
 {
-    return ((ISteamController*)linux_side)->GetActiveActionSetLayers((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t *)handlesOut);
+    struct ISteamController_SteamController007_GetActiveActionSetLayers_params *params = (struct ISteamController_SteamController007_GetActiveActionSetLayers_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetActiveActionSetLayers( params->controllerHandle, params->handlesOut );
+    return 0;
 }

-ControllerDigitalActionHandle_t cppISteamController_SteamController007_GetDigitalActionHandle(void *linux_side, const char * pszActionName)
+NTSTATUS ISteamController_SteamController007_GetDigitalActionHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionHandle((const char *)pszActionName);
+    struct ISteamController_SteamController007_GetDigitalActionHandle_params *params = (struct ISteamController_SteamController007_GetDigitalActionHandle_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetDigitalActionHandle( params->pszActionName );
+    return 0;
 }

-InputDigitalActionData_t cppISteamController_SteamController007_GetDigitalActionData(void *linux_side, ControllerHandle_t controllerHandle, ControllerDigitalActionHandle_t digitalActionHandle)
+NTSTATUS ISteamController_SteamController007_GetDigitalActionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionData((ControllerHandle_t)controllerHandle, (ControllerDigitalActionHandle_t)digitalActionHandle);
+    struct ISteamController_SteamController007_GetDigitalActionData_params *params = (struct ISteamController_SteamController007_GetDigitalActionData_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    *params->_ret = iface->GetDigitalActionData( params->controllerHandle, params->digitalActionHandle );
+    return 0;
 }

-int cppISteamController_SteamController007_GetDigitalActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle, ControllerDigitalActionHandle_t digitalActionHandle, EControllerActionOrigin * originsOut)
+NTSTATUS ISteamController_SteamController007_GetDigitalActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionOrigins((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle, (ControllerDigitalActionHandle_t)digitalActionHandle, (EControllerActionOrigin *)originsOut);
+    struct ISteamController_SteamController007_GetDigitalActionOrigins_params *params = (struct ISteamController_SteamController007_GetDigitalActionOrigins_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetDigitalActionOrigins( params->controllerHandle, params->actionSetHandle, params->digitalActionHandle, params->originsOut );
+    return 0;
 }

-ControllerAnalogActionHandle_t cppISteamController_SteamController007_GetAnalogActionHandle(void *linux_side, const char * pszActionName)
+NTSTATUS ISteamController_SteamController007_GetAnalogActionHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionHandle((const char *)pszActionName);
+    struct ISteamController_SteamController007_GetAnalogActionHandle_params *params = (struct ISteamController_SteamController007_GetAnalogActionHandle_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetAnalogActionHandle( params->pszActionName );
+    return 0;
 }

-InputAnalogActionData_t cppISteamController_SteamController007_GetAnalogActionData(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t analogActionHandle)
+NTSTATUS ISteamController_SteamController007_GetAnalogActionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionData((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)analogActionHandle);
+    struct ISteamController_SteamController007_GetAnalogActionData_params *params = (struct ISteamController_SteamController007_GetAnalogActionData_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    *params->_ret = iface->GetAnalogActionData( params->controllerHandle, params->analogActionHandle );
+    return 0;
 }

-int cppISteamController_SteamController007_GetAnalogActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle, ControllerAnalogActionHandle_t analogActionHandle, EControllerActionOrigin * originsOut)
+NTSTATUS ISteamController_SteamController007_GetAnalogActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionOrigins((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle, (ControllerAnalogActionHandle_t)analogActionHandle, (EControllerActionOrigin *)originsOut);
+    struct ISteamController_SteamController007_GetAnalogActionOrigins_params *params = (struct ISteamController_SteamController007_GetAnalogActionOrigins_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetAnalogActionOrigins( params->controllerHandle, params->actionSetHandle, params->analogActionHandle, params->originsOut );
+    return 0;
 }

-const char * cppISteamController_SteamController007_GetStringForActionOrigin(void *linux_side, EControllerActionOrigin eOrigin)
+NTSTATUS ISteamController_SteamController007_GetStringForActionOrigin( void *args )
 {
-    return ((ISteamController*)linux_side)->GetStringForActionOrigin((EControllerActionOrigin)eOrigin);
+    struct ISteamController_SteamController007_GetStringForActionOrigin_params *params = (struct ISteamController_SteamController007_GetStringForActionOrigin_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetStringForActionOrigin( params->eOrigin );
+    return 0;
 }

-void cppISteamController_SteamController007_StopAnalogActionMomentum(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t eAction)
+NTSTATUS ISteamController_SteamController007_StopAnalogActionMomentum( void *args )
 {
-    ((ISteamController*)linux_side)->StopAnalogActionMomentum((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)eAction);
+    struct ISteamController_SteamController007_StopAnalogActionMomentum_params *params = (struct ISteamController_SteamController007_StopAnalogActionMomentum_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    iface->StopAnalogActionMomentum( params->controllerHandle, params->eAction );
+    return 0;
 }

-InputMotionData_t cppISteamController_SteamController007_GetMotionData(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController007_GetMotionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetMotionData((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController007_GetMotionData_params *params = (struct ISteamController_SteamController007_GetMotionData_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    *params->_ret = iface->GetMotionData( params->controllerHandle );
+    return 0;
 }

-void cppISteamController_SteamController007_TriggerHapticPulse(void *linux_side, ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec)
+NTSTATUS ISteamController_SteamController007_TriggerHapticPulse( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerHapticPulse((ControllerHandle_t)controllerHandle, (ESteamControllerPad)eTargetPad, (unsigned short)usDurationMicroSec);
+    struct ISteamController_SteamController007_TriggerHapticPulse_params *params = (struct ISteamController_SteamController007_TriggerHapticPulse_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    iface->TriggerHapticPulse( params->controllerHandle, params->eTargetPad, params->usDurationMicroSec );
+    return 0;
 }

-void cppISteamController_SteamController007_TriggerRepeatedHapticPulse(void *linux_side, ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec, unsigned short usOffMicroSec, unsigned short unRepeat, unsigned int nFlags)
+NTSTATUS ISteamController_SteamController007_TriggerRepeatedHapticPulse( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerRepeatedHapticPulse((ControllerHandle_t)controllerHandle, (ESteamControllerPad)eTargetPad, (unsigned short)usDurationMicroSec, (unsigned short)usOffMicroSec, (unsigned short)unRepeat, (unsigned int)nFlags);
+    struct ISteamController_SteamController007_TriggerRepeatedHapticPulse_params *params = (struct ISteamController_SteamController007_TriggerRepeatedHapticPulse_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    iface->TriggerRepeatedHapticPulse( params->controllerHandle, params->eTargetPad, params->usDurationMicroSec, params->usOffMicroSec, params->unRepeat, params->nFlags );
+    return 0;
 }

-void cppISteamController_SteamController007_TriggerVibration(void *linux_side, ControllerHandle_t controllerHandle, unsigned short usLeftSpeed, unsigned short usRightSpeed)
+NTSTATUS ISteamController_SteamController007_TriggerVibration( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerVibration((ControllerHandle_t)controllerHandle, (unsigned short)usLeftSpeed, (unsigned short)usRightSpeed);
+    struct ISteamController_SteamController007_TriggerVibration_params *params = (struct ISteamController_SteamController007_TriggerVibration_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    iface->TriggerVibration( params->controllerHandle, params->usLeftSpeed, params->usRightSpeed );
+    return 0;
 }

-void cppISteamController_SteamController007_SetLEDColor(void *linux_side, ControllerHandle_t controllerHandle, uint8 nColorR, uint8 nColorG, uint8 nColorB, unsigned int nFlags)
+NTSTATUS ISteamController_SteamController007_SetLEDColor( void *args )
 {
-    ((ISteamController*)linux_side)->SetLEDColor((ControllerHandle_t)controllerHandle, (uint8)nColorR, (uint8)nColorG, (uint8)nColorB, (unsigned int)nFlags);
+    struct ISteamController_SteamController007_SetLEDColor_params *params = (struct ISteamController_SteamController007_SetLEDColor_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    iface->SetLEDColor( params->controllerHandle, params->nColorR, params->nColorG, params->nColorB, params->nFlags );
+    return 0;
 }

-bool cppISteamController_SteamController007_ShowBindingPanel(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController007_ShowBindingPanel( void *args )
 {
-    return ((ISteamController*)linux_side)->ShowBindingPanel((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController007_ShowBindingPanel_params *params = (struct ISteamController_SteamController007_ShowBindingPanel_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->ShowBindingPanel( params->controllerHandle );
+    return 0;
 }

-ESteamInputType cppISteamController_SteamController007_GetInputTypeForHandle(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController007_GetInputTypeForHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetInputTypeForHandle((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController007_GetInputTypeForHandle_params *params = (struct ISteamController_SteamController007_GetInputTypeForHandle_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetInputTypeForHandle( params->controllerHandle );
+    return 0;
 }

-ControllerHandle_t cppISteamController_SteamController007_GetControllerForGamepadIndex(void *linux_side, int nIndex)
+NTSTATUS ISteamController_SteamController007_GetControllerForGamepadIndex( void *args )
 {
-    return ((ISteamController*)linux_side)->GetControllerForGamepadIndex((int)nIndex);
+    struct ISteamController_SteamController007_GetControllerForGamepadIndex_params *params = (struct ISteamController_SteamController007_GetControllerForGamepadIndex_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetControllerForGamepadIndex( params->nIndex );
+    return 0;
 }

-int cppISteamController_SteamController007_GetGamepadIndexForController(void *linux_side, ControllerHandle_t ulControllerHandle)
+NTSTATUS ISteamController_SteamController007_GetGamepadIndexForController( void *args )
 {
-    return ((ISteamController*)linux_side)->GetGamepadIndexForController((ControllerHandle_t)ulControllerHandle);
+    struct ISteamController_SteamController007_GetGamepadIndexForController_params *params = (struct ISteamController_SteamController007_GetGamepadIndexForController_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetGamepadIndexForController( params->ulControllerHandle );
+    return 0;
 }

-const char * cppISteamController_SteamController007_GetStringForXboxOrigin(void *linux_side, EXboxOrigin eOrigin)
+NTSTATUS ISteamController_SteamController007_GetStringForXboxOrigin( void *args )
 {
-    return ((ISteamController*)linux_side)->GetStringForXboxOrigin((EXboxOrigin)eOrigin);
+    struct ISteamController_SteamController007_GetStringForXboxOrigin_params *params = (struct ISteamController_SteamController007_GetStringForXboxOrigin_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetStringForXboxOrigin( params->eOrigin );
+    return 0;
 }

-EControllerActionOrigin cppISteamController_SteamController007_GetActionOriginFromXboxOrigin(void *linux_side, ControllerHandle_t controllerHandle, EXboxOrigin eOrigin)
+NTSTATUS ISteamController_SteamController007_GetActionOriginFromXboxOrigin( void *args )
 {
-    return ((ISteamController*)linux_side)->GetActionOriginFromXboxOrigin((ControllerHandle_t)controllerHandle, (EXboxOrigin)eOrigin);
+    struct ISteamController_SteamController007_GetActionOriginFromXboxOrigin_params *params = (struct ISteamController_SteamController007_GetActionOriginFromXboxOrigin_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetActionOriginFromXboxOrigin( params->controllerHandle, params->eOrigin );
+    return 0;
 }

-EControllerActionOrigin cppISteamController_SteamController007_TranslateActionOrigin(void *linux_side, ESteamInputType eDestinationInputType, EControllerActionOrigin eSourceOrigin)
+NTSTATUS ISteamController_SteamController007_TranslateActionOrigin( void *args )
 {
-    return ((ISteamController*)linux_side)->TranslateActionOrigin((ESteamInputType)eDestinationInputType, (EControllerActionOrigin)eSourceOrigin);
+    struct ISteamController_SteamController007_TranslateActionOrigin_params *params = (struct ISteamController_SteamController007_TranslateActionOrigin_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->TranslateActionOrigin( params->eDestinationInputType, params->eSourceOrigin );
+    return 0;
 }

-bool cppISteamController_SteamController007_GetControllerBindingRevision(void *linux_side, ControllerHandle_t controllerHandle, int * pMajor, int * pMinor)
+NTSTATUS ISteamController_SteamController007_GetControllerBindingRevision( void *args )
 {
-    return ((ISteamController*)linux_side)->GetControllerBindingRevision((ControllerHandle_t)controllerHandle, (int *)pMajor, (int *)pMinor);
+    struct ISteamController_SteamController007_GetControllerBindingRevision_params *params = (struct ISteamController_SteamController007_GetControllerBindingRevision_params *)args;
+    struct u_ISteamController_SteamController007 *iface = (struct u_ISteamController_SteamController007 *)params->linux_side;
+    params->_ret = iface->GetControllerBindingRevision( params->controllerHandle, params->pMajor, params->pMinor );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamController_SteamController007.h
+++ b/lsteamclient/cppISteamController_SteamController007.h
@ -1,34 +0,0 @@
-extern bool cppISteamController_SteamController007_Init(void *);
-extern bool cppISteamController_SteamController007_Shutdown(void *);
-extern void cppISteamController_SteamController007_RunFrame(void *);
-extern int cppISteamController_SteamController007_GetConnectedControllers(void *, ControllerHandle_t *);
-extern ControllerActionSetHandle_t cppISteamController_SteamController007_GetActionSetHandle(void *, const char *);
-extern void cppISteamController_SteamController007_ActivateActionSet(void *, ControllerHandle_t, ControllerActionSetHandle_t);
-extern ControllerActionSetHandle_t cppISteamController_SteamController007_GetCurrentActionSet(void *, ControllerHandle_t);
-extern void cppISteamController_SteamController007_ActivateActionSetLayer(void *, ControllerHandle_t, ControllerActionSetHandle_t);
-extern void cppISteamController_SteamController007_DeactivateActionSetLayer(void *, ControllerHandle_t, ControllerActionSetHandle_t);
-extern void cppISteamController_SteamController007_DeactivateAllActionSetLayers(void *, ControllerHandle_t);
-extern int cppISteamController_SteamController007_GetActiveActionSetLayers(void *, ControllerHandle_t, ControllerActionSetHandle_t *);
-extern ControllerDigitalActionHandle_t cppISteamController_SteamController007_GetDigitalActionHandle(void *, const char *);
-extern InputDigitalActionData_t cppISteamController_SteamController007_GetDigitalActionData(void *, ControllerHandle_t, ControllerDigitalActionHandle_t);
-extern int cppISteamController_SteamController007_GetDigitalActionOrigins(void *, ControllerHandle_t, ControllerActionSetHandle_t, ControllerDigitalActionHandle_t, EControllerActionOrigin *);
-extern ControllerAnalogActionHandle_t cppISteamController_SteamController007_GetAnalogActionHandle(void *, const char *);
-extern InputAnalogActionData_t cppISteamController_SteamController007_GetAnalogActionData(void *, ControllerHandle_t, ControllerAnalogActionHandle_t);
-extern int cppISteamController_SteamController007_GetAnalogActionOrigins(void *, ControllerHandle_t, ControllerActionSetHandle_t, ControllerAnalogActionHandle_t, EControllerActionOrigin *);
-extern const char * cppISteamController_SteamController007_GetGlyphForActionOrigin(void *, EControllerActionOrigin);
-extern const char * cppISteamController_SteamController007_GetStringForActionOrigin(void *, EControllerActionOrigin);
-extern void cppISteamController_SteamController007_StopAnalogActionMomentum(void *, ControllerHandle_t, ControllerAnalogActionHandle_t);
-extern InputMotionData_t cppISteamController_SteamController007_GetMotionData(void *, ControllerHandle_t);
-extern void cppISteamController_SteamController007_TriggerHapticPulse(void *, ControllerHandle_t, ESteamControllerPad, unsigned short);
-extern void cppISteamController_SteamController007_TriggerRepeatedHapticPulse(void *, ControllerHandle_t, ESteamControllerPad, unsigned short, unsigned short, unsigned short, unsigned int);
-extern void cppISteamController_SteamController007_TriggerVibration(void *, ControllerHandle_t, unsigned short, unsigned short);
-extern void cppISteamController_SteamController007_SetLEDColor(void *, ControllerHandle_t, uint8, uint8, uint8, unsigned int);
-extern bool cppISteamController_SteamController007_ShowBindingPanel(void *, ControllerHandle_t);
-extern ESteamInputType cppISteamController_SteamController007_GetInputTypeForHandle(void *, ControllerHandle_t);
-extern ControllerHandle_t cppISteamController_SteamController007_GetControllerForGamepadIndex(void *, int);
-extern int cppISteamController_SteamController007_GetGamepadIndexForController(void *, ControllerHandle_t);
-extern const char * cppISteamController_SteamController007_GetStringForXboxOrigin(void *, EXboxOrigin);
-extern const char * cppISteamController_SteamController007_GetGlyphForXboxOrigin(void *, EXboxOrigin);
-extern EControllerActionOrigin cppISteamController_SteamController007_GetActionOriginFromXboxOrigin(void *, ControllerHandle_t, EXboxOrigin);
-extern EControllerActionOrigin cppISteamController_SteamController007_TranslateActionOrigin(void *, ESteamInputType, EControllerActionOrigin);
-extern bool cppISteamController_SteamController007_GetControllerBindingRevision(void *, ControllerHandle_t, int *, int *);
--- a/lsteamclient/cppISteamController_SteamController008.cpp
+++ b/lsteamclient/cppISteamController_SteamController008.cpp
@ -1,177 +1,263 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_158/steam_api.h"
-#include "steamworks_sdk_158/steamnetworkingtypes.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_158
-#include "struct_converters.h"
-#include "cppISteamController_SteamController008.h"
-bool cppISteamController_SteamController008_Init(void *linux_side)
+
+NTSTATUS ISteamController_SteamController008_Init( void *args )
 {
-    return ((ISteamController*)linux_side)->Init();
+    struct ISteamController_SteamController008_Init_params *params = (struct ISteamController_SteamController008_Init_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->Init(  );
+    return 0;
 }

-bool cppISteamController_SteamController008_Shutdown(void *linux_side)
+NTSTATUS ISteamController_SteamController008_Shutdown( void *args )
 {
-    return ((ISteamController*)linux_side)->Shutdown();
+    struct ISteamController_SteamController008_Shutdown_params *params = (struct ISteamController_SteamController008_Shutdown_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->Shutdown(  );
+    return 0;
 }

-void cppISteamController_SteamController008_RunFrame(void *linux_side)
+NTSTATUS ISteamController_SteamController008_RunFrame( void *args )
 {
-    ((ISteamController*)linux_side)->RunFrame();
+    struct ISteamController_SteamController008_RunFrame_params *params = (struct ISteamController_SteamController008_RunFrame_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    iface->RunFrame(  );
+    return 0;
 }

-int cppISteamController_SteamController008_GetConnectedControllers(void *linux_side, ControllerHandle_t * handlesOut)
+NTSTATUS ISteamController_SteamController008_GetConnectedControllers( void *args )
 {
-    return ((ISteamController*)linux_side)->GetConnectedControllers((ControllerHandle_t *)handlesOut);
+    struct ISteamController_SteamController008_GetConnectedControllers_params *params = (struct ISteamController_SteamController008_GetConnectedControllers_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetConnectedControllers( params->handlesOut );
+    return 0;
 }

-ControllerActionSetHandle_t cppISteamController_SteamController008_GetActionSetHandle(void *linux_side, const char * pszActionSetName)
+NTSTATUS ISteamController_SteamController008_GetActionSetHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetActionSetHandle((const char *)pszActionSetName);
+    struct ISteamController_SteamController008_GetActionSetHandle_params *params = (struct ISteamController_SteamController008_GetActionSetHandle_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetActionSetHandle( params->pszActionSetName );
+    return 0;
 }

-void cppISteamController_SteamController008_ActivateActionSet(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle)
+NTSTATUS ISteamController_SteamController008_ActivateActionSet( void *args )
 {
-    ((ISteamController*)linux_side)->ActivateActionSet((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle);
+    struct ISteamController_SteamController008_ActivateActionSet_params *params = (struct ISteamController_SteamController008_ActivateActionSet_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    iface->ActivateActionSet( params->controllerHandle, params->actionSetHandle );
+    return 0;
 }

-ControllerActionSetHandle_t cppISteamController_SteamController008_GetCurrentActionSet(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController008_GetCurrentActionSet( void *args )
 {
-    return ((ISteamController*)linux_side)->GetCurrentActionSet((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController008_GetCurrentActionSet_params *params = (struct ISteamController_SteamController008_GetCurrentActionSet_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetCurrentActionSet( params->controllerHandle );
+    return 0;
 }

-void cppISteamController_SteamController008_ActivateActionSetLayer(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetLayerHandle)
+NTSTATUS ISteamController_SteamController008_ActivateActionSetLayer( void *args )
 {
-    ((ISteamController*)linux_side)->ActivateActionSetLayer((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetLayerHandle);
+    struct ISteamController_SteamController008_ActivateActionSetLayer_params *params = (struct ISteamController_SteamController008_ActivateActionSetLayer_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    iface->ActivateActionSetLayer( params->controllerHandle, params->actionSetLayerHandle );
+    return 0;
 }

-void cppISteamController_SteamController008_DeactivateActionSetLayer(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetLayerHandle)
+NTSTATUS ISteamController_SteamController008_DeactivateActionSetLayer( void *args )
 {
-    ((ISteamController*)linux_side)->DeactivateActionSetLayer((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetLayerHandle);
+    struct ISteamController_SteamController008_DeactivateActionSetLayer_params *params = (struct ISteamController_SteamController008_DeactivateActionSetLayer_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    iface->DeactivateActionSetLayer( params->controllerHandle, params->actionSetLayerHandle );
+    return 0;
 }

-void cppISteamController_SteamController008_DeactivateAllActionSetLayers(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController008_DeactivateAllActionSetLayers( void *args )
 {
-    ((ISteamController*)linux_side)->DeactivateAllActionSetLayers((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController008_DeactivateAllActionSetLayers_params *params = (struct ISteamController_SteamController008_DeactivateAllActionSetLayers_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    iface->DeactivateAllActionSetLayers( params->controllerHandle );
+    return 0;
 }

-int cppISteamController_SteamController008_GetActiveActionSetLayers(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t * handlesOut)
+NTSTATUS ISteamController_SteamController008_GetActiveActionSetLayers( void *args )
 {
-    return ((ISteamController*)linux_side)->GetActiveActionSetLayers((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t *)handlesOut);
+    struct ISteamController_SteamController008_GetActiveActionSetLayers_params *params = (struct ISteamController_SteamController008_GetActiveActionSetLayers_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetActiveActionSetLayers( params->controllerHandle, params->handlesOut );
+    return 0;
 }

-ControllerDigitalActionHandle_t cppISteamController_SteamController008_GetDigitalActionHandle(void *linux_side, const char * pszActionName)
+NTSTATUS ISteamController_SteamController008_GetDigitalActionHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionHandle((const char *)pszActionName);
+    struct ISteamController_SteamController008_GetDigitalActionHandle_params *params = (struct ISteamController_SteamController008_GetDigitalActionHandle_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetDigitalActionHandle( params->pszActionName );
+    return 0;
 }

-InputDigitalActionData_t cppISteamController_SteamController008_GetDigitalActionData(void *linux_side, ControllerHandle_t controllerHandle, ControllerDigitalActionHandle_t digitalActionHandle)
+NTSTATUS ISteamController_SteamController008_GetDigitalActionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionData((ControllerHandle_t)controllerHandle, (ControllerDigitalActionHandle_t)digitalActionHandle);
+    struct ISteamController_SteamController008_GetDigitalActionData_params *params = (struct ISteamController_SteamController008_GetDigitalActionData_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    *params->_ret = iface->GetDigitalActionData( params->controllerHandle, params->digitalActionHandle );
+    return 0;
 }

-int cppISteamController_SteamController008_GetDigitalActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle, ControllerDigitalActionHandle_t digitalActionHandle, EControllerActionOrigin * originsOut)
+NTSTATUS ISteamController_SteamController008_GetDigitalActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->GetDigitalActionOrigins((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle, (ControllerDigitalActionHandle_t)digitalActionHandle, (EControllerActionOrigin *)originsOut);
+    struct ISteamController_SteamController008_GetDigitalActionOrigins_params *params = (struct ISteamController_SteamController008_GetDigitalActionOrigins_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetDigitalActionOrigins( params->controllerHandle, params->actionSetHandle, params->digitalActionHandle, params->originsOut );
+    return 0;
 }

-ControllerAnalogActionHandle_t cppISteamController_SteamController008_GetAnalogActionHandle(void *linux_side, const char * pszActionName)
+NTSTATUS ISteamController_SteamController008_GetAnalogActionHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionHandle((const char *)pszActionName);
+    struct ISteamController_SteamController008_GetAnalogActionHandle_params *params = (struct ISteamController_SteamController008_GetAnalogActionHandle_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetAnalogActionHandle( params->pszActionName );
+    return 0;
 }

-InputAnalogActionData_t cppISteamController_SteamController008_GetAnalogActionData(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t analogActionHandle)
+NTSTATUS ISteamController_SteamController008_GetAnalogActionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionData((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)analogActionHandle);
+    struct ISteamController_SteamController008_GetAnalogActionData_params *params = (struct ISteamController_SteamController008_GetAnalogActionData_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    *params->_ret = iface->GetAnalogActionData( params->controllerHandle, params->analogActionHandle );
+    return 0;
 }

-int cppISteamController_SteamController008_GetAnalogActionOrigins(void *linux_side, ControllerHandle_t controllerHandle, ControllerActionSetHandle_t actionSetHandle, ControllerAnalogActionHandle_t analogActionHandle, EControllerActionOrigin * originsOut)
+NTSTATUS ISteamController_SteamController008_GetAnalogActionOrigins( void *args )
 {
-    return ((ISteamController*)linux_side)->GetAnalogActionOrigins((ControllerHandle_t)controllerHandle, (ControllerActionSetHandle_t)actionSetHandle, (ControllerAnalogActionHandle_t)analogActionHandle, (EControllerActionOrigin *)originsOut);
+    struct ISteamController_SteamController008_GetAnalogActionOrigins_params *params = (struct ISteamController_SteamController008_GetAnalogActionOrigins_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetAnalogActionOrigins( params->controllerHandle, params->actionSetHandle, params->analogActionHandle, params->originsOut );
+    return 0;
 }

-const char * cppISteamController_SteamController008_GetStringForActionOrigin(void *linux_side, EControllerActionOrigin eOrigin)
+NTSTATUS ISteamController_SteamController008_GetStringForActionOrigin( void *args )
 {
-    return ((ISteamController*)linux_side)->GetStringForActionOrigin((EControllerActionOrigin)eOrigin);
+    struct ISteamController_SteamController008_GetStringForActionOrigin_params *params = (struct ISteamController_SteamController008_GetStringForActionOrigin_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetStringForActionOrigin( params->eOrigin );
+    return 0;
 }

-void cppISteamController_SteamController008_StopAnalogActionMomentum(void *linux_side, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t eAction)
+NTSTATUS ISteamController_SteamController008_StopAnalogActionMomentum( void *args )
 {
-    ((ISteamController*)linux_side)->StopAnalogActionMomentum((ControllerHandle_t)controllerHandle, (ControllerAnalogActionHandle_t)eAction);
+    struct ISteamController_SteamController008_StopAnalogActionMomentum_params *params = (struct ISteamController_SteamController008_StopAnalogActionMomentum_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    iface->StopAnalogActionMomentum( params->controllerHandle, params->eAction );
+    return 0;
 }

-InputMotionData_t cppISteamController_SteamController008_GetMotionData(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController008_GetMotionData( void *args )
 {
-    return ((ISteamController*)linux_side)->GetMotionData((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController008_GetMotionData_params *params = (struct ISteamController_SteamController008_GetMotionData_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    *params->_ret = iface->GetMotionData( params->controllerHandle );
+    return 0;
 }

-void cppISteamController_SteamController008_TriggerHapticPulse(void *linux_side, ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec)
+NTSTATUS ISteamController_SteamController008_TriggerHapticPulse( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerHapticPulse((ControllerHandle_t)controllerHandle, (ESteamControllerPad)eTargetPad, (unsigned short)usDurationMicroSec);
+    struct ISteamController_SteamController008_TriggerHapticPulse_params *params = (struct ISteamController_SteamController008_TriggerHapticPulse_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    iface->TriggerHapticPulse( params->controllerHandle, params->eTargetPad, params->usDurationMicroSec );
+    return 0;
 }

-void cppISteamController_SteamController008_TriggerRepeatedHapticPulse(void *linux_side, ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec, unsigned short usOffMicroSec, unsigned short unRepeat, unsigned int nFlags)
+NTSTATUS ISteamController_SteamController008_TriggerRepeatedHapticPulse( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerRepeatedHapticPulse((ControllerHandle_t)controllerHandle, (ESteamControllerPad)eTargetPad, (unsigned short)usDurationMicroSec, (unsigned short)usOffMicroSec, (unsigned short)unRepeat, (unsigned int)nFlags);
+    struct ISteamController_SteamController008_TriggerRepeatedHapticPulse_params *params = (struct ISteamController_SteamController008_TriggerRepeatedHapticPulse_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    iface->TriggerRepeatedHapticPulse( params->controllerHandle, params->eTargetPad, params->usDurationMicroSec, params->usOffMicroSec, params->unRepeat, params->nFlags );
+    return 0;
 }

-void cppISteamController_SteamController008_TriggerVibration(void *linux_side, ControllerHandle_t controllerHandle, unsigned short usLeftSpeed, unsigned short usRightSpeed)
+NTSTATUS ISteamController_SteamController008_TriggerVibration( void *args )
 {
-    ((ISteamController*)linux_side)->TriggerVibration((ControllerHandle_t)controllerHandle, (unsigned short)usLeftSpeed, (unsigned short)usRightSpeed);
+    struct ISteamController_SteamController008_TriggerVibration_params *params = (struct ISteamController_SteamController008_TriggerVibration_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    iface->TriggerVibration( params->controllerHandle, params->usLeftSpeed, params->usRightSpeed );
+    return 0;
 }

-void cppISteamController_SteamController008_SetLEDColor(void *linux_side, ControllerHandle_t controllerHandle, uint8 nColorR, uint8 nColorG, uint8 nColorB, unsigned int nFlags)
+NTSTATUS ISteamController_SteamController008_SetLEDColor( void *args )
 {
-    ((ISteamController*)linux_side)->SetLEDColor((ControllerHandle_t)controllerHandle, (uint8)nColorR, (uint8)nColorG, (uint8)nColorB, (unsigned int)nFlags);
+    struct ISteamController_SteamController008_SetLEDColor_params *params = (struct ISteamController_SteamController008_SetLEDColor_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    iface->SetLEDColor( params->controllerHandle, params->nColorR, params->nColorG, params->nColorB, params->nFlags );
+    return 0;
 }

-bool cppISteamController_SteamController008_ShowBindingPanel(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController008_ShowBindingPanel( void *args )
 {
-    return ((ISteamController*)linux_side)->ShowBindingPanel((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController008_ShowBindingPanel_params *params = (struct ISteamController_SteamController008_ShowBindingPanel_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->ShowBindingPanel( params->controllerHandle );
+    return 0;
 }

-ESteamInputType cppISteamController_SteamController008_GetInputTypeForHandle(void *linux_side, ControllerHandle_t controllerHandle)
+NTSTATUS ISteamController_SteamController008_GetInputTypeForHandle( void *args )
 {
-    return ((ISteamController*)linux_side)->GetInputTypeForHandle((ControllerHandle_t)controllerHandle);
+    struct ISteamController_SteamController008_GetInputTypeForHandle_params *params = (struct ISteamController_SteamController008_GetInputTypeForHandle_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetInputTypeForHandle( params->controllerHandle );
+    return 0;
 }

-ControllerHandle_t cppISteamController_SteamController008_GetControllerForGamepadIndex(void *linux_side, int nIndex)
+NTSTATUS ISteamController_SteamController008_GetControllerForGamepadIndex( void *args )
 {
-    return ((ISteamController*)linux_side)->GetControllerForGamepadIndex((int)nIndex);
+    struct ISteamController_SteamController008_GetControllerForGamepadIndex_params *params = (struct ISteamController_SteamController008_GetControllerForGamepadIndex_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetControllerForGamepadIndex( params->nIndex );
+    return 0;
 }

-int cppISteamController_SteamController008_GetGamepadIndexForController(void *linux_side, ControllerHandle_t ulControllerHandle)
+NTSTATUS ISteamController_SteamController008_GetGamepadIndexForController( void *args )
 {
-    return ((ISteamController*)linux_side)->GetGamepadIndexForController((ControllerHandle_t)ulControllerHandle);
+    struct ISteamController_SteamController008_GetGamepadIndexForController_params *params = (struct ISteamController_SteamController008_GetGamepadIndexForController_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetGamepadIndexForController( params->ulControllerHandle );
+    return 0;
 }

-const char * cppISteamController_SteamController008_GetStringForXboxOrigin(void *linux_side, EXboxOrigin eOrigin)
+NTSTATUS ISteamController_SteamController008_GetStringForXboxOrigin( void *args )
 {
-    return ((ISteamController*)linux_side)->GetStringForXboxOrigin((EXboxOrigin)eOrigin);
+    struct ISteamController_SteamController008_GetStringForXboxOrigin_params *params = (struct ISteamController_SteamController008_GetStringForXboxOrigin_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetStringForXboxOrigin( params->eOrigin );
+    return 0;
 }

-EControllerActionOrigin cppISteamController_SteamController008_GetActionOriginFromXboxOrigin(void *linux_side, ControllerHandle_t controllerHandle, EXboxOrigin eOrigin)
+NTSTATUS ISteamController_SteamController008_GetActionOriginFromXboxOrigin( void *args )
 {
-    return ((ISteamController*)linux_side)->GetActionOriginFromXboxOrigin((ControllerHandle_t)controllerHandle, (EXboxOrigin)eOrigin);
+    struct ISteamController_SteamController008_GetActionOriginFromXboxOrigin_params *params = (struct ISteamController_SteamController008_GetActionOriginFromXboxOrigin_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetActionOriginFromXboxOrigin( params->controllerHandle, params->eOrigin );
+    return 0;
 }

-EControllerActionOrigin cppISteamController_SteamController008_TranslateActionOrigin(void *linux_side, ESteamInputType eDestinationInputType, EControllerActionOrigin eSourceOrigin)
+NTSTATUS ISteamController_SteamController008_TranslateActionOrigin( void *args )
 {
-    return ((ISteamController*)linux_side)->TranslateActionOrigin((ESteamInputType)eDestinationInputType, (EControllerActionOrigin)eSourceOrigin);
+    struct ISteamController_SteamController008_TranslateActionOrigin_params *params = (struct ISteamController_SteamController008_TranslateActionOrigin_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->TranslateActionOrigin( params->eDestinationInputType, params->eSourceOrigin );
+    return 0;
 }

-bool cppISteamController_SteamController008_GetControllerBindingRevision(void *linux_side, ControllerHandle_t controllerHandle, int * pMajor, int * pMinor)
+NTSTATUS ISteamController_SteamController008_GetControllerBindingRevision( void *args )
 {
-    return ((ISteamController*)linux_side)->GetControllerBindingRevision((ControllerHandle_t)controllerHandle, (int *)pMajor, (int *)pMinor);
+    struct ISteamController_SteamController008_GetControllerBindingRevision_params *params = (struct ISteamController_SteamController008_GetControllerBindingRevision_params *)args;
+    struct u_ISteamController_SteamController008 *iface = (struct u_ISteamController_SteamController008 *)params->linux_side;
+    params->_ret = iface->GetControllerBindingRevision( params->controllerHandle, params->pMajor, params->pMinor );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamController_SteamController008.h
+++ b/lsteamclient/cppISteamController_SteamController008.h
@ -1,34 +0,0 @@
-extern bool cppISteamController_SteamController008_Init(void *);
-extern bool cppISteamController_SteamController008_Shutdown(void *);
-extern void cppISteamController_SteamController008_RunFrame(void *);
-extern int cppISteamController_SteamController008_GetConnectedControllers(void *, ControllerHandle_t *);
-extern ControllerActionSetHandle_t cppISteamController_SteamController008_GetActionSetHandle(void *, const char *);
-extern void cppISteamController_SteamController008_ActivateActionSet(void *, ControllerHandle_t, ControllerActionSetHandle_t);
-extern ControllerActionSetHandle_t cppISteamController_SteamController008_GetCurrentActionSet(void *, ControllerHandle_t);
-extern void cppISteamController_SteamController008_ActivateActionSetLayer(void *, ControllerHandle_t, ControllerActionSetHandle_t);
-extern void cppISteamController_SteamController008_DeactivateActionSetLayer(void *, ControllerHandle_t, ControllerActionSetHandle_t);
-extern void cppISteamController_SteamController008_DeactivateAllActionSetLayers(void *, ControllerHandle_t);
-extern int cppISteamController_SteamController008_GetActiveActionSetLayers(void *, ControllerHandle_t, ControllerActionSetHandle_t *);
-extern ControllerDigitalActionHandle_t cppISteamController_SteamController008_GetDigitalActionHandle(void *, const char *);
-extern InputDigitalActionData_t cppISteamController_SteamController008_GetDigitalActionData(void *, ControllerHandle_t, ControllerDigitalActionHandle_t);
-extern int cppISteamController_SteamController008_GetDigitalActionOrigins(void *, ControllerHandle_t, ControllerActionSetHandle_t, ControllerDigitalActionHandle_t, EControllerActionOrigin *);
-extern ControllerAnalogActionHandle_t cppISteamController_SteamController008_GetAnalogActionHandle(void *, const char *);
-extern InputAnalogActionData_t cppISteamController_SteamController008_GetAnalogActionData(void *, ControllerHandle_t, ControllerAnalogActionHandle_t);
-extern int cppISteamController_SteamController008_GetAnalogActionOrigins(void *, ControllerHandle_t, ControllerActionSetHandle_t, ControllerAnalogActionHandle_t, EControllerActionOrigin *);
-extern const char * cppISteamController_SteamController008_GetGlyphForActionOrigin(void *, EControllerActionOrigin);
-extern const char * cppISteamController_SteamController008_GetStringForActionOrigin(void *, EControllerActionOrigin);
-extern void cppISteamController_SteamController008_StopAnalogActionMomentum(void *, ControllerHandle_t, ControllerAnalogActionHandle_t);
-extern InputMotionData_t cppISteamController_SteamController008_GetMotionData(void *, ControllerHandle_t);
-extern void cppISteamController_SteamController008_TriggerHapticPulse(void *, ControllerHandle_t, ESteamControllerPad, unsigned short);
-extern void cppISteamController_SteamController008_TriggerRepeatedHapticPulse(void *, ControllerHandle_t, ESteamControllerPad, unsigned short, unsigned short, unsigned short, unsigned int);
-extern void cppISteamController_SteamController008_TriggerVibration(void *, ControllerHandle_t, unsigned short, unsigned short);
-extern void cppISteamController_SteamController008_SetLEDColor(void *, ControllerHandle_t, uint8, uint8, uint8, unsigned int);
-extern bool cppISteamController_SteamController008_ShowBindingPanel(void *, ControllerHandle_t);
-extern ESteamInputType cppISteamController_SteamController008_GetInputTypeForHandle(void *, ControllerHandle_t);
-extern ControllerHandle_t cppISteamController_SteamController008_GetControllerForGamepadIndex(void *, int);
-extern int cppISteamController_SteamController008_GetGamepadIndexForController(void *, ControllerHandle_t);
-extern const char * cppISteamController_SteamController008_GetStringForXboxOrigin(void *, EXboxOrigin);
-extern const char * cppISteamController_SteamController008_GetGlyphForXboxOrigin(void *, EXboxOrigin);
-extern EControllerActionOrigin cppISteamController_SteamController008_GetActionOriginFromXboxOrigin(void *, ControllerHandle_t, EXboxOrigin);
-extern EControllerActionOrigin cppISteamController_SteamController008_TranslateActionOrigin(void *, ESteamInputType, EControllerActionOrigin);
-extern bool cppISteamController_SteamController008_GetControllerBindingRevision(void *, ControllerHandle_t, int *, int *);
--- a/lsteamclient/cppISteamFriends_SteamFriends001.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends001.cpp
@ -1,151 +1,223 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_099x/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_099x
-#include "struct_converters.h"
-#include "cppISteamFriends_SteamFriends001.h"
-const char * cppISteamFriends_SteamFriends001_GetPersonaName(void *linux_side)
+
+NTSTATUS ISteamFriends_SteamFriends001_GetPersonaName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetPersonaName();
+    struct ISteamFriends_SteamFriends001_GetPersonaName_params *params = (struct ISteamFriends_SteamFriends001_GetPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->GetPersonaName(  );
+    return 0;
 }

-void cppISteamFriends_SteamFriends001_SetPersonaName(void *linux_side, const char * pchPersonaName)
+NTSTATUS ISteamFriends_SteamFriends001_SetPersonaName( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetPersonaName((const char *)pchPersonaName);
+    struct ISteamFriends_SteamFriends001_SetPersonaName_params *params = (struct ISteamFriends_SteamFriends001_SetPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    iface->SetPersonaName( params->pchPersonaName );
+    return 0;
 }

-EPersonaState cppISteamFriends_SteamFriends001_GetPersonaState(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends001_GetPersonaState( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetPersonaState();
+    struct ISteamFriends_SteamFriends001_GetPersonaState_params *params = (struct ISteamFriends_SteamFriends001_GetPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->GetPersonaState(  );
+    return 0;
 }

-void cppISteamFriends_SteamFriends001_SetPersonaState(void *linux_side, EPersonaState ePersonaState)
+NTSTATUS ISteamFriends_SteamFriends001_SetPersonaState( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetPersonaState((EPersonaState)ePersonaState);
+    struct ISteamFriends_SteamFriends001_SetPersonaState_params *params = (struct ISteamFriends_SteamFriends001_SetPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    iface->SetPersonaState( params->ePersonaState );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends001_AddFriend(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends001_AddFriend( void *args )
 {
-    return ((ISteamFriends*)linux_side)->AddFriend((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends001_AddFriend_params *params = (struct ISteamFriends_SteamFriends001_AddFriend_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->AddFriend( params->steamIDFriend );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends001_RemoveFriend(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends001_RemoveFriend( void *args )
 {
-    return ((ISteamFriends*)linux_side)->RemoveFriend((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends001_RemoveFriend_params *params = (struct ISteamFriends_SteamFriends001_RemoveFriend_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->RemoveFriend( params->steamIDFriend );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends001_HasFriend(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends001_HasFriend( void *args )
 {
-    return ((ISteamFriends*)linux_side)->HasFriend((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends001_HasFriend_params *params = (struct ISteamFriends_SteamFriends001_HasFriend_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->HasFriend( params->steamIDFriend );
+    return 0;
 }

-EFriendRelationship cppISteamFriends_SteamFriends001_GetFriendRelationship(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends001_GetFriendRelationship( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendRelationship((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends001_GetFriendRelationship_params *params = (struct ISteamFriends_SteamFriends001_GetFriendRelationship_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->GetFriendRelationship( params->steamIDFriend );
+    return 0;
 }

-EPersonaState cppISteamFriends_SteamFriends001_GetFriendPersonaState(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends001_GetFriendPersonaState( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaState((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends001_GetFriendPersonaState_params *params = (struct ISteamFriends_SteamFriends001_GetFriendPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaState( params->steamIDFriend );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends001_Deprecated_GetFriendGamePlayed(void *linux_side, CSteamID steamIDFriend, int32 * pnGameID, uint32 * punGameIP, uint16 * pusGamePort)
+NTSTATUS ISteamFriends_SteamFriends001_Deprecated_GetFriendGamePlayed( void *args )
 {
-    return ((ISteamFriends*)linux_side)->Deprecated_GetFriendGamePlayed((CSteamID)steamIDFriend, (int32 *)pnGameID, (uint32 *)punGameIP, (uint16 *)pusGamePort);
+    struct ISteamFriends_SteamFriends001_Deprecated_GetFriendGamePlayed_params *params = (struct ISteamFriends_SteamFriends001_Deprecated_GetFriendGamePlayed_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->Deprecated_GetFriendGamePlayed( params->steamIDFriend, params->pnGameID, params->punGameIP, params->pusGamePort );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends001_GetFriendPersonaName(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends001_GetFriendPersonaName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaName((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends001_GetFriendPersonaName_params *params = (struct ISteamFriends_SteamFriends001_GetFriendPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaName( params->steamIDFriend );
+    return 0;
 }

-int32 cppISteamFriends_SteamFriends001_AddFriendByName(void *linux_side, const char * pchEmailOrAccountName)
+NTSTATUS ISteamFriends_SteamFriends001_AddFriendByName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->AddFriendByName((const char *)pchEmailOrAccountName);
+    struct ISteamFriends_SteamFriends001_AddFriendByName_params *params = (struct ISteamFriends_SteamFriends001_AddFriendByName_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->AddFriendByName( params->pchEmailOrAccountName );
+    return 0;
 }

-int cppISteamFriends_SteamFriends001_GetFriendCount(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends001_GetFriendCount( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendCount();
+    struct ISteamFriends_SteamFriends001_GetFriendCount_params *params = (struct ISteamFriends_SteamFriends001_GetFriendCount_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->GetFriendCount(  );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends001_GetFriendByIndex(void *linux_side, int iFriend)
+NTSTATUS ISteamFriends_SteamFriends001_GetFriendByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendByIndex((int)iFriend);
+    struct ISteamFriends_SteamFriends001_GetFriendByIndex_params *params = (struct ISteamFriends_SteamFriends001_GetFriendByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    *params->_ret = iface->GetFriendByIndex( params->iFriend );
+    return 0;
 }

-void cppISteamFriends_SteamFriends001_SendMsgToFriend(void *linux_side, CSteamID steamIDFriend, EChatEntryType eChatEntryType, const char * pchMsgBody)
+NTSTATUS ISteamFriends_SteamFriends001_SendMsgToFriend( void *args )
 {
-    ((ISteamFriends*)linux_side)->SendMsgToFriend((CSteamID)steamIDFriend, (EChatEntryType)eChatEntryType, (const char *)pchMsgBody);
+    struct ISteamFriends_SteamFriends001_SendMsgToFriend_params *params = (struct ISteamFriends_SteamFriends001_SendMsgToFriend_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    iface->SendMsgToFriend( params->steamIDFriend, params->eChatEntryType, params->pchMsgBody );
+    return 0;
 }

-void cppISteamFriends_SteamFriends001_SetFriendRegValue(void *linux_side, CSteamID steamIDFriend, const char * pchKey, const char * pchValue)
+NTSTATUS ISteamFriends_SteamFriends001_SetFriendRegValue( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetFriendRegValue((CSteamID)steamIDFriend, (const char *)pchKey, (const char *)pchValue);
+    struct ISteamFriends_SteamFriends001_SetFriendRegValue_params *params = (struct ISteamFriends_SteamFriends001_SetFriendRegValue_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    iface->SetFriendRegValue( params->steamIDFriend, params->pchKey, params->pchValue );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends001_GetFriendRegValue(void *linux_side, CSteamID steamIDFriend, const char * pchKey)
+NTSTATUS ISteamFriends_SteamFriends001_GetFriendRegValue( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendRegValue((CSteamID)steamIDFriend, (const char *)pchKey);
+    struct ISteamFriends_SteamFriends001_GetFriendRegValue_params *params = (struct ISteamFriends_SteamFriends001_GetFriendRegValue_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->GetFriendRegValue( params->steamIDFriend, params->pchKey );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends001_GetFriendPersonaNameHistory(void *linux_side, CSteamID steamIDFriend, int iPersonaName)
+NTSTATUS ISteamFriends_SteamFriends001_GetFriendPersonaNameHistory( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaNameHistory((CSteamID)steamIDFriend, (int)iPersonaName);
+    struct ISteamFriends_SteamFriends001_GetFriendPersonaNameHistory_params *params = (struct ISteamFriends_SteamFriends001_GetFriendPersonaNameHistory_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaNameHistory( params->steamIDFriend, params->iPersonaName );
+    return 0;
 }

-int cppISteamFriends_SteamFriends001_GetChatMessage(void *linux_side, CSteamID steamIDFriend, int iChatID, void * pvData, int cubData, EChatEntryType * peChatEntryType)
+NTSTATUS ISteamFriends_SteamFriends001_GetChatMessage( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetChatMessage((CSteamID)steamIDFriend, (int)iChatID, (void *)pvData, (int)cubData, (EChatEntryType *)peChatEntryType);
+    struct ISteamFriends_SteamFriends001_GetChatMessage_params *params = (struct ISteamFriends_SteamFriends001_GetChatMessage_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->GetChatMessage( params->steamIDFriend, params->iChatID, params->pvData, params->cubData, params->peChatEntryType );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends001_SendMsgToFriend_2(void *linux_side, CSteamID steamIDFriend, EChatEntryType eChatEntryType, const void * pvMsgBody, int cubMsgBody)
+NTSTATUS ISteamFriends_SteamFriends001_SendMsgToFriend_2( void *args )
 {
-    return ((ISteamFriends*)linux_side)->SendMsgToFriend((CSteamID)steamIDFriend, (EChatEntryType)eChatEntryType, (const void *)pvMsgBody, (int)cubMsgBody);
+    struct ISteamFriends_SteamFriends001_SendMsgToFriend_2_params *params = (struct ISteamFriends_SteamFriends001_SendMsgToFriend_2_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->SendMsgToFriend( params->steamIDFriend, params->eChatEntryType, params->pvMsgBody, params->cubMsgBody );
+    return 0;
 }

-int cppISteamFriends_SteamFriends001_GetChatIDOfChatHistoryStart(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends001_GetChatIDOfChatHistoryStart( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetChatIDOfChatHistoryStart((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends001_GetChatIDOfChatHistoryStart_params *params = (struct ISteamFriends_SteamFriends001_GetChatIDOfChatHistoryStart_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->GetChatIDOfChatHistoryStart( params->steamIDFriend );
+    return 0;
 }

-void cppISteamFriends_SteamFriends001_SetChatHistoryStart(void *linux_side, CSteamID steamIDFriend, int iChatID)
+NTSTATUS ISteamFriends_SteamFriends001_SetChatHistoryStart( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetChatHistoryStart((CSteamID)steamIDFriend, (int)iChatID);
+    struct ISteamFriends_SteamFriends001_SetChatHistoryStart_params *params = (struct ISteamFriends_SteamFriends001_SetChatHistoryStart_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    iface->SetChatHistoryStart( params->steamIDFriend, params->iChatID );
+    return 0;
 }

-void cppISteamFriends_SteamFriends001_ClearChatHistory(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends001_ClearChatHistory( void *args )
 {
-    ((ISteamFriends*)linux_side)->ClearChatHistory((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends001_ClearChatHistory_params *params = (struct ISteamFriends_SteamFriends001_ClearChatHistory_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    iface->ClearChatHistory( params->steamIDFriend );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends001_InviteFriendByEmail(void *linux_side, const char * pchEmailAccount)
+NTSTATUS ISteamFriends_SteamFriends001_InviteFriendByEmail( void *args )
 {
-    return ((ISteamFriends*)linux_side)->InviteFriendByEmail((const char *)pchEmailAccount);
+    struct ISteamFriends_SteamFriends001_InviteFriendByEmail_params *params = (struct ISteamFriends_SteamFriends001_InviteFriendByEmail_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->InviteFriendByEmail( params->pchEmailAccount );
+    return 0;
 }

-int cppISteamFriends_SteamFriends001_GetBlockedFriendCount(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends001_GetBlockedFriendCount( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetBlockedFriendCount();
+    struct ISteamFriends_SteamFriends001_GetBlockedFriendCount_params *params = (struct ISteamFriends_SteamFriends001_GetBlockedFriendCount_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->GetBlockedFriendCount(  );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends001_GetFriendGamePlayed(void *linux_side, CSteamID steamIDFriend, uint64 * pulGameID, uint32 * punGameIP, uint16 * pusGamePort)
+NTSTATUS ISteamFriends_SteamFriends001_GetFriendGamePlayed( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendGamePlayed((CSteamID)steamIDFriend, (uint64 *)pulGameID, (uint32 *)punGameIP, (uint16 *)pusGamePort);
+    struct ISteamFriends_SteamFriends001_GetFriendGamePlayed_params *params = (struct ISteamFriends_SteamFriends001_GetFriendGamePlayed_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->GetFriendGamePlayed( params->steamIDFriend, params->pulGameID, params->punGameIP, params->pusGamePort );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends001_GetFriendGamePlayed2(void *linux_side, CSteamID steamIDFriend, uint64 * pulGameID, uint32 * punGameIP, uint16 * pusGamePort, uint16 * pusQueryPort)
+NTSTATUS ISteamFriends_SteamFriends001_GetFriendGamePlayed2( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendGamePlayed2((CSteamID)steamIDFriend, (uint64 *)pulGameID, (uint32 *)punGameIP, (uint16 *)pusGamePort, (uint16 *)pusQueryPort);
+    struct ISteamFriends_SteamFriends001_GetFriendGamePlayed2_params *params = (struct ISteamFriends_SteamFriends001_GetFriendGamePlayed2_params *)args;
+    struct u_ISteamFriends_SteamFriends001 *iface = (struct u_ISteamFriends_SteamFriends001 *)params->linux_side;
+    params->_ret = iface->GetFriendGamePlayed2( params->steamIDFriend, params->pulGameID, params->punGameIP, params->pusGamePort, params->pusQueryPort );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamFriends_SteamFriends001.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends001.h
@ -1,27 +0,0 @@
-extern const char * cppISteamFriends_SteamFriends001_GetPersonaName(void *);
-extern void cppISteamFriends_SteamFriends001_SetPersonaName(void *, const char *);
-extern EPersonaState cppISteamFriends_SteamFriends001_GetPersonaState(void *);
-extern void cppISteamFriends_SteamFriends001_SetPersonaState(void *, EPersonaState);
-extern bool cppISteamFriends_SteamFriends001_AddFriend(void *, CSteamID);
-extern bool cppISteamFriends_SteamFriends001_RemoveFriend(void *, CSteamID);
-extern bool cppISteamFriends_SteamFriends001_HasFriend(void *, CSteamID);
-extern EFriendRelationship cppISteamFriends_SteamFriends001_GetFriendRelationship(void *, CSteamID);
-extern EPersonaState cppISteamFriends_SteamFriends001_GetFriendPersonaState(void *, CSteamID);
-extern bool cppISteamFriends_SteamFriends001_Deprecated_GetFriendGamePlayed(void *, CSteamID, int32 *, uint32 *, uint16 *);
-extern const char * cppISteamFriends_SteamFriends001_GetFriendPersonaName(void *, CSteamID);
-extern int32 cppISteamFriends_SteamFriends001_AddFriendByName(void *, const char *);
-extern int cppISteamFriends_SteamFriends001_GetFriendCount(void *);
-extern CSteamID cppISteamFriends_SteamFriends001_GetFriendByIndex(void *, int);
-extern void cppISteamFriends_SteamFriends001_SendMsgToFriend(void *, CSteamID, EChatEntryType, const char *);
-extern void cppISteamFriends_SteamFriends001_SetFriendRegValue(void *, CSteamID, const char *, const char *);
-extern const char * cppISteamFriends_SteamFriends001_GetFriendRegValue(void *, CSteamID, const char *);
-extern const char * cppISteamFriends_SteamFriends001_GetFriendPersonaNameHistory(void *, CSteamID, int);
-extern int cppISteamFriends_SteamFriends001_GetChatMessage(void *, CSteamID, int, void *, int, EChatEntryType *);
-extern bool cppISteamFriends_SteamFriends001_SendMsgToFriend_2(void *, CSteamID, EChatEntryType, const void *, int);
-extern int cppISteamFriends_SteamFriends001_GetChatIDOfChatHistoryStart(void *, CSteamID);
-extern void cppISteamFriends_SteamFriends001_SetChatHistoryStart(void *, CSteamID, int);
-extern void cppISteamFriends_SteamFriends001_ClearChatHistory(void *, CSteamID);
-extern bool cppISteamFriends_SteamFriends001_InviteFriendByEmail(void *, const char *);
-extern int cppISteamFriends_SteamFriends001_GetBlockedFriendCount(void *);
-extern bool cppISteamFriends_SteamFriends001_GetFriendGamePlayed(void *, CSteamID, uint64 *, uint32 *, uint16 *);
-extern bool cppISteamFriends_SteamFriends001_GetFriendGamePlayed2(void *, CSteamID, uint64 *, uint32 *, uint16 *, uint16 *);
--- a/lsteamclient/cppISteamFriends_SteamFriends002.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends002.cpp
@ -1,166 +1,247 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_099y/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_099y
-#include "struct_converters.h"
-#include "cppISteamFriends_SteamFriends002.h"
-const char * cppISteamFriends_SteamFriends002_GetPersonaName(void *linux_side)
+
+NTSTATUS ISteamFriends_SteamFriends002_GetPersonaName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetPersonaName();
+    struct ISteamFriends_SteamFriends002_GetPersonaName_params *params = (struct ISteamFriends_SteamFriends002_GetPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->GetPersonaName(  );
+    return 0;
 }

-void cppISteamFriends_SteamFriends002_SetPersonaName(void *linux_side, const char * pchPersonaName)
+NTSTATUS ISteamFriends_SteamFriends002_SetPersonaName( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetPersonaName((const char *)pchPersonaName);
+    struct ISteamFriends_SteamFriends002_SetPersonaName_params *params = (struct ISteamFriends_SteamFriends002_SetPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    iface->SetPersonaName( params->pchPersonaName );
+    return 0;
 }

-EPersonaState cppISteamFriends_SteamFriends002_GetPersonaState(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends002_GetPersonaState( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetPersonaState();
+    struct ISteamFriends_SteamFriends002_GetPersonaState_params *params = (struct ISteamFriends_SteamFriends002_GetPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->GetPersonaState(  );
+    return 0;
 }

-void cppISteamFriends_SteamFriends002_SetPersonaState(void *linux_side, EPersonaState ePersonaState)
+NTSTATUS ISteamFriends_SteamFriends002_SetPersonaState( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetPersonaState((EPersonaState)ePersonaState);
+    struct ISteamFriends_SteamFriends002_SetPersonaState_params *params = (struct ISteamFriends_SteamFriends002_SetPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    iface->SetPersonaState( params->ePersonaState );
+    return 0;
 }

-int cppISteamFriends_SteamFriends002_GetFriendCount(void *linux_side, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends002_GetFriendCount( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendCount((int)iFriendFlags);
+    struct ISteamFriends_SteamFriends002_GetFriendCount_params *params = (struct ISteamFriends_SteamFriends002_GetFriendCount_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->GetFriendCount( params->iFriendFlags );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends002_GetFriendByIndex(void *linux_side, int iFriend, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends002_GetFriendByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendByIndex((int)iFriend, (int)iFriendFlags);
+    struct ISteamFriends_SteamFriends002_GetFriendByIndex_params *params = (struct ISteamFriends_SteamFriends002_GetFriendByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    *params->_ret = iface->GetFriendByIndex( params->iFriend, params->iFriendFlags );
+    return 0;
 }

-EFriendRelationship cppISteamFriends_SteamFriends002_GetFriendRelationship(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends002_GetFriendRelationship( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendRelationship((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends002_GetFriendRelationship_params *params = (struct ISteamFriends_SteamFriends002_GetFriendRelationship_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->GetFriendRelationship( params->steamIDFriend );
+    return 0;
 }

-EPersonaState cppISteamFriends_SteamFriends002_GetFriendPersonaState(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends002_GetFriendPersonaState( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaState((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends002_GetFriendPersonaState_params *params = (struct ISteamFriends_SteamFriends002_GetFriendPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaState( params->steamIDFriend );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends002_GetFriendPersonaName(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends002_GetFriendPersonaName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaName((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends002_GetFriendPersonaName_params *params = (struct ISteamFriends_SteamFriends002_GetFriendPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaName( params->steamIDFriend );
+    return 0;
 }

-void cppISteamFriends_SteamFriends002_SetFriendRegValue(void *linux_side, CSteamID steamIDFriend, const char * pchKey, const char * pchValue)
+NTSTATUS ISteamFriends_SteamFriends002_SetFriendRegValue( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetFriendRegValue((CSteamID)steamIDFriend, (const char *)pchKey, (const char *)pchValue);
+    struct ISteamFriends_SteamFriends002_SetFriendRegValue_params *params = (struct ISteamFriends_SteamFriends002_SetFriendRegValue_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    iface->SetFriendRegValue( params->steamIDFriend, params->pchKey, params->pchValue );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends002_GetFriendRegValue(void *linux_side, CSteamID steamIDFriend, const char * pchKey)
+NTSTATUS ISteamFriends_SteamFriends002_GetFriendRegValue( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendRegValue((CSteamID)steamIDFriend, (const char *)pchKey);
+    struct ISteamFriends_SteamFriends002_GetFriendRegValue_params *params = (struct ISteamFriends_SteamFriends002_GetFriendRegValue_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->GetFriendRegValue( params->steamIDFriend, params->pchKey );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends002_GetFriendGamePlayed(void *linux_side, CSteamID steamIDFriend, uint64 * pulGameID, uint32 * punGameIP, uint16 * pusGamePort, uint16 * pusQueryPort)
+NTSTATUS ISteamFriends_SteamFriends002_GetFriendGamePlayed( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendGamePlayed((CSteamID)steamIDFriend, (uint64 *)pulGameID, (uint32 *)punGameIP, (uint16 *)pusGamePort, (uint16 *)pusQueryPort);
+    struct ISteamFriends_SteamFriends002_GetFriendGamePlayed_params *params = (struct ISteamFriends_SteamFriends002_GetFriendGamePlayed_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->GetFriendGamePlayed( params->steamIDFriend, params->pulGameID, params->punGameIP, params->pusGamePort, params->pusQueryPort );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends002_GetFriendPersonaNameHistory(void *linux_side, CSteamID steamIDFriend, int iPersonaName)
+NTSTATUS ISteamFriends_SteamFriends002_GetFriendPersonaNameHistory( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaNameHistory((CSteamID)steamIDFriend, (int)iPersonaName);
+    struct ISteamFriends_SteamFriends002_GetFriendPersonaNameHistory_params *params = (struct ISteamFriends_SteamFriends002_GetFriendPersonaNameHistory_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaNameHistory( params->steamIDFriend, params->iPersonaName );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends002_AddFriend(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends002_AddFriend( void *args )
 {
-    return ((ISteamFriends*)linux_side)->AddFriend((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends002_AddFriend_params *params = (struct ISteamFriends_SteamFriends002_AddFriend_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->AddFriend( params->steamIDFriend );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends002_RemoveFriend(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends002_RemoveFriend( void *args )
 {
-    return ((ISteamFriends*)linux_side)->RemoveFriend((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends002_RemoveFriend_params *params = (struct ISteamFriends_SteamFriends002_RemoveFriend_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->RemoveFriend( params->steamIDFriend );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends002_HasFriend(void *linux_side, CSteamID steamIDFriend, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends002_HasFriend( void *args )
 {
-    return ((ISteamFriends*)linux_side)->HasFriend((CSteamID)steamIDFriend, (int)iFriendFlags);
+    struct ISteamFriends_SteamFriends002_HasFriend_params *params = (struct ISteamFriends_SteamFriends002_HasFriend_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->HasFriend( params->steamIDFriend, params->iFriendFlags );
+    return 0;
 }

-int32 cppISteamFriends_SteamFriends002_AddFriendByName(void *linux_side, const char * pchEmailOrAccountName)
+NTSTATUS ISteamFriends_SteamFriends002_AddFriendByName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->AddFriendByName((const char *)pchEmailOrAccountName);
+    struct ISteamFriends_SteamFriends002_AddFriendByName_params *params = (struct ISteamFriends_SteamFriends002_AddFriendByName_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->AddFriendByName( params->pchEmailOrAccountName );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends002_InviteFriendByEmail(void *linux_side, const char * pchEmailAccount)
+NTSTATUS ISteamFriends_SteamFriends002_InviteFriendByEmail( void *args )
 {
-    return ((ISteamFriends*)linux_side)->InviteFriendByEmail((const char *)pchEmailAccount);
+    struct ISteamFriends_SteamFriends002_InviteFriendByEmail_params *params = (struct ISteamFriends_SteamFriends002_InviteFriendByEmail_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->InviteFriendByEmail( params->pchEmailAccount );
+    return 0;
 }

-int cppISteamFriends_SteamFriends002_GetChatMessage(void *linux_side, CSteamID steamIDFriend, int iChatID, void * pvData, int cubData, EChatEntryType * peChatEntryType)
+NTSTATUS ISteamFriends_SteamFriends002_GetChatMessage( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetChatMessage((CSteamID)steamIDFriend, (int)iChatID, (void *)pvData, (int)cubData, (EChatEntryType *)peChatEntryType);
+    struct ISteamFriends_SteamFriends002_GetChatMessage_params *params = (struct ISteamFriends_SteamFriends002_GetChatMessage_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->GetChatMessage( params->steamIDFriend, params->iChatID, params->pvData, params->cubData, params->peChatEntryType );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends002_SendMsgToFriend(void *linux_side, CSteamID steamIDFriend, EChatEntryType eChatEntryType, const void * pvMsgBody, int cubMsgBody)
+NTSTATUS ISteamFriends_SteamFriends002_SendMsgToFriend( void *args )
 {
-    return ((ISteamFriends*)linux_side)->SendMsgToFriend((CSteamID)steamIDFriend, (EChatEntryType)eChatEntryType, (const void *)pvMsgBody, (int)cubMsgBody);
+    struct ISteamFriends_SteamFriends002_SendMsgToFriend_params *params = (struct ISteamFriends_SteamFriends002_SendMsgToFriend_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->SendMsgToFriend( params->steamIDFriend, params->eChatEntryType, params->pvMsgBody, params->cubMsgBody );
+    return 0;
 }

-int cppISteamFriends_SteamFriends002_GetChatIDOfChatHistoryStart(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends002_GetChatIDOfChatHistoryStart( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetChatIDOfChatHistoryStart((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends002_GetChatIDOfChatHistoryStart_params *params = (struct ISteamFriends_SteamFriends002_GetChatIDOfChatHistoryStart_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->GetChatIDOfChatHistoryStart( params->steamIDFriend );
+    return 0;
 }

-void cppISteamFriends_SteamFriends002_SetChatHistoryStart(void *linux_side, CSteamID steamIDFriend, int iChatID)
+NTSTATUS ISteamFriends_SteamFriends002_SetChatHistoryStart( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetChatHistoryStart((CSteamID)steamIDFriend, (int)iChatID);
+    struct ISteamFriends_SteamFriends002_SetChatHistoryStart_params *params = (struct ISteamFriends_SteamFriends002_SetChatHistoryStart_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    iface->SetChatHistoryStart( params->steamIDFriend, params->iChatID );
+    return 0;
 }

-void cppISteamFriends_SteamFriends002_ClearChatHistory(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends002_ClearChatHistory( void *args )
 {
-    ((ISteamFriends*)linux_side)->ClearChatHistory((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends002_ClearChatHistory_params *params = (struct ISteamFriends_SteamFriends002_ClearChatHistory_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    iface->ClearChatHistory( params->steamIDFriend );
+    return 0;
 }

-int cppISteamFriends_SteamFriends002_GetClanCount(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends002_GetClanCount( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanCount();
+    struct ISteamFriends_SteamFriends002_GetClanCount_params *params = (struct ISteamFriends_SteamFriends002_GetClanCount_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->GetClanCount(  );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends002_GetClanByIndex(void *linux_side, int iClan)
+NTSTATUS ISteamFriends_SteamFriends002_GetClanByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanByIndex((int)iClan);
+    struct ISteamFriends_SteamFriends002_GetClanByIndex_params *params = (struct ISteamFriends_SteamFriends002_GetClanByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    *params->_ret = iface->GetClanByIndex( params->iClan );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends002_GetClanName(void *linux_side, CSteamID steamIDClan)
+NTSTATUS ISteamFriends_SteamFriends002_GetClanName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanName((CSteamID)steamIDClan);
+    struct ISteamFriends_SteamFriends002_GetClanName_params *params = (struct ISteamFriends_SteamFriends002_GetClanName_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->GetClanName( params->steamIDClan );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends002_InviteFriendToClan(void *linux_side, CSteamID steamIDFriend, CSteamID steamIDClan)
+NTSTATUS ISteamFriends_SteamFriends002_InviteFriendToClan( void *args )
 {
-    return ((ISteamFriends*)linux_side)->InviteFriendToClan((CSteamID)steamIDFriend, (CSteamID)steamIDClan);
+    struct ISteamFriends_SteamFriends002_InviteFriendToClan_params *params = (struct ISteamFriends_SteamFriends002_InviteFriendToClan_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->InviteFriendToClan( params->steamIDFriend, params->steamIDClan );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends002_AcknowledgeInviteToClan(void *linux_side, CSteamID steamIDClan, bool bAcceptOrDenyClanInvite)
+NTSTATUS ISteamFriends_SteamFriends002_AcknowledgeInviteToClan( void *args )
 {
-    return ((ISteamFriends*)linux_side)->AcknowledgeInviteToClan((CSteamID)steamIDClan, (bool)bAcceptOrDenyClanInvite);
+    struct ISteamFriends_SteamFriends002_AcknowledgeInviteToClan_params *params = (struct ISteamFriends_SteamFriends002_AcknowledgeInviteToClan_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->AcknowledgeInviteToClan( params->steamIDClan, params->bAcceptOrDenyClanInvite );
+    return 0;
 }

-int cppISteamFriends_SteamFriends002_GetFriendCountFromSource(void *linux_side, CSteamID steamIDSource)
+NTSTATUS ISteamFriends_SteamFriends002_GetFriendCountFromSource( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendCountFromSource((CSteamID)steamIDSource);
+    struct ISteamFriends_SteamFriends002_GetFriendCountFromSource_params *params = (struct ISteamFriends_SteamFriends002_GetFriendCountFromSource_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    params->_ret = iface->GetFriendCountFromSource( params->steamIDSource );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends002_GetFriendFromSourceByIndex(void *linux_side, CSteamID steamIDSource, int iFriend)
+NTSTATUS ISteamFriends_SteamFriends002_GetFriendFromSourceByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendFromSourceByIndex((CSteamID)steamIDSource, (int)iFriend);
+    struct ISteamFriends_SteamFriends002_GetFriendFromSourceByIndex_params *params = (struct ISteamFriends_SteamFriends002_GetFriendFromSourceByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends002 *iface = (struct u_ISteamFriends_SteamFriends002 *)params->linux_side;
+    *params->_ret = iface->GetFriendFromSourceByIndex( params->steamIDSource, params->iFriend );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamFriends_SteamFriends002.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends002.h
@ -1,30 +0,0 @@
-extern const char * cppISteamFriends_SteamFriends002_GetPersonaName(void *);
-extern void cppISteamFriends_SteamFriends002_SetPersonaName(void *, const char *);
-extern EPersonaState cppISteamFriends_SteamFriends002_GetPersonaState(void *);
-extern void cppISteamFriends_SteamFriends002_SetPersonaState(void *, EPersonaState);
-extern int cppISteamFriends_SteamFriends002_GetFriendCount(void *, int);
-extern CSteamID cppISteamFriends_SteamFriends002_GetFriendByIndex(void *, int, int);
-extern EFriendRelationship cppISteamFriends_SteamFriends002_GetFriendRelationship(void *, CSteamID);
-extern EPersonaState cppISteamFriends_SteamFriends002_GetFriendPersonaState(void *, CSteamID);
-extern const char * cppISteamFriends_SteamFriends002_GetFriendPersonaName(void *, CSteamID);
-extern void cppISteamFriends_SteamFriends002_SetFriendRegValue(void *, CSteamID, const char *, const char *);
-extern const char * cppISteamFriends_SteamFriends002_GetFriendRegValue(void *, CSteamID, const char *);
-extern bool cppISteamFriends_SteamFriends002_GetFriendGamePlayed(void *, CSteamID, uint64 *, uint32 *, uint16 *, uint16 *);
-extern const char * cppISteamFriends_SteamFriends002_GetFriendPersonaNameHistory(void *, CSteamID, int);
-extern bool cppISteamFriends_SteamFriends002_AddFriend(void *, CSteamID);
-extern bool cppISteamFriends_SteamFriends002_RemoveFriend(void *, CSteamID);
-extern bool cppISteamFriends_SteamFriends002_HasFriend(void *, CSteamID, int);
-extern int32 cppISteamFriends_SteamFriends002_AddFriendByName(void *, const char *);
-extern bool cppISteamFriends_SteamFriends002_InviteFriendByEmail(void *, const char *);
-extern int cppISteamFriends_SteamFriends002_GetChatMessage(void *, CSteamID, int, void *, int, EChatEntryType *);
-extern bool cppISteamFriends_SteamFriends002_SendMsgToFriend(void *, CSteamID, EChatEntryType, const void *, int);
-extern int cppISteamFriends_SteamFriends002_GetChatIDOfChatHistoryStart(void *, CSteamID);
-extern void cppISteamFriends_SteamFriends002_SetChatHistoryStart(void *, CSteamID, int);
-extern void cppISteamFriends_SteamFriends002_ClearChatHistory(void *, CSteamID);
-extern int cppISteamFriends_SteamFriends002_GetClanCount(void *);
-extern CSteamID cppISteamFriends_SteamFriends002_GetClanByIndex(void *, int);
-extern const char * cppISteamFriends_SteamFriends002_GetClanName(void *, CSteamID);
-extern bool cppISteamFriends_SteamFriends002_InviteFriendToClan(void *, CSteamID, CSteamID);
-extern bool cppISteamFriends_SteamFriends002_AcknowledgeInviteToClan(void *, CSteamID, bool);
-extern int cppISteamFriends_SteamFriends002_GetFriendCountFromSource(void *, CSteamID);
-extern CSteamID cppISteamFriends_SteamFriends002_GetFriendFromSourceByIndex(void *, CSteamID, int);
--- a/lsteamclient/cppISteamFriends_SteamFriends003.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends003.cpp
@ -1,116 +1,167 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_101/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_101
-#include "struct_converters.h"
-#include "cppISteamFriends_SteamFriends003.h"
-const char * cppISteamFriends_SteamFriends003_GetPersonaName(void *linux_side)
+
+NTSTATUS ISteamFriends_SteamFriends003_GetPersonaName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetPersonaName();
+    struct ISteamFriends_SteamFriends003_GetPersonaName_params *params = (struct ISteamFriends_SteamFriends003_GetPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    params->_ret = iface->GetPersonaName(  );
+    return 0;
 }

-void cppISteamFriends_SteamFriends003_SetPersonaName(void *linux_side, const char * pchPersonaName)
+NTSTATUS ISteamFriends_SteamFriends003_SetPersonaName( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetPersonaName((const char *)pchPersonaName);
+    struct ISteamFriends_SteamFriends003_SetPersonaName_params *params = (struct ISteamFriends_SteamFriends003_SetPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    iface->SetPersonaName( params->pchPersonaName );
+    return 0;
 }

-EPersonaState cppISteamFriends_SteamFriends003_GetPersonaState(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends003_GetPersonaState( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetPersonaState();
+    struct ISteamFriends_SteamFriends003_GetPersonaState_params *params = (struct ISteamFriends_SteamFriends003_GetPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    params->_ret = iface->GetPersonaState(  );
+    return 0;
 }

-int cppISteamFriends_SteamFriends003_GetFriendCount(void *linux_side, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends003_GetFriendCount( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendCount((int)iFriendFlags);
+    struct ISteamFriends_SteamFriends003_GetFriendCount_params *params = (struct ISteamFriends_SteamFriends003_GetFriendCount_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    params->_ret = iface->GetFriendCount( params->iFriendFlags );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends003_GetFriendByIndex(void *linux_side, int iFriend, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends003_GetFriendByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendByIndex((int)iFriend, (int)iFriendFlags);
+    struct ISteamFriends_SteamFriends003_GetFriendByIndex_params *params = (struct ISteamFriends_SteamFriends003_GetFriendByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    *params->_ret = iface->GetFriendByIndex( params->iFriend, params->iFriendFlags );
+    return 0;
 }

-EFriendRelationship cppISteamFriends_SteamFriends003_GetFriendRelationship(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends003_GetFriendRelationship( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendRelationship((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends003_GetFriendRelationship_params *params = (struct ISteamFriends_SteamFriends003_GetFriendRelationship_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    params->_ret = iface->GetFriendRelationship( params->steamIDFriend );
+    return 0;
 }

-EPersonaState cppISteamFriends_SteamFriends003_GetFriendPersonaState(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends003_GetFriendPersonaState( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaState((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends003_GetFriendPersonaState_params *params = (struct ISteamFriends_SteamFriends003_GetFriendPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaState( params->steamIDFriend );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends003_GetFriendPersonaName(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends003_GetFriendPersonaName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaName((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends003_GetFriendPersonaName_params *params = (struct ISteamFriends_SteamFriends003_GetFriendPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaName( params->steamIDFriend );
+    return 0;
 }

-int cppISteamFriends_SteamFriends003_GetFriendAvatar(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends003_GetFriendAvatar( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendAvatar((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends003_GetFriendAvatar_params *params = (struct ISteamFriends_SteamFriends003_GetFriendAvatar_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    params->_ret = iface->GetFriendAvatar( params->steamIDFriend );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends003_GetFriendGamePlayed(void *linux_side, CSteamID steamIDFriend, uint64 * pulGameID, uint32 * punGameIP, uint16 * pusGamePort, uint16 * pusQueryPort)
+NTSTATUS ISteamFriends_SteamFriends003_GetFriendGamePlayed( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendGamePlayed((CSteamID)steamIDFriend, (uint64 *)pulGameID, (uint32 *)punGameIP, (uint16 *)pusGamePort, (uint16 *)pusQueryPort);
+    struct ISteamFriends_SteamFriends003_GetFriendGamePlayed_params *params = (struct ISteamFriends_SteamFriends003_GetFriendGamePlayed_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    params->_ret = iface->GetFriendGamePlayed( params->steamIDFriend, params->pulGameID, params->punGameIP, params->pusGamePort, params->pusQueryPort );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends003_GetFriendPersonaNameHistory(void *linux_side, CSteamID steamIDFriend, int iPersonaName)
+NTSTATUS ISteamFriends_SteamFriends003_GetFriendPersonaNameHistory( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaNameHistory((CSteamID)steamIDFriend, (int)iPersonaName);
+    struct ISteamFriends_SteamFriends003_GetFriendPersonaNameHistory_params *params = (struct ISteamFriends_SteamFriends003_GetFriendPersonaNameHistory_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaNameHistory( params->steamIDFriend, params->iPersonaName );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends003_HasFriend(void *linux_side, CSteamID steamIDFriend, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends003_HasFriend( void *args )
 {
-    return ((ISteamFriends*)linux_side)->HasFriend((CSteamID)steamIDFriend, (int)iFriendFlags);
+    struct ISteamFriends_SteamFriends003_HasFriend_params *params = (struct ISteamFriends_SteamFriends003_HasFriend_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    params->_ret = iface->HasFriend( params->steamIDFriend, params->iFriendFlags );
+    return 0;
 }

-int cppISteamFriends_SteamFriends003_GetClanCount(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends003_GetClanCount( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanCount();
+    struct ISteamFriends_SteamFriends003_GetClanCount_params *params = (struct ISteamFriends_SteamFriends003_GetClanCount_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    params->_ret = iface->GetClanCount(  );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends003_GetClanByIndex(void *linux_side, int iClan)
+NTSTATUS ISteamFriends_SteamFriends003_GetClanByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanByIndex((int)iClan);
+    struct ISteamFriends_SteamFriends003_GetClanByIndex_params *params = (struct ISteamFriends_SteamFriends003_GetClanByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    *params->_ret = iface->GetClanByIndex( params->iClan );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends003_GetClanName(void *linux_side, CSteamID steamIDClan)
+NTSTATUS ISteamFriends_SteamFriends003_GetClanName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanName((CSteamID)steamIDClan);
+    struct ISteamFriends_SteamFriends003_GetClanName_params *params = (struct ISteamFriends_SteamFriends003_GetClanName_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    params->_ret = iface->GetClanName( params->steamIDClan );
+    return 0;
 }

-int cppISteamFriends_SteamFriends003_GetFriendCountFromSource(void *linux_side, CSteamID steamIDSource)
+NTSTATUS ISteamFriends_SteamFriends003_GetFriendCountFromSource( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendCountFromSource((CSteamID)steamIDSource);
+    struct ISteamFriends_SteamFriends003_GetFriendCountFromSource_params *params = (struct ISteamFriends_SteamFriends003_GetFriendCountFromSource_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    params->_ret = iface->GetFriendCountFromSource( params->steamIDSource );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends003_GetFriendFromSourceByIndex(void *linux_side, CSteamID steamIDSource, int iFriend)
+NTSTATUS ISteamFriends_SteamFriends003_GetFriendFromSourceByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendFromSourceByIndex((CSteamID)steamIDSource, (int)iFriend);
+    struct ISteamFriends_SteamFriends003_GetFriendFromSourceByIndex_params *params = (struct ISteamFriends_SteamFriends003_GetFriendFromSourceByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    *params->_ret = iface->GetFriendFromSourceByIndex( params->steamIDSource, params->iFriend );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends003_IsUserInSource(void *linux_side, CSteamID steamIDUser, CSteamID steamIDSource)
+NTSTATUS ISteamFriends_SteamFriends003_IsUserInSource( void *args )
 {
-    return ((ISteamFriends*)linux_side)->IsUserInSource((CSteamID)steamIDUser, (CSteamID)steamIDSource);
+    struct ISteamFriends_SteamFriends003_IsUserInSource_params *params = (struct ISteamFriends_SteamFriends003_IsUserInSource_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    params->_ret = iface->IsUserInSource( params->steamIDUser, params->steamIDSource );
+    return 0;
 }

-void cppISteamFriends_SteamFriends003_SetInGameVoiceSpeaking(void *linux_side, CSteamID steamIDUser, bool bSpeaking)
+NTSTATUS ISteamFriends_SteamFriends003_SetInGameVoiceSpeaking( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetInGameVoiceSpeaking((CSteamID)steamIDUser, (bool)bSpeaking);
+    struct ISteamFriends_SteamFriends003_SetInGameVoiceSpeaking_params *params = (struct ISteamFriends_SteamFriends003_SetInGameVoiceSpeaking_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    iface->SetInGameVoiceSpeaking( params->steamIDUser, params->bSpeaking );
+    return 0;
 }

-void cppISteamFriends_SteamFriends003_ActivateGameOverlay(void *linux_side, const char * pchDialog)
+NTSTATUS ISteamFriends_SteamFriends003_ActivateGameOverlay( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlay((const char *)pchDialog);
+    struct ISteamFriends_SteamFriends003_ActivateGameOverlay_params *params = (struct ISteamFriends_SteamFriends003_ActivateGameOverlay_params *)args;
+    struct u_ISteamFriends_SteamFriends003 *iface = (struct u_ISteamFriends_SteamFriends003 *)params->linux_side;
+    iface->ActivateGameOverlay( params->pchDialog );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamFriends_SteamFriends003.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends003.h
@ -1,20 +0,0 @@
-extern const char * cppISteamFriends_SteamFriends003_GetPersonaName(void *);
-extern void cppISteamFriends_SteamFriends003_SetPersonaName(void *, const char *);
-extern EPersonaState cppISteamFriends_SteamFriends003_GetPersonaState(void *);
-extern int cppISteamFriends_SteamFriends003_GetFriendCount(void *, int);
-extern CSteamID cppISteamFriends_SteamFriends003_GetFriendByIndex(void *, int, int);
-extern EFriendRelationship cppISteamFriends_SteamFriends003_GetFriendRelationship(void *, CSteamID);
-extern EPersonaState cppISteamFriends_SteamFriends003_GetFriendPersonaState(void *, CSteamID);
-extern const char * cppISteamFriends_SteamFriends003_GetFriendPersonaName(void *, CSteamID);
-extern int cppISteamFriends_SteamFriends003_GetFriendAvatar(void *, CSteamID);
-extern bool cppISteamFriends_SteamFriends003_GetFriendGamePlayed(void *, CSteamID, uint64 *, uint32 *, uint16 *, uint16 *);
-extern const char * cppISteamFriends_SteamFriends003_GetFriendPersonaNameHistory(void *, CSteamID, int);
-extern bool cppISteamFriends_SteamFriends003_HasFriend(void *, CSteamID, int);
-extern int cppISteamFriends_SteamFriends003_GetClanCount(void *);
-extern CSteamID cppISteamFriends_SteamFriends003_GetClanByIndex(void *, int);
-extern const char * cppISteamFriends_SteamFriends003_GetClanName(void *, CSteamID);
-extern int cppISteamFriends_SteamFriends003_GetFriendCountFromSource(void *, CSteamID);
-extern CSteamID cppISteamFriends_SteamFriends003_GetFriendFromSourceByIndex(void *, CSteamID, int);
-extern bool cppISteamFriends_SteamFriends003_IsUserInSource(void *, CSteamID, CSteamID);
-extern void cppISteamFriends_SteamFriends003_SetInGameVoiceSpeaking(void *, CSteamID, bool);
-extern void cppISteamFriends_SteamFriends003_ActivateGameOverlay(void *, const char *);
--- a/lsteamclient/cppISteamFriends_SteamFriends004.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends004.cpp
@ -1,116 +1,167 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_102/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_102
-#include "struct_converters.h"
-#include "cppISteamFriends_SteamFriends004.h"
-const char * cppISteamFriends_SteamFriends004_GetPersonaName(void *linux_side)
+
+NTSTATUS ISteamFriends_SteamFriends004_GetPersonaName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetPersonaName();
+    struct ISteamFriends_SteamFriends004_GetPersonaName_params *params = (struct ISteamFriends_SteamFriends004_GetPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    params->_ret = iface->GetPersonaName(  );
+    return 0;
 }

-void cppISteamFriends_SteamFriends004_SetPersonaName(void *linux_side, const char * pchPersonaName)
+NTSTATUS ISteamFriends_SteamFriends004_SetPersonaName( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetPersonaName((const char *)pchPersonaName);
+    struct ISteamFriends_SteamFriends004_SetPersonaName_params *params = (struct ISteamFriends_SteamFriends004_SetPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    iface->SetPersonaName( params->pchPersonaName );
+    return 0;
 }

-EPersonaState cppISteamFriends_SteamFriends004_GetPersonaState(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends004_GetPersonaState( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetPersonaState();
+    struct ISteamFriends_SteamFriends004_GetPersonaState_params *params = (struct ISteamFriends_SteamFriends004_GetPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    params->_ret = iface->GetPersonaState(  );
+    return 0;
 }

-int cppISteamFriends_SteamFriends004_GetFriendCount(void *linux_side, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends004_GetFriendCount( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendCount((int)iFriendFlags);
+    struct ISteamFriends_SteamFriends004_GetFriendCount_params *params = (struct ISteamFriends_SteamFriends004_GetFriendCount_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    params->_ret = iface->GetFriendCount( params->iFriendFlags );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends004_GetFriendByIndex(void *linux_side, int iFriend, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends004_GetFriendByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendByIndex((int)iFriend, (int)iFriendFlags);
+    struct ISteamFriends_SteamFriends004_GetFriendByIndex_params *params = (struct ISteamFriends_SteamFriends004_GetFriendByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    *params->_ret = iface->GetFriendByIndex( params->iFriend, params->iFriendFlags );
+    return 0;
 }

-EFriendRelationship cppISteamFriends_SteamFriends004_GetFriendRelationship(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends004_GetFriendRelationship( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendRelationship((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends004_GetFriendRelationship_params *params = (struct ISteamFriends_SteamFriends004_GetFriendRelationship_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    params->_ret = iface->GetFriendRelationship( params->steamIDFriend );
+    return 0;
 }

-EPersonaState cppISteamFriends_SteamFriends004_GetFriendPersonaState(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends004_GetFriendPersonaState( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaState((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends004_GetFriendPersonaState_params *params = (struct ISteamFriends_SteamFriends004_GetFriendPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaState( params->steamIDFriend );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends004_GetFriendPersonaName(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends004_GetFriendPersonaName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaName((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends004_GetFriendPersonaName_params *params = (struct ISteamFriends_SteamFriends004_GetFriendPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaName( params->steamIDFriend );
+    return 0;
 }

-int cppISteamFriends_SteamFriends004_GetFriendAvatar(void *linux_side, CSteamID steamIDFriend, int eAvatarSize)
+NTSTATUS ISteamFriends_SteamFriends004_GetFriendAvatar( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendAvatar((CSteamID)steamIDFriend, (int)eAvatarSize);
+    struct ISteamFriends_SteamFriends004_GetFriendAvatar_params *params = (struct ISteamFriends_SteamFriends004_GetFriendAvatar_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    params->_ret = iface->GetFriendAvatar( params->steamIDFriend, params->eAvatarSize );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends004_GetFriendGamePlayed(void *linux_side, CSteamID steamIDFriend, uint64 * pulGameID, uint32 * punGameIP, uint16 * pusGamePort, uint16 * pusQueryPort)
+NTSTATUS ISteamFriends_SteamFriends004_GetFriendGamePlayed( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendGamePlayed((CSteamID)steamIDFriend, (uint64 *)pulGameID, (uint32 *)punGameIP, (uint16 *)pusGamePort, (uint16 *)pusQueryPort);
+    struct ISteamFriends_SteamFriends004_GetFriendGamePlayed_params *params = (struct ISteamFriends_SteamFriends004_GetFriendGamePlayed_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    params->_ret = iface->GetFriendGamePlayed( params->steamIDFriend, params->pulGameID, params->punGameIP, params->pusGamePort, params->pusQueryPort );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends004_GetFriendPersonaNameHistory(void *linux_side, CSteamID steamIDFriend, int iPersonaName)
+NTSTATUS ISteamFriends_SteamFriends004_GetFriendPersonaNameHistory( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaNameHistory((CSteamID)steamIDFriend, (int)iPersonaName);
+    struct ISteamFriends_SteamFriends004_GetFriendPersonaNameHistory_params *params = (struct ISteamFriends_SteamFriends004_GetFriendPersonaNameHistory_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaNameHistory( params->steamIDFriend, params->iPersonaName );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends004_HasFriend(void *linux_side, CSteamID steamIDFriend, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends004_HasFriend( void *args )
 {
-    return ((ISteamFriends*)linux_side)->HasFriend((CSteamID)steamIDFriend, (int)iFriendFlags);
+    struct ISteamFriends_SteamFriends004_HasFriend_params *params = (struct ISteamFriends_SteamFriends004_HasFriend_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    params->_ret = iface->HasFriend( params->steamIDFriend, params->iFriendFlags );
+    return 0;
 }

-int cppISteamFriends_SteamFriends004_GetClanCount(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends004_GetClanCount( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanCount();
+    struct ISteamFriends_SteamFriends004_GetClanCount_params *params = (struct ISteamFriends_SteamFriends004_GetClanCount_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    params->_ret = iface->GetClanCount(  );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends004_GetClanByIndex(void *linux_side, int iClan)
+NTSTATUS ISteamFriends_SteamFriends004_GetClanByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanByIndex((int)iClan);
+    struct ISteamFriends_SteamFriends004_GetClanByIndex_params *params = (struct ISteamFriends_SteamFriends004_GetClanByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    *params->_ret = iface->GetClanByIndex( params->iClan );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends004_GetClanName(void *linux_side, CSteamID steamIDClan)
+NTSTATUS ISteamFriends_SteamFriends004_GetClanName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanName((CSteamID)steamIDClan);
+    struct ISteamFriends_SteamFriends004_GetClanName_params *params = (struct ISteamFriends_SteamFriends004_GetClanName_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    params->_ret = iface->GetClanName( params->steamIDClan );
+    return 0;
 }

-int cppISteamFriends_SteamFriends004_GetFriendCountFromSource(void *linux_side, CSteamID steamIDSource)
+NTSTATUS ISteamFriends_SteamFriends004_GetFriendCountFromSource( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendCountFromSource((CSteamID)steamIDSource);
+    struct ISteamFriends_SteamFriends004_GetFriendCountFromSource_params *params = (struct ISteamFriends_SteamFriends004_GetFriendCountFromSource_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    params->_ret = iface->GetFriendCountFromSource( params->steamIDSource );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends004_GetFriendFromSourceByIndex(void *linux_side, CSteamID steamIDSource, int iFriend)
+NTSTATUS ISteamFriends_SteamFriends004_GetFriendFromSourceByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendFromSourceByIndex((CSteamID)steamIDSource, (int)iFriend);
+    struct ISteamFriends_SteamFriends004_GetFriendFromSourceByIndex_params *params = (struct ISteamFriends_SteamFriends004_GetFriendFromSourceByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    *params->_ret = iface->GetFriendFromSourceByIndex( params->steamIDSource, params->iFriend );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends004_IsUserInSource(void *linux_side, CSteamID steamIDUser, CSteamID steamIDSource)
+NTSTATUS ISteamFriends_SteamFriends004_IsUserInSource( void *args )
 {
-    return ((ISteamFriends*)linux_side)->IsUserInSource((CSteamID)steamIDUser, (CSteamID)steamIDSource);
+    struct ISteamFriends_SteamFriends004_IsUserInSource_params *params = (struct ISteamFriends_SteamFriends004_IsUserInSource_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    params->_ret = iface->IsUserInSource( params->steamIDUser, params->steamIDSource );
+    return 0;
 }

-void cppISteamFriends_SteamFriends004_SetInGameVoiceSpeaking(void *linux_side, CSteamID steamIDUser, bool bSpeaking)
+NTSTATUS ISteamFriends_SteamFriends004_SetInGameVoiceSpeaking( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetInGameVoiceSpeaking((CSteamID)steamIDUser, (bool)bSpeaking);
+    struct ISteamFriends_SteamFriends004_SetInGameVoiceSpeaking_params *params = (struct ISteamFriends_SteamFriends004_SetInGameVoiceSpeaking_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    iface->SetInGameVoiceSpeaking( params->steamIDUser, params->bSpeaking );
+    return 0;
 }

-void cppISteamFriends_SteamFriends004_ActivateGameOverlay(void *linux_side, const char * pchDialog)
+NTSTATUS ISteamFriends_SteamFriends004_ActivateGameOverlay( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlay((const char *)pchDialog);
+    struct ISteamFriends_SteamFriends004_ActivateGameOverlay_params *params = (struct ISteamFriends_SteamFriends004_ActivateGameOverlay_params *)args;
+    struct u_ISteamFriends_SteamFriends004 *iface = (struct u_ISteamFriends_SteamFriends004 *)params->linux_side;
+    iface->ActivateGameOverlay( params->pchDialog );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamFriends_SteamFriends004.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends004.h
@ -1,20 +0,0 @@
-extern const char * cppISteamFriends_SteamFriends004_GetPersonaName(void *);
-extern void cppISteamFriends_SteamFriends004_SetPersonaName(void *, const char *);
-extern EPersonaState cppISteamFriends_SteamFriends004_GetPersonaState(void *);
-extern int cppISteamFriends_SteamFriends004_GetFriendCount(void *, int);
-extern CSteamID cppISteamFriends_SteamFriends004_GetFriendByIndex(void *, int, int);
-extern EFriendRelationship cppISteamFriends_SteamFriends004_GetFriendRelationship(void *, CSteamID);
-extern EPersonaState cppISteamFriends_SteamFriends004_GetFriendPersonaState(void *, CSteamID);
-extern const char * cppISteamFriends_SteamFriends004_GetFriendPersonaName(void *, CSteamID);
-extern int cppISteamFriends_SteamFriends004_GetFriendAvatar(void *, CSteamID, int);
-extern bool cppISteamFriends_SteamFriends004_GetFriendGamePlayed(void *, CSteamID, uint64 *, uint32 *, uint16 *, uint16 *);
-extern const char * cppISteamFriends_SteamFriends004_GetFriendPersonaNameHistory(void *, CSteamID, int);
-extern bool cppISteamFriends_SteamFriends004_HasFriend(void *, CSteamID, int);
-extern int cppISteamFriends_SteamFriends004_GetClanCount(void *);
-extern CSteamID cppISteamFriends_SteamFriends004_GetClanByIndex(void *, int);
-extern const char * cppISteamFriends_SteamFriends004_GetClanName(void *, CSteamID);
-extern int cppISteamFriends_SteamFriends004_GetFriendCountFromSource(void *, CSteamID);
-extern CSteamID cppISteamFriends_SteamFriends004_GetFriendFromSourceByIndex(void *, CSteamID, int);
-extern bool cppISteamFriends_SteamFriends004_IsUserInSource(void *, CSteamID, CSteamID);
-extern void cppISteamFriends_SteamFriends004_SetInGameVoiceSpeaking(void *, CSteamID, bool);
-extern void cppISteamFriends_SteamFriends004_ActivateGameOverlay(void *, const char *);
--- a/lsteamclient/cppISteamFriends_SteamFriends005.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends005.cpp
@ -1,136 +1,201 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_109/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_109
-#include "struct_converters.h"
-#include "cppISteamFriends_SteamFriends005.h"
-const char * cppISteamFriends_SteamFriends005_GetPersonaName(void *linux_side)
+
+NTSTATUS ISteamFriends_SteamFriends005_GetPersonaName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetPersonaName();
+    struct ISteamFriends_SteamFriends005_GetPersonaName_params *params = (struct ISteamFriends_SteamFriends005_GetPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    params->_ret = iface->GetPersonaName(  );
+    return 0;
 }

-void cppISteamFriends_SteamFriends005_SetPersonaName(void *linux_side, const char * pchPersonaName)
+NTSTATUS ISteamFriends_SteamFriends005_SetPersonaName( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetPersonaName((const char *)pchPersonaName);
+    struct ISteamFriends_SteamFriends005_SetPersonaName_params *params = (struct ISteamFriends_SteamFriends005_SetPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    iface->SetPersonaName( params->pchPersonaName );
+    return 0;
 }

-EPersonaState cppISteamFriends_SteamFriends005_GetPersonaState(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends005_GetPersonaState( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetPersonaState();
+    struct ISteamFriends_SteamFriends005_GetPersonaState_params *params = (struct ISteamFriends_SteamFriends005_GetPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    params->_ret = iface->GetPersonaState(  );
+    return 0;
 }

-int cppISteamFriends_SteamFriends005_GetFriendCount(void *linux_side, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends005_GetFriendCount( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendCount((int)iFriendFlags);
+    struct ISteamFriends_SteamFriends005_GetFriendCount_params *params = (struct ISteamFriends_SteamFriends005_GetFriendCount_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    params->_ret = iface->GetFriendCount( params->iFriendFlags );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends005_GetFriendByIndex(void *linux_side, int iFriend, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends005_GetFriendByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendByIndex((int)iFriend, (int)iFriendFlags);
+    struct ISteamFriends_SteamFriends005_GetFriendByIndex_params *params = (struct ISteamFriends_SteamFriends005_GetFriendByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    *params->_ret = iface->GetFriendByIndex( params->iFriend, params->iFriendFlags );
+    return 0;
 }

-EFriendRelationship cppISteamFriends_SteamFriends005_GetFriendRelationship(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends005_GetFriendRelationship( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendRelationship((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends005_GetFriendRelationship_params *params = (struct ISteamFriends_SteamFriends005_GetFriendRelationship_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    params->_ret = iface->GetFriendRelationship( params->steamIDFriend );
+    return 0;
 }

-EPersonaState cppISteamFriends_SteamFriends005_GetFriendPersonaState(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends005_GetFriendPersonaState( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaState((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends005_GetFriendPersonaState_params *params = (struct ISteamFriends_SteamFriends005_GetFriendPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaState( params->steamIDFriend );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends005_GetFriendPersonaName(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends005_GetFriendPersonaName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaName((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends005_GetFriendPersonaName_params *params = (struct ISteamFriends_SteamFriends005_GetFriendPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaName( params->steamIDFriend );
+    return 0;
 }

-int cppISteamFriends_SteamFriends005_GetFriendAvatar(void *linux_side, CSteamID steamIDFriend, int eAvatarSize)
+NTSTATUS ISteamFriends_SteamFriends005_GetFriendAvatar( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendAvatar((CSteamID)steamIDFriend, (int)eAvatarSize);
+    struct ISteamFriends_SteamFriends005_GetFriendAvatar_params *params = (struct ISteamFriends_SteamFriends005_GetFriendAvatar_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    params->_ret = iface->GetFriendAvatar( params->steamIDFriend, params->eAvatarSize );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends005_GetFriendGamePlayed(void *linux_side, CSteamID steamIDFriend, FriendGameInfo_t * pFriendGameInfo)
+NTSTATUS ISteamFriends_SteamFriends005_GetFriendGamePlayed( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendGamePlayed((CSteamID)steamIDFriend, (FriendGameInfo_t *)pFriendGameInfo);
+    struct ISteamFriends_SteamFriends005_GetFriendGamePlayed_params *params = (struct ISteamFriends_SteamFriends005_GetFriendGamePlayed_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    params->_ret = iface->GetFriendGamePlayed( params->steamIDFriend, params->pFriendGameInfo );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends005_GetFriendPersonaNameHistory(void *linux_side, CSteamID steamIDFriend, int iPersonaName)
+NTSTATUS ISteamFriends_SteamFriends005_GetFriendPersonaNameHistory( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaNameHistory((CSteamID)steamIDFriend, (int)iPersonaName);
+    struct ISteamFriends_SteamFriends005_GetFriendPersonaNameHistory_params *params = (struct ISteamFriends_SteamFriends005_GetFriendPersonaNameHistory_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaNameHistory( params->steamIDFriend, params->iPersonaName );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends005_HasFriend(void *linux_side, CSteamID steamIDFriend, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends005_HasFriend( void *args )
 {
-    return ((ISteamFriends*)linux_side)->HasFriend((CSteamID)steamIDFriend, (int)iFriendFlags);
+    struct ISteamFriends_SteamFriends005_HasFriend_params *params = (struct ISteamFriends_SteamFriends005_HasFriend_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    params->_ret = iface->HasFriend( params->steamIDFriend, params->iFriendFlags );
+    return 0;
 }

-int cppISteamFriends_SteamFriends005_GetClanCount(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends005_GetClanCount( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanCount();
+    struct ISteamFriends_SteamFriends005_GetClanCount_params *params = (struct ISteamFriends_SteamFriends005_GetClanCount_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    params->_ret = iface->GetClanCount(  );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends005_GetClanByIndex(void *linux_side, int iClan)
+NTSTATUS ISteamFriends_SteamFriends005_GetClanByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanByIndex((int)iClan);
+    struct ISteamFriends_SteamFriends005_GetClanByIndex_params *params = (struct ISteamFriends_SteamFriends005_GetClanByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    *params->_ret = iface->GetClanByIndex( params->iClan );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends005_GetClanName(void *linux_side, CSteamID steamIDClan)
+NTSTATUS ISteamFriends_SteamFriends005_GetClanName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanName((CSteamID)steamIDClan);
+    struct ISteamFriends_SteamFriends005_GetClanName_params *params = (struct ISteamFriends_SteamFriends005_GetClanName_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    params->_ret = iface->GetClanName( params->steamIDClan );
+    return 0;
 }

-int cppISteamFriends_SteamFriends005_GetFriendCountFromSource(void *linux_side, CSteamID steamIDSource)
+NTSTATUS ISteamFriends_SteamFriends005_GetFriendCountFromSource( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendCountFromSource((CSteamID)steamIDSource);
+    struct ISteamFriends_SteamFriends005_GetFriendCountFromSource_params *params = (struct ISteamFriends_SteamFriends005_GetFriendCountFromSource_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    params->_ret = iface->GetFriendCountFromSource( params->steamIDSource );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends005_GetFriendFromSourceByIndex(void *linux_side, CSteamID steamIDSource, int iFriend)
+NTSTATUS ISteamFriends_SteamFriends005_GetFriendFromSourceByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendFromSourceByIndex((CSteamID)steamIDSource, (int)iFriend);
+    struct ISteamFriends_SteamFriends005_GetFriendFromSourceByIndex_params *params = (struct ISteamFriends_SteamFriends005_GetFriendFromSourceByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    *params->_ret = iface->GetFriendFromSourceByIndex( params->steamIDSource, params->iFriend );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends005_IsUserInSource(void *linux_side, CSteamID steamIDUser, CSteamID steamIDSource)
+NTSTATUS ISteamFriends_SteamFriends005_IsUserInSource( void *args )
 {
-    return ((ISteamFriends*)linux_side)->IsUserInSource((CSteamID)steamIDUser, (CSteamID)steamIDSource);
+    struct ISteamFriends_SteamFriends005_IsUserInSource_params *params = (struct ISteamFriends_SteamFriends005_IsUserInSource_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    params->_ret = iface->IsUserInSource( params->steamIDUser, params->steamIDSource );
+    return 0;
 }

-void cppISteamFriends_SteamFriends005_SetInGameVoiceSpeaking(void *linux_side, CSteamID steamIDUser, bool bSpeaking)
+NTSTATUS ISteamFriends_SteamFriends005_SetInGameVoiceSpeaking( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetInGameVoiceSpeaking((CSteamID)steamIDUser, (bool)bSpeaking);
+    struct ISteamFriends_SteamFriends005_SetInGameVoiceSpeaking_params *params = (struct ISteamFriends_SteamFriends005_SetInGameVoiceSpeaking_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    iface->SetInGameVoiceSpeaking( params->steamIDUser, params->bSpeaking );
+    return 0;
 }

-void cppISteamFriends_SteamFriends005_ActivateGameOverlay(void *linux_side, const char * pchDialog)
+NTSTATUS ISteamFriends_SteamFriends005_ActivateGameOverlay( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlay((const char *)pchDialog);
+    struct ISteamFriends_SteamFriends005_ActivateGameOverlay_params *params = (struct ISteamFriends_SteamFriends005_ActivateGameOverlay_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    iface->ActivateGameOverlay( params->pchDialog );
+    return 0;
 }

-void cppISteamFriends_SteamFriends005_ActivateGameOverlayToUser(void *linux_side, const char * pchDialog, CSteamID steamID)
+NTSTATUS ISteamFriends_SteamFriends005_ActivateGameOverlayToUser( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlayToUser((const char *)pchDialog, (CSteamID)steamID);
+    struct ISteamFriends_SteamFriends005_ActivateGameOverlayToUser_params *params = (struct ISteamFriends_SteamFriends005_ActivateGameOverlayToUser_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    iface->ActivateGameOverlayToUser( params->pchDialog, params->steamID );
+    return 0;
 }

-void cppISteamFriends_SteamFriends005_ActivateGameOverlayToWebPage(void *linux_side, const char * pchURL)
+NTSTATUS ISteamFriends_SteamFriends005_ActivateGameOverlayToWebPage( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlayToWebPage((const char *)pchURL);
+    struct ISteamFriends_SteamFriends005_ActivateGameOverlayToWebPage_params *params = (struct ISteamFriends_SteamFriends005_ActivateGameOverlayToWebPage_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    char *u_pchURL = steamclient_dos_to_unix_path( params->pchURL, 1 );
+    iface->ActivateGameOverlayToWebPage( u_pchURL );
+    steamclient_free_path( u_pchURL );
+    return 0;
 }

-void cppISteamFriends_SteamFriends005_ActivateGameOverlayToStore(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamFriends_SteamFriends005_ActivateGameOverlayToStore( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlayToStore((AppId_t)nAppID);
+    struct ISteamFriends_SteamFriends005_ActivateGameOverlayToStore_params *params = (struct ISteamFriends_SteamFriends005_ActivateGameOverlayToStore_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    iface->ActivateGameOverlayToStore( params->nAppID );
+    return 0;
 }

-void cppISteamFriends_SteamFriends005_SetPlayedWith(void *linux_side, CSteamID steamIDUserPlayedWith)
+NTSTATUS ISteamFriends_SteamFriends005_SetPlayedWith( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetPlayedWith((CSteamID)steamIDUserPlayedWith);
+    struct ISteamFriends_SteamFriends005_SetPlayedWith_params *params = (struct ISteamFriends_SteamFriends005_SetPlayedWith_params *)args;
+    struct u_ISteamFriends_SteamFriends005 *iface = (struct u_ISteamFriends_SteamFriends005 *)params->linux_side;
+    iface->SetPlayedWith( params->steamIDUserPlayedWith );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamFriends_SteamFriends005.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends005.h
@ -1,24 +0,0 @@
-extern const char * cppISteamFriends_SteamFriends005_GetPersonaName(void *);
-extern void cppISteamFriends_SteamFriends005_SetPersonaName(void *, const char *);
-extern EPersonaState cppISteamFriends_SteamFriends005_GetPersonaState(void *);
-extern int cppISteamFriends_SteamFriends005_GetFriendCount(void *, int);
-extern CSteamID cppISteamFriends_SteamFriends005_GetFriendByIndex(void *, int, int);
-extern EFriendRelationship cppISteamFriends_SteamFriends005_GetFriendRelationship(void *, CSteamID);
-extern EPersonaState cppISteamFriends_SteamFriends005_GetFriendPersonaState(void *, CSteamID);
-extern const char * cppISteamFriends_SteamFriends005_GetFriendPersonaName(void *, CSteamID);
-extern int cppISteamFriends_SteamFriends005_GetFriendAvatar(void *, CSteamID, int);
-extern bool cppISteamFriends_SteamFriends005_GetFriendGamePlayed(void *, CSteamID, FriendGameInfo_t *);
-extern const char * cppISteamFriends_SteamFriends005_GetFriendPersonaNameHistory(void *, CSteamID, int);
-extern bool cppISteamFriends_SteamFriends005_HasFriend(void *, CSteamID, int);
-extern int cppISteamFriends_SteamFriends005_GetClanCount(void *);
-extern CSteamID cppISteamFriends_SteamFriends005_GetClanByIndex(void *, int);
-extern const char * cppISteamFriends_SteamFriends005_GetClanName(void *, CSteamID);
-extern int cppISteamFriends_SteamFriends005_GetFriendCountFromSource(void *, CSteamID);
-extern CSteamID cppISteamFriends_SteamFriends005_GetFriendFromSourceByIndex(void *, CSteamID, int);
-extern bool cppISteamFriends_SteamFriends005_IsUserInSource(void *, CSteamID, CSteamID);
-extern void cppISteamFriends_SteamFriends005_SetInGameVoiceSpeaking(void *, CSteamID, bool);
-extern void cppISteamFriends_SteamFriends005_ActivateGameOverlay(void *, const char *);
-extern void cppISteamFriends_SteamFriends005_ActivateGameOverlayToUser(void *, const char *, CSteamID);
-extern void cppISteamFriends_SteamFriends005_ActivateGameOverlayToWebPage(void *, const char *);
-extern void cppISteamFriends_SteamFriends005_ActivateGameOverlayToStore(void *, AppId_t);
-extern void cppISteamFriends_SteamFriends005_SetPlayedWith(void *, CSteamID);
--- a/lsteamclient/cppISteamFriends_SteamFriends006.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends006.cpp
@ -1,146 +1,217 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_110/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_110
-#include "struct_converters.h"
-#include "cppISteamFriends_SteamFriends006.h"
-const char * cppISteamFriends_SteamFriends006_GetPersonaName(void *linux_side)
+
+NTSTATUS ISteamFriends_SteamFriends006_GetPersonaName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetPersonaName();
+    struct ISteamFriends_SteamFriends006_GetPersonaName_params *params = (struct ISteamFriends_SteamFriends006_GetPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->GetPersonaName(  );
+    return 0;
 }

-void cppISteamFriends_SteamFriends006_SetPersonaName(void *linux_side, const char * pchPersonaName)
+NTSTATUS ISteamFriends_SteamFriends006_SetPersonaName( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetPersonaName((const char *)pchPersonaName);
+    struct ISteamFriends_SteamFriends006_SetPersonaName_params *params = (struct ISteamFriends_SteamFriends006_SetPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    iface->SetPersonaName( params->pchPersonaName );
+    return 0;
 }

-EPersonaState cppISteamFriends_SteamFriends006_GetPersonaState(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends006_GetPersonaState( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetPersonaState();
+    struct ISteamFriends_SteamFriends006_GetPersonaState_params *params = (struct ISteamFriends_SteamFriends006_GetPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->GetPersonaState(  );
+    return 0;
 }

-int cppISteamFriends_SteamFriends006_GetFriendCount(void *linux_side, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends006_GetFriendCount( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendCount((int)iFriendFlags);
+    struct ISteamFriends_SteamFriends006_GetFriendCount_params *params = (struct ISteamFriends_SteamFriends006_GetFriendCount_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->GetFriendCount( params->iFriendFlags );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends006_GetFriendByIndex(void *linux_side, int iFriend, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends006_GetFriendByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendByIndex((int)iFriend, (int)iFriendFlags);
+    struct ISteamFriends_SteamFriends006_GetFriendByIndex_params *params = (struct ISteamFriends_SteamFriends006_GetFriendByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    *params->_ret = iface->GetFriendByIndex( params->iFriend, params->iFriendFlags );
+    return 0;
 }

-EFriendRelationship cppISteamFriends_SteamFriends006_GetFriendRelationship(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends006_GetFriendRelationship( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendRelationship((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends006_GetFriendRelationship_params *params = (struct ISteamFriends_SteamFriends006_GetFriendRelationship_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->GetFriendRelationship( params->steamIDFriend );
+    return 0;
 }

-EPersonaState cppISteamFriends_SteamFriends006_GetFriendPersonaState(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends006_GetFriendPersonaState( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaState((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends006_GetFriendPersonaState_params *params = (struct ISteamFriends_SteamFriends006_GetFriendPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaState( params->steamIDFriend );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends006_GetFriendPersonaName(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends006_GetFriendPersonaName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaName((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends006_GetFriendPersonaName_params *params = (struct ISteamFriends_SteamFriends006_GetFriendPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaName( params->steamIDFriend );
+    return 0;
 }

-int cppISteamFriends_SteamFriends006_GetFriendAvatar(void *linux_side, CSteamID steamIDFriend, int eAvatarSize)
+NTSTATUS ISteamFriends_SteamFriends006_GetFriendAvatar( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendAvatar((CSteamID)steamIDFriend, (int)eAvatarSize);
+    struct ISteamFriends_SteamFriends006_GetFriendAvatar_params *params = (struct ISteamFriends_SteamFriends006_GetFriendAvatar_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->GetFriendAvatar( params->steamIDFriend, params->eAvatarSize );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends006_GetFriendGamePlayed(void *linux_side, CSteamID steamIDFriend, FriendGameInfo_t * pFriendGameInfo)
+NTSTATUS ISteamFriends_SteamFriends006_GetFriendGamePlayed( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendGamePlayed((CSteamID)steamIDFriend, (FriendGameInfo_t *)pFriendGameInfo);
+    struct ISteamFriends_SteamFriends006_GetFriendGamePlayed_params *params = (struct ISteamFriends_SteamFriends006_GetFriendGamePlayed_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->GetFriendGamePlayed( params->steamIDFriend, params->pFriendGameInfo );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends006_GetFriendPersonaNameHistory(void *linux_side, CSteamID steamIDFriend, int iPersonaName)
+NTSTATUS ISteamFriends_SteamFriends006_GetFriendPersonaNameHistory( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaNameHistory((CSteamID)steamIDFriend, (int)iPersonaName);
+    struct ISteamFriends_SteamFriends006_GetFriendPersonaNameHistory_params *params = (struct ISteamFriends_SteamFriends006_GetFriendPersonaNameHistory_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaNameHistory( params->steamIDFriend, params->iPersonaName );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends006_HasFriend(void *linux_side, CSteamID steamIDFriend, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends006_HasFriend( void *args )
 {
-    return ((ISteamFriends*)linux_side)->HasFriend((CSteamID)steamIDFriend, (int)iFriendFlags);
+    struct ISteamFriends_SteamFriends006_HasFriend_params *params = (struct ISteamFriends_SteamFriends006_HasFriend_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->HasFriend( params->steamIDFriend, params->iFriendFlags );
+    return 0;
 }

-int cppISteamFriends_SteamFriends006_GetClanCount(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends006_GetClanCount( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanCount();
+    struct ISteamFriends_SteamFriends006_GetClanCount_params *params = (struct ISteamFriends_SteamFriends006_GetClanCount_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->GetClanCount(  );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends006_GetClanByIndex(void *linux_side, int iClan)
+NTSTATUS ISteamFriends_SteamFriends006_GetClanByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanByIndex((int)iClan);
+    struct ISteamFriends_SteamFriends006_GetClanByIndex_params *params = (struct ISteamFriends_SteamFriends006_GetClanByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    *params->_ret = iface->GetClanByIndex( params->iClan );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends006_GetClanName(void *linux_side, CSteamID steamIDClan)
+NTSTATUS ISteamFriends_SteamFriends006_GetClanName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanName((CSteamID)steamIDClan);
+    struct ISteamFriends_SteamFriends006_GetClanName_params *params = (struct ISteamFriends_SteamFriends006_GetClanName_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->GetClanName( params->steamIDClan );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends006_GetClanTag(void *linux_side, CSteamID steamIDClan)
+NTSTATUS ISteamFriends_SteamFriends006_GetClanTag( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanTag((CSteamID)steamIDClan);
+    struct ISteamFriends_SteamFriends006_GetClanTag_params *params = (struct ISteamFriends_SteamFriends006_GetClanTag_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->GetClanTag( params->steamIDClan );
+    return 0;
 }

-int cppISteamFriends_SteamFriends006_GetFriendCountFromSource(void *linux_side, CSteamID steamIDSource)
+NTSTATUS ISteamFriends_SteamFriends006_GetFriendCountFromSource( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendCountFromSource((CSteamID)steamIDSource);
+    struct ISteamFriends_SteamFriends006_GetFriendCountFromSource_params *params = (struct ISteamFriends_SteamFriends006_GetFriendCountFromSource_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->GetFriendCountFromSource( params->steamIDSource );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends006_GetFriendFromSourceByIndex(void *linux_side, CSteamID steamIDSource, int iFriend)
+NTSTATUS ISteamFriends_SteamFriends006_GetFriendFromSourceByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendFromSourceByIndex((CSteamID)steamIDSource, (int)iFriend);
+    struct ISteamFriends_SteamFriends006_GetFriendFromSourceByIndex_params *params = (struct ISteamFriends_SteamFriends006_GetFriendFromSourceByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    *params->_ret = iface->GetFriendFromSourceByIndex( params->steamIDSource, params->iFriend );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends006_IsUserInSource(void *linux_side, CSteamID steamIDUser, CSteamID steamIDSource)
+NTSTATUS ISteamFriends_SteamFriends006_IsUserInSource( void *args )
 {
-    return ((ISteamFriends*)linux_side)->IsUserInSource((CSteamID)steamIDUser, (CSteamID)steamIDSource);
+    struct ISteamFriends_SteamFriends006_IsUserInSource_params *params = (struct ISteamFriends_SteamFriends006_IsUserInSource_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    params->_ret = iface->IsUserInSource( params->steamIDUser, params->steamIDSource );
+    return 0;
 }

-void cppISteamFriends_SteamFriends006_SetInGameVoiceSpeaking(void *linux_side, CSteamID steamIDUser, bool bSpeaking)
+NTSTATUS ISteamFriends_SteamFriends006_SetInGameVoiceSpeaking( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetInGameVoiceSpeaking((CSteamID)steamIDUser, (bool)bSpeaking);
+    struct ISteamFriends_SteamFriends006_SetInGameVoiceSpeaking_params *params = (struct ISteamFriends_SteamFriends006_SetInGameVoiceSpeaking_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    iface->SetInGameVoiceSpeaking( params->steamIDUser, params->bSpeaking );
+    return 0;
 }

-void cppISteamFriends_SteamFriends006_ActivateGameOverlay(void *linux_side, const char * pchDialog)
+NTSTATUS ISteamFriends_SteamFriends006_ActivateGameOverlay( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlay((const char *)pchDialog);
+    struct ISteamFriends_SteamFriends006_ActivateGameOverlay_params *params = (struct ISteamFriends_SteamFriends006_ActivateGameOverlay_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    iface->ActivateGameOverlay( params->pchDialog );
+    return 0;
 }

-void cppISteamFriends_SteamFriends006_ActivateGameOverlayToUser(void *linux_side, const char * pchDialog, CSteamID steamID)
+NTSTATUS ISteamFriends_SteamFriends006_ActivateGameOverlayToUser( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlayToUser((const char *)pchDialog, (CSteamID)steamID);
+    struct ISteamFriends_SteamFriends006_ActivateGameOverlayToUser_params *params = (struct ISteamFriends_SteamFriends006_ActivateGameOverlayToUser_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    iface->ActivateGameOverlayToUser( params->pchDialog, params->steamID );
+    return 0;
 }

-void cppISteamFriends_SteamFriends006_ActivateGameOverlayToWebPage(void *linux_side, const char * pchURL)
+NTSTATUS ISteamFriends_SteamFriends006_ActivateGameOverlayToWebPage( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlayToWebPage((const char *)pchURL);
+    struct ISteamFriends_SteamFriends006_ActivateGameOverlayToWebPage_params *params = (struct ISteamFriends_SteamFriends006_ActivateGameOverlayToWebPage_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    char *u_pchURL = steamclient_dos_to_unix_path( params->pchURL, 1 );
+    iface->ActivateGameOverlayToWebPage( u_pchURL );
+    steamclient_free_path( u_pchURL );
+    return 0;
 }

-void cppISteamFriends_SteamFriends006_ActivateGameOverlayToStore(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamFriends_SteamFriends006_ActivateGameOverlayToStore( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlayToStore((AppId_t)nAppID);
+    struct ISteamFriends_SteamFriends006_ActivateGameOverlayToStore_params *params = (struct ISteamFriends_SteamFriends006_ActivateGameOverlayToStore_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    iface->ActivateGameOverlayToStore( params->nAppID );
+    return 0;
 }

-void cppISteamFriends_SteamFriends006_SetPlayedWith(void *linux_side, CSteamID steamIDUserPlayedWith)
+NTSTATUS ISteamFriends_SteamFriends006_SetPlayedWith( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetPlayedWith((CSteamID)steamIDUserPlayedWith);
+    struct ISteamFriends_SteamFriends006_SetPlayedWith_params *params = (struct ISteamFriends_SteamFriends006_SetPlayedWith_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    iface->SetPlayedWith( params->steamIDUserPlayedWith );
+    return 0;
 }

-void cppISteamFriends_SteamFriends006_ActivateGameOverlayInviteDialog(void *linux_side, CSteamID steamIDLobby)
+NTSTATUS ISteamFriends_SteamFriends006_ActivateGameOverlayInviteDialog( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlayInviteDialog((CSteamID)steamIDLobby);
+    struct ISteamFriends_SteamFriends006_ActivateGameOverlayInviteDialog_params *params = (struct ISteamFriends_SteamFriends006_ActivateGameOverlayInviteDialog_params *)args;
+    struct u_ISteamFriends_SteamFriends006 *iface = (struct u_ISteamFriends_SteamFriends006 *)params->linux_side;
+    iface->ActivateGameOverlayInviteDialog( params->steamIDLobby );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamFriends_SteamFriends006.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends006.h
@ -1,26 +0,0 @@
-extern const char * cppISteamFriends_SteamFriends006_GetPersonaName(void *);
-extern void cppISteamFriends_SteamFriends006_SetPersonaName(void *, const char *);
-extern EPersonaState cppISteamFriends_SteamFriends006_GetPersonaState(void *);
-extern int cppISteamFriends_SteamFriends006_GetFriendCount(void *, int);
-extern CSteamID cppISteamFriends_SteamFriends006_GetFriendByIndex(void *, int, int);
-extern EFriendRelationship cppISteamFriends_SteamFriends006_GetFriendRelationship(void *, CSteamID);
-extern EPersonaState cppISteamFriends_SteamFriends006_GetFriendPersonaState(void *, CSteamID);
-extern const char * cppISteamFriends_SteamFriends006_GetFriendPersonaName(void *, CSteamID);
-extern int cppISteamFriends_SteamFriends006_GetFriendAvatar(void *, CSteamID, int);
-extern bool cppISteamFriends_SteamFriends006_GetFriendGamePlayed(void *, CSteamID, FriendGameInfo_t *);
-extern const char * cppISteamFriends_SteamFriends006_GetFriendPersonaNameHistory(void *, CSteamID, int);
-extern bool cppISteamFriends_SteamFriends006_HasFriend(void *, CSteamID, int);
-extern int cppISteamFriends_SteamFriends006_GetClanCount(void *);
-extern CSteamID cppISteamFriends_SteamFriends006_GetClanByIndex(void *, int);
-extern const char * cppISteamFriends_SteamFriends006_GetClanName(void *, CSteamID);
-extern const char * cppISteamFriends_SteamFriends006_GetClanTag(void *, CSteamID);
-extern int cppISteamFriends_SteamFriends006_GetFriendCountFromSource(void *, CSteamID);
-extern CSteamID cppISteamFriends_SteamFriends006_GetFriendFromSourceByIndex(void *, CSteamID, int);
-extern bool cppISteamFriends_SteamFriends006_IsUserInSource(void *, CSteamID, CSteamID);
-extern void cppISteamFriends_SteamFriends006_SetInGameVoiceSpeaking(void *, CSteamID, bool);
-extern void cppISteamFriends_SteamFriends006_ActivateGameOverlay(void *, const char *);
-extern void cppISteamFriends_SteamFriends006_ActivateGameOverlayToUser(void *, const char *, CSteamID);
-extern void cppISteamFriends_SteamFriends006_ActivateGameOverlayToWebPage(void *, const char *);
-extern void cppISteamFriends_SteamFriends006_ActivateGameOverlayToStore(void *, AppId_t);
-extern void cppISteamFriends_SteamFriends006_SetPlayedWith(void *, CSteamID);
-extern void cppISteamFriends_SteamFriends006_ActivateGameOverlayInviteDialog(void *, CSteamID);
--- a/lsteamclient/cppISteamFriends_SteamFriends007.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends007.cpp
@ -1,156 +1,233 @@
-#include "steam_defs.h"
-#pragma push_macro("__cdecl")
-#undef __cdecl
-#define __cdecl
-#include "steamworks_sdk_111/steam_api.h"
-#pragma pop_macro("__cdecl")
-#include "steamclient_private.h"
-#ifdef __cplusplus
-extern "C" {
+/* This file is auto-generated, do not edit. */
+#include "unix_private.h"
+
+#if 0
+#pragma makedep unix
 #endif
-#define SDKVER_111
-#include "struct_converters.h"
-#include "cppISteamFriends_SteamFriends007.h"
-const char * cppISteamFriends_SteamFriends007_GetPersonaName(void *linux_side)
+
+NTSTATUS ISteamFriends_SteamFriends007_GetPersonaName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetPersonaName();
+    struct ISteamFriends_SteamFriends007_GetPersonaName_params *params = (struct ISteamFriends_SteamFriends007_GetPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetPersonaName(  );
+    return 0;
 }

-void cppISteamFriends_SteamFriends007_SetPersonaName(void *linux_side, const char * pchPersonaName)
+NTSTATUS ISteamFriends_SteamFriends007_SetPersonaName( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetPersonaName((const char *)pchPersonaName);
+    struct ISteamFriends_SteamFriends007_SetPersonaName_params *params = (struct ISteamFriends_SteamFriends007_SetPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    iface->SetPersonaName( params->pchPersonaName );
+    return 0;
 }

-EPersonaState cppISteamFriends_SteamFriends007_GetPersonaState(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends007_GetPersonaState( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetPersonaState();
+    struct ISteamFriends_SteamFriends007_GetPersonaState_params *params = (struct ISteamFriends_SteamFriends007_GetPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetPersonaState(  );
+    return 0;
 }

-int cppISteamFriends_SteamFriends007_GetFriendCount(void *linux_side, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends007_GetFriendCount( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendCount((int)iFriendFlags);
+    struct ISteamFriends_SteamFriends007_GetFriendCount_params *params = (struct ISteamFriends_SteamFriends007_GetFriendCount_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetFriendCount( params->iFriendFlags );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends007_GetFriendByIndex(void *linux_side, int iFriend, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends007_GetFriendByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendByIndex((int)iFriend, (int)iFriendFlags);
+    struct ISteamFriends_SteamFriends007_GetFriendByIndex_params *params = (struct ISteamFriends_SteamFriends007_GetFriendByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    *params->_ret = iface->GetFriendByIndex( params->iFriend, params->iFriendFlags );
+    return 0;
 }

-EFriendRelationship cppISteamFriends_SteamFriends007_GetFriendRelationship(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends007_GetFriendRelationship( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendRelationship((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends007_GetFriendRelationship_params *params = (struct ISteamFriends_SteamFriends007_GetFriendRelationship_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetFriendRelationship( params->steamIDFriend );
+    return 0;
 }

-EPersonaState cppISteamFriends_SteamFriends007_GetFriendPersonaState(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends007_GetFriendPersonaState( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaState((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends007_GetFriendPersonaState_params *params = (struct ISteamFriends_SteamFriends007_GetFriendPersonaState_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaState( params->steamIDFriend );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends007_GetFriendPersonaName(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends007_GetFriendPersonaName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaName((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends007_GetFriendPersonaName_params *params = (struct ISteamFriends_SteamFriends007_GetFriendPersonaName_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaName( params->steamIDFriend );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends007_GetFriendGamePlayed(void *linux_side, CSteamID steamIDFriend, FriendGameInfo_t * pFriendGameInfo)
+NTSTATUS ISteamFriends_SteamFriends007_GetFriendGamePlayed( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendGamePlayed((CSteamID)steamIDFriend, (FriendGameInfo_t *)pFriendGameInfo);
+    struct ISteamFriends_SteamFriends007_GetFriendGamePlayed_params *params = (struct ISteamFriends_SteamFriends007_GetFriendGamePlayed_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetFriendGamePlayed( params->steamIDFriend, params->pFriendGameInfo );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends007_GetFriendPersonaNameHistory(void *linux_side, CSteamID steamIDFriend, int iPersonaName)
+NTSTATUS ISteamFriends_SteamFriends007_GetFriendPersonaNameHistory( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendPersonaNameHistory((CSteamID)steamIDFriend, (int)iPersonaName);
+    struct ISteamFriends_SteamFriends007_GetFriendPersonaNameHistory_params *params = (struct ISteamFriends_SteamFriends007_GetFriendPersonaNameHistory_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetFriendPersonaNameHistory( params->steamIDFriend, params->iPersonaName );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends007_HasFriend(void *linux_side, CSteamID steamIDFriend, int iFriendFlags)
+NTSTATUS ISteamFriends_SteamFriends007_HasFriend( void *args )
 {
-    return ((ISteamFriends*)linux_side)->HasFriend((CSteamID)steamIDFriend, (int)iFriendFlags);
+    struct ISteamFriends_SteamFriends007_HasFriend_params *params = (struct ISteamFriends_SteamFriends007_HasFriend_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->HasFriend( params->steamIDFriend, params->iFriendFlags );
+    return 0;
 }

-int cppISteamFriends_SteamFriends007_GetClanCount(void *linux_side)
+NTSTATUS ISteamFriends_SteamFriends007_GetClanCount( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanCount();
+    struct ISteamFriends_SteamFriends007_GetClanCount_params *params = (struct ISteamFriends_SteamFriends007_GetClanCount_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetClanCount(  );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends007_GetClanByIndex(void *linux_side, int iClan)
+NTSTATUS ISteamFriends_SteamFriends007_GetClanByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanByIndex((int)iClan);
+    struct ISteamFriends_SteamFriends007_GetClanByIndex_params *params = (struct ISteamFriends_SteamFriends007_GetClanByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    *params->_ret = iface->GetClanByIndex( params->iClan );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends007_GetClanName(void *linux_side, CSteamID steamIDClan)
+NTSTATUS ISteamFriends_SteamFriends007_GetClanName( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanName((CSteamID)steamIDClan);
+    struct ISteamFriends_SteamFriends007_GetClanName_params *params = (struct ISteamFriends_SteamFriends007_GetClanName_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetClanName( params->steamIDClan );
+    return 0;
 }

-const char * cppISteamFriends_SteamFriends007_GetClanTag(void *linux_side, CSteamID steamIDClan)
+NTSTATUS ISteamFriends_SteamFriends007_GetClanTag( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetClanTag((CSteamID)steamIDClan);
+    struct ISteamFriends_SteamFriends007_GetClanTag_params *params = (struct ISteamFriends_SteamFriends007_GetClanTag_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetClanTag( params->steamIDClan );
+    return 0;
 }

-int cppISteamFriends_SteamFriends007_GetFriendCountFromSource(void *linux_side, CSteamID steamIDSource)
+NTSTATUS ISteamFriends_SteamFriends007_GetFriendCountFromSource( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendCountFromSource((CSteamID)steamIDSource);
+    struct ISteamFriends_SteamFriends007_GetFriendCountFromSource_params *params = (struct ISteamFriends_SteamFriends007_GetFriendCountFromSource_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetFriendCountFromSource( params->steamIDSource );
+    return 0;
 }

-CSteamID cppISteamFriends_SteamFriends007_GetFriendFromSourceByIndex(void *linux_side, CSteamID steamIDSource, int iFriend)
+NTSTATUS ISteamFriends_SteamFriends007_GetFriendFromSourceByIndex( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetFriendFromSourceByIndex((CSteamID)steamIDSource, (int)iFriend);
+    struct ISteamFriends_SteamFriends007_GetFriendFromSourceByIndex_params *params = (struct ISteamFriends_SteamFriends007_GetFriendFromSourceByIndex_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    *params->_ret = iface->GetFriendFromSourceByIndex( params->steamIDSource, params->iFriend );
+    return 0;
 }

-bool cppISteamFriends_SteamFriends007_IsUserInSource(void *linux_side, CSteamID steamIDUser, CSteamID steamIDSource)
+NTSTATUS ISteamFriends_SteamFriends007_IsUserInSource( void *args )
 {
-    return ((ISteamFriends*)linux_side)->IsUserInSource((CSteamID)steamIDUser, (CSteamID)steamIDSource);
+    struct ISteamFriends_SteamFriends007_IsUserInSource_params *params = (struct ISteamFriends_SteamFriends007_IsUserInSource_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->IsUserInSource( params->steamIDUser, params->steamIDSource );
+    return 0;
 }

-void cppISteamFriends_SteamFriends007_SetInGameVoiceSpeaking(void *linux_side, CSteamID steamIDUser, bool bSpeaking)
+NTSTATUS ISteamFriends_SteamFriends007_SetInGameVoiceSpeaking( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetInGameVoiceSpeaking((CSteamID)steamIDUser, (bool)bSpeaking);
+    struct ISteamFriends_SteamFriends007_SetInGameVoiceSpeaking_params *params = (struct ISteamFriends_SteamFriends007_SetInGameVoiceSpeaking_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    iface->SetInGameVoiceSpeaking( params->steamIDUser, params->bSpeaking );
+    return 0;
 }

-void cppISteamFriends_SteamFriends007_ActivateGameOverlay(void *linux_side, const char * pchDialog)
+NTSTATUS ISteamFriends_SteamFriends007_ActivateGameOverlay( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlay((const char *)pchDialog);
+    struct ISteamFriends_SteamFriends007_ActivateGameOverlay_params *params = (struct ISteamFriends_SteamFriends007_ActivateGameOverlay_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    iface->ActivateGameOverlay( params->pchDialog );
+    return 0;
 }

-void cppISteamFriends_SteamFriends007_ActivateGameOverlayToUser(void *linux_side, const char * pchDialog, CSteamID steamID)
+NTSTATUS ISteamFriends_SteamFriends007_ActivateGameOverlayToUser( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlayToUser((const char *)pchDialog, (CSteamID)steamID);
+    struct ISteamFriends_SteamFriends007_ActivateGameOverlayToUser_params *params = (struct ISteamFriends_SteamFriends007_ActivateGameOverlayToUser_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    iface->ActivateGameOverlayToUser( params->pchDialog, params->steamID );
+    return 0;
 }

-void cppISteamFriends_SteamFriends007_ActivateGameOverlayToWebPage(void *linux_side, const char * pchURL)
+NTSTATUS ISteamFriends_SteamFriends007_ActivateGameOverlayToWebPage( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlayToWebPage((const char *)pchURL);
+    struct ISteamFriends_SteamFriends007_ActivateGameOverlayToWebPage_params *params = (struct ISteamFriends_SteamFriends007_ActivateGameOverlayToWebPage_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    char *u_pchURL = steamclient_dos_to_unix_path( params->pchURL, 1 );
+    iface->ActivateGameOverlayToWebPage( u_pchURL );
+    steamclient_free_path( u_pchURL );
+    return 0;
 }

-void cppISteamFriends_SteamFriends007_ActivateGameOverlayToStore(void *linux_side, AppId_t nAppID)
+NTSTATUS ISteamFriends_SteamFriends007_ActivateGameOverlayToStore( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlayToStore((AppId_t)nAppID);
+    struct ISteamFriends_SteamFriends007_ActivateGameOverlayToStore_params *params = (struct ISteamFriends_SteamFriends007_ActivateGameOverlayToStore_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    iface->ActivateGameOverlayToStore( params->nAppID );
+    return 0;
 }

-void cppISteamFriends_SteamFriends007_SetPlayedWith(void *linux_side, CSteamID steamIDUserPlayedWith)
+NTSTATUS ISteamFriends_SteamFriends007_SetPlayedWith( void *args )
 {
-    ((ISteamFriends*)linux_side)->SetPlayedWith((CSteamID)steamIDUserPlayedWith);
+    struct ISteamFriends_SteamFriends007_SetPlayedWith_params *params = (struct ISteamFriends_SteamFriends007_SetPlayedWith_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    iface->SetPlayedWith( params->steamIDUserPlayedWith );
+    return 0;
 }

-void cppISteamFriends_SteamFriends007_ActivateGameOverlayInviteDialog(void *linux_side, CSteamID steamIDLobby)
+NTSTATUS ISteamFriends_SteamFriends007_ActivateGameOverlayInviteDialog( void *args )
 {
-    ((ISteamFriends*)linux_side)->ActivateGameOverlayInviteDialog((CSteamID)steamIDLobby);
+    struct ISteamFriends_SteamFriends007_ActivateGameOverlayInviteDialog_params *params = (struct ISteamFriends_SteamFriends007_ActivateGameOverlayInviteDialog_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    iface->ActivateGameOverlayInviteDialog( params->steamIDLobby );
+    return 0;
 }

-int cppISteamFriends_SteamFriends007_GetSmallFriendAvatar(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends007_GetSmallFriendAvatar( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetSmallFriendAvatar((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends007_GetSmallFriendAvatar_params *params = (struct ISteamFriends_SteamFriends007_GetSmallFriendAvatar_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetSmallFriendAvatar( params->steamIDFriend );
+    return 0;
 }

-int cppISteamFriends_SteamFriends007_GetMediumFriendAvatar(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends007_GetMediumFriendAvatar( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetMediumFriendAvatar((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends007_GetMediumFriendAvatar_params *params = (struct ISteamFriends_SteamFriends007_GetMediumFriendAvatar_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetMediumFriendAvatar( params->steamIDFriend );
+    return 0;
 }

-int cppISteamFriends_SteamFriends007_GetLargeFriendAvatar(void *linux_side, CSteamID steamIDFriend)
+NTSTATUS ISteamFriends_SteamFriends007_GetLargeFriendAvatar( void *args )
 {
-    return ((ISteamFriends*)linux_side)->GetLargeFriendAvatar((CSteamID)steamIDFriend);
+    struct ISteamFriends_SteamFriends007_GetLargeFriendAvatar_params *params = (struct ISteamFriends_SteamFriends007_GetLargeFriendAvatar_params *)args;
+    struct u_ISteamFriends_SteamFriends007 *iface = (struct u_ISteamFriends_SteamFriends007 *)params->linux_side;
+    params->_ret = iface->GetLargeFriendAvatar( params->steamIDFriend );
+    return 0;
 }

-#ifdef __cplusplus
-}
-#endif
--- a/lsteamclient/cppISteamFriends_SteamFriends007.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends007.h
@ -1,28 +0,0 @@
-extern const char * cppISteamFriends_SteamFriends007_GetPersonaName(void *);
-extern void cppISteamFriends_SteamFriends007_SetPersonaName(void *, const char *);
-extern EPersonaState cppISteamFriends_SteamFriends007_GetPersonaState(void *);
-extern int cppISteamFriends_SteamFriends007_GetFriendCount(void *, int);
-extern CSteamID cppISteamFriends_SteamFriends007_GetFriendByIndex(void *, int, int);
-extern EFriendRelationship cppISteamFriends_SteamFriends007_GetFriendRelationship(void *, CSteamID);
-extern EPersonaState cppISteamFriends_SteamFriends007_GetFriendPersonaState(void *, CSteamID);
-extern const char * cppISteamFriends_SteamFriends007_GetFriendPersonaName(void *, CSteamID);
-extern bool cppISteamFriends_SteamFriends007_GetFriendGamePlayed(void *, CSteamID, FriendGameInfo_t *);
-extern const char * cppISteamFriends_SteamFriends007_GetFriendPersonaNameHistory(void *, CSteamID, int);
-extern bool cppISteamFriends_SteamFriends007_HasFriend(void *, CSteamID, int);
-extern int cppISteamFriends_SteamFriends007_GetClanCount(void *);
-extern CSteamID cppISteamFriends_SteamFriends007_GetClanByIndex(void *, int);
-extern const char * cppISteamFriends_SteamFriends007_GetClanName(void *, CSteamID);
-extern const char * cppISteamFriends_SteamFriends007_GetClanTag(void *, CSteamID);
-extern int cppISteamFriends_SteamFriends007_GetFriendCountFromSource(void *, CSteamID);
-extern CSteamID cppISteamFriends_SteamFriends007_GetFriendFromSourceByIndex(void *, CSteamID, int);
-extern bool cppISteamFriends_SteamFriends007_IsUserInSource(void *, CSteamID, CSteamID);
-extern void cppISteamFriends_SteamFriends007_SetInGameVoiceSpeaking(void *, CSteamID, bool);
-extern void cppISteamFriends_SteamFriends007_ActivateGameOverlay(void *, const char *);
-extern void cppISteamFriends_SteamFriends007_ActivateGameOverlayToUser(void *, const char *, CSteamID);
-extern void cppISteamFriends_SteamFriends007_ActivateGameOverlayToWebPage(void *, const char *);
-extern void cppISteamFriends_SteamFriends007_ActivateGameOverlayToStore(void *, AppId_t);
-extern void cppISteamFriends_SteamFriends007_SetPlayedWith(void *, CSteamID);
-extern void cppISteamFriends_SteamFriends007_ActivateGameOverlayInviteDialog(void *, CSteamID);
-extern int cppISteamFriends_SteamFriends007_GetSmallFriendAvatar(void *, CSteamID);
-extern int cppISteamFriends_SteamFriends007_GetMediumFriendAvatar(void *, CSteamID);
-extern int cppISteamFriends_SteamFriends007_GetLargeFriendAvatar(void *, CSteamID);
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`Subproject commit 538b2676eaac29565e4f1034a6f8a59ce158213d`
				`@ -1 +0,0 @@`
				`extern uint32 cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001_GetAppOwnershipTicketData(void , uint32, void , uint32, uint32 , uint32 , uint32 , uint32 );`
				`@ -1 +0,0 @@`
				`extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION001_GetAppData(void , AppId_t, const char , char *, int);`