diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 6085aba9..6a69960c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "a9c4b309f6af82b624604bd0df898ad88d59ab5a" + echo "aa3d01e65019fb2f135f74cf26cfa1661ca09325" } # Show version information @@ -308,7 +308,6 @@ patch_enable_all () enable_wine_inf_Directory_ContextMenuHandlers="$1" enable_wine_inf_Dummy_CA_Certificate="$1" enable_wine_inf_Performance="$1" - enable_wine_inf_ProfileList_UserSID="$1" enable_wineboot_DriveSerial="$1" enable_wineboot_HKEY_DYN_DATA="$1" enable_wineboot_ProxySettings="$1" @@ -1047,9 +1046,6 @@ patch_enable () wine.inf-Performance) enable_wine_inf_Performance="$2" ;; - wine.inf-ProfileList_UserSID) - enable_wine_inf_ProfileList_UserSID="$2" - ;; wineboot-DriveSerial) enable_wineboot_DriveSerial="$2" ;; @@ -6483,24 +6479,6 @@ if test "$enable_wine_inf_Performance" -eq 1; then ) >> "$patchlist" fi -# Patchset wine.inf-ProfileList_UserSID -# | -# | This patchset fixes the following Wine bugs: -# | * [#15670] Add a ProfileList\ registry subkey -# | * [#42249] Add a ProfileImagePath key with users profile directory -# | -# | Modified files: -# | * loader/wine.inf.in -# | -if test "$enable_wine_inf_ProfileList_UserSID" -eq 1; then - patch_apply wine.inf-ProfileList_UserSID/0001-wine.inf-Add-a-ProfileList-UserSID-registry-subkey.patch - patch_apply wine.inf-ProfileList_UserSID/0002-wine.inf-Add-ProfileImagePath-with-the-user-s-profil.patch - ( - printf '%s\n' '+ { "Sebastian Lackner", "wine.inf: Add a ProfileList\\ registry subkey.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "wine.inf: Add \"ProfileImagePath\" with the user'\''s profile directory under ProfileList key.", 1 },'; - ) >> "$patchlist" -fi - # Patchset wineboot-DriveSerial # | # | This patchset fixes the following Wine bugs: diff --git a/patches/wine.inf-ProfileList_UserSID/0001-wine.inf-Add-a-ProfileList-UserSID-registry-subkey.patch b/patches/wine.inf-ProfileList_UserSID/0001-wine.inf-Add-a-ProfileList-UserSID-registry-subkey.patch deleted file mode 100644 index 3734da2a..00000000 --- a/patches/wine.inf-ProfileList_UserSID/0001-wine.inf-Add-a-ProfileList-UserSID-registry-subkey.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 24ba61d54e9af4927f0e3be4c1789f3007d20b8b Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sat, 18 Apr 2015 15:55:20 +0200 -Subject: wine.inf: Add a ProfileList\ registry subkey. - ---- - loader/wine.inf.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index d901251..68a1b69 100644 ---- a/loader/wine.inf.in -+++ b/loader/wine.inf.in -@@ -492,6 +492,8 @@ HKLM,%CurrentVersionNT%\Perflib,,16 - HKLM,%CurrentVersionNT%\Ports,,16 - HKLM,%CurrentVersionNT%\Print,,16 - HKLM,%CurrentVersionNT%\ProfileList,,16 -+; Update/Replace if local_user_sid in server/token.c changes -+HKLM,%CurrentVersionNT%\ProfileList\S-1-5-21-0-0-0-1000,,16 - - [CurrentVersionWow64] - HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%" --- -2.3.5 - diff --git a/patches/wine.inf-ProfileList_UserSID/0002-wine.inf-Add-ProfileImagePath-with-the-user-s-profil.patch b/patches/wine.inf-ProfileList_UserSID/0002-wine.inf-Add-ProfileImagePath-with-the-user-s-profil.patch deleted file mode 100644 index 608259a1..00000000 --- a/patches/wine.inf-ProfileList_UserSID/0002-wine.inf-Add-ProfileImagePath-with-the-user-s-profil.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1801be8ad009b75cdbd53645cec99b24f0344a7f Mon Sep 17 00:00:00 2001 -From: Dmitry Timoshkov -Date: Mon, 23 Jan 2017 13:16:27 +0800 -Subject: wine.inf: Add "ProfileImagePath" with the user's profile directory - under ProfileList key. - ---- - loader/wine.inf.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index e9906c322f8..907df4a022f 100644 ---- a/loader/wine.inf.in -+++ b/loader/wine.inf.in -@@ -524,6 +524,7 @@ HKLM,%CurrentVersionNT%\Print,,16 - HKLM,%CurrentVersionNT%\ProfileList,,16 - ; Update/Replace if local_user_sid in server/token.c changes - HKLM,%CurrentVersionNT%\ProfileList\S-1-5-21-0-0-0-1000,,16 -+HKLM,%CurrentVersionNT%\ProfileList\S-1-5-21-0-0-0-1000,"ProfileImagePath",0x20000,"%53%" - - [CurrentVersionWow64] - HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%" --- -2.11.0 - diff --git a/patches/wine.inf-ProfileList_UserSID/definition b/patches/wine.inf-ProfileList_UserSID/definition deleted file mode 100644 index b84070b5..00000000 --- a/patches/wine.inf-ProfileList_UserSID/definition +++ /dev/null @@ -1,2 +0,0 @@ -Fixes: [15670] Add a ProfileList\ registry subkey -Fixes: [42249] Add a ProfileImagePath key with users profile directory diff --git a/patches/wineboot-drivers_etc_Stubs/0001-wineboot-Init-system32-drivers-etc-host-networks-pro.patch b/patches/wineboot-drivers_etc_Stubs/0001-wineboot-Init-system32-drivers-etc-host-networks-pro.patch index 8586fd8d..618bcb97 100644 --- a/patches/wineboot-drivers_etc_Stubs/0001-wineboot-Init-system32-drivers-etc-host-networks-pro.patch +++ b/patches/wineboot-drivers_etc_Stubs/0001-wineboot-Init-system32-drivers-etc-host-networks-pro.patch @@ -1,4 +1,4 @@ -From 06ca247b861836d715668818370337d415ceebfa Mon Sep 17 00:00:00 2001 +From 21098077b467295c38b3257cbb8b4919b58fe62c Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 13 May 2015 06:58:16 +0200 Subject: [PATCH] wineboot: Init @@ -10,10 +10,10 @@ Based on a patch by Jactry Zeng. 1 file changed, 36 insertions(+) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c -index 4d65b9c13a4..4718a8f717e 100644 +index 9710b78ab..80511584a 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c -@@ -701,6 +701,41 @@ static void create_volatile_environment_registry_key(void) +@@ -570,6 +570,41 @@ static void create_volatile_environment_registry_key(void) RegCloseKey( hkey ); } @@ -55,14 +55,14 @@ index 4d65b9c13a4..4718a8f717e 100644 /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini. * Returns FALSE if there was an error, or otherwise if all is ok. */ -@@ -1350,6 +1385,7 @@ static void update_wineprefix( BOOL force ) - DestroyWindow( hwnd ); +@@ -1261,6 +1296,7 @@ static void update_wineprefix( BOOL force ) } install_root_pnp_devices(); + update_user_profile(); + create_etc_stub_files(); WINE_MESSAGE( "wine: configuration in '%s' has been updated.\n", prettyprint_configdir() ); } -- -2.17.1 +2.23.0