diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 91c944e6..860ce2bc 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2056,9 +2056,6 @@ if test "$enable_category_stable" -eq 1; then if test "$enable_wine_inf_Performance" -gt 1; then abort "Patchset wine.inf-Performance disabled, but category-stable depends on that." fi - if test "$enable_wine_inf_ProfileList_UserSID" -gt 1; then - abort "Patchset wine.inf-ProfileList_UserSID disabled, but category-stable depends on that." - fi if test "$enable_wineboot_HKEY_DYN_DATA" -gt 1; then abort "Patchset wineboot-HKEY_DYN_DATA disabled, but category-stable depends on that." fi @@ -2133,7 +2130,6 @@ if test "$enable_category_stable" -eq 1; then enable_shell32_SHFileOperation_Win9x=1 enable_user32_DrawTextExW=1 enable_wine_inf_Performance=1 - enable_wine_inf_ProfileList_UserSID=1 enable_wineboot_HKEY_DYN_DATA=1 enable_winecfg_Libraries=1 enable_wined3d_Silence_FIXMEs=1 @@ -8322,14 +8318,17 @@ fi # | # | 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 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 new file mode 100644 index 00000000..608259a1 --- /dev/null +++ b/patches/wine.inf-ProfileList_UserSID/0002-wine.inf-Add-ProfileImagePath-with-the-user-s-profil.patch @@ -0,0 +1,25 @@ +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 index d2a5eea9..b84070b5 100644 --- a/patches/wine.inf-ProfileList_UserSID/definition +++ b/patches/wine.inf-ProfileList_UserSID/definition @@ -1,2 +1,2 @@ Fixes: [15670] Add a ProfileList\ registry subkey -Category: stable +Fixes: [42249] Add a ProfileImagePath key with users profile directory