From 3426979ddfc3abafedd7de83231480cdbfe9ca66 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 4 May 2015 21:52:33 +0200 Subject: [PATCH] Disable patchset shell32-Default_Folder_ACLs (fixes Wine Staging Bug #265). --- README.md | 2 +- debian/changelog | 1 + patches/patchinstall.sh | 16 ---------------- patches/shell32-Default_Folder_ACLs/definition | 3 ++- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 7c7d0ac8..8347a72b 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ releases, take a look at the for more details.* * Add a ProfileList\ registry subkey ([Wine Bug #15670](https://bugs.winehq.org/show_bug.cgi?id=15670)) -* Add default ACLs for user shell folders +* ~~Add default ACLs for user shell folders~~ * Add implementation for CreateThreadpool ([Wine Bug #35192](https://bugs.winehq.org/show_bug.cgi?id=35192)) * Add implementation for mfplat.MFTRegister ([Wine Bug #37811](https://bugs.winehq.org/show_bug.cgi?id=37811)) * Add nvapi stubs required for GPU PhysX support diff --git a/debian/changelog b/debian/changelog index e627232a..fb92cead 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,5 @@ wine-staging (1.7.43) UNRELEASED; urgency=low + * Disable patchset shell32-Default_Folder_ACLs (fixes Wine Staging Bug #265). * Removed patch to use lockfree implementation for FD cache. * Partially removed patches to test behaviour of VirtualProtect / NtProtectVirtualMemory. -- Sebastian Lackner Mon, 04 May 2015 19:02:02 +0200 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index c8a4635a..ac9ca928 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -199,7 +199,6 @@ patch_enable_all () enable_setupapi_SetupDiSetDeviceInstallParamsW="$1" enable_setupapi_SetupPromptForDisk="$1" enable_shdocvw_ParseURLFromOutsideSource_Tests="$1" - enable_shell32_Default_Folder_ACLs="$1" enable_shell32_Default_Path="$1" enable_shell32_Icons="$1" enable_shell32_Progress_Dialog="$1" @@ -677,9 +676,6 @@ patch_enable () shdocvw-ParseURLFromOutsideSource_Tests) enable_shdocvw_ParseURLFromOutsideSource_Tests="$2" ;; - shell32-Default_Folder_ACLs) - enable_shell32_Default_Folder_ACLs="$2" - ;; shell32-Default_Path) enable_shell32_Default_Path="$2" ;; @@ -4408,18 +4404,6 @@ if test "$enable_shdocvw_ParseURLFromOutsideSource_Tests" -eq 1; then ) >> "$patchlist" fi -# Patchset shell32-Default_Folder_ACLs -# | -# | Modified files: -# | * dlls/shell32/shellpath.c -# | -if test "$enable_shell32_Default_Folder_ACLs" -eq 1; then - patch_apply shell32-Default_Folder_ACLs/0001-shell32-Set-the-default-security-attributes-for-user.patch - ( - echo '+ { "Sebastian Lackner", "shell32: Set the default security attributes for user shell folders.", 7 },'; - ) >> "$patchlist" -fi - # Patchset shell32-Default_Path # | # | This patchset fixes the following Wine bugs: diff --git a/patches/shell32-Default_Folder_ACLs/definition b/patches/shell32-Default_Folder_ACLs/definition index 16094313..ff8e78a7 100644 --- a/patches/shell32-Default_Folder_ACLs/definition +++ b/patches/shell32-Default_Folder_ACLs/definition @@ -1 +1,2 @@ -Fixes: Add default ACLs for user shell folders +#Fixes: Add default ACLs for user shell folders +Disabled: True