Skip to content

Commit

Permalink
update to near-stable build
Browse files Browse the repository at this point in the history
  • Loading branch information
GloriousEggroll committed Mar 3, 2020
1 parent 83cafe7 commit d86a9ee
Show file tree
Hide file tree
Showing 9 changed files with 159 additions and 518 deletions.
22 changes: 22 additions & 0 deletions game-patches-testing/game-patches/detroit_BH.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index 61e48f6fbd..cc2b690b61 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -482,6 +482,7 @@ void version_init(void)
BOOL got_win_ver = FALSE;
const WCHAR *p, *appname = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer;
WCHAR appversion[MAX_PATH+20];
+ SYSTEM_BASIC_INFORMATION sbi;

current_version = &VersionData[WIN7];

@@ -547,6 +548,9 @@ done:
user_shared_data->NtMinorVersion = current_version->dwMinorVersion;
user_shared_data->SuiteMask = current_version->wSuiteMask;

+ virtual_get_system_info(&sbi);
+ user_shared_data->NumberOfPhysicalPages = sbi.MmNumberOfPhysicalPages;
+
TRACE( "got %d.%d platform %d build %x name %s service pack %d.%d product %d\n",
current_version->dwMajorVersion, current_version->dwMinorVersion,
current_version->dwPlatformId, current_version->dwBuildNumber,
20 changes: 20 additions & 0 deletions game-patches-testing/game-patches/gtav_activation_fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
From 66e9185710015fa4eff0677a3cb0bba47f992d78 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Tue, 3 Mar 2020 01:20:46 +0100
Subject: Prevent create_bios_key to run
Workaround for Grand Theft Auto 5 activation timeout since 68a01c8c


diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -679,9 +679,6 @@ static void create_hardware_registry_keys(void)
RegCloseKey( hkey );
}
}
-
- create_bios_key( system_key );
-
RegCloseKey( fpu_key );
RegCloseKey( cpu_key );
RegCloseKey( system_key );
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,10 @@ We need access to linux crt functions (like getenv()), so disallow use
of msvcrt. Notably, linux crt wchar functions are _not_ compatible with
Windows WCHAR strings.
---
build/makefile_base.mak | 3 +--
steam_helper/steam.cpp | 21 ++++++++++++++++-----
2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/build/makefile_base.mak b/build/makefile_base.mak
index 5ac0fef..15409ec 100644
--- a/build/makefile_base.mak
+++ b/build/makefile_base.mak
@@ -1127,12 +1127,11 @@ $(STEAMEXE_CONFIGURE_FILES): $(STEAMEXE_SYN) $(MAKEFILE_DEP) | $(STEAMEXE_OBJ) $
-I"../$(TOOLS_DIR32)"/include/ \
-I"../$(TOOLS_DIR32)"/include/wine/ \
-I"../$(TOOLS_DIR32)"/include/wine/windows/ \
- -I"../$(TOOLS_DIR32)"/include/wine/msvcrt/ \
-I"../$(SRCDIR)"/lsteamclient/steamworks_sdk_142/ \
-L"../$(TOOLS_DIR32)"/lib/ \
-L"../$(TOOLS_DIR32)"/lib/wine/ \
-L"../$(SRCDIR)"/steam_helper/ \
- --guiexe ../$(STEAMEXE_SYN) && \
+ --guiexe --nomsvcrt ../$(STEAMEXE_SYN) && \
cp ../$(STEAMEXE_SYN)/Makefile . && \
echo >> ./Makefile 'SRCDIR := ../$(STEAMEXE_SYN)' && \
echo >> ./Makefile 'vpath % $$(SRCDIR)' && \
diff --git a/steam_helper/steam.cpp b/steam_helper/steam.cpp
diff --git a/steam.cpp b/steam.cpp
index 8e5b977..9dcc891 100644
--- a/steam_helper/steam.cpp
+++ b/steam_helper/steam.cpp
--- a/steam.cpp
+++ b/steam.cpp
@@ -117,9 +117,20 @@ static void setup_steam_registry(void)
SteamAPI_Shutdown();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,11 @@ Date: Wed, 26 Feb 2020 10:49:35 -0600
Subject: [PATCH] steam_helper: Import jsoncpp

---
steam_helper/json/json-forwards.h | 284 ++
steam_helper/json/json.h | 2077 ++++++++++++
steam_helper/jsoncpp.cpp | 5266 +++++++++++++++++++++++++++++
3 files changed, 7627 insertions(+)
create mode 100644 steam_helper/json/json-forwards.h
create mode 100644 steam_helper/json/json.h
create mode 100644 steam_helper/jsoncpp.cpp

diff --git a/steam_helper/json/json-forwards.h b/steam_helper/json/json-forwards.h
diff --git a/json/json-forwards.h b/json/json-forwards.h
new file mode 100644
index 0000000..910c7de
--- /dev/null
+++ b/steam_helper/json/json-forwards.h
+++ b/json/json-forwards.h
@@ -0,0 +1,284 @@
+/// Json-cpp amalgated forward header (http://jsoncpp.sourceforge.net/).
+/// It is intended to be used with #include "json/json-forwards.h"
Expand Down Expand Up @@ -302,11 +294,11 @@ index 0000000..910c7de
+
+
+#endif //ifndef JSON_FORWARD_AMALGATED_H_INCLUDED
diff --git a/steam_helper/json/json.h b/steam_helper/json/json.h
diff --git a/json/json.h b/json/json.h
new file mode 100644
index 0000000..d27f65d
--- /dev/null
+++ b/steam_helper/json/json.h
+++ b/json/json.h
@@ -0,0 +1,2077 @@
+/// Json-cpp amalgated header (http://jsoncpp.sourceforge.net/).
+/// It is intended to be used with #include "json/json.h"
Expand Down Expand Up @@ -2385,11 +2377,11 @@ index 0000000..d27f65d
+
+
+#endif //ifndef JSON_AMALGATED_H_INCLUDED
diff --git a/steam_helper/jsoncpp.cpp b/steam_helper/jsoncpp.cpp
diff --git a/jsoncpp.cpp b/jsoncpp.cpp
new file mode 100644
index 0000000..e67d353
--- /dev/null
+++ b/steam_helper/jsoncpp.cpp
+++ b/jsoncpp.cpp
@@ -0,0 +1,5266 @@
+/// Json-cpp amalgated source (http://jsoncpp.sourceforge.net/).
+/// It is intended to be used with #include "json/json.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] steam_helper: Set up VR paths in steam.exe, not proton

This speeds up game launch times.
---
diff --git a/steam_helper/steam.cpp b/steam_helper/steam.cpp
diff --git a/steam.cpp b/steam.cpp
index 9dcc891..f4eb2cb 100644
--- a/steam_helper/steam.cpp
+++ b/steam_helper/steam.cpp
--- a/steam.cpp
+++ b/steam.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Valve Corporation
Expand Down
12 changes: 9 additions & 3 deletions game-patches-testing/protonprep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
cd vkd3d
git reset --hard HEAD
git clean -xdf
#WoW anti-flicker patch - disabled - causes metro exodus menu crash
#patch -Np1 < ../game-patches-testing/vkd3d-patches/wow-flicker.patch
#WoW anti-flicker patch
patch -Np1 < ../game-patches-testing/vkd3d-patches/Support_RS_1.0_Volatile.patch
cd ..

# Valve DXVK patches
Expand Down Expand Up @@ -84,7 +84,13 @@
patch -Np1 < ../game-patches-testing/game-patches/sword-art-online-gnutls.patch

echo "Jedi Fallen Order steam + origin patch"
patch -Np1 < ../game-patches-testing/game-patches/steam-origin-JFO.patch.patch
patch -Np1 < ../game-patches-testing/game-patches/steam-origin-JFO.patch

echo "gta v activation fix"
patch -Np1 < ../game-patches-testing/game-patches/gtav_activation_fix.patch

echo "detroit become human patch"
patch -Np1 < ../game-patches-testing/game-patches/detroit_BH.patch

echo "origin downloads fix"
patch -Np1 < ../game-patches-testing/game-patches/origin-downloads_fix.patch
Expand Down
Loading

0 comments on commit d86a9ee

Please sign in to comment.