From 35eeb37cd4f9edb9b3031a462733ed0ba150b27d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 3 Jul 2016 23:36:21 +0000 Subject: [PATCH] [SHELL32]: Shell policies should also read what's stored in HKEY_LOCAL_MACHINE ... Actually SHRestricted should call SHRestrictionLookup from shlwapi.dll . I think I'll have to fork this code... svn path=/trunk/; revision=71804 --- reactos/dll/win32/shell32/wine/shpolicy.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/reactos/dll/win32/shell32/wine/shpolicy.c b/reactos/dll/win32/shell32/wine/shpolicy.c index 4286db1928d..d57e90e7862 100644 --- a/reactos/dll/win32/shell32/wine/shpolicy.c +++ b/reactos/dll/win32/shell32/wine/shpolicy.c @@ -860,7 +860,15 @@ DWORD WINAPI SHRestricted (RESTRICTIONS policy) /* return 0 and don't set the cache if any registry errors occur */ retval = 0; +#ifndef __REACTOS__ if (RegOpenKeyA(HKEY_CURRENT_USER, regstr, &xhkey) == ERROR_SUCCESS) +#else // FIXME: Actually this *MUST* use shlwapi!SHRestrictionLookup() + // See http://www.geoffchappell.com/studies/windows/shell/shell32/api/util/shrestricted.htm + retval = RegOpenKeyA(HKEY_LOCAL_MACHINE, regstr, &xhkey); + if (retval != ERROR_SUCCESS) + retval = RegOpenKeyA(HKEY_CURRENT_USER, regstr, &xhkey); + if (retval == ERROR_SUCCESS) +#endif { if (RegQueryValueExA(xhkey, p->keystr, NULL, NULL, (LPBYTE)&retval, &datsize) == ERROR_SUCCESS) {