import upstream changes

Author: GloriousEggroll

Makefile.in

@@ -25,11 +25,15 @@ SHELL := /bin/bash
 #   BUILD_NAME      - Name of the build for manifests etc.
 #   STEAMRT_IMAGE   - Name of the docker image to use for building
 
-STEAMRT_IMAGE ?= registry.gitlab.steamos.cloud/proton/sniper/sdk:0.20230905.59202-0
+STEAMRT_IMAGE ?= registry.gitlab.steamos.cloud/proton/sniper/sdk:0.20240307.80401-0
 ifeq ($(SRCDIR),)
 	foo := $(error SRCDIR not set, do not include Makefile.in directly, run ./configure.sh to generate Makefile)
 endif
 
+SOURCE_DATE_EPOCH ?= $(shell date +%s)
+MFLAGS += BASE_SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH)
+unexport SOURCE_DATE_EPOCH
+
 DST_BASE := $(OBJ)/dist
 DST_DIR := $(DST_BASE)/files
 DST_LIBDIR32 := $(DST_DIR)/lib
@@ -72,6 +76,9 @@ $(DST_DIR):
 	mkdir -p $@
 
 ifeq ($(CONTAINER),1) # inside the container
+BASE_SOURCE_DATE_EPOCH32 := $(BASE_SOURCE_DATE_EPOCH)
+BASE_SOURCE_DATE_EPOCH64 := $(shell expr $(BASE_SOURCE_DATE_EPOCH) - 10)
+
 # all, all-dist and dist are basically synonyms
 .PHONY: all all-dist dist
 all: all-dist | $(DST_DIR)
@@ -215,6 +222,7 @@ FFMPEG_CONFIGURE_ARGS := \
 	--disable-everything \
 	--disable-programs \
 	--disable-doc \
+	--disable-inline-asm \
 
 $(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg))
 $(eval $(call rules-configure,ffmpeg,32))
@@ -450,6 +458,10 @@ $(eval $(call rules-makedep,vrclient,64))
 ## dxvk
 ##
 
+# wine builds DLLs with the same names, we need to differentiate the timestamps
+DXVK_SOURCE_DATE_EPOCH32 := $(shell expr $(BASE_SOURCE_DATE_EPOCH32) - 1)
+DXVK_SOURCE_DATE_EPOCH64 := $(shell expr $(BASE_SOURCE_DATE_EPOCH64) - 1)
+
 DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
 DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
 DXVK_DEPENDS = glslang
@@ -519,6 +531,7 @@ VKD3D_CONFIGURE_ARGS = \
   --disable-tests \
   --disable-demos \
   --without-ncurses \
+  SONAME_LIBVULKAN=vulkan-1 \
 
 VKD3D_LDFLAGS = -static-libgcc $(CROSSLDFLAGS)
 VKD3D_DEPENDS = vulkan-loader vulkan-headers spirv-headers
@@ -543,6 +556,10 @@ $(OBJ)/.vkd3d-post-build32:
 ## vkd3d-proton
 ##
 
+# wine builds DLLs with the same names, we need to differentiate the timestamps
+VKD3D_PROTON_SOURCE_DATE_EPOCH32 := $(shell expr $(BASE_SOURCE_DATE_EPOCH32) - 2)
+VKD3D_PROTON_SOURCE_DATE_EPOCH64 := $(shell expr $(BASE_SOURCE_DATE_EPOCH64) - 2)
+
 VKD3D_PROTON_SOURCE_ARGS = \
   --exclude vkd3d_build.h.in \
   --exclude vkd3d_version.h.in \
@@ -578,27 +595,6 @@ $(OBJ)/.vkd3d-proton-post-build64:
 
 
 
-##
-## mediaconv
-##
-
-MEDIACONV_DEPENDS = gst_orc gstreamer gst_base
-
-$(eval $(call rules-source,mediaconv,$(SRCDIR)/media-converter))
-$(eval $(call rules-cargo,mediaconv,32))
-$(eval $(call rules-cargo,mediaconv,64))
-
-$(OBJ)/.mediaconv-post-build64:
-	mkdir -p $(MEDIACONV_DST64)/lib64/gstreamer-1.0/
-	cp -a $(MEDIACONV_OBJ64)/x86_64-unknown-linux-gnu/release/libprotonmediaconverter.so $(MEDIACONV_DST64)/lib64/gstreamer-1.0/
-	touch $@
-
-$(OBJ)/.mediaconv-post-build32:
-	mkdir -p $(MEDIACONV_DST32)/lib/gstreamer-1.0/
-	cp -a $(MEDIACONV_OBJ32)/i686-unknown-linux-gnu/release/libprotonmediaconverter.so $(MEDIACONV_DST32)/lib/gstreamer-1.0/
-	touch $@
-
-
 ##
 ## BattlEye Bridge
 ##
@@ -671,23 +667,6 @@ $(OBJ)/.eac-build32:
 
 endif
 
-# HACK: we need to order those builds so that timestamps are different between
-# 32 and 64 bit versions of the dlls. Otherwise there's a significant chance for
-# conflict when creating symbol storage. We also have to make sure that projects
-# which build alternative versions of the DLLs do not share the same timestamps.
-#
-# This is a temporary solution that only lowers the chance of conflicts.
-# Binutils 2.42 (not released yet at the time of writing this) will introduce
-# support for SOURCE_DATE_EPOCH which we should use instead.
-$(OBJ)/.wine-build64: $(OBJ)/.wine-build32
-$(OBJ)/.vkd3d-proton-build32: $(OBJ)/.wine-build64
-$(OBJ)/.vkd3d-proton-build64: $(OBJ)/.vkd3d-proton-build32
-$(OBJ)/.dxvk-build32: $(OBJ)/.wine-build64
-$(OBJ)/.dxvk-build64: $(OBJ)/.dxvk-build32
-$(OBJ)/.dxvk-lsteamclient64: $(OBJ)/.dxvk-lsteamclient32
-$(OBJ)/.vkd3d-build64: $(OBJ)/.vkd3d-build32
-# nvapi and vrclient dlls have distinct names for 64 bit versions
-
 ##
 ## Windows Symbol Store creation
 ##
@@ -709,6 +688,18 @@ symstore-tarball:
 	$(SYMSTORE_OBJ64)/symstore --skip-managed $(DST_BASE) $(OBJ)/symstore/$(BUILD_NAME)
 	cd $(OBJ)/symstore/$(BUILD_NAME) && zip -r ../$(BUILD_NAME)-symstore.zip . >& /dev/null
 
+##
+## Media
+##
+
+DIST_MEDIA := $(DST_DIR)/share/media
+$(DIST_MEDIA):
+	mkdir -p $@
+	cp $(SRCDIR)/media/blank.mkv $@
+	cp $(SRCDIR)/media/blank.ptna $@
+
+all-dist: $(DIST_MEDIA)
+
 ##
 ## Fonts
 ##
@@ -958,7 +949,7 @@ all-dist: $(DIST_GECKO32) $(DIST_GECKO64)
 ## wine-mono
 ##
 
-WINEMONO_VER := 9.0.0
+WINEMONO_VER := 9.1.0
 WINEMONO_TARBALL := wine-mono-$(WINEMONO_VER)-x86.tar.xz
 DIST_WINEMONO_DIR := $(DST_DIR)/share/wine/mono
 DIST_WINEMONO := $(OBJ)/.wine-mono-dist
@@ -977,6 +968,29 @@ $(DIST_WINEMONO): $(SRC)/contrib/$(WINEMONO_TARBALL)
 all-dist: $(DIST_WINEMONO)
 
 
+##
+## xalia
+##
+
+XALIA_VER := 0.4.2
+XALIA_ZIP := xalia-$(XALIA_VER)-net48-mono.zip
+DIST_XALIA_DIR := $(DST_DIR)/share/xalia
+DIST_XALIA := $(OBJ)/.xalia-dist
+XALIA_ZIP_URL := https://github.com/madewokherd/xalia/releases/download/xalia-$(XALIA_VER)/$(XALIA_ZIP)
+
+$(SRC)/contrib/$(XALIA_ZIP):
+	mkdir -p $(dir $@)
+	wget --no-use-server-timestamps -O $@ $(XALIA_ZIP_URL) || (rm $@; false)
+
+$(DIST_XALIA): $(SRC)/contrib/$(XALIA_ZIP)
+	rm -rf $(DIST_XALIA_DIR)
+	mkdir -p $(DIST_XALIA_DIR)
+	unzip $< -d $(DIST_XALIA_DIR)
+	touch $@
+
+all-dist: $(DIST_XALIA)
+
+
 ##
 ## openvr
 ##

OpenXR-SDK

@@ -1,4 +1,4 @@
-STEAMRT_VERSION = 0.20230905.59202
+STEAMRT_VERSION = 0.20240307.80401
 STEAMRT_URLBASE = registry.gitlab.steamos.cloud
 
 PROTONSDK_URLBASE = $(STEAMRT_URLBASE)/proton/sniper/sdk
@@ -9,7 +9,7 @@ PROTONSDK_VERSION = $(STEAMRT_VERSION)-0-dev
 # docker caches, so we need something that don't change much
 BASE_IMAGE = $(STEAMRT_URLBASE)/steamrt/sniper/sdk:0.20221017.1
 
-BINUTILS_VERSION = 2.40
+BINUTILS_VERSION = 2.42
 GCC_VERSION = 10.3.0
 MINGW_VERSION = 9.0.0
 RUST_VERSION = 1.68.0
@@ -29,7 +29,7 @@ RUST_SOURCE_x86_64 = rust-$(RUST_VERSION)-x86_64-unknown-linux-gnu.tar.gz
 RUST_SOURCE_i686 = rust-$(RUST_VERSION)-i686-unknown-linux-gnu.tar.gz
 NINJA_SOURCE = ninja-build_$(NINJA_VERSION).orig.tar.gz
 
-BINUTILS_SHA256 = 0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
+BINUTILS_SHA256 = f6e4d41fd5fc778b06b7891457b3620da5ecea1006c6a4a41ae998109f85a800
 GCC_SHA256 = 64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344
 MINGW_SHA256 = 1929b94b402f5ff4d7d37a9fe88daa9cc55515a6134805c104d1794ae22a4181
 RUST_SHA256_x86_64 = 7be1acdac656d0b0b7e909e5c0d4ddf61c755c203ec26ebafbd306322335b361

docker/Makefile

@@ -1,6 +1,6 @@
 MODULE    = lsteamclient.dll
 UNIXLIB   = lsteamclient.so
-IMPORTS   = user32
+IMPORTS   = user32 ws2_32
 
 EXTRADEFS = -DWINE_NO_LONG_TYPES -DSTEAM_API_EXPORTS -Dprivate=public -Dprotected=public
 

dxvk

@@ -88,7 +88,11 @@ static BOOL networking_message_pool_receive_144( int32_t capacity, int32_t count
     struct networking_message_pool *pool = CONTAINING_RECORD( messages[0], struct networking_message, w_msg_144 )->pool;
     int32_t i;
 
-    for (i = count; i < capacity; i++) messages[i]->m_pfnRelease( messages[i] );
+    for (i = count; i < capacity; i++)
+    {
+        messages[i]->m_pfnRelease( messages[i] );
+        messages[i] = NULL;
+    }
 
     if (count > 0)
     {
@@ -156,7 +160,11 @@ static BOOL networking_message_pool_receive_147( uint32_t capacity, uint32_t cou
     struct networking_message_pool *pool = CONTAINING_RECORD( messages[0], struct networking_message, w_msg_147 )->pool;
     uint32_t i;
 
-    for (i = count; i < capacity; i++) messages[i]->m_pfnRelease( messages[i] );
+    for (i = count; i < capacity; i++)
+    {
+        messages[i]->m_pfnRelease( messages[i] );
+        messages[i] = NULL;
+    }
 
     if (count)
     {
@@ -224,7 +232,11 @@ static BOOL networking_message_pool_receive_153a( uint32_t capacity, uint32_t co
     struct networking_message_pool *pool = CONTAINING_RECORD( messages[0], struct networking_message, w_msg_153a )->pool;
     uint32_t i;
 
-    for (i = count; i < capacity; i++) messages[i]->m_pfnRelease( messages[i] );
+    for (i = count; i < capacity; i++)
+    {
+        messages[i]->m_pfnRelease( messages[i] );
+        messages[i] = NULL;
+    }
 
     if (count)
     {

dxvk-nvapi

@@ -10,6 +10,7 @@
 #include "winnls.h"
 #include "winuser.h"
 #include "winternl.h"
+#include "winsock2.h"
 
 #include "steamclient_private.h"
 
@@ -49,6 +50,7 @@ static char temp_path_buffer[TEMP_PATH_BUFFER_LENGTH];
 
 static CRITICAL_SECTION steamclient_cs = { NULL, -1, 0, 0, 0, 0 };
 static HANDLE steam_overlay_event;
+static BOOL wsa_initialized;
 
 BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
 {
@@ -67,12 +69,30 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
             break;
         case DLL_PROCESS_DETACH:
             CloseHandle(steam_overlay_event);
+            if (wsa_initialized)
+            {
+                WSACleanup();
+                wsa_initialized = FALSE;
+            }
             break;
     }
 
     return TRUE;
 }
 
+NTSTATUS steamclient_call( unsigned int code, void *args, const char *name )
+{
+    NTSTATUS status = WINE_UNIX_CALL( code, args );
+
+    if (status == STATUS_ACCESS_VIOLATION)
+    {
+        ERR( "Access violation in %s.\n", name );
+        RaiseException( status, 0, 0, NULL );
+    }
+    if (status) WARN( "%s failed, status %#x\n", name, (UINT)status );
+    return status;
+}
+
 static BYTE *alloc_start, *alloc_end;
 
 static int8_t allocated_from_steamclient_dll( void *ptr )
@@ -334,6 +354,14 @@ static int load_steamclient(void)
         params.ignore_child_processes = ignore_child_processes;
 
     if (STEAMCLIENT_CALL( steamclient_init, &params )) return 0;
+    if (!wsa_initialized)
+    {
+        /* Some games depend on winsocks being initialized after initializing Steam API. */
+        WSADATA data;
+
+        WSAStartup(0x202, &data);
+        wsa_initialized = TRUE;
+    }
     return 1;
 }
 
@@ -359,12 +387,12 @@ void execute_pending_callbacks(void)
         {
         case SOCKETS_DEBUG_OUTPUT:
             TRACE( "SOCKETS_DEBUG_OUTPUT func %p, type %u, msg %s.\n", params.callback->sockets_debug_output.pfnFunc,
-                   params.callback->sockets_debug_output.type, wine_dbgstr_a( params.callback->sockets_debug_output.msg ) );
+                   params.callback->sockets_debug_output.type, debugstr_a( params.callback->sockets_debug_output.msg ) );
             params.callback->sockets_debug_output.pfnFunc( params.callback->sockets_debug_output.type, params.callback->sockets_debug_output.msg );
             break;
         case WARNING_MESSAGE_HOOK:
             TRACE( "WARNING_MESSAGE_HOOK func %p, severity %d, msg %s.\n", params.callback->warning_message_hook.pFunction,
-                   params.callback->warning_message_hook.severity, wine_dbgstr_a( params.callback->warning_message_hook.msg ) );
+                   params.callback->warning_message_hook.severity, debugstr_a( params.callback->warning_message_hook.msg ) );
             params.callback->warning_message_hook.pFunction( params.callback->warning_message_hook.severity, params.callback->warning_message_hook.msg );
             break;
         case CALL_CDECL_FUNC_DATA:
@@ -398,15 +426,15 @@ void execute_pending_callbacks(void)
             break;
         case CALL_IFACE_VTABLE_0_ADD_PLAYER_TO_LIST:
             TRACE( "CALL_IFACE_VTABLE_0_ADD_PLAYER_TO_LIST iface %p, name %s, score %u, time_played %f.\n", params.callback->add_player_to_list.iface,
-                   params.callback->add_player_to_list.name, params.callback->add_player_to_list.score, params.callback->add_player_to_list.time_played );
+                   debugstr_a( params.callback->add_player_to_list.name ), params.callback->add_player_to_list.score, params.callback->add_player_to_list.time_played );
             CALL_VTBL_FUNC( params.callback->add_player_to_list.iface, 0, void, (void *, const char *, int32_t, float), (params.callback->add_player_to_list.iface,
                             params.callback->add_player_to_list.name, params.callback->add_player_to_list.score, params.callback->add_player_to_list.time_played) );
             break;
         case CALL_IFACE_VTABLE_0_RULES_RESPONDED:
         {
             const char *value = params.callback->rules_responded.rule_and_value + strlen( params.callback->rules_responded.rule_and_value ) + 1;
             TRACE( "CALL_IFACE_VTABLE_0_RULES_RESPONDED iface %p, rule %s, value %s.\n", params.callback->rules_responded.iface,
-                   params.callback->rules_responded.rule_and_value, value );
+                   debugstr_a( params.callback->rules_responded.rule_and_value ), debugstr_a( value ) );
             CALL_VTBL_FUNC( params.callback->rules_responded.iface, 0, void, (void *, const char *, const char *), (params.callback->rules_responded.iface,
                             params.callback->rules_responded.rule_and_value, value) );
             break;