update wine

proton: Remove LOST EMBER from MFDXGI hack
2023-02-02 09:22:51 +01:00 · 2023-01-20 14:36:35 +02:00 · 2022-12-16 20:40:44 +01:00 · 2022-12-12 13:43:56 +01:00 · 2022-12-06 19:21:57 +02:00 · 2022-12-06 19:21:57 +02:00
1427 changed files with 236279 additions and 557154 deletions
--- a/.github/ISSUE_TEMPLATE/compatibility-report.md
+++ b/.github/ISSUE_TEMPLATE/compatibility-report.md
@ -10,7 +10,7 @@ about: Game compatibility issues.

 ## System Information
 - GPU: <!-- e.g. RX 580 or GTX 970 -->
- Video driver version: <!-- e.g. Mesa 18.2 or nvidia 396.54 -->
+- Driver/LLVM version: <!-- e.g. Mesa 18.2/7.0.0 or nvidia 396.54 -->
 - Kernel version: <!-- e.g. 4.17 -->
 - Link to full system information report as [Gist](https://gist.github.com/):
 - Proton version:
@ -39,8 +39,6 @@ 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 Diagnostics` to
-   the gist.
-6. Please search for open issues and pull requests by the name of the game and
+5. 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/.github/ISSUE_TEMPLATE/whitelist-request.md
+++ b/.github/ISSUE_TEMPLATE/whitelist-request.md
@ -10,7 +10,7 @@ about: Games tested and found to have no issues.

 ## System Information
 - GPU: <!-- e.g. RX 580 or GTX 970 -->
- Video driver version: <!-- e.g. Mesa 18.2 or nvidia 396.54 -->
+- Driver/LLVM version: <!-- e.g. Mesa 18.2/7.0.0 or nvidia 396.54 -->
 - Distro version: <!-- e.g. Ubuntu 18.04 -->
 - Link to full system information report as [Gist](https://gist.github.com/):
 - Proton version:
--- a/.gitmodules
+++ b/.gitmodules
@ -13,6 +13,12 @@
 [submodule "gstreamer"]
 	path = gstreamer
 	url = https://github.com/GStreamer/gstreamer.git
+[submodule "gst-plugins-base"]
+	path = gst-plugins-base
+	url = https://github.com/GStreamer/gst-plugins-base.git
+[submodule "gst-plugins-good"]
+	path = gst-plugins-good
+	url = https://github.com/GStreamer/gst-plugins-good.git
 [submodule "gst-orc"]
 	path = gst-orc
 	url = https://github.com/GStreamer/orc.git
--- a/2
+++ b/2
@ -4,7 +4,7 @@ All rights reserved.
 Redistribution and use of Proton in source and binary forms is governed
 by a variety of licenses.

-Refer to the contents of LICENSE.proton for the license for the top
+Refer to the contents of LICENCE.proton for the license for the top
 level contents of the Proton project.

 Proton uses a variety of other software, each of which is governed
--- a/73
+++ b/73
@ -57,12 +57,9 @@ ifneq ($(enable_ccache),0)
    CONFIGURE_CMD += --enable-ccache
 endif

-TOPLEVELGOALS := all any clean configure deploy downloads help install module proton protonsdk redist
-CONTAINERGOALS := $(filter-out $(TOPLEVELGOALS),$(MAKECMDGOALS))
-CONTAINERGOALS := $(filter-out $(BUILD_ROOT)/%,$(CONTAINERGOALS))
-
 all: help
-.PHONY: $(TOPLEVELGOALS)
+
+.PHONY: help clean configure proton install deploy module protonsdk

 help:
 	@echo "Proton Makefile instructions"
@ -124,24 +121,26 @@ ifeq ($(protonsdk_version),local)
 configure: protonsdk
 endif

-proton: configure
+downloads: configure
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR) downloads
+
+proton: downloads
 	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) dist && \
 	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
+install: downloads
 	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) install
 	echo "Proton installed to your local Steam installation"

 redist: | $(BUILD_ROOT)/$(DEPLOY_DIR)
-redist: configure
+redist: downloads
 	rm -rf $(BUILD_ROOT)/$(DEPLOY_DIR)/* && \
 	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) redist && \
 	cp -Rf $(BUILD_DIR)/redist/* $(BUILD_ROOT)/$(DEPLOY_DIR) && \
 	echo "Proton build available at $(BUILD_ROOT)/$(DEPLOY_DIR)"

 deploy: | $(BUILD_ROOT)/$(DEPLOY_DIR)-deploy
-deploy: configure
+deploy: downloads
 	rm -rf $(BUILD_ROOT)/$(DEPLOY_DIR)-deploy/* && \
 	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) deploy && \
 	cp -Rf $(BUILD_DIR)/deploy/* $(BUILD_ROOT)/$(DEPLOY_DIR)-deploy && \
@ -151,7 +150,7 @@ module: | $(BUILD_ROOT)/$(module)/lib/wine/i386-windows
 module: | $(BUILD_ROOT)/$(module)/lib/wine/i386-unix
 module: | $(BUILD_ROOT)/$(module)/lib64/wine/x86_64-windows
 module: | $(BUILD_ROOT)/$(module)/lib64/wine/x86_64-unix
-module: configure
+module: downloads
 	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) module=$(module) module && \
 	cp -f $(BUILD_DIR)/obj-wine32/dlls/$(module)/$(MODULE_PEFILE) $(BUILD_ROOT)/$(module)/lib/wine/i386-windows/ && \
 	cp -f $(BUILD_DIR)/obj-wine64/dlls/$(module)/$(MODULE_PEFILE) $(BUILD_ROOT)/$(module)/lib64/wine/x86_64-windows/ && \
@ -164,58 +163,62 @@ module: configure
 		cp -f $(BUILD_DIR)/obj-wine64/dlls/$(module)/$(MODULE_SOFILE) $(BUILD_ROOT)/$(module)/lib64/wine/x86_64-unix/; \
 	fi

-any $(CONTAINERGOALS): configure
-	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) $(CONTAINERGOALS)
-
 dxvk: | $(BUILD_ROOT)/dxvk/lib/wine/dxvk
 dxvk: | $(BUILD_ROOT)/dxvk/lib64/wine/dxvk
-dxvk: any
-	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: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) dxvk && \
+	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/

 dxvk-nvapi: | $(BUILD_ROOT)/dxvk-nvapi/lib/wine/nvapi
 dxvk-nvapi: | $(BUILD_ROOT)/dxvk-nvapi/lib64/wine/nvapi
-dxvk-nvapi: any
+dxvk-nvapi: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) dxvk-nvapi && \
 	cp -f $(BUILD_DIR)/dist/files/lib/wine/nvapi/*.dll $(BUILD_ROOT)/dxvk-nvapi/lib/wine/nvapi/ && \
 	cp -f $(BUILD_DIR)/dist/files/lib64/wine/nvapi/*.dll $(BUILD_ROOT)/dxvk-nvapi/lib64/wine/nvapi/

 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/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/
+vkd3d-proton: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) vkd3d-proton && \
+	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/

 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/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/
+lsteamclient: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) lsteamclient && \
+	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/

 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/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/
+vrclient: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) vrclient && \
+	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/

 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/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/
+wineopenxr: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) wineopenxr && \
+	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/

 battleye: | $(BUILD_ROOT)/battleye/v1/lib/wine/i386-windows
 battleye: | $(BUILD_ROOT)/battleye/v1/lib/wine/i386-unix
 battleye: | $(BUILD_ROOT)/battleye/v1/lib64/wine/x86_64-windows
 battleye: | $(BUILD_ROOT)/battleye/v1/lib64/wine/x86_64-unix
-battleye: any
+battleye: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) battleye && \
 	cp -f $(BUILD_DIR)/dist-battleye/v1/lib/wine/i386-windows/beclient.dll $(BUILD_ROOT)/battleye/v1/lib/wine/i386-windows/ && \
 	cp -f $(BUILD_DIR)/dist-battleye/v1/lib/wine/i386-unix/beclient.dll.so $(BUILD_ROOT)/battleye/v1/lib/wine/i386-unix/ && \
 	cp -f $(BUILD_DIR)/dist-battleye/v1/lib64/wine/x86_64-windows/beclient_x64.dll $(BUILD_ROOT)/battleye/v1/lib64/wine/x86_64-windows/ && \
--- a/Makefile.in
+++ b/Makefile.in
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8899a91c17ce9618f565f42408b47db1d6e9ccc7
+Subproject commit 80adfd9ace05be069bfd3cbfa87a64dbee0d0a02
--- a/README.md
+++ b/README.md
@ -160,7 +160,7 @@ E.g.:
 ```
 mkdir ../debug-proton-build && cd ../debug-proton-build
 ../proton/configure.sh --enable-ccache --build-name=debug_build
-make UNSTRIPPED_BUILD=1 install
+make UNSTRIPPED_BUILD=1 install`
 ```


@ -218,44 +218,6 @@ 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`
-----------------------
-
-For use with [clangd](https://clangd.llvm.org/) LSP server and similar tooling.
-
-Projects built using cmake or meson (e.g. vkd3d-proton) automatically come with
-`compile_commands.json`. For autotools (e.g. wine) you have to [configure the
-build](#configuring-the-build) with `--enable-bear` that uses
-[bear](https://github.com/rizsotto/Bear) to create the compilation database.
-It's not on by default as it make the build slightly slower.
-
-The build system collects all the created compile_commands.json files in a
-build subdirectory named `compile_commands/`.
-
-The paths are translated to point to the real source (i.e. not the rsynced
-copy). It still may depend on build directory for things like auto-generated
-`config.h` though and for wine it may be beneficial to run `tools/make_requests`
-in you source directories as those changes are not committed.
-
-You can then configure your editor to use that file for clangd in a few ways:
-
-1) directly - some editors/plugins allow you to specify the path to `compile_commands.json`
-2) via `.clangd` file, e.g.
-```bash
-cd src/proton/wine/
-cat > .clangd <<EOF
-CompileFlags:
-  CompilationDatabase: ../build/current-dev/compile_commands/wine64/
-EOF
-```
-3) by symlinking:
-```bash
-ln -s ../build/current-dev/compile_commands/wine64/compile_commands.json .
-```
-

 Runtime Config Options
 ----------------------
@ -286,16 +248,17 @@ 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. |
-| `disablenvapi`        | `PROTON_DISABLE_NVAPI`             | Disable NVIDIA's NVAPI GPU support library. |
+| `enablenvapi`         | `PROTON_ENABLE_NVAPI`              | Enable 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. |
@ -309,7 +272,8 @@ 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. |
-| `xalia`               | `PROTON_USE_XALIA`                 | Enable Xalia, a program that can add a gamepad UI for some keyboard/mouse interfaces. |
+| `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. |
 | `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/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 538b2676eaac29565e4f1034a6f8a59ce158213d
--- a/configure.sh
+++ b/configure.sh
@ -19,9 +19,9 @@ if [[ $(tput colors 2>/dev/null || echo 0) -gt 0 ]]; then
  COLOR_CLEAR=$'\e[0m'
 fi

-sh_quote() {
+sh_quote() { 
        local quoted
-        quoted="$(printf '%q ' "$@")"; [[ $# -eq 0 ]] || echo "${quoted:0:-1}";
+        quoted="$(printf '%q ' "$@")"; [[ $# -eq 0 ]] || echo "${quoted:0:-1}"; 
 }
 err()      { echo >&2 "${COLOR_ERR}!!${COLOR_CLEAR} $*"; }
 stat()     { echo >&2 "${COLOR_STAT}::${COLOR_CLEAR} $*"; }
@ -50,14 +50,14 @@ CONTAINER_MOUNT_OPTS=""

 check_container_engine() {
    stat "Trying $1."
-    if ! cmd $1 run --rm $2; then
+    if ! cmd $1 run --rm $arg_protonsdk_image; then
        info "$1 is unable to run the container."
        return 1
    fi

    touch permission_check
    local inner_uid="$($1 run -v "$(pwd):/test$CONTAINER_MOUNT_OPTS" \
-                                            --rm $2 \
+                                            --rm $arg_protonsdk_image \
                                            stat --format "%u" /test/permission_check 2>&1)"
    rm permission_check

@ -94,21 +94,11 @@ function escape_for_make() {
 }

 function configure() {
-  local steamrt_image="$arg_protonsdk_image"
+  local steamrt_image="$1"
+  local steamrt_name="$2"
  local srcdir
  srcdir="$(dirname "$0")"

-  if [[ "$srcdir" = "." ]]; then
-    err "Cannot do a top level in-tree build."
-    die "Create a subdirectory in build/ or outside of the tree and run configure.sh from there."
-  fi
-
-  # nothing specified, getting the default value from the Makefile to test the
-  # container engine
-  if [[ -z $steamrt_image ]]; then
-    steamrt_image="$(sed -n 's/STEAMRT_IMAGE ?= //p' $SRCDIR/Makefile.in)"
-  fi
-
  # Build name
  local build_name="$arg_build_name"
  if [[ -n $build_name ]]; then
@ -118,7 +108,15 @@ function configure() {
    info "No build name specified, using default: $build_name"
  fi

+  dependency_command fontforge
+  dependency_command find "findutils"
  dependency_command make "GNU Make"
+  dependency_command rsync
+  dependency_command wget
+  dependency_command xz
+  dependency_command patch
+  dependency_command git
+  dependency_command python3

  if [ "$MISSING_DEPENDENCIES" -ne 0 ]; then
      die "Missing dependencies, cannot continue."
@ -129,12 +127,12 @@ function configure() {
  fi

  if [[ -n "$arg_container_engine" ]]; then
-    check_container_engine "$arg_container_engine" "$steamrt_image" || die "Specified container engine \"$arg_container_engine\" doesn't work"
+    check_container_engine "$arg_container_engine" || die "Specified container engine \"$arg_container_engine\" doesn't work"
  else
    stat "Trying to find usable container engine."
-    if check_container_engine docker "$steamrt_image"; then
+    if check_container_engine docker; then
      arg_container_engine="docker"
-    elif check_container_engine podman "$steamrt_image"; then
+    elif check_container_engine podman; then
      arg_container_engine="podman"
    else
        die "${arg_container_engine:-Container engine discovery} has failed. Please fix your setup."
@ -154,10 +152,9 @@ function configure() {
    echo "SRCDIR     := $(escape_for_make "$srcdir")"
    echo "BUILD_NAME := $(escape_for_make "$build_name")"

-    # SteamRT was specified, baking it into the Makefile
-    if [[ -n $arg_protonsdk_image ]]; then
-      echo "STEAMRT_IMAGE := $(escape_for_make "$arg_protonsdk_image")"
-    fi
+    # SteamRT
+    echo "STEAMRT_NAME  := $(escape_for_make "$steamrt_name")"
+    echo "STEAMRT_IMAGE := $(escape_for_make "$steamrt_image")"

    echo "ROOTLESS_CONTAINER := $ROOTLESS_CONTAINER"
    echo "CONTAINER_ENGINE := $arg_container_engine"
@ -170,9 +167,6 @@ function configure() {
    if [[ -n "$arg_enable_ccache" ]]; then
      echo "ENABLE_CCACHE := 1"
    fi
-    if [[ -n "$arg_enable_bear" ]]; then
-      echo "ENABLE_BEAR := 1"
-    fi

    # Include base
    echo ""
@ -187,13 +181,14 @@ function configure() {
 # Parse arguments
 #

-arg_protonsdk_image=""
+arg_steamrt="soldier"
+arg_protonsdk_image="registry.gitlab.steamos.cloud/proton/soldier/sdk:0.20220601.0-1"
+arg_no_protonsdk=""
 arg_build_name=""
 arg_container_engine=""
 arg_docker_opts=""
 arg_relabel_volumes=""
 arg_enable_ccache=""
-arg_enable_bear=""
 arg_help=""
 invalid_args=""
 function parse_args() {
@ -240,11 +235,14 @@ function parse_args() {
      arg_relabel_volumes="1"
    elif [[ $arg = --enable-ccache ]]; then
      arg_enable_ccache="1"
-    elif [[ $arg = --enable-bear ]]; then
-      arg_enable_bear="1"
    elif [[ $arg = --proton-sdk-image ]]; then
      val_used=1
      arg_protonsdk_image="$val"
+    elif [[ $arg = --steam-runtime ]]; then
+      val_used=1
+      arg_steamrt="$val"
+    elif [[ $arg = --no-proton-sdk ]]; then
+      arg_no_protonsdk=1
    else
      err "Unrecognized option $arg"
      return 1
@ -279,7 +277,7 @@ function parse_args() {
 }

 usage() {
-  "$1" "Usage: $0 { --proton-sdk-image=<image> }"
+  "$1" "Usage: $0 { --no-proton-sdk | --proton-sdk-image=<image> --steam-runtime=<name> }"
  "$1" "  Generate a Makefile for building Proton.  May be run from another directory to create"
  "$1" "  out-of-tree build directories (e.g. mkdir mybuild && cd mybuild && ../configure.sh)"
  "$1" ""
@ -297,8 +295,6 @@ usage() {
  "$1" ""
  "$1" "    --enable-ccache Mount \$CCACHE_DIR or \$HOME/.ccache inside of the container and use ccache for the build."
  "$1" ""
-  "$1" "    --enable-bear Invokes make via bear creating compile_commands.json."
-  "$1" ""
  "$1" "  Steam Runtime"
  "$1" "    Proton builds that are to be installed & run under the steam client must be built with"
  "$1" "    the Steam Runtime SDK to ensure compatibility.  See README.md for more information."
@ -307,10 +303,21 @@ usage() {
  "$1" "                                for build steps that must be run in an SDK"
  "$1" "                                environment.  See README.md for instructions to"
  "$1" "                                create this image."
+  "$1" "    --steam-runtime=soldier  Name of the steam runtime release to build for (soldier, scout)."
+  "$1" ""
+  "$1" "    --no-proton-sdk  Do not automatically invoke any runtime SDK as part of the build."
+  "$1" "                     Build steps may still be manually run in a runtime environment."
  exit 1;
 }

 parse_args "$@" || usage err
 [[ -z $arg_help ]] || usage info

-configure
+# Sanity check arguments
+if [[ -n $arg_no_protonsdk && -n $arg_protonsdk_image ]]; then
+    die "Cannot specify --proton-sdk-image as well as --no-proton-sdk"
+elif [[ -z $arg_no_protonsdk && -z $arg_protonsdk_image ]]; then
+    die "Must specify either --no-proton-sdk or --proton-sdk-image"
+fi
+
+configure "$arg_protonsdk_image" "$arg_steamrt"
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8a6f054ef1e0f7886bc6e53e6be97c427154fe85
+Subproject commit 7b433e077298d0f4faf8da6d6eb5774e29bffa54
--- a/default_pfx.py
+++ b/default_pfx.py
@ -6,7 +6,6 @@

 import os
 import subprocess
-import re

 def file_is_wine_builtin_dll(path):
    if not os.path.exists(path):
@ -72,62 +71,22 @@ def setup_dll_symlinks(default_pfx_dir, dist_dir):
                os.unlink(filename)
                make_relative_symlink(target, filename)

-KEY_RE = re.compile(r'\[(.+)\] ([0-9]+)')
-VALUE_RE = re.compile(r'"(.*)"="(.+)"')
-
-def filter_registry(filename):
-    """Remove registry values that contain a fully qualified path
-    inside some well-known registry keys. These paths are devised on
-    the build machine and it makes no sense to distribute them. Plus,
-    they are known to cause bugs."""
-
-    FILTER_KEYS = [
-        r'Software\\Microsoft\\Windows\\CurrentVersion\\Fonts',
-        r'Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts',
-        r'Software\\Wine\\Fonts\\External Fonts',
-    ]
-
-    filtering = False
-    with open(filename) as fin:
-        with open(filename + '.tmp', 'w') as fout:
-            for line in fin:
-                line = line.strip()
-
-                match = KEY_RE.match(line)
-                if match is not None:
-                    fout.write(line + '\n')
-                    filtering = match.group(1) in FILTER_KEYS
-                    continue
-
-                match = VALUE_RE.match(line)
-                if match is not None:
-                    if not filtering or match.group(2)[1:2] != ':':
-                        fout.write(line + '\n')
-                    continue
-
-                fout.write(line + '\n')
-
-    os.rename(filename + '.tmp', filename)
-
-#steampipe can't handle filenames with colons, so we remove them here
-#and restore them in the proton script
-def fixup_drive_links(default_pfx_dir):
-    for walk_dir, dirs, files in os.walk(os.path.join(default_pfx_dir, "dosdevices")):
-        for dir_ in dirs:
-            if ":" in dir_:
-                os.remove(os.path.join(walk_dir, dir_))
-
-def make_default_pfx(default_pfx_dir, dist_dir):
+def make_default_pfx(default_pfx_dir, dist_dir, runtime):
    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 = []
+    if runtime is None:
+        local_env["LD_LIBRARY_PATH"] = ld_path
+        local_env["WINEPREFIX"] = default_pfx_dir
+        local_env["WINEDEBUG"] = "-all"
+        runtime_args = []
+    else:
+        #the runtime clears the environment, so we pass it in on the CL via env
+        runtime_args = runtime + ["env",
+                "LD_LIBRARY_PATH=" + ld_path,
+                "WINEPREFIX=" + default_pfx_dir,
+                "WINEDEBUG=-all"]

    subprocess.run(runtime_args + ["/bin/bash", "-c",
        os.path.join(dist_dir, 'bin', 'wine') + " wineboot && " +
@ -135,11 +94,10 @@ def make_default_pfx(default_pfx_dir, dist_dir):

        env=local_env, check=True)
    setup_dll_symlinks(default_pfx_dir, dist_dir)
-    fixup_drive_links(default_pfx_dir)
-
-    filter_registry(os.path.join(default_pfx_dir, 'user.reg'))
-    filter_registry(os.path.join(default_pfx_dir, 'system.reg'))

 if __name__ == '__main__':
    import sys
-    make_default_pfx(sys.argv[1], sys.argv[2])
+    if len(sys.argv) > 3:
+        make_default_pfx(sys.argv[1], sys.argv[2], sys.argv[3:])
+    else:
+        make_default_pfx(sys.argv[1], sys.argv[2], None)
--- a/docker/Makefile
+++ b/docker/Makefile
@ -1,44 +1,41 @@
-STEAMRT_VERSION = 0.20240307.80401
+STEAMRT_VERSION = 0.20220601.0
 STEAMRT_URLBASE = registry.gitlab.steamos.cloud

-PROTONSDK_URLBASE = $(STEAMRT_URLBASE)/proton/sniper/sdk
+PROTONSDK_URLBASE = $(STEAMRT_URLBASE)/proton/soldier/sdk
 PROTONSDK_VERSION = $(STEAMRT_VERSION)-0-dev

 # this is just for building toolchain, as we do static builds it should
 # not have any impact on the end result, but changing it will invalidate
 # docker caches, so we need something that don't change much
-BASE_IMAGE = $(STEAMRT_URLBASE)/steamrt/sniper/sdk:0.20221017.1
+BASE_IMAGE_i686 = docker.io/i386/ubuntu:18.04
+BASE_IMAGE_x86_64 = docker.io/amd64/ubuntu:18.04

-BINUTILS_VERSION = 2.42
+BINUTILS_VERSION = 2.37
 GCC_VERSION = 10.3.0
 MINGW_VERSION = 9.0.0
-RUST_VERSION = 1.68.0
-NINJA_VERSION = 1.11.1
+RUST_VERSION = 1.65.0

 SOURCES_URLBASE = https://repo.steampowered.com/proton-sdk
 BINUTILS_URLBASE = $(SOURCES_URLBASE)
 GCC_URLBASE = $(SOURCES_URLBASE)
 MINGW_URLBASE = $(SOURCES_URLBASE)
 RUST_URLBASE = $(SOURCES_URLBASE)
-NINJA_URLBASE = $(SOURCES_URLBASE)

 BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.xz
 GCC_SOURCE = gcc-$(GCC_VERSION).tar.xz
 MINGW_SOURCE = mingw-w64-v$(MINGW_VERSION).tar.bz2
 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 = f6e4d41fd5fc778b06b7891457b3620da5ecea1006c6a4a41ae998109f85a800
+BINUTILS_SHA256 = 820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c
 GCC_SHA256 = 64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344
 MINGW_SHA256 = 1929b94b402f5ff4d7d37a9fe88daa9cc55515a6134805c104d1794ae22a4181
-RUST_SHA256_x86_64 = 7be1acdac656d0b0b7e909e5c0d4ddf61c755c203ec26ebafbd306322335b361
-RUST_SHA256_i686 = dc931adeb2943dcadfbd29546481f0296fcb97a511421053ecae6586a85869b1
-NINJA_SHA256 = 31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea
+RUST_SHA256_x86_64 = 8f754fdd5af783fe9020978c64e414cb45f3ad0a6f44d045219bbf2210ca3cb9
+RUST_SHA256_i686 = b29869f8e2c7029150a929b2c4e26843f363846ad99253a25be6abcfa8e84f46

 DOCKER = docker

-%.Dockerfile: %.Dockerfile.in Makefile
+%.Dockerfile: %.Dockerfile.in
 	sed -re 's!@PROTONSDK_URLBASE@!$(PROTONSDK_URLBASE)!g' \
 	    -re 's!@BASE_IMAGE@!$(BASE_IMAGE)!g' \
 	    -re 's!@BINUTILS_VERSION@!$(BINUTILS_VERSION)!g' \
@ -59,43 +56,37 @@ DOCKER = docker
 	    -re 's!@RUST_SOURCE_i686@!$(RUST_SOURCE_i686)!g' \
 	    -re 's!@RUST_SHA256_x86_64@!$(RUST_SHA256_x86_64)!g' \
 	    -re 's!@RUST_SHA256_i686@!$(RUST_SHA256_i686)!g' \
-	    -re 's!@NINJA_VERSION@!$(NINJA_VERSION)!g' \
-	    -re 's!@NINJA_URLBASE@!$(NINJA_URLBASE)!g' \
-	    -re 's!@NINJA_SOURCE@!$(NINJA_SOURCE)!g' \
-	    -re 's!@NINJA_SHA256@!$(NINJA_SHA256)!g' \
 	    -re 's!@J@!$(shell nproc)!g' \
 	    $< >$@

 %-i686.Dockerfile.in: %.Dockerfile.in
 	sed -re 's!@ARCH@!i686!g' \
-	    -re 's!@ARCH_FLAGS@!$(ARCH_FLAGS)!g' \
 	    $< >$@

 %-x86_64.Dockerfile.in: %.Dockerfile.in
 	sed -re 's!@ARCH@!x86_64!g' \
-	    -re 's!@ARCH_FLAGS@!$(ARCH_FLAGS)!g' \
 	    $< >$@

 %-linux-gnu.Dockerfile.in: %.Dockerfile.in
 	sed -re 's!@TARGET@!linux-gnu!g' \
-	    -re 's!@ARCH_FLAGS@!$(ARCH_FLAGS)!g' \
 	    -re 's!@TARGET_FLAGS@!$(TARGET_FLAGS)!g' \
 	    $< >$@

 %-w64-mingw32.Dockerfile.in: %.Dockerfile.in
 	sed -re 's!@TARGET@!w64-mingw32!g' \
-	    -re 's!@ARCH_FLAGS@!$(ARCH_FLAGS)!g' \
 	    -re 's!@TARGET_FLAGS@!$(TARGET_FLAGS)!g' \
 	    $< >$@

 define create-build-base-rules
 .PHONY: build-base-$(1)
 all build-base: build-base-$(1)
+build-base-$(1): BASE_IMAGE = $(BASE_IMAGE_$(1))
 build-base-$(1): build-base-$(1).Dockerfile
+	rm -rf build; mkdir -p build
 	$(DOCKER) build -f $$< \
 	  --cache-from=$(PROTONSDK_URLBASE)/build-base-$(1) \
 	  -t $(PROTONSDK_URLBASE)/build-base-$(1):latest \
-	  context
+	  build
 pull::
 	-$(DOCKER) pull $(PROTONSDK_URLBASE)/build-base-$(1):latest
 push::
@ -109,11 +100,12 @@ define create-binutils-rules
 .PHONY: binutils-$(1)-$(2)
 all binutils: binutils-$(1)-$(2)
 binutils-$(1)-$(2): binutils-$(1)-$(2).Dockerfile | build-base
+	rm -rf build; mkdir -p build
 	$(DOCKER) build -f $$< \
 	  --cache-from=$(PROTONSDK_URLBASE)/binutils-$(1)-$(2) \
 	  -t $(PROTONSDK_URLBASE)/binutils-$(1)-$(2):$(BINUTILS_VERSION) \
 	  -t $(PROTONSDK_URLBASE)/binutils-$(1)-$(2):latest \
-	  context
+	  build
 pull::
 	-$(DOCKER) pull $(PROTONSDK_URLBASE)/binutils-$(1)-$(2):$(BINUTILS_VERSION)
 push::
@ -126,21 +118,16 @@ $(eval $(call create-binutils-rules,i686,linux-gnu))
 $(eval $(call create-binutils-rules,x86_64,w64-mingw32))
 $(eval $(call create-binutils-rules,x86_64,linux-gnu))

-MINGW_ARCH_FLAGS_crt-x86_64 = --disable-lib32 CFLAGS="-mcmodel=small"
-MINGW_ARCH_FLAGS_crt-i686 = --disable-lib64
-MINGW_ARCH_FLAGS_pthread-x86_64 = CFLAGS="-mcmodel=small"
-MINGW_ARCH_FLAGS_pthread-i686 =
-
 define create-mingw-rules
 .PHONY: mingw-$(2)-$(1)
 all mingw: mingw-$(2)-$(1)
-mingw-$(2)-$(1): ARCH_FLAGS = $(MINGW_ARCH_FLAGS_$(2)-$(1))
 mingw-$(2)-$(1): mingw-$(2)-$(1).Dockerfile | binutils
+	rm -rf build; mkdir -p build
 	$(DOCKER) build -f $$< \
 	  --cache-from=$(PROTONSDK_URLBASE)/mingw-$(2)-$(1) \
 	  -t $(PROTONSDK_URLBASE)/mingw-$(2)-$(1):$(MINGW_VERSION) \
 	  -t $(PROTONSDK_URLBASE)/mingw-$(2)-$(1):latest \
-	  context
+	  build
 pull::
 	-$(DOCKER) pull $(PROTONSDK_URLBASE)/mingw-$(2)-$(1):$(MINGW_VERSION)
 push::
@ -159,23 +146,20 @@ $(eval $(call create-mingw-rules,x86_64,crt))
 $(eval $(call create-mingw-rules,x86_64,pthreads))
 $(eval $(call create-mingw-rules,x86_64,widl))

-GCC_ARCH_FLAGS_x86_64 = CFLAGS_FOR_TARGET="-mcmodel=small" CXXFLAGS_FOR_TARGET="-mcmodel=small"
-GCC_ARCH_FLAGS_i686 =
-
 GCC_TARGET_FLAGS_w64-mingw32 = --disable-shared
 GCC_TARGET_FLAGS_linux-gnu =

 define create-gcc-rules
 .PHONY: gcc-$(1)-$(2)
 all gcc: gcc-$(1)-$(2)
-gcc-$(1)-$(2): ARCH_FLAGS = $(GCC_ARCH_FLAGS_$(1))
 gcc-$(1)-$(2): TARGET_FLAGS = $(GCC_TARGET_FLAGS_$(2))
 gcc-$(1)-$(2): gcc-$(1)-$(2).Dockerfile | mingw
+	rm -rf build; mkdir -p build
 	$(DOCKER) build -f $$< \
 	  --cache-from=$(PROTONSDK_URLBASE)/gcc-$(1)-$(2) \
 	  -t $(PROTONSDK_URLBASE)/gcc-$(1)-$(2):$(GCC_VERSION) \
 	  -t $(PROTONSDK_URLBASE)/gcc-$(1)-$(2):latest \
-	  context
+	  build
 pull::
 	-$(DOCKER) pull $(PROTONSDK_URLBASE)/gcc-$(1)-$(2):$(GCC_VERSION)
 push::
@ -191,13 +175,14 @@ $(eval $(call create-gcc-rules,x86_64,w64-mingw32))
 define create-proton-rules
 .PHONY: proton
 all: proton
-proton: BASE_IMAGE = $(STEAMRT_URLBASE)/steamrt/sniper/sdk:$(STEAMRT_VERSION)
+proton: BASE_IMAGE = $(STEAMRT_URLBASE)/steamrt/soldier/sdk:$(STEAMRT_VERSION)
 proton: proton.Dockerfile | gcc
+	rm -rf build; mkdir -p build
 	$(DOCKER) build -f $$< \
 	  --cache-from=$(PROTONSDK_URLBASE) \
 	  -t $(PROTONSDK_URLBASE):$(PROTONSDK_VERSION) \
 	  -t $(PROTONSDK_URLBASE):latest \
-	  context
+	  build
 pull::
 	-$(DOCKER) pull $(PROTONSDK_URLBASE):$(PROTONSDK_VERSION)
 push::
@ -213,16 +198,13 @@ sources::
 	rm -f $(GCC_SOURCE)
 	rm -f $(RUST_SOURCE_x86_64)
 	rm -f $(RUST_SOURCE_i686)
-	rm -f $(NINJA_SOURCE)
 	wget $(BINUTILS_URLBASE)/$(BINUTILS_SOURCE)
 	wget $(MINGW_URLBASE)/$(MINGW_SOURCE)
 	wget $(GCC_URLBASE)/$(GCC_SOURCE)
 	wget $(RUST_URLBASE)/$(RUST_SOURCE_x86_64)
 	wget $(RUST_URLBASE)/$(RUST_SOURCE_i686)
-	wget $(NINJA_URLBASE)/$(NINJA_SOURCE)
 	echo $(BINUTILS_SHA256) $(BINUTILS_SOURCE) | sha256sum -c -
 	echo $(MINGW_SHA256) $(MINGW_SOURCE) | sha256sum -c -
 	echo $(GCC_SHA256) $(GCC_SOURCE) | sha256sum -c -
 	echo $(RUST_SHA256_x86_64) $(RUST_SOURCE_x86_64) | sha256sum -c -
 	echo $(RUST_SHA256_i686) $(RUST_SOURCE_i686) | sha256sum -c -
-	echo $(NINJA_SHA256) $(NINJA_SOURCE) | sha256sum -c -
--- a/docker/README.md
+++ b/docker/README.md
@ -1,9 +1,9 @@
-Proton (sniper) SDK
+Proton (soldier) SDK
 ====================

 These are the build rules that are used to create docker images to build
 Proton. The automated creation of the official images lives in
-<https://gitlab.steamos.cloud/proton/sniper/sdk>, but this can be
+<https://gitlab.steamos.cloud/proton/soldier/sdk>, but this can be
 used to create local images too.

 Local usage
@ -31,7 +31,7 @@ To update the official Proton SDK images:
   commit and push the changes.

 2) Update `.gitlab-ci.yml` in the
-   [Proton SDK](https://gitlab.steamos.cloud/proton/sniper/sdk)
+   [Proton SDK](https://gitlab.steamos.cloud/proton/soldier/sdk)
   repository to point to the new commit, commit and push to trigger a
   new build of "-dev" images.

@ -72,7 +72,7 @@ replacements done using `sed`.
 The <https://gitlab.steamos.cloud> CI uses Kaniko instead of Docker,
 with a bit of script conversion to generate commands usable there. More
 details are available in
-[Proton SDK](https://gitlab.steamos.cloud/proton/sniper/sdk).
+[Proton SDK](https://gitlab.steamos.cloud/proton/soldier/sdk).

 The `build-base` images are there to create a common ground to build the
 other elements of the toolchain. They are based on fairly recent (more
--- a/docker/context/ninja-jobserver-client.patch
+++ b/docker/context/ninja-jobserver-client.patch
--- a/docker/gcc.Dockerfile.in
+++ b/docker/gcc.Dockerfile.in
@ -40,7 +40,6 @@ RUN wget -q @GCC_URLBASE@/@GCC_SOURCE@ \
  --with-system-mpfr \
  --with-system-zlib \
  --with-tune=core-avx2 \
-  @ARCH_FLAGS@ \
  MAKEINFO=true \
 && make --quiet -j@J@ MAKEINFO=true CFLAGS="-static --static" LDFLAGS="-s -static --static" \
 && make --quiet -j@J@ MAKEINFO=true CFLAGS="-static --static" LDFLAGS="-s -static --static" install-strip DESTDIR=/opt \
--- a/docker/mingw-crt.Dockerfile.in
+++ b/docker/mingw-crt.Dockerfile.in
@ -13,8 +13,7 @@ RUN wget -q @MINGW_URLBASE@/@MINGW_SOURCE@ \
  --prefix=/usr/@ARCH@-w64-mingw32/ \
  --host=@ARCH@-w64-mingw32 \
  --enable-wildcard \
-  @ARCH_FLAGS@ \
-  MAKEINFO=true \
+  MAKEINFO=true || cat config.log \
 && make --quiet -j@J@ MAKEINFO=true \
 && make --quiet -j@J@ MAKEINFO=true install-strip DESTDIR=/opt \
 && rm -rf /opt/usr/share/doc /opt/usr/share/info /opt/usr/share/man \
--- a/docker/mingw-pthreads.Dockerfile.in
+++ b/docker/mingw-pthreads.Dockerfile.in
@ -15,7 +15,6 @@ RUN wget -q @MINGW_URLBASE@/@MINGW_SOURCE@ \
  --prefix=/usr/@ARCH@-w64-mingw32/ \
  --host=@ARCH@-w64-mingw32 \
  --disable-shared \
-  @ARCH_FLAGS@ \
  MAKEINFO=true \
 && make --quiet -j@J@ MAKEINFO=true \
 && make --quiet -j@J@ MAKEINFO=true install-strip DESTDIR=/opt \
--- a/docker/proton.Dockerfile.in
+++ b/docker/proton.Dockerfile.in
@ -69,23 +69,6 @@ RUN apt-get install -y \
 && rm -rf /opt/usr/share/doc /opt/usr/share/info /opt/usr/share/man \
 && rm -rf /var/lib/apt/lists/*

-COPY ninja-jobserver-client.patch /tmp
-
-RUN wget -q @NINJA_URLBASE@/@NINJA_SOURCE@ \
-&& echo '@NINJA_SHA256@ @NINJA_SOURCE@' \
-&& echo '@NINJA_SHA256@ @NINJA_SOURCE@' | sha256sum -c - \
-&& tar xf @NINJA_SOURCE@ -C /tmp && rm @NINJA_SOURCE@ \
-&& cd /tmp/ninja-@NINJA_VERSION@ \
-&& patch -p1 < /tmp/ninja-jobserver-client.patch \
-&& mkdir build \
-&& cd build \
-&& cmake .. \
-&& make \
-&& cp ninja $(which ninja) \
-&& cd / \
-&& rm -rf /tmp/ninja-@NINJA_VERSION@ \
-&& rm -rf /tmp/ninja-jobserver-client.patch
-
 ENTRYPOINT ["/usr/bin/tini-static", "-s", "-g", "--"]

 CMD ["/bin/bash"]
--- a/docs/DEBUGGING.md
+++ b/docs/DEBUGGING.md
@ -1,186 +0,0 @@
-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 d0ea5a4a87c9b4ee8a7d700c5f55baf26054bd6a
+Subproject commit e3daa699cb05d3f67d3b065eafcfc041f6136a80
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit bd542144518dce62b39f131b20093c295e21b7e1
+Subproject commit 5fe4a73eddb938ce6f866944e502e9209bd7020e
--- a/fonts/noto/NotoSans-Regular.ttf
+++ b/fonts/noto/NotoSans-Regular.ttf
--- a/fonts/noto/NotoSansArabic-Regular.ttf
+++ b/fonts/noto/NotoSansArabic-Regular.ttf
--- a/fonts/noto/NotoSansArmenian-Regular.ttf
+++ b/fonts/noto/NotoSansArmenian-Regular.ttf
--- a/fonts/noto/NotoSansBengali-Regular.ttf
+++ b/fonts/noto/NotoSansBengali-Regular.ttf
--- a/fonts/noto/NotoSansBengaliUI-Regular.ttf
+++ b/fonts/noto/NotoSansBengaliUI-Regular.ttf
--- a/fonts/noto/NotoSansChakma-Regular.ttf
+++ b/fonts/noto/NotoSansChakma-Regular.ttf
--- a/fonts/noto/NotoSansCoptic-Regular.ttf
+++ b/fonts/noto/NotoSansCoptic-Regular.ttf
--- a/fonts/noto/NotoSansDevanagariUI-Regular.ttf
+++ b/fonts/noto/NotoSansDevanagariUI-Regular.ttf
--- a/fonts/noto/NotoSansGeorgian-Regular.ttf
+++ b/fonts/noto/NotoSansGeorgian-Regular.ttf
--- a/fonts/noto/NotoSansGujarati-Regular.ttf
+++ b/fonts/noto/NotoSansGujarati-Regular.ttf
--- a/fonts/noto/NotoSansGujaratiUI-Regular.ttf
+++ b/fonts/noto/NotoSansGujaratiUI-Regular.ttf
--- a/fonts/noto/NotoSansGurmukhiUI-Regular.ttf
+++ b/fonts/noto/NotoSansGurmukhiUI-Regular.ttf
--- a/fonts/noto/NotoSansHebrew-Regular.ttf
+++ b/fonts/noto/NotoSansHebrew-Regular.ttf
--- a/fonts/noto/NotoSansKannadaUI-Regular.ttf
+++ b/fonts/noto/NotoSansKannadaUI-Regular.ttf
--- a/fonts/noto/NotoSansKhmer-Regular.ttf
+++ b/fonts/noto/NotoSansKhmer-Regular.ttf
--- a/fonts/noto/NotoSansMalayalamUI-Regular.ttf
+++ b/fonts/noto/NotoSansMalayalamUI-Regular.ttf
--- a/fonts/noto/NotoSansMath-Regular.ttf
+++ b/fonts/noto/NotoSansMath-Regular.ttf
--- a/fonts/noto/NotoSansMeeteiMayek-Regular.ttf
+++ b/fonts/noto/NotoSansMeeteiMayek-Regular.ttf
--- a/fonts/noto/NotoSansMono-Regular.ttf
+++ b/fonts/noto/NotoSansMono-Regular.ttf
--- a/fonts/noto/NotoSansOlChiki-Regular.ttf
+++ b/fonts/noto/NotoSansOlChiki-Regular.ttf
--- a/fonts/noto/NotoSansOriyaUI-Regular.ttf
+++ b/fonts/noto/NotoSansOriyaUI-Regular.ttf
--- a/fonts/noto/NotoSansSinhalaUI-Regular.ttf
+++ b/fonts/noto/NotoSansSinhalaUI-Regular.ttf
--- a/fonts/noto/NotoSansSoraSompeng-Regular.ttf
+++ b/fonts/noto/NotoSansSoraSompeng-Regular.ttf
--- a/fonts/noto/NotoSansSymbols-Regular.ttf
+++ b/fonts/noto/NotoSansSymbols-Regular.ttf
--- a/fonts/noto/NotoSansSymbols2-Regular.ttf
+++ b/fonts/noto/NotoSansSymbols2-Regular.ttf
--- a/fonts/noto/NotoSansTamil-Regular.ttf
+++ b/fonts/noto/NotoSansTamil-Regular.ttf
--- a/fonts/noto/NotoSansTamilUI-Regular.ttf
+++ b/fonts/noto/NotoSansTamilUI-Regular.ttf
--- a/fonts/noto/NotoSansTeluguUI-Regular.ttf
+++ b/fonts/noto/NotoSansTeluguUI-Regular.ttf
--- a/fonts/noto/NotoSansThaana-Regular.ttf
+++ b/fonts/noto/NotoSansThaana-Regular.ttf
--- a/fonts/noto/NotoSansThai-Regular.ttf
+++ b/fonts/noto/NotoSansThai-Regular.ttf
--- a/fonts/noto/NotoSerifTibetan-Regular.ttf
+++ b/fonts/noto/NotoSerifTibetan-Regular.ttf
--- a/fonts/ranges/arial
+++ b/fonts/ranges/arial
@ -1,140 +0,0 @@
-0020-007E
-00A0-0377
-037A-037F
-0384-038A
-038C
-038E-03A1
-03A3-052F
-0531-0556
-0559-055F
-0561-0587
-0589-058A
-058D-058F
-0591-05C7
-05D0-05EA
-05F0-05F4
-0600-061C
-061E-06FF
-0750-077F
-08A0-08B4
-08B6-08BD
-08D4-08FF
-1D00-1DCA
-1DFE-1F15
-1F18-1F1D
-1F20-1F45
-1F48-1F4D
-1F50-1F57
-1F59
-1F5B
-1F5D
-1F5F-1F7D
-1F80-1FB4
-1FB6-1FC4
-1FC6-1FD3
-1FD6-1FDB
-1FDD-1FEF
-1FF2-1FF4
-1FF6-1FFE
-2000-200F
-2012-2022
-2026
-202A-2030
-2032-2034
-2039-203A
-203C-203E
-2044
-205E
-206A-2070
-2074-2079
-207F
-2090-2094
-20A0-20BF
-20F0
-2105
-2113
-2116-2117
-2122
-2126
-212E
-214D-214E
-2153-2154
-215B-215E
-2184
-2190-2195
-21A8
-2202
-2206
-220F
-2211-2212
-2215
-2219-221A
-221E-221F
-2229
-222B
-2248
-2260-2261
-2264-2265
-2302
-2310
-2320-2321
-2500
-2502
-250C
-2510
-2514
-2518
-251C
-2524
-252C
-2534
-253C
-2550-256C
-2580
-2584
-2588
-258C
-2590-2593
-25A0-25A1
-25AA-25AC
-25B2
-25BA
-25BC
-25C4
-25CA-25CC
-25CF
-25D8-25D9
-25E6
-263A-263C
-2640
-2642
-2660
-2663
-2665-2666
-266A-266B
-266F
-2C60-2C7F
-2E17
-A717-A7AE
-A7B0-A7B7
-A7F7-A7FF
-AB30-AB65
-FB00-FB06
-FB13-FB17
-FB1D-FB36
-FB38-FB3C
-FB3E
-FB40-FB41
-FB43-FB44
-FB46-FBC1
-FBD3-FBFF
-FC5E-FC63
-FCF2-FCF4
-FD3C-FD3F
-FDF2
-FDF4
-FDFA-FDFD
-FE20-FE23
-FE70-FE74
-FE76-FEFC
-FFFC
--- a/fonts/ranges/micross
+++ b/fonts/ranges/micross
@ -1,123 +0,0 @@
-0020-007E
-00A0-0377
-037A-037F
-0384-038A
-038C
-038E-03A1
-03A3-052F
-0531-0556
-0559-055F
-0561-0587
-0589-058A
-058D-058F
-0591-05C7
-05D0-05EA
-05F0-05F4
-0600-061C
-061E-06FF
-0750-077F
-0783
-08A0-08B4
-08B6-08BD
-08D4-08FF
-09F2-09F3
-0AF1
-0BF9
-0E01-0E3A
-0E3F-0E5B
-10A0-10C5
-10C7
-10CD
-10D0-10FF
-17DB
-1D00-1DCA
-1DFE-1F15
-1F18-1F1D
-1F20-1F45
-1F48-1F4D
-1F50-1F57
-1F59
-1F5B
-1F5D
-1F5F-1F7D
-1F80-1FB4
-1FB6-1FC4
-1FC6-1FD3
-1FD6-1FDB
-1FDD-1FEF
-1FF2-1FF4
-1FF6-1FFE
-2000-2064
-2066-2071
-2074-208E
-2090-209C
-20A0-20BF
-20E3
-20F0
-2105
-2113
-2116-2117
-2122
-2126
-212E
-2133
-214D-214E
-2150-218B
-2190-2195
-21A8
-2202
-2206
-220F
-2211-2212
-2215
-2219-221A
-221E-221F
-2229
-222B
-2248
-2260-2261
-2264-2265
-2302
-2310
-2320-2321
-2500
-2502
-250C
-25A1
-25AA-25AB
-25CA
-25CC
-25CF
-25E6
-266F
-2C60-2C7F
-2D00-2D25
-2D27
-2D2D
-2DE0-2DFF
-2E17
-A640-A69F
-A717-A7AD
-A7B0-A7B7
-A7F7-A7FF
-AB30-AB65
-FB00-FB06
-FB13-FB17
-FB1D-FB36
-FB38-FB3C
-FB3E
-FB40-FB41
-FB43-FB44
-FB46-FBC1
-FBD3-FBFF
-FC5E-FC63
-FCF2-FCF4
-FD3C-FD3F
-FDF2
-FDF4
-FDFA-FDFD
-FE20-FE23
-FE70-FE74
-FE76-FEFC
-FEFF
-FFFC-FFFD
--- a/fonts/ranges/nirmala
+++ b/fonts/ranges/nirmala
@ -1,166 +0,0 @@
-000D
-0020-007E
-00A0-00FF
-0131
-0152-0153
-0160-0161
-0178
-017D-017E
-0192
-02BC
-02C6-02C7
-02D8
-02DA
-02DC
-03BC
-0900-0983
-0985-098C
-098F-0990
-0993-09A8
-09AA-09B0
-09B2
-09B6-09B9
-09BC-09C4
-09C7-09C8
-09CB-09CE
-09D7
-09DC-09DD
-09DF-09E3
-09E6-09FE
-0A01-0A03
-0A05-0A0A
-0A0F-0A10
-0A13-0A28
-0A2A-0A30
-0A32-0A33
-0A35-0A36
-0A38-0A39
-0A3C
-0A3E-0A42
-0A47-0A48
-0A4B-0A4D
-0A51
-0A59-0A5C
-0A5E
-0A66-0A76
-0A81-0A83
-0A85-0A8D
-0A8F-0A91
-0A93-0AA8
-0AAA-0AB0
-0AB2-0AB3
-0AB5-0AB9
-0ABC-0AC5
-0AC7-0AC9
-0ACB-0ACD
-0AD0
-0AE0-0AE3
-0AE6-0AF1
-0AF9-0AFF
-0B01-0B03
-0B05-0B0C
-0B0F-0B10
-0B13-0B28
-0B2A-0B30
-0B32-0B33
-0B35-0B39
-0B3C-0B44
-0B47-0B48
-0B4B-0B4D
-0B56-0B57
-0B5C-0B5D
-0B5F-0B63
-0B66-0B77
-0B82-0B83
-0B85-0B8A
-0B8E-0B90
-0B92-0B95
-0B99-0B9A
-0B9C
-0B9E-0B9F
-0BA3-0BA4
-0BA8-0BAA
-0BAE-0BB9
-0BBE-0BC2
-0BC6-0BC8
-0BCA-0BCD
-0BD0
-0BD7
-0BE6-0BFA
-0C00-0C0C
-0C0E-0C10
-0C12-0C28
-0C2A-0C39
-0C3D-0C44
-0C46-0C48
-0C4A-0C4D
-0C55-0C56
-0C58-0C5A
-0C60-0C63
-0C66-0C6F
-0C78-0C8C
-0C8E-0C90
-0C92-0CA8
-0CAA-0CB3
-0CB5-0CB9
-0CBC-0CC4
-0CC6-0CC8
-0CCA-0CCD
-0CD5-0CD6
-0CDE
-0CE0-0CE3
-0CE6-0CEF
-0CF1-0CF2
-0D00-0D03
-0D05-0D0C
-0D0E-0D10
-0D12-0D44
-0D46-0D48
-0D4A-0D4F
-0D54-0D63
-0D66-0D7F
-0D82-0D83
-0D85-0D96
-0D9A-0DB1
-0DB3-0DBB
-0DBD
-0DC0-0DC6
-0DCA
-0DCF-0DD4
-0DD6
-0DD8-0DDF
-0DE6-0DEF
-0DF2-0DF4
-0FD5-0FD8
-1C50-1C7F
-1CD0-1CF9
-200B-200D
-2010
-2013-2014
-2018-201A
-201C-201E
-2020-2022
-2026
-2030
-2039-203A
-2044
-20A8
-20AC
-20B9
-2122
-2212
-2215
-2219
-2236
-25CC
-25CF
-262C
-A830-A839
-A8E0-A8FF
-ABC0-ABED
-ABF0-ABF9
-110D0-110E8
-110F0-110F9
-11100-11134
-11136-11146
-111E1-111F4
--- a/fonts/scripts/generatefont.pe
+++ b/fonts/scripts/generatefont.pe
@ -1,7 +1,7 @@
-if ($argc != 6)
-    Error ("Expected arguments - FileName, PSName, FamilyName, FaceName, OutFileName")
+if ($argc != 5)
+    Error ("Expected arguments - FileName, PSName, FamilyName, FaceName")
 endif

 Open($1)
 SetFontNames($argv[2], $argv[3], $argv[4])
-Generate($5)
+Generate($1:r + ".ttf")
--- a/fonts/scripts/merge.py
+++ b/fonts/scripts/merge.py
@ -1,290 +0,0 @@
-#!/usr/bin/env python3
-
-# This script was created by Giovanni Mascellani for CodeWeavers
-
-# Based on merge_noto.py and merge_fonts.py from the nototools
-# (https://github.com/googlefonts/nototools), with the following
-# copyright notice:
-
-# Copyright 2014-2017 Google Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# The font name changing logic is taken from
-# https://github.com/chrissimpkins/fontname.py/blob/master/fontname.py,
-# with the following copyright notice:
-
-# Copyright 2019 Christopher Simpkins
-# MIT License
-
-# The font subsetting logic is taken from
-# https://github.com/fonttools/fonttools/blob/main/Lib/fontTools/subset/__init__.py
-# with the following copyright notice:
-
-# Copyright 2013 Google, Inc. All Rights Reserved.
-# Google Author(s): Behdad Esfahbod
-
-# The whole fonttools repository is distributed under the MIT license.
-
-"""Merges a number of Noto fonts and then sets a given name to the
-result.
-
-"""
-
-import sys
-import tempfile
-import os
-
-from fontTools import merge
-from fontTools import ttLib
-from fontTools import subset
-from fontTools.ttLib.tables import otTables
-
-def read_line_metrics(font):
-    metrics = {
-        "ascent": font["hhea"].ascent,
-        "descent": font["hhea"].descent,
-        "usWinAscent": font["OS/2"].usWinAscent,
-        "usWinDescent": font["OS/2"].usWinDescent,
-        "sTypoAscender": font["OS/2"].sTypoAscender,
-        "sTypoDescender": font["OS/2"].sTypoDescender,
-        "sxHeight": font["OS/2"].sxHeight,
-        "sCapHeight": font["OS/2"].sCapHeight,
-        "sTypoLineGap": font["OS/2"].sTypoLineGap,
-    }
-    return metrics
-
-
-def set_line_metrics(font, metrics):
-    font["hhea"].ascent = metrics["ascent"]
-    font["hhea"].descent = metrics["descent"]
-    font["OS/2"].usWinAscent = metrics["usWinAscent"]
-    font["OS/2"].usWinDescent = metrics["usWinDescent"]
-    font["OS/2"].sTypoAscender = metrics["sTypoAscender"]
-    font["OS/2"].sTypoDescender = metrics["sTypoDescender"]
-    font["OS/2"].sxHeight = metrics["sxHeight"]
-    font["OS/2"].sCapHeight = metrics["sCapHeight"]
-    font["OS/2"].sTypoLineGap = metrics["sTypoLineGap"]
-
-def has_gsub_table(fontfile):
-    font = ttLib.TTFont(fontfile)
-    return "GSUB" in font
-
-SCRIPT_TO_OPENTYPE_SCRIPT_TAG = {
-    # Retrieved from Opentype 1.9 delta specs. Prerelease scripttags used out of necessity. https://docs.microsoft.com/en-us/typography/opentype/spec/scripttags
-    "Carian": "cari",
-    "CypriotSyllabary": "cprt",
-    "CyproMinoan": "cpmn",
-    "Deseret": "dsrt",
-    "Glagolitic": "glag",
-    "EgyptianHieroglyphs": "egyp",
-    "ImperialAramaic": "armi",
-    "LinearA": "lina",
-    "LinearB": "linb",
-    "Lisu": "lisu",
-    "Lycian": "lyci",
-    "Lydian": "lydi",
-    "Ogham": "ogam",
-    "OldItalic": "ital",
-    "OldPersian": "xpeo",
-    "OldSouthArabian": "sarb",
-    "OldTurkic": "orkh",
-    "OldSogdian": "sogo",
-    "OldNorthArabian": "narb",
-    "OldHungarian": "hung",
-    "Osmanya": "osma",
-    "Phoenician": "phnx",
-    "SumeroAkkadianCuneiform": "xsux",
-    "Ugaritic": "ugar",
-    "OlChiki": "olck",
-    "TaiLe": "tale",
-    "Cuneiform": "xsux",
-    "Cypriot": "cprt",
-    "Runic": "runr",
-    "Shavian": "shaw",
-    "Vai": "vai ",
-    "Yi": "yi  ",
-    "AnatolianHieroglyphs": "hluw",
-    "Bamum": "bamu",
-    "ByzantineMusic": "byzm",
-    "Gothic": "goth",
-    "ImperialAramaic": "armi",
-    "InscriptionalPahlavi": "phli",
-    "InscriptionalParthian": "prti",
-    "Khojki": "khoj",
-    "MathematicalAlphanumericSymbols": "math",
-    "MeroiticCursive": "merc",
-    "MeroiticHieroglyphs": "mero",
-    "MusicalSymbols": "musc",
-    "Palmyrene": "palm",
-    "Rejang": "rjng",
-    "Samaritan": "samr",
-    "Carian": "cari",
-    "Ahom": "ahom",
-    "Adlam": "adlm",
-    "Dogra": "dogr",
-    "Lisu": "lisu",
-    "Mandaean": "mand",
-    "Manichaean": "mani",
-    "Tifinagh": "tfng",
-    "Wancho": "wcho",
-    "Yezidi": "yezi",
-    "Cherokee": "cher",
-    "Chorasmian": "chrs",
-    "PahawhHmong": "hmng",
-    "Phagspa": "phag",
-    "Sundanese": "sund",
-    "WarangCiti": "wara",
-    "SylotiNagri": "sylo",
-    "PsalterPahlavi": "phlp",
-    "CaucasianAlbanian": "aghb",
-    "Medefaidrin": "medf",
-    "MeiteiMayek": "mtei",
-    "MendeKikakui": "mend",
-    "Mro": "mroo",
-    "Multani": "mult",
-    "Nabataean": "nbat",
-    "Nandinagari": "nand",
-    "Newa": "newa",
-    "NewTaiLue": "talu",
-    "Nushu": "nshu",
-    "NyiakengPuachueHmong": "hmnp",
-    "OldPermic": "perm",
-    "SoraSompeng": "sora",
-    "Soyombo": "soyo",
-    "SylotiNagri": "sylo",
-    "Tagbanwa": "tagb",
-    "Tagalog": "tglg",
-    "Takri": "takr",
-    "TaiTham": "lana",
-    "TaiViet": "tavt",
-    "Tangut": "tang",
-    "Thaana": "thaa",
-    "UgariticCuneiform": "ugar",
-    "ZanabazarSquare": "zanb",
-    "SignWriting": "sgnw",
-    "OldUyghur": "ougr",
-    "Tangsa": "tnsa",
-    "Toto": "toto",
-    "Vithkuqi": "vith",
-    "Duployan": "dupl",
-    "Hatran": "hatr",
-    # These last two would only merge using the long script name including the 'NotoSerif' part
-    "NotoSerifYezidi": "yezi",
-    "NotoSerifNyiakengPuachueHmong": "hmnp",
-}
-
-def get_opentype_script_tag(fontfile):
-    fontfile = os.path.basename(fontfile)
-    if fontfile.startswith("NotoSans"):
-        fontfile = fontfile[8:]
-    fontfile = fontfile[: fontfile.index("-")]
-    return SCRIPT_TO_OPENTYPE_SCRIPT_TAG[fontfile]
-
-def add_gsub_to_font(fontfile):
-    """Adds an empty GSUB table to a font."""
-    font = ttLib.TTFont(fontfile)
-    gsub_table = ttLib.getTableClass("GSUB")("GSUB")
-    gsub_table.table = otTables.GSUB()
-    gsub_table.table.Version = 1.0
-    gsub_table.table.ScriptList = otTables.ScriptList()
-    gsub_table.table.ScriptCount = 1
-    gsub_table.table.LookupList = otTables.LookupList()
-    gsub_table.table.LookupList.LookupCount = 0
-    gsub_table.table.LookupList.Lookup = []
-    gsub_table.table.FeatureList = otTables.FeatureList()
-    gsub_table.table.FeatureList.FeatureCount = 0
-    gsub_table.table.LookupList.FeatureRecord = []
-
-    script_record = otTables.ScriptRecord()
-    script_record.ScriptTag = get_opentype_script_tag(fontfile)
-    script_record.Script = otTables.Script()
-    script_record.Script.LangSysCount = 0
-    script_record.Script.LangSysRecord = []
-
-    default_lang_sys = otTables.DefaultLangSys()
-    default_lang_sys.FeatureIndex = []
-    default_lang_sys.FeatureCount = 0
-    default_lang_sys.LookupOrder = None
-    default_lang_sys.ReqFeatureIndex = 65535
-    script_record.Script.DefaultLangSys = default_lang_sys
-
-    gsub_table.table.ScriptList.ScriptRecord = [script_record]
-
-    font["GSUB"] = gsub_table
-
-    target_file = tempfile.gettempdir() + "/" + os.path.basename(fontfile)
-    font.save(target_file)
-    return target_file
-
-def parse_unicodes(s):
-    import re
-
-    s = re.sub(r"0[xX]", " ", s)
-    s = re.sub(r"[<+>,;&#\\xXuU\n	]", " ", s)
-    l = []
-    for item in s.split():
-        fields = item.split("-")
-        if len(fields) == 1:
-            l.append(int(item, 16))
-        else:
-            start, end = fields
-            l.extend(range(int(start, 16), int(end, 16) + 1))
-    return l
-
-def main():
-    output_filename = sys.argv[-1]
-    ranges_filename = sys.argv[-2]
-    weight = sys.argv[-3]
-    font_name = sys.argv[-4]
-    ps_name = sys.argv[-5]
-    input_filenames = sys.argv[1:-5]
-
-    # Add a GSUB table to the fonts that do not have one, otherwise
-    # the merger will complain
-    for index, filename in enumerate(input_filenames):
-        if not has_gsub_table(filename):
-            input_filenames[index] = add_gsub_to_font(filename)
-
-    merger = merge.Merger()
-    font = merger.merge(input_filenames)
-
-    # Use the line metrics defined by the first font, which is
-    # supposed to be the basic NotoSans
-    metrics = read_line_metrics(ttLib.TTFont(input_filenames[0]))
-    set_line_metrics(font, metrics)
-
-    # Select the subset we care about
-    options = subset.Options(ignore_missing_unicodes=False)
-    subsetter = subset.Subsetter(options)
-    unicodes = []
-    with open(ranges_filename) as ranges:
-        for line in ranges:
-            unicodes.extend(parse_unicodes(line.split("#")[0]))
-    if len(unicodes) != 0:
-        subsetter.populate(unicodes=unicodes)
-        subsetter.subset(font)
-
-    # Rename the result
-    for record in font['name'].names:
-        if record.nameID == 1:
-            record.string = font_name
-        elif record.nameID == 4:
-            record.string = "{} {}".format(font_name, weight)
-        elif record.nameID == 6:
-            record.string = "{}-{}".format(ps_name, weight.replace(' ', ''))
-
-    font.save(output_filename)
-
-if __name__ == '__main__':
-    main()
--- a/fonts/scripts/mergefonts.pe
+++ b/fonts/scripts/mergefonts.pe
@ -0,0 +1,29 @@
+if ($argc < 6)
+    Error ("Expected arguments - Font1, Font2, Font3, ..., FontName, FullName, FontWeight, OutputFilename")
+endif
+
+FONTNAME = ToString($argv[$argc - 4])
+FULLNAME = ToString($argv[$argc - 3])
+FONTWEIGHT = ToString($argv[$argc - 2])
+SRCFONTNAME = ToString($argv[1])
+DESTFONTNAME = ToString($argv[$argc - 1])
+
+Open(SRCFONTNAME)
+
+i = 2
+while (i < $argc - 4)
+  MergeFonts($argv[i])
+  i = i + 1
+endloop
+
+SetFontNames(FONTNAME, FULLNAME, FULLNAME, FONTWEIGHT, "", "1.0.0")
+Generate(DESTFONTNAME)
+Close()
+
+Open(DESTFONTNAME)
+Reencode("unicode")
+SelectWorthOutputting()
+SelectInvert()
+BuildAccented()
+Generate(DESTFONTNAME)
+Close()
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit e896aabe3c3d278510fb567712c4a55ed0eae075
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 7d5bbada3f1c6cf34182abccf47a34d79b83fa97
+Subproject commit 629864f073ae003e63c026c1de2407fec713cb53
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 57fb883b3f8c6d7a397afc0dfc4a7c2e5af05579
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 56dec037a80266add6853e4b06e2dc379de757d1
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 0205aa43d6d8c5d0c9d4e4f83e0a3aaa94acef89
+Subproject commit d0466b3eee114207f851b37cae0015c0e718f021
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit bf6ce1d64a0697e7910826147b48f8f658366a5a
+Subproject commit 71c213f99ad5c8fc8f36a26238483f2bdf7d846a
--- a/lsteamclient/Makefile.in
+++ b/lsteamclient/Makefile.in
@ -1,251 +0,0 @@
-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 \
-	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 \
-	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 \
-	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 \
-	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 \
-	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 \
-	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
@ -0,0 +1,156 @@
+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 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
@ -0,0 +1,400 @@
+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 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
@ -0,0 +1,264 @@
+#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 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 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
@ -0,0 +1,806 @@
+#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 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 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,48 +1,41 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_153a/steam_api.h"
+#include "steamworks_sdk_153a/steamnetworkingtypes.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetNumInstalledApps( void *args )
+#define SDKVER_153a
+#include "struct_converters.h"
+#include "cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.h"
+uint32 cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetNumInstalledApps(void *linux_side)
 {
-    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;
+    return ((ISteamAppList*)linux_side)->GetNumInstalledApps();
 }

-NTSTATUS ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetInstalledApps( void *args )
+uint32 cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetInstalledApps(void *linux_side, 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;
+    return ((ISteamAppList*)linux_side)->GetInstalledApps((AppId_t *)pvecAppID, (uint32)unMaxAppIDs);
 }

-NTSTATUS ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppName( void *args )
+int cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppName(void *linux_side, 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;
+    return ((ISteamAppList*)linux_side)->GetAppName((AppId_t)nAppID, (char *)pchName, (int)cchNameMax);
 }

-NTSTATUS ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppInstallDir( void *args )
+int cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppInstallDir(void *linux_side, 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;
+    return ((ISteamAppList*)linux_side)->GetAppInstallDir((AppId_t)nAppID, (char *)pchDirectory, (int)cchNameMax);
 }

-NTSTATUS ISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppBuildId( void *args )
+int cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppBuildId(void *linux_side, 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;
+    return ((ISteamAppList*)linux_side)->GetAppBuildId((AppId_t)nAppID);
 }

+#ifdef __cplusplus
+}
+#endif
--- a/lsteamclient/cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.h
@ -0,0 +1,5 @@
+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,15 +1,22 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_153a/steam_api.h"
+#include "steamworks_sdk_153a/steamnetworkingtypes.h"
+#include "steamworks_sdk_153a/isteamappticket.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001_GetAppOwnershipTicketData( void *args )
+#define SDKVER_153a
+#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)
 {
-    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;
+    return ((ISteamAppTicket*)linux_side)->GetAppOwnershipTicketData((uint32)nAppID, (void *)pvBuffer, (uint32)cbBufferLength, (uint32 *)piAppId, (uint32 *)piSteamId, (uint32 *)piSignature, (uint32 *)pcbSignature);
 }

+#ifdef __cplusplus
+}
+#endif
--- a/lsteamclient/cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.h
@ -0,0 +1 @@
+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,15 +1,20 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_100/steam_api.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION001_GetAppData( void *args )
+#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)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetAppData((AppId_t)nAppID, (const char *)pchKey, (char *)pchValue, (int)cchValueMax);
 }

+#ifdef __cplusplus
+}
+#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.h
@ -0,0 +1 @@
+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,63 +1,50 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_103/steam_api.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribed( void *args )
+#define SDKVER_103
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.h"
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribed(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsSubscribed();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsLowViolence( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsLowViolence(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsLowViolence();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsCybercafe( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsCybercafe(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsCybercafe();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsVACBanned( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsVACBanned(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsVACBanned();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetCurrentGameLanguage( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetCurrentGameLanguage(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetCurrentGameLanguage();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetAvailableGameLanguages( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetAvailableGameLanguages(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetAvailableGameLanguages();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribedApp( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribedApp(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsSubscribedApp((AppId_t)appID);
 }

+#ifdef __cplusplus
+}
+#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.h
@ -0,0 +1,7 @@
+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,71 +1,55 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_111/steam_api.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribed( void *args )
+#define SDKVER_111
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.h"
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribed(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsSubscribed();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsLowViolence( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsLowViolence(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsLowViolence();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsCybercafe( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsCybercafe(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsCybercafe();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsVACBanned( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsVACBanned(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsVACBanned();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetCurrentGameLanguage( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetCurrentGameLanguage(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetCurrentGameLanguage();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetAvailableGameLanguages( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetAvailableGameLanguages(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetAvailableGameLanguages();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribedApp( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribedApp(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsSubscribedApp((AppId_t)appID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsDlcInstalled( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsDlcInstalled(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsDlcInstalled((AppId_t)appID);
 }

+#ifdef __cplusplus
+}
+#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.h
@ -0,0 +1,8 @@
+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,119 +1,85 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_117/steam_api.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribed( void *args )
+#define SDKVER_117
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.h"
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribed(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsSubscribed();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsLowViolence( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsLowViolence(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsLowViolence();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsCybercafe( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsCybercafe(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsCybercafe();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsVACBanned( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsVACBanned(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsVACBanned();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetCurrentGameLanguage( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetCurrentGameLanguage(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetCurrentGameLanguage();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetAvailableGameLanguages( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetAvailableGameLanguages(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetAvailableGameLanguages();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribedApp( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribedApp(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsSubscribedApp((AppId_t)appID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsDlcInstalled( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsDlcInstalled(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsDlcInstalled((AppId_t)appID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetEarliestPurchaseUnixTime( void *args )
+uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetEarliestPurchaseUnixTime(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetEarliestPurchaseUnixTime((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribedFromFreeWeekend( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribedFromFreeWeekend(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsSubscribedFromFreeWeekend();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetDLCCount( void *args )
+int cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetDLCCount(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetDLCCount();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_BGetDLCDataByIndex( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BGetDLCDataByIndex(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BGetDLCDataByIndex((int)iDLC, (AppId_t *)pAppID, (bool *)pbAvailable, (char *)pchName, (int)cchNameBufferSize);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_InstallDLC( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_InstallDLC(void *linux_side, 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;
+    ((ISteamApps*)linux_side)->InstallDLC((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION004_UninstallDLC( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_UninstallDLC(void *linux_side, 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;
+    ((ISteamApps*)linux_side)->UninstallDLC((AppId_t)nAppID);
 }

+#ifdef __cplusplus
+}
+#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.h
@ -0,0 +1,14 @@
+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,168 +1,115 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_125/steam_api.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribed( void *args )
+#define SDKVER_125
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.h"
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribed(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsSubscribed();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsLowViolence( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsLowViolence(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsLowViolence();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsCybercafe( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsCybercafe(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsCybercafe();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsVACBanned( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsVACBanned(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsVACBanned();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetCurrentGameLanguage( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetCurrentGameLanguage(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetCurrentGameLanguage();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAvailableGameLanguages( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAvailableGameLanguages(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetAvailableGameLanguages();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribedApp( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribedApp(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsSubscribedApp((AppId_t)appID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsDlcInstalled( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsDlcInstalled(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsDlcInstalled((AppId_t)appID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetEarliestPurchaseUnixTime( void *args )
+uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetEarliestPurchaseUnixTime(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetEarliestPurchaseUnixTime((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribedFromFreeWeekend( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribedFromFreeWeekend(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsSubscribedFromFreeWeekend();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetDLCCount( void *args )
+int cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetDLCCount(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetDLCCount();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BGetDLCDataByIndex( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BGetDLCDataByIndex(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BGetDLCDataByIndex((int)iDLC, (AppId_t *)pAppID, (bool *)pbAvailable, (char *)pchName, (int)cchNameBufferSize);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_InstallDLC( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_InstallDLC(void *linux_side, 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;
+    ((ISteamApps*)linux_side)->InstallDLC((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_UninstallDLC( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_UninstallDLC(void *linux_side, 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;
+    ((ISteamApps*)linux_side)->UninstallDLC((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_RequestAppProofOfPurchaseKey( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_RequestAppProofOfPurchaseKey(void *linux_side, 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;
+    ((ISteamApps*)linux_side)->RequestAppProofOfPurchaseKey((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetCurrentBetaName( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetCurrentBetaName(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetCurrentBetaName((char *)pchName, (int)cchNameBufferSize);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_MarkContentCorrupt( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_MarkContentCorrupt(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->MarkContentCorrupt((bool)bMissingFilesOnly);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetInstalledDepots( void *args )
+uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetInstalledDepots(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetInstalledDepots((DepotId_t *)pvecDepots, (uint32)cMaxDepots);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAppInstallDir( void *args )
+uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAppInstallDir(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetAppInstallDir((AppId_t)appID, (char *)pchFolder, (uint32)cchFolderBufferSize);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsAppInstalled( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsAppInstalled(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsAppInstalled((AppId_t)appID);
 }

+#ifdef __cplusplus
+}
+#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.h
@ -0,0 +1,20 @@
+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,184 +1,125 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_131/steam_api.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribed( void *args )
+#define SDKVER_131
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.h"
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribed(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsSubscribed();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsLowViolence( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsLowViolence(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsLowViolence();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsCybercafe( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsCybercafe(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsCybercafe();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsVACBanned( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsVACBanned(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsVACBanned();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetCurrentGameLanguage( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetCurrentGameLanguage(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetCurrentGameLanguage();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAvailableGameLanguages( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAvailableGameLanguages(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetAvailableGameLanguages();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribedApp( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribedApp(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsSubscribedApp((AppId_t)appID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsDlcInstalled( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsDlcInstalled(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsDlcInstalled((AppId_t)appID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetEarliestPurchaseUnixTime( void *args )
+uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetEarliestPurchaseUnixTime(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetEarliestPurchaseUnixTime((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribedFromFreeWeekend( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribedFromFreeWeekend(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsSubscribedFromFreeWeekend();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetDLCCount( void *args )
+int cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetDLCCount(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetDLCCount();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BGetDLCDataByIndex( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BGetDLCDataByIndex(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BGetDLCDataByIndex((int)iDLC, (AppId_t *)pAppID, (bool *)pbAvailable, (char *)pchName, (int)cchNameBufferSize);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_InstallDLC( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_InstallDLC(void *linux_side, 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;
+    ((ISteamApps*)linux_side)->InstallDLC((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_UninstallDLC( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_UninstallDLC(void *linux_side, 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;
+    ((ISteamApps*)linux_side)->UninstallDLC((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_RequestAppProofOfPurchaseKey( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_RequestAppProofOfPurchaseKey(void *linux_side, 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;
+    ((ISteamApps*)linux_side)->RequestAppProofOfPurchaseKey((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetCurrentBetaName( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetCurrentBetaName(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetCurrentBetaName((char *)pchName, (int)cchNameBufferSize);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_MarkContentCorrupt( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_MarkContentCorrupt(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->MarkContentCorrupt((bool)bMissingFilesOnly);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetInstalledDepots( void *args )
+uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetInstalledDepots(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetInstalledDepots((AppId_t)appID, (DepotId_t *)pvecDepots, (uint32)cMaxDepots);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppInstallDir( void *args )
+uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppInstallDir(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetAppInstallDir((AppId_t)appID, (char *)pchFolder, (uint32)cchFolderBufferSize);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsAppInstalled( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsAppInstalled(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsAppInstalled((AppId_t)appID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppOwner( void *args )
+CSteamID cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppOwner(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetAppOwner();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetLaunchQueryParam( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetLaunchQueryParam(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetLaunchQueryParam((const char *)pchKey);
 }

+#ifdef __cplusplus
+}
+#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.h
@ -0,0 +1,22 @@
+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,200 +1,135 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_136/steam_api.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribed( void *args )
+#define SDKVER_136
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.h"
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribed(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsSubscribed();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsLowViolence( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsLowViolence(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsLowViolence();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsCybercafe( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsCybercafe(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsCybercafe();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsVACBanned( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsVACBanned(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsVACBanned();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetCurrentGameLanguage( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetCurrentGameLanguage(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetCurrentGameLanguage();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAvailableGameLanguages( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAvailableGameLanguages(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetAvailableGameLanguages();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribedApp( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribedApp(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsSubscribedApp((AppId_t)appID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsDlcInstalled( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsDlcInstalled(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsDlcInstalled((AppId_t)appID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetEarliestPurchaseUnixTime( void *args )
+uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetEarliestPurchaseUnixTime(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetEarliestPurchaseUnixTime((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribedFromFreeWeekend( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribedFromFreeWeekend(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsSubscribedFromFreeWeekend();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDLCCount( void *args )
+int cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDLCCount(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetDLCCount();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BGetDLCDataByIndex( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BGetDLCDataByIndex(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BGetDLCDataByIndex((int)iDLC, (AppId_t *)pAppID, (bool *)pbAvailable, (char *)pchName, (int)cchNameBufferSize);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_InstallDLC( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_InstallDLC(void *linux_side, 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;
+    ((ISteamApps*)linux_side)->InstallDLC((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_UninstallDLC( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_UninstallDLC(void *linux_side, 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;
+    ((ISteamApps*)linux_side)->UninstallDLC((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_RequestAppProofOfPurchaseKey( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_RequestAppProofOfPurchaseKey(void *linux_side, 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;
+    ((ISteamApps*)linux_side)->RequestAppProofOfPurchaseKey((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetCurrentBetaName( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetCurrentBetaName(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetCurrentBetaName((char *)pchName, (int)cchNameBufferSize);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_MarkContentCorrupt( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_MarkContentCorrupt(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->MarkContentCorrupt((bool)bMissingFilesOnly);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetInstalledDepots( void *args )
+uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetInstalledDepots(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetInstalledDepots((AppId_t)appID, (DepotId_t *)pvecDepots, (uint32)cMaxDepots);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppInstallDir( void *args )
+uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppInstallDir(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetAppInstallDir((AppId_t)appID, (char *)pchFolder, (uint32)cchFolderBufferSize);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsAppInstalled( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsAppInstalled(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsAppInstalled((AppId_t)appID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppOwner( void *args )
+CSteamID cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppOwner(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetAppOwner();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetLaunchQueryParam( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetLaunchQueryParam(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetLaunchQueryParam((const char *)pchKey);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDlcDownloadProgress( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDlcDownloadProgress(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetDlcDownloadProgress((AppId_t)nAppID, (uint64 *)punBytesDownloaded, (uint64 *)punBytesTotal);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppBuildId( void *args )
+int cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppBuildId(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetAppBuildId();
 }

+#ifdef __cplusplus
+}
+#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.h
@ -0,0 +1,24 @@
+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,274 +1,161 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_153a/steam_api.h"
+#include "steamworks_sdk_153a/steamnetworkingtypes.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribed( void *args )
+#define SDKVER_153a
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.h"
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribed(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsSubscribed();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsLowViolence( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsLowViolence(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsLowViolence();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsCybercafe( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsCybercafe(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsCybercafe();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsVACBanned( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsVACBanned(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsVACBanned();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetCurrentGameLanguage( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetCurrentGameLanguage(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetCurrentGameLanguage();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAvailableGameLanguages( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAvailableGameLanguages(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetAvailableGameLanguages();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedApp( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedApp(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsSubscribedApp((AppId_t)appID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsDlcInstalled( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsDlcInstalled(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsDlcInstalled((AppId_t)appID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetEarliestPurchaseUnixTime( void *args )
+uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetEarliestPurchaseUnixTime(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetEarliestPurchaseUnixTime((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFreeWeekend( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFreeWeekend(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsSubscribedFromFreeWeekend();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetDLCCount( void *args )
+int cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetDLCCount(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetDLCCount();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BGetDLCDataByIndex( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BGetDLCDataByIndex(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BGetDLCDataByIndex((int)iDLC, (AppId_t *)pAppID, (bool *)pbAvailable, (char *)pchName, (int)cchNameBufferSize);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_InstallDLC( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_InstallDLC(void *linux_side, 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;
+    ((ISteamApps*)linux_side)->InstallDLC((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_UninstallDLC( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_UninstallDLC(void *linux_side, 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;
+    ((ISteamApps*)linux_side)->UninstallDLC((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAppProofOfPurchaseKey( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAppProofOfPurchaseKey(void *linux_side, 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;
+    ((ISteamApps*)linux_side)->RequestAppProofOfPurchaseKey((AppId_t)nAppID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetCurrentBetaName( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetCurrentBetaName(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetCurrentBetaName((char *)pchName, (int)cchNameBufferSize);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_MarkContentCorrupt( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_MarkContentCorrupt(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->MarkContentCorrupt((bool)bMissingFilesOnly);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetInstalledDepots( void *args )
+uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetInstalledDepots(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetInstalledDepots((AppId_t)appID, (DepotId_t *)pvecDepots, (uint32)cMaxDepots);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppInstallDir( void *args )
+uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppInstallDir(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetAppInstallDir((AppId_t)appID, (char *)pchFolder, (uint32)cchFolderBufferSize);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsAppInstalled( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsAppInstalled(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsAppInstalled((AppId_t)appID);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppOwner( void *args )
+CSteamID cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppOwner(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetAppOwner();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchQueryParam( void *args )
+const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchQueryParam(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetLaunchQueryParam((const char *)pchKey);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetDlcDownloadProgress( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetDlcDownloadProgress(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetDlcDownloadProgress((AppId_t)nAppID, (uint64 *)punBytesDownloaded, (uint64 *)punBytesTotal);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppBuildId( void *args )
+int cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetAppBuildId(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->GetAppBuildId();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAllProofOfPurchaseKeys( void *args )
+void cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAllProofOfPurchaseKeys(void *linux_side)
 {
-    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;
+    ((ISteamApps*)linux_side)->RequestAllProofOfPurchaseKeys();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetFileDetails( void *args )
+SteamAPICall_t cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetFileDetails(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetFileDetails((const char *)pszFileName);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchCommandLine( void *args )
+int cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchCommandLine(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->GetLaunchCommandLine((char *)pszCommandLine, (int)cubCommandLine);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFamilySharing( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFamilySharing(void *linux_side)
 {
-    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;
+    return ((ISteamApps*)linux_side)->BIsSubscribedFromFamilySharing();
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsTimedTrial( void *args )
+bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsTimedTrial(void *linux_side, 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;
+    return ((ISteamApps*)linux_side)->BIsTimedTrial((uint32 *)punSecondsAllowed, (uint32 *)punSecondsPlayed);
 }

-NTSTATUS ISteamApps_STEAMAPPS_INTERFACE_VERSION008_SetDlcContext( void *args )
-{
-    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;
-}
-
-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;
-}
-
+#endif
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.h
@ -0,0 +1,29 @@
+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 *);
--- a/lsteamclient/cppISteamClient_SteamClient006.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient006.cpp
@ -1,175 +1,120 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_099y/steam_api.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamClient_SteamClient006_CreateSteamPipe( void *args )
+#define SDKVER_099y
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient006.h"
+HSteamPipe cppISteamClient_SteamClient006_CreateSteamPipe(void *linux_side)
 {
-    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;
+    return ((ISteamClient*)linux_side)->CreateSteamPipe();
 }

-NTSTATUS ISteamClient_SteamClient006_BReleaseSteamPipe( void *args )
+bool cppISteamClient_SteamClient006_BReleaseSteamPipe(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
 }

-NTSTATUS ISteamClient_SteamClient006_CreateGlobalUser( void *args )
+HSteamUser cppISteamClient_SteamClient006_CreateGlobalUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->CreateGlobalUser((HSteamPipe *)phSteamPipe);
 }

-NTSTATUS ISteamClient_SteamClient006_ConnectToGlobalUser( void *args )
+HSteamUser cppISteamClient_SteamClient006_ConnectToGlobalUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
 }

-NTSTATUS ISteamClient_SteamClient006_CreateLocalUser( void *args )
+HSteamUser cppISteamClient_SteamClient006_CreateLocalUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe);
 }

-NTSTATUS ISteamClient_SteamClient006_ReleaseUser( void *args )
+void cppISteamClient_SteamClient006_ReleaseUser(void *linux_side, 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;
+    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
 }

-NTSTATUS ISteamClient_SteamClient006_GetISteamUser( void *args )
+void *cppISteamClient_SteamClient006_GetISteamUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient006_GetIVAC( void *args )
+void * cppISteamClient_SteamClient006_GetIVAC(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetIVAC((HSteamUser)hSteamUser);
 }

-NTSTATUS ISteamClient_SteamClient006_GetISteamGameServer( void *args )
+void *cppISteamClient_SteamClient006_GetISteamGameServer(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient006_SetLocalIPBinding( void *args )
+void cppISteamClient_SteamClient006_SetLocalIPBinding(void *linux_side, 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;
+    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
 }

-NTSTATUS ISteamClient_SteamClient006_GetUniverseName( void *args )
+const char * cppISteamClient_SteamClient006_GetUniverseName(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetUniverseName((EUniverse)eUniverse);
 }

-NTSTATUS ISteamClient_SteamClient006_GetISteamFriends( void *args )
+void *cppISteamClient_SteamClient006_GetISteamFriends(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient006_GetISteamUtils( void *args )
+void *cppISteamClient_SteamClient006_GetISteamUtils(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient006_GetISteamBilling( void *args )
+void * cppISteamClient_SteamClient006_GetISteamBilling(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamBilling((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient006_GetISteamMatchmaking( void *args )
+void *cppISteamClient_SteamClient006_GetISteamMatchmaking(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient006_GetISteamApps( void *args )
+void *cppISteamClient_SteamClient006_GetISteamApps(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient006_GetISteamContentServer( void *args )
+void *cppISteamClient_SteamClient006_GetISteamContentServer(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamContentServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient006_GetISteamMasterServerUpdater( void *args )
+void *cppISteamClient_SteamClient006_GetISteamMasterServerUpdater(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMasterServerUpdater((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient006_GetISteamMatchmakingServers( void *args )
+void *cppISteamClient_SteamClient006_GetISteamMatchmakingServers(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient006_RunFrame( void *args )
+void cppISteamClient_SteamClient006_RunFrame(void *linux_side)
 {
-    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;
+    ((ISteamClient*)linux_side)->RunFrame();
 }

-NTSTATUS ISteamClient_SteamClient006_GetIPCCallCount( void *args )
+uint32 cppISteamClient_SteamClient006_GetIPCCallCount(void *linux_side)
 {
-    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;
+    return ((ISteamClient*)linux_side)->GetIPCCallCount();
 }

+#ifdef __cplusplus
+}
+#endif
--- a/lsteamclient/cppISteamClient_SteamClient006.h
+++ b/lsteamclient/cppISteamClient_SteamClient006.h
@ -0,0 +1,21 @@
+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,184 +1,126 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_103/steam_api.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamClient_SteamClient007_CreateSteamPipe( void *args )
+#define SDKVER_103
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient007.h"
+HSteamPipe cppISteamClient_SteamClient007_CreateSteamPipe(void *linux_side)
 {
-    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;
+    return ((ISteamClient*)linux_side)->CreateSteamPipe();
 }

-NTSTATUS ISteamClient_SteamClient007_BReleaseSteamPipe( void *args )
+bool cppISteamClient_SteamClient007_BReleaseSteamPipe(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
 }

-NTSTATUS ISteamClient_SteamClient007_ConnectToGlobalUser( void *args )
+HSteamUser cppISteamClient_SteamClient007_ConnectToGlobalUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
 }

-NTSTATUS ISteamClient_SteamClient007_CreateLocalUser( void *args )
+HSteamUser cppISteamClient_SteamClient007_CreateLocalUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe);
 }

-NTSTATUS ISteamClient_SteamClient007_ReleaseUser( void *args )
+void cppISteamClient_SteamClient007_ReleaseUser(void *linux_side, 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;
+    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
 }

-NTSTATUS ISteamClient_SteamClient007_GetISteamUser( void *args )
+void *cppISteamClient_SteamClient007_GetISteamUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient007_GetISteamGameServer( void *args )
+void *cppISteamClient_SteamClient007_GetISteamGameServer(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient007_SetLocalIPBinding( void *args )
+void cppISteamClient_SteamClient007_SetLocalIPBinding(void *linux_side, 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;
+    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
 }

-NTSTATUS ISteamClient_SteamClient007_GetISteamFriends( void *args )
+void *cppISteamClient_SteamClient007_GetISteamFriends(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient007_GetISteamUtils( void *args )
+void *cppISteamClient_SteamClient007_GetISteamUtils(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient007_GetISteamMatchmaking( void *args )
+void *cppISteamClient_SteamClient007_GetISteamMatchmaking(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient007_GetISteamContentServer( void *args )
+void *cppISteamClient_SteamClient007_GetISteamContentServer(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamContentServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient007_GetISteamMasterServerUpdater( void *args )
+void *cppISteamClient_SteamClient007_GetISteamMasterServerUpdater(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMasterServerUpdater((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient007_GetISteamMatchmakingServers( void *args )
+void *cppISteamClient_SteamClient007_GetISteamMatchmakingServers(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient007_GetISteamGenericInterface( void *args )
+void * cppISteamClient_SteamClient007_GetISteamGenericInterface(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient007_RunFrame( void *args )
+void cppISteamClient_SteamClient007_RunFrame(void *linux_side)
 {
-    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;
+    ((ISteamClient*)linux_side)->RunFrame();
 }

-NTSTATUS ISteamClient_SteamClient007_GetIPCCallCount( void *args )
+uint32 cppISteamClient_SteamClient007_GetIPCCallCount(void *linux_side)
 {
-    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;
+    return ((ISteamClient*)linux_side)->GetIPCCallCount();
 }

-NTSTATUS ISteamClient_SteamClient007_GetISteamUserStats( void *args )
+void *cppISteamClient_SteamClient007_GetISteamUserStats(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient007_GetISteamApps( void *args )
+void *cppISteamClient_SteamClient007_GetISteamApps(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient007_GetISteamNetworking( void *args )
+void *cppISteamClient_SteamClient007_GetISteamNetworking(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient007_SetWarningMessageHook( void *args )
+void cppISteamClient_SteamClient007_SetWarningMessageHook(void *linux_side, 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;
+    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
+    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
 }

-NTSTATUS ISteamClient_SteamClient007_GetISteamRemoteStorage( void *args )
+void *cppISteamClient_SteamClient007_GetISteamRemoteStorage(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

+#ifdef __cplusplus
+}
+#endif
--- a/lsteamclient/cppISteamClient_SteamClient007.h
+++ b/lsteamclient/cppISteamClient_SteamClient007.h
@ -0,0 +1,22 @@
+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,176 +1,121 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_107/steam_api.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamClient_SteamClient008_CreateSteamPipe( void *args )
+#define SDKVER_107
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient008.h"
+HSteamPipe cppISteamClient_SteamClient008_CreateSteamPipe(void *linux_side)
 {
-    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;
+    return ((ISteamClient*)linux_side)->CreateSteamPipe();
 }

-NTSTATUS ISteamClient_SteamClient008_BReleaseSteamPipe( void *args )
+bool cppISteamClient_SteamClient008_BReleaseSteamPipe(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
 }

-NTSTATUS ISteamClient_SteamClient008_ConnectToGlobalUser( void *args )
+HSteamUser cppISteamClient_SteamClient008_ConnectToGlobalUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
 }

-NTSTATUS ISteamClient_SteamClient008_CreateLocalUser( void *args )
+HSteamUser cppISteamClient_SteamClient008_CreateLocalUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
 }

-NTSTATUS ISteamClient_SteamClient008_ReleaseUser( void *args )
+void cppISteamClient_SteamClient008_ReleaseUser(void *linux_side, 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;
+    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
 }

-NTSTATUS ISteamClient_SteamClient008_GetISteamUser( void *args )
+void *cppISteamClient_SteamClient008_GetISteamUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient008_GetISteamGameServer( void *args )
+void *cppISteamClient_SteamClient008_GetISteamGameServer(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient008_SetLocalIPBinding( void *args )
+void cppISteamClient_SteamClient008_SetLocalIPBinding(void *linux_side, 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;
+    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
 }

-NTSTATUS ISteamClient_SteamClient008_GetISteamFriends( void *args )
+void *cppISteamClient_SteamClient008_GetISteamFriends(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient008_GetISteamUtils( void *args )
+void *cppISteamClient_SteamClient008_GetISteamUtils(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient008_GetISteamMatchmaking( void *args )
+void *cppISteamClient_SteamClient008_GetISteamMatchmaking(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient008_GetISteamMasterServerUpdater( void *args )
+void *cppISteamClient_SteamClient008_GetISteamMasterServerUpdater(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMasterServerUpdater((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient008_GetISteamMatchmakingServers( void *args )
+void *cppISteamClient_SteamClient008_GetISteamMatchmakingServers(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient008_GetISteamGenericInterface( void *args )
+void * cppISteamClient_SteamClient008_GetISteamGenericInterface(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient008_GetISteamUserStats( void *args )
+void *cppISteamClient_SteamClient008_GetISteamUserStats(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient008_GetISteamApps( void *args )
+void *cppISteamClient_SteamClient008_GetISteamApps(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient008_GetISteamNetworking( void *args )
+void *cppISteamClient_SteamClient008_GetISteamNetworking(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient008_GetISteamRemoteStorage( void *args )
+void *cppISteamClient_SteamClient008_GetISteamRemoteStorage(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient008_RunFrame( void *args )
+void cppISteamClient_SteamClient008_RunFrame(void *linux_side)
 {
-    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;
+    ((ISteamClient*)linux_side)->RunFrame();
 }

-NTSTATUS ISteamClient_SteamClient008_GetIPCCallCount( void *args )
+uint32 cppISteamClient_SteamClient008_GetIPCCallCount(void *linux_side)
 {
-    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;
+    return ((ISteamClient*)linux_side)->GetIPCCallCount();
 }

-NTSTATUS ISteamClient_SteamClient008_SetWarningMessageHook( void *args )
+void cppISteamClient_SteamClient008_SetWarningMessageHook(void *linux_side, 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;
+    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
+    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
 }

+#ifdef __cplusplus
+}
+#endif
--- a/lsteamclient/cppISteamClient_SteamClient008.h
+++ b/lsteamclient/cppISteamClient_SteamClient008.h
@ -0,0 +1,21 @@
+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,184 +1,126 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_111/steam_api.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamClient_SteamClient009_CreateSteamPipe( void *args )
+#define SDKVER_111
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient009.h"
+HSteamPipe cppISteamClient_SteamClient009_CreateSteamPipe(void *linux_side)
 {
-    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;
+    return ((ISteamClient*)linux_side)->CreateSteamPipe();
 }

-NTSTATUS ISteamClient_SteamClient009_BReleaseSteamPipe( void *args )
+bool cppISteamClient_SteamClient009_BReleaseSteamPipe(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
 }

-NTSTATUS ISteamClient_SteamClient009_ConnectToGlobalUser( void *args )
+HSteamUser cppISteamClient_SteamClient009_ConnectToGlobalUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
 }

-NTSTATUS ISteamClient_SteamClient009_CreateLocalUser( void *args )
+HSteamUser cppISteamClient_SteamClient009_CreateLocalUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
 }

-NTSTATUS ISteamClient_SteamClient009_ReleaseUser( void *args )
+void cppISteamClient_SteamClient009_ReleaseUser(void *linux_side, 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;
+    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
 }

-NTSTATUS ISteamClient_SteamClient009_GetISteamUser( void *args )
+void *cppISteamClient_SteamClient009_GetISteamUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient009_GetISteamGameServer( void *args )
+void *cppISteamClient_SteamClient009_GetISteamGameServer(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient009_SetLocalIPBinding( void *args )
+void cppISteamClient_SteamClient009_SetLocalIPBinding(void *linux_side, 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;
+    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
 }

-NTSTATUS ISteamClient_SteamClient009_GetISteamFriends( void *args )
+void *cppISteamClient_SteamClient009_GetISteamFriends(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient009_GetISteamUtils( void *args )
+void *cppISteamClient_SteamClient009_GetISteamUtils(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient009_GetISteamMatchmaking( void *args )
+void *cppISteamClient_SteamClient009_GetISteamMatchmaking(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient009_GetISteamMasterServerUpdater( void *args )
+void *cppISteamClient_SteamClient009_GetISteamMasterServerUpdater(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMasterServerUpdater((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient009_GetISteamMatchmakingServers( void *args )
+void *cppISteamClient_SteamClient009_GetISteamMatchmakingServers(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient009_GetISteamGenericInterface( void *args )
+void * cppISteamClient_SteamClient009_GetISteamGenericInterface(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient009_GetISteamUserStats( void *args )
+void *cppISteamClient_SteamClient009_GetISteamUserStats(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient009_GetISteamGameServerStats( void *args )
+void *cppISteamClient_SteamClient009_GetISteamGameServerStats(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamGameServerStats((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient009_GetISteamApps( void *args )
+void *cppISteamClient_SteamClient009_GetISteamApps(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient009_GetISteamNetworking( void *args )
+void *cppISteamClient_SteamClient009_GetISteamNetworking(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient009_GetISteamRemoteStorage( void *args )
+void *cppISteamClient_SteamClient009_GetISteamRemoteStorage(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient009_RunFrame( void *args )
+void cppISteamClient_SteamClient009_RunFrame(void *linux_side)
 {
-    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;
+    ((ISteamClient*)linux_side)->RunFrame();
 }

-NTSTATUS ISteamClient_SteamClient009_GetIPCCallCount( void *args )
+uint32 cppISteamClient_SteamClient009_GetIPCCallCount(void *linux_side)
 {
-    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;
+    return ((ISteamClient*)linux_side)->GetIPCCallCount();
 }

-NTSTATUS ISteamClient_SteamClient009_SetWarningMessageHook( void *args )
+void cppISteamClient_SteamClient009_SetWarningMessageHook(void *linux_side, 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;
+    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
+    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
 }

+#ifdef __cplusplus
+}
+#endif
--- a/lsteamclient/cppISteamClient_SteamClient009.h
+++ b/lsteamclient/cppISteamClient_SteamClient009.h
@ -0,0 +1,22 @@
+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,200 +1,136 @@
-/* This file is auto-generated, do not edit. */
-#include "unix_private.h"
-
-#if 0
-#pragma makedep unix
+#include "steam_defs.h"
+#pragma push_macro("__cdecl")
+#undef __cdecl
+#include "steamworks_sdk_115/steam_api.h"
+#pragma pop_macro("__cdecl")
+#include "steamclient_private.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
-
-NTSTATUS ISteamClient_SteamClient010_CreateSteamPipe( void *args )
+#define SDKVER_115
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient010.h"
+HSteamPipe cppISteamClient_SteamClient010_CreateSteamPipe(void *linux_side)
 {
-    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;
+    return ((ISteamClient*)linux_side)->CreateSteamPipe();
 }

-NTSTATUS ISteamClient_SteamClient010_BReleaseSteamPipe( void *args )
+bool cppISteamClient_SteamClient010_BReleaseSteamPipe(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->BReleaseSteamPipe((HSteamPipe)hSteamPipe);
 }

-NTSTATUS ISteamClient_SteamClient010_ConnectToGlobalUser( void *args )
+HSteamUser cppISteamClient_SteamClient010_ConnectToGlobalUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->ConnectToGlobalUser((HSteamPipe)hSteamPipe);
 }

-NTSTATUS ISteamClient_SteamClient010_CreateLocalUser( void *args )
+HSteamUser cppISteamClient_SteamClient010_CreateLocalUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->CreateLocalUser((HSteamPipe *)phSteamPipe, (EAccountType)eAccountType);
 }

-NTSTATUS ISteamClient_SteamClient010_ReleaseUser( void *args )
+void cppISteamClient_SteamClient010_ReleaseUser(void *linux_side, 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;
+    ((ISteamClient*)linux_side)->ReleaseUser((HSteamPipe)hSteamPipe, (HSteamUser)hUser);
 }

-NTSTATUS ISteamClient_SteamClient010_GetISteamUser( void *args )
+void *cppISteamClient_SteamClient010_GetISteamUser(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamUser((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient010_GetISteamGameServer( void *args )
+void *cppISteamClient_SteamClient010_GetISteamGameServer(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamGameServer((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient010_SetLocalIPBinding( void *args )
+void cppISteamClient_SteamClient010_SetLocalIPBinding(void *linux_side, 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;
+    ((ISteamClient*)linux_side)->SetLocalIPBinding((uint32)unIP, (uint16)usPort);
 }

-NTSTATUS ISteamClient_SteamClient010_GetISteamFriends( void *args )
+void *cppISteamClient_SteamClient010_GetISteamFriends(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamFriends((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient010_GetISteamUtils( void *args )
+void *cppISteamClient_SteamClient010_GetISteamUtils(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamUtils((HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient010_GetISteamMatchmaking( void *args )
+void *cppISteamClient_SteamClient010_GetISteamMatchmaking(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMatchmaking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient010_GetISteamMasterServerUpdater( void *args )
+void *cppISteamClient_SteamClient010_GetISteamMasterServerUpdater(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMasterServerUpdater((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient010_GetISteamMatchmakingServers( void *args )
+void *cppISteamClient_SteamClient010_GetISteamMatchmakingServers(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamMatchmakingServers((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient010_GetISteamGenericInterface( void *args )
+void * cppISteamClient_SteamClient010_GetISteamGenericInterface(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamGenericInterface((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient010_GetISteamUserStats( void *args )
+void *cppISteamClient_SteamClient010_GetISteamUserStats(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamUserStats((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient010_GetISteamGameServerStats( void *args )
+void *cppISteamClient_SteamClient010_GetISteamGameServerStats(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamGameServerStats((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient010_GetISteamApps( void *args )
+void *cppISteamClient_SteamClient010_GetISteamApps(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamApps((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient010_GetISteamNetworking( void *args )
+void *cppISteamClient_SteamClient010_GetISteamNetworking(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamNetworking((HSteamUser)hSteamUser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient010_GetISteamRemoteStorage( void *args )
+void *cppISteamClient_SteamClient010_GetISteamRemoteStorage(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamRemoteStorage((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

-NTSTATUS ISteamClient_SteamClient010_RunFrame( void *args )
+void cppISteamClient_SteamClient010_RunFrame(void *linux_side)
 {
-    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;
+    ((ISteamClient*)linux_side)->RunFrame();
 }

-NTSTATUS ISteamClient_SteamClient010_GetIPCCallCount( void *args )
+uint32 cppISteamClient_SteamClient010_GetIPCCallCount(void *linux_side)
 {
-    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;
+    return ((ISteamClient*)linux_side)->GetIPCCallCount();
 }

-NTSTATUS ISteamClient_SteamClient010_SetWarningMessageHook( void *args )
+void cppISteamClient_SteamClient010_SetWarningMessageHook(void *linux_side, 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;
+    pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t((void*)pFunction);
+    ((ISteamClient*)linux_side)->SetWarningMessageHook((SteamAPIWarningMessageHook_t)pFunction);
 }

-NTSTATUS ISteamClient_SteamClient010_BShutdownIfAllPipesClosed( void *args )
+bool cppISteamClient_SteamClient010_BShutdownIfAllPipesClosed(void *linux_side)
 {
-    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;
+    return ((ISteamClient*)linux_side)->BShutdownIfAllPipesClosed();
 }

-NTSTATUS ISteamClient_SteamClient010_GetISteamHTTP( void *args )
+void *cppISteamClient_SteamClient010_GetISteamHTTP(void *linux_side, 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;
+    return ((ISteamClient*)linux_side)->GetISteamHTTP((HSteamUser)hSteamuser, (HSteamPipe)hSteamPipe, (const char *)pchVersion);
 }

+#ifdef __cplusplus
+}
+#endif
--- a/lsteamclient/cppISteamClient_SteamClient010.h
+++ b/lsteamclient/cppISteamClient_SteamClient010.h
@ -0,0 +1,24 @@
+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/Show more
+++ b/Show more
Author	SHA1	Message	Date
Rémi Bernon	4a3731c3d9	update wine	2023-02-02 09:22:51 +01:00
Arkadiusz Hiler	f4c090a221	update wine	2023-01-20 14:36:35 +02:00
Anna Lasky	c5ad95671c	proton: Remove LOST EMBER from MFDXGI hack CW-Bug-Id: #21097	2022-12-16 20:40:44 +01:00
Arkadiusz Hiler	c703fadb78	update wine	2022-12-12 13:43:56 +01:00
Esme Povirk	40bfcf80d1	Update Wine Mono to 7.4.0.	2022-12-06 19:21:57 +02:00
Arkadiusz Hiler	2c632b6b7f	update dxvk-nvapi to v0.6	2022-12-06 19:21:57 +02:00
Paul Gofman	fd7c705a69	proton: Enable gamedrive compat option for As Dusk Fails. CW-Bug-Id: #21485	2022-12-06 19:21:57 +02:00
Arkadiusz Hiler	ad1a597368	media-converter: Use the test pattern video even without dump/transcoded files. So the game won't trip over lack of media when shader pre-cacheing is disabled in Steam. CW-Bug-Id: #21524	2022-12-06 19:21:57 +02:00
Shaun Ren	4793830e64	media-converter: Set stream ID as the video hash. If a stream ID is not set, gstreamer will generate random stream IDs for the streams in downstream elements. This can cause decodebin to generate its source pads in a non-deterministic order, as decodebin takes into account the stream IDs when sorting the source pads. This patch includes some changes from Arek Hiler. CW-Bug-Id: #21192	2022-12-06 19:21:57 +02:00
Rémi Bernon	64729f7842	docker: Add autoconf-archive dependency. For OpenFST.	2022-12-06 19:21:57 +02:00
Simon McVittie	11336323c1	proton: Don't crash if sys.stderr is not usable If a Steam user runs Steam from a terminal, puts it in the background and then exits from that terminal, or if they restart their desktop session from a terminal (as in ValveSoftware/Proton#6277) and then exit from that terminal, then we can inherit a stdout and/or stderr file descriptor pointing to an invalid file descriptor. Writing to such a file descriptor fails with EIO. Similarly, we could get write errors as a result of OS state, such as ENOSPC if we are writing to a disk that is full, or EPIPE if a stream to a logging framework such as the systemd journal has been shut down. In sufficiently pathological situations, the file descriptor could even become invalid while the `proton` script is running, so even checking for validity on startup would not be enough to prevent this. The ability to log to stderr is important but not functionally critical, and it's not like there is anything we can usefully do about a write failure here (or even anywhere we can usefully put a warning message), so just ignore write errors. This is similar to the behaviour of the `logging` framework in the Python standard library (which writes to `stderr` if a user-defined handler fails, but takes no other action) and also similar to the approach taken to solve ValveSoftware/steam-for-linux#8069. Signed-off-by: Simon McVittie <smcv@collabora.com> Link: https://github.com/ValveSoftware/Proton/pull/6341	2022-12-06 19:21:57 +02:00
Arkadiusz Hiler	07ef25e563	docker: Bump Rust to 1.65. For let-else statements and generic associated types.	2022-12-06 19:21:57 +02:00
Arkadiusz Hiler	0341fce653	docker: Don't specify the image tag in --cache-from The option is badly documented. Apparently the image name is enough. Specifying the tag breaks podman/buildah build.	2022-12-06 19:21:57 +02:00
Rémi Bernon	4b473d106e	docker: Add python3-mako to the SDK images.	2022-12-06 13:51:33 +01:00
Rémi Bernon	39b7a1e58e	docker: Add OpenBLAS dependency. For Kaldi / Vosk.	2022-12-06 13:51:30 +01:00
Anna Lasky	0dc2944e43	proton: Reorganize games in MFDXGI hack and add missing titles This separates out the games that only need shared resources in order to play video correctly without the MFDXGI hack. El Hijo (853050) and Labyrinth City: Pierre the Maze Detective (1421790) were also added.	2022-11-23 11:45:47 -06:00
Arkadiusz Hiler	babce20fc2	media-converter: Create a tag file when placeholder media are used. CW-Bug-Id: #21473	2022-11-23 14:06:19 +02:00
Arkadiusz Hiler	f053d6da15	media-converter: Apply `cargo clippy` suggestions.	2022-11-23 14:06:19 +02:00
Arkadiusz Hiler	5713bfc7b0	media-converter: Update to the newest gst bindings. 1. ElementImpl trait requires GstObjectImpl 2. gst logging macros are no longer globals prefixed with gst_, they live inside gst:: instead 3. element is not longer passed around in many places, it can be accessed as self.obj() or self.instance() 4. query_default is now a part of gst::Pad and takes the pad as an argument 5. some constructors were changed to use from_$type() 6. query.view_mut() returns QueryViewMut 7. ElementFactory::make now returns a builder that we have to .build() There are some extra cleanups as well: 1. spurious 'mut' and '&' are removed, a lot of that can be infered or were turned into a dereference by the compiler anyway 2. !bla.is_ok() are now bla.is_err() 3. some unneeded imports were removed	2022-11-23 14:06:19 +02:00
				`@ -0,0 +1 @@`
				`Subproject commit 538b2676eaac29565e4f1034a6f8a59ce158213d`
				`@ -0,0 +1 @@`
				`Subproject commit e896aabe3c3d278510fb567712c4a55ed0eae075`
				`@ -0,0 +1 @@`
				`Subproject commit 57fb883b3f8c6d7a397afc0dfc4a7c2e5af05579`
				`@ -0,0 +1 @@`
				`Subproject commit 56dec037a80266add6853e4b06e2dc379de757d1`
				`@ -0,0 +1 @@`
				`extern uint32 cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001_GetAppOwnershipTicketData(void , uint32, void , uint32, uint32 , uint32 , uint32 , uint32 );`
				`@ -0,0 +1 @@`
				`extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION001_GetAppData(void , AppId_t, const char , char *, int);`