diff --git a/debian/changelog b/debian/changelog index b2456f5f..5db670dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ wine-compholio (1.7.21) UNRELEASED; urgency=low * Added NT4 support to the process ACL tests. * Implement RegSetKeySecurity on top of NtSetSecurityObject. - -- Erich E. Hoover Tue, 01 Jul 2014 19:25:52 -0600 + * Updated RegSetKeySecurity patch to work with special root keys. + -- Erich E. Hoover Fri, 04 Jul 2014 10:14:42 -0600 wine-compholio (1.7.21) unstable; urgency=low * Remove several patches (accepted upstream). diff --git a/patches/13-Misc_ACL/0003-advapi32-Implement-RegSetKeySecurity-on-top-of-NtSet.patch b/patches/13-Misc_ACL/0003-advapi32-Implement-RegSetKeySecurity-on-top-of-NtSet.patch index caa98b1b..9f2de84e 100644 --- a/patches/13-Misc_ACL/0003-advapi32-Implement-RegSetKeySecurity-on-top-of-NtSet.patch +++ b/patches/13-Misc_ACL/0003-advapi32-Implement-RegSetKeySecurity-on-top-of-NtSet.patch @@ -1,7 +1,7 @@ -From f578524f71033b89cbb1fda1d3ac676f2d330ea6 Mon Sep 17 00:00:00 2001 +From 391dc884f7da99562b8816e70ef5aa99a1df5cba Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" -Date: Tue, 1 Jul 2014 19:23:30 -0600 -Subject: advapi: Implement RegSetKeySecurity on top of NtSetSecurityObject. +Date: Fri, 4 Jul 2014 10:10:45 -0600 +Subject: advapi32: Implement RegSetKeySecurity on top of NtSetSecurityObject. --- dlls/advapi32/registry.c | 4 ++-- @@ -9,7 +9,7 @@ Subject: advapi: Implement RegSetKeySecurity on top of NtSetSecurityObject. 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c -index c7ba3ef..253e708 100644 +index c7ba3ef..f4a8d9b 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2469,9 +2469,9 @@ LSTATUS WINAPI RegSetKeySecurity( HKEY hkey, SECURITY_INFORMATION SecurityInfo, @@ -17,7 +17,7 @@ index c7ba3ef..253e708 100644 return ERROR_INVALID_PARAMETER; - FIXME(":(%p,%d,%p): stub\n",hkey,SecurityInfo,pSecurityDesc); -+ TRACE("(%p,%d,%p)\n",hkey,SecurityInfo,pSecurityDesc); ++ if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; - return ERROR_SUCCESS; + return RtlNtStatusToDosError( NtSetSecurityObject( hkey, SecurityInfo, pSecurityDesc ) );