proton: import upstream symstore fixes

Makefile.in

@@ -901,23 +901,22 @@ endif
 ## Windows Symbol Store creation
 ##
 
-ifneq ($(wildcard $(SRCDIR)/symstore/.*),)
+SYMSTORE_DEPENDS = wine
 
 $(eval $(call rules-source,symstore,$(SRCDIR)/symstore))
+$(eval $(call create-rules-common,symstore,SYMSTORE,64))
 
-SYMSTORE_OBJ := $(OBJ)/obj-symstore
+$(OBJ)/.symstore-build64:
+	@echo ":: building symstore helper..." >&2
+	rsync -arx "$(SYMSTORE_SRC)/" "$(SYMSTORE_OBJ64)/"
+	$(MAKE) -C "$(SYMSTORE_OBJ64)" SYMSTORE_CFLAGS="-I$(WINE_SRC)/include -I$(WINE_OBJ64)/include"
+	touch $@
 
 .PHONY: symstore-tarball
-symstore-tarball: dist
-	@echo ":: building symbol store..." >&2
-	rsync -arx "$(SYMSTORE_SRC)/" "$(SYMSTORE_OBJ)/"
-	$(MAKE) -C "$(SYMSTORE_OBJ)" SYMSTORE_CFLAGS="-I$(WINE_SRC)/include -I$(WINE_OBJ64)/include"
+symstore-tarball:
 	mkdir -p $(OBJ)/symstore/$(BUILD_NAME)
-	$(SYMSTORE_OBJ)/symstore --skip-managed $(DST_BASE) $(OBJ)/symstore/$(BUILD_NAME)
-	cd $(OBJ)/symstore/$(BUILD_NAME) && tar zcf ../$(BUILD_NAME)-symbolstore.tgz .
-	cd $(OBJ)/symstore/$(BUILD_NAME) && zip -r ../$(BUILD_NAME)-symbolstore.zip . >& /dev/null
-
-endif
+	$(SYMSTORE_OBJ64)/symstore --skip-managed $(DST_BASE) $(OBJ)/symstore/$(BUILD_NAME)
+	cd $(OBJ)/symstore/$(BUILD_NAME) && zip -r ../$(BUILD_NAME)-symstore.zip . >& /dev/null
 
 ##
 ## Fonts

symstore/guidelines-deploy.md

@@ -1,6 +1,6 @@
 # Building the symbol server
 
-From a Proton build environment, run
+From a Proton build environment, after building Proton, run
 ```
 make symstore-tarball
 ```
@@ -15,18 +15,3 @@ a given URI.
 There are two strong requirements:
 - all files in <TOP> must be served as binary,
 - the mapping of <TOP> must be case insensitive.
-
-# Deploying a new Proton version
-
-Get the <BUILD_NAME>-symstore.zip [[URI or process to get it]] and
-extract in inside <TOP>.
-```
-cd <TOP> && unzip <BUILD_NAME>-symstore.zip
-```
-[[ Note: no check when overwritting files... this shouldn't happen as
-the timestamp should diversify ]]
-
-# Removing a Proton version
-
-Erase <TOP> and reinstall all Proton version -symstore.tip files
-except the one(s) to be removed.

symstore/guidelines.md

@@ -20,10 +20,10 @@ information, and your setup must be fixed before going any further.
 
 # Installing on dev machine
 
-Each new released proton version (starting at XXXX FIXME XXXX) will
-also be available as a zip package to be installed inside symbol store.
+Each new released proton version (starting at Proton 8.0-4) will also be
+available as a zip package to be installed inside symbol store.
 
-The .zip file is available at URL XXX FIXME XXX [decide] and is named
+The .zip file is available as a part of GitHub release and is named
 <BUILD_NAME>-symstore.zip.
 
 You must create a top directory (referred as <SYMSTORE> below) and
@@ -65,13 +65,10 @@ configuration as described above for MS tools.
 
 # Public store
 
-[[ NOTE depends on Valve's agreeing to set it up ]]
-
-A Proton symbol store is available at <SYMSTORE_URI>.
+A Proton symbol store is available at <https://proton-archive.steamos.cloud/>.
 
 Then no local installation is required, only setting the
 ```
 srv*<SYMSTORE_URI>
 ```
 in the debugging tools would be required.
-

symstore/symstore.c

@@ -127,7 +127,7 @@ static BOOL copy_file(const char* from, const char* to)
 static BOOL files_same_content(const char* file1, const char* file2)
 {
     FILE* f1 = fopen(file1, "rb");
-    FILE* f2 = fopen(file1, "rb");
+    FILE* f2 = fopen(file2, "rb");
     BOOL ret = FALSE;
 
     if (f1 && f2)