-
-
Notifications
You must be signed in to change notification settings - Fork 166
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update de-steamify-90-be.mypatch for current bleeding-edge (#1338)
* Updated de-steamify-90.mypatch for currentent experimental * Updated de-steamify-90-be.mypatch for current bleeding-edge
- Loading branch information
1 parent
310775a
commit e9125cb
Showing
1 changed file
with
37 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| From af53158335550986ad5d01020e54d0b8385b3fa1 Mon Sep 17 00:00:00 2001 | ||
| From d06acc9bfad289a644f9831e5c21f263157faa53 Mon Sep 17 00:00:00 2001 | ||
| From: Federico Dossena <[email protected]> | ||
| Date: Mon, 5 Aug 2024 12:47:58 +0200 | ||
| Date: Thu, 5 Dec 2024 08:05:28 +0100 | ||
| Subject: [PATCH] De-steamify proton's wine | ||
|
|
||
| --- | ||
|
|
@@ -76,10 +76,10 @@ index 127cec57252..2284e92b263 100644 | |
|
|
||
| /****************************************************************************** | ||
| diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c | ||
| index abf789d6033..2edd77e273f 100644 | ||
| index 9add5d9afac..a23d1cacebd 100644 | ||
| --- a/dlls/kernelbase/process.c | ||
| +++ b/dlls/kernelbase/process.c | ||
| @@ -1302,21 +1302,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenProcess( DWORD access, BOOL inherit, DWORD i | ||
| @@ -1303,21 +1303,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenProcess( DWORD access, BOOL inherit, DWORD i | ||
| attr.SecurityDescriptor = NULL; | ||
| attr.SecurityQualityOfService = NULL; | ||
|
|
||
|
|
@@ -102,7 +102,7 @@ index abf789d6033..2edd77e273f 100644 | |
| cid.UniqueThread = 0; | ||
|
|
||
| diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c | ||
| index 7ad0086daf0..6a2958d1985 100644 | ||
| index b16a899525d..8cbeb664b29 100644 | ||
| --- a/dlls/ntdll/loader.c | ||
| +++ b/dlls/ntdll/loader.c | ||
| @@ -90,7 +90,7 @@ const WCHAR windows_dir[] = L"C:\\windows"; | ||
|
|
@@ -114,7 +114,7 @@ index 7ad0086daf0..6a2958d1985 100644 | |
|
|
||
| static BOOL is_prefix_bootstrap; /* are we bootstrapping the prefix? */ | ||
| static BOOL imports_fixup_done = FALSE; /* set once the imports have been fixed up, before attaching them */ | ||
| @@ -2231,19 +2231,6 @@ static NTSTATUS perform_relocations( void *module, IMAGE_NT_HEADERS *nt, SIZE_T | ||
| @@ -2327,19 +2327,6 @@ static NTSTATUS perform_relocations( void *module, IMAGE_NT_HEADERS *nt, SIZE_T | ||
| return STATUS_SUCCESS; | ||
| } | ||
|
|
||
|
|
@@ -134,7 +134,7 @@ index 7ad0086daf0..6a2958d1985 100644 | |
| /************************************************************************* | ||
| * build_module | ||
| * | ||
| @@ -2254,17 +2241,12 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, | ||
| @@ -2350,17 +2337,12 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, | ||
| DWORD flags, BOOL system, WINE_MODREF **pwm ) | ||
| { | ||
| static const char builtin_signature[] = "Wine builtin DLL"; | ||
|
|
@@ -152,7 +152,7 @@ index 7ad0086daf0..6a2958d1985 100644 | |
|
|
||
| if (!(nt = RtlImageNtHeader( *module ))) return STATUS_INVALID_IMAGE_FORMAT; | ||
|
|
||
| @@ -2285,50 +2267,6 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, | ||
| @@ -2381,50 +2363,6 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, | ||
|
|
||
| update_load_config( *module ); | ||
|
|
||
|
|
@@ -204,10 +204,10 @@ index 7ad0086daf0..6a2958d1985 100644 | |
|
|
||
| if (!(flags & DONT_RESOLVE_DLL_REFERENCES) && | ||
| diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c | ||
| index d068c1a7df9..f1a97dc1149 100644 | ||
| index f76368ba73d..c0ed676963d 100644 | ||
| --- a/dlls/ntdll/unix/env.c | ||
| +++ b/dlls/ntdll/unix/env.c | ||
| @@ -2508,7 +2508,6 @@ void WINAPI RtlSetLastWin32Error( DWORD err ) | ||
| @@ -2515,7 +2515,6 @@ void WINAPI RtlSetLastWin32Error( DWORD err ) | ||
| */ | ||
| NTSTATUS WINAPI __wine_set_unix_env( const char *var, const char *val ) | ||
| { | ||
|
|
@@ -217,7 +217,7 @@ index d068c1a7df9..f1a97dc1149 100644 | |
| return 0; | ||
| } | ||
| diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c | ||
| index f8695a70deb..1c965027184 100644 | ||
| index 1e75eff1595..6dc5706b9ea 100644 | ||
| --- a/dlls/ntdll/unix/loader.c | ||
| +++ b/dlls/ntdll/unix/loader.c | ||
| @@ -592,47 +592,12 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i | ||
|
|
@@ -375,18 +375,18 @@ index f8695a70deb..1c965027184 100644 | |
| debugstr_pc, | ||
| }; | ||
| diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c | ||
| index faf09c05371..1751853bd1f 100644 | ||
| index 23c01c6b64c..3a138c1dfc1 100644 | ||
| --- a/dlls/ntdll/unix/signal_i386.c | ||
| +++ b/dlls/ntdll/unix/signal_i386.c | ||
| @@ -1916,7 +1916,6 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) | ||
| @@ -1927,7 +1927,6 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) | ||
| struct xcontext xcontext; | ||
| ucontext_t *ucontext = sigcontext; | ||
| void *stack = setup_exception_record( sigcontext, &rec, &xcontext ); | ||
| - void *steamclient_addr = NULL; | ||
|
|
||
| switch (TRAP_sig(ucontext)) | ||
| { | ||
| @@ -1951,12 +1950,6 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) | ||
| @@ -1962,12 +1961,6 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) | ||
| } | ||
| break; | ||
| case TRAP_x86_PAGEFLT: /* Page fault */ | ||
|
|
@@ -400,18 +400,18 @@ index faf09c05371..1751853bd1f 100644 | |
| rec.ExceptionInformation[0] = (ERROR_sig(ucontext) >> 1) & 0x09; | ||
| rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; | ||
| diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c | ||
| index be9af2c23d1..944bb0097b2 100644 | ||
| index c76a08c5237..a5814688d5c 100644 | ||
| --- a/dlls/ntdll/unix/signal_x86_64.c | ||
| +++ b/dlls/ntdll/unix/signal_x86_64.c | ||
| @@ -2276,7 +2276,6 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) | ||
| @@ -2315,7 +2315,6 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) | ||
| EXCEPTION_RECORD rec = { 0 }; | ||
| struct xcontext context; | ||
| ucontext_t *ucontext = init_handler( sigcontext ); | ||
| - void *steamclient_addr = NULL; | ||
|
|
||
| rec.ExceptionAddress = (void *)RIP_sig(ucontext); | ||
| save_context( &context, ucontext ); | ||
| @@ -2308,12 +2307,6 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) | ||
| @@ -2347,12 +2346,6 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) | ||
| } | ||
| break; | ||
| case TRAP_x86_PAGEFLT: /* Page fault */ | ||
|
|
@@ -425,10 +425,10 @@ index be9af2c23d1..944bb0097b2 100644 | |
| rec.ExceptionInformation[0] = (ERROR_sig(ucontext) >> 1) & 0x09; | ||
| rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; | ||
| diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h | ||
| index 2b62d5c7754..3c0bf2bab95 100644 | ||
| index 9dc8ea627e0..d7d749ec741 100644 | ||
| --- a/dlls/ntdll/unix/unix_private.h | ||
| +++ b/dlls/ntdll/unix/unix_private.h | ||
| @@ -265,7 +265,6 @@ extern unsigned int alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, stru | ||
| @@ -268,7 +268,6 @@ extern unsigned int alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, stru | ||
| data_size_t *ret_len ); | ||
| extern NTSTATUS system_time_precise( void *args ); | ||
|
|
||
|
|
@@ -462,10 +462,10 @@ index e0870584a68..94abe3450b8 100644 | |
| unix_debugstr_pc, | ||
| }; | ||
| diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c | ||
| index c384919fdc2..634fd944ca0 100644 | ||
| index 27354345c94..1ac928b66b8 100644 | ||
| --- a/dlls/shell32/shellpath.c | ||
| +++ b/dlls/shell32/shellpath.c | ||
| @@ -2639,6 +2639,183 @@ end: | ||
| @@ -2651,6 +2651,183 @@ end: | ||
| return hr; | ||
| } | ||
|
|
||
|
|
@@ -649,7 +649,7 @@ index c384919fdc2..634fd944ca0 100644 | |
| /****************************************************************************** | ||
| * SHGetFolderPathW [SHELL32.@] | ||
| * | ||
| @@ -2827,6 +3004,10 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( | ||
| @@ -2839,6 +3016,10 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( | ||
| goto end; | ||
| } | ||
|
|
||
|
|
@@ -660,7 +660,7 @@ index c384919fdc2..634fd944ca0 100644 | |
| /* create directory/directories */ | ||
| ret = SHCreateDirectoryExW(hwndOwner, szBuildPath, NULL); | ||
| if (ret && ret != ERROR_ALREADY_EXISTS) | ||
| @@ -2881,8 +3062,6 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, | ||
| @@ -2893,8 +3074,6 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, | ||
| LPCWSTR szUserShellFolderPath, LPCWSTR szShellFolderPath, const UINT folders[], | ||
| UINT foldersLen) | ||
| { | ||
|
|
@@ -669,15 +669,15 @@ index c384919fdc2..634fd944ca0 100644 | |
| const WCHAR *szValueName; | ||
| WCHAR buffer[40]; | ||
| UINT i; | ||
| @@ -2891,7 +3070,6 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, | ||
| @@ -2903,7 +3082,6 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, | ||
| HKEY hUserKey = NULL, hKey = NULL; | ||
| DWORD dwType, dwPathLen; | ||
| LONG ret; | ||
| - DWORD already_vista_paths = 0; | ||
|
|
||
| TRACE("%p,%p,%s,%p,%u\n", hRootKey, hToken, | ||
| debugstr_w(szUserShellFolderPath), folders, foldersLen); | ||
| @@ -2905,12 +3083,6 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, | ||
| @@ -2917,12 +3095,6 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, | ||
| if (ret) | ||
| hr = HRESULT_FROM_WIN32(ret); | ||
| } | ||
|
|
@@ -690,7 +690,7 @@ index c384919fdc2..634fd944ca0 100644 | |
| for (i = 0; SUCCEEDED(hr) && i < foldersLen; i++) | ||
| { | ||
| dwPathLen = MAX_PATH * sizeof(WCHAR); | ||
| @@ -2923,10 +3095,9 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, | ||
| @@ -2935,10 +3107,9 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, | ||
| szValueName = &buffer[0]; | ||
| } | ||
|
|
||
|
|
@@ -704,7 +704,7 @@ index c384919fdc2..634fd944ca0 100644 | |
| { | ||
| *path = '\0'; | ||
| if (CSIDL_Data[folders[i]].type == CSIDL_Type_User) | ||
| @@ -2967,11 +3138,6 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, | ||
| @@ -2979,11 +3150,6 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, | ||
| hToken, SHGFP_TYPE_DEFAULT, path); | ||
| } | ||
| } | ||
|
|
@@ -716,7 +716,7 @@ index c384919fdc2..634fd944ca0 100644 | |
| if (hUserKey) | ||
| RegCloseKey(hUserKey); | ||
| if (hKey) | ||
| @@ -3112,23 +3278,6 @@ static HRESULT create_extra_folders(void) | ||
| @@ -3123,23 +3289,6 @@ static HRESULT create_extra_folders(void) | ||
| hr = SHGetFolderPathAndSubDirW(0, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, | ||
| SHGFP_TYPE_DEFAULT, L"Microsoft\\Windows\\Themes", path); | ||
| } | ||
|
|
@@ -741,7 +741,7 @@ index c384919fdc2..634fd944ca0 100644 | |
| } | ||
|
|
||
| diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c | ||
| index c4b43077d68..5b2fd40ea9b 100644 | ||
| index b8075aeb5a9..53bcc3b8211 100644 | ||
| --- a/dlls/winex11.drv/window.c | ||
| +++ b/dlls/winex11.drv/window.c | ||
| @@ -1060,19 +1060,8 @@ static void set_initial_wm_hints( Display *display, Window window ) | ||
|
|
@@ -767,7 +767,7 @@ index c4b43077d68..5b2fd40ea9b 100644 | |
| XFree( class_hints ); | ||
| } | ||
| diff --git a/loader/wine.inf.in b/loader/wine.inf.in | ||
| index 1f4019cc417..0dd824f9f44 100644 | ||
| index 4c423fe97a7..d136598d1fa 100644 | ||
| --- a/loader/wine.inf.in | ||
| +++ b/loader/wine.inf.in | ||
| @@ -98,8 +98,7 @@ AddReg=\ | ||
|
|
@@ -780,17 +780,17 @@ index 1f4019cc417..0dd824f9f44 100644 | |
|
|
||
| [DefaultInstall.ntamd64] | ||
| RegisterDlls=RegisterDllsSection | ||
| @@ -127,8 +126,7 @@ AddReg=\ | ||
| VersionInfo,\ | ||
| @@ -128,8 +127,7 @@ AddReg=\ | ||
| LicenseInformation,\ | ||
| NVIDIANGX, \ | ||
| TTS, \ | ||
| - ProtonOverrides,\ | ||
| - SteamClient.ntamd64 | ||
| + ProtonOverrides | ||
|
|
||
| [DefaultInstall.ntarm64] | ||
| RegisterDlls=RegisterDllsSection | ||
| @@ -172,8 +170,7 @@ AddReg=\ | ||
| @@ -173,8 +171,7 @@ AddReg=\ | ||
| VersionInfo,\ | ||
| LicenseInformation,\ | ||
| NVIDIANGX, \ | ||
|
|
@@ -800,23 +800,23 @@ index 1f4019cc417..0dd824f9f44 100644 | |
|
|
||
| [Wow64Install.ntarm] | ||
| RegisterDlls=RegisterDllsSection | ||
| @@ -351,7 +348,6 @@ HKCR,ftp\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" | ||
| @@ -352,7 +349,6 @@ HKCR,ftp\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" | ||
| HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" | ||
| HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" | ||
| HKCR,mailto\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" | ||
| -HKCR,steam\shell\open\command,,,"""%16426%\Steam\Steam.exe"" -- ""%1""" | ||
|
|
||
| [ContentIndex] | ||
| HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}" | ||
| @@ -466,7 +462,6 @@ HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" | ||
| @@ -467,7 +463,6 @@ HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" | ||
| HKLM,%CurrentVersionNT%\AeDebug,"Auto",2,"1" | ||
| HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlTryEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98;kernel32.TlsGetValue;kernel32.TlsSetValue;kernel32.FlsGetValue;kernel32.FlsSetValue;kernel32.SetLastError" | ||
| HKCU,Software\Wine\Debug,"RelayFromExclude",2,"winex11.drv;winemac.drv;user32;gdi32;advapi32;kernel32" | ||
| -HKCU,Software\Wine\WineDbg,"ShowCrashDialog",0x00010003,0x00000000 | ||
|
|
||
| [DirectX] | ||
| HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904" | ||
| @@ -2820,22 +2815,6 @@ InfFiles = 17 | ||
| @@ -2821,22 +2816,6 @@ InfFiles = 17 | ||
| NlsFiles = 11 | ||
| SortFiles = 10,globalization\sorting | ||
|
|
||
|
|
@@ -1053,5 +1053,5 @@ index 7769d20481d..92fa77429f6 100644 | |
| line_pos -= i; | ||
| } | ||
| -- | ||
| 2.46.0 | ||
| 2.47.1 | ||
|
|
||