Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-05 17:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32]

Browse source 
- Fix registry value retrieval with RegGetValue (RRF_RT_REG_EXPAND_SZ has a non-obvious functioning: it should be used with NO_EXPAND flag. Otherwise use RRF_RT_REG_SZ to retrieve REG_SZ values, or REG_EXPAND_SZ values with automatic expansion as expected). CORE-9001 #resolve #comment Fixed, thanks for reporting!
- Fix whitespace.

svn path=/trunk/; revision=66178
This commit is contained in:
Hermès Bélusca-Maïto 2015-02-06 00:07:23 +00:00
parent b07541cc5d
commit 149e5e961a
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/dll/win32/shell32/CDefaultContextMenu.cpp
View file

@ -450,12 +450,12 @@ CDefaultContextMenu::EnumerateDynamicContextHandlerForKey(HKEY hRootKey)
if (m_bGroupPolicyActive) if (m_bGroupPolicyActive)
{ {
if (RegGetValueW(HKEY_LOCAL_MACHINE, if (RegGetValueW(HKEY_LOCAL_MACHINE,
L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved",
pwszClsid, pwszClsid,
RRF_RT_REG_SZ, RRF_RT_REG_SZ,
NULL, NULL,
NULL, NULL,
NULL) == ERROR_SUCCESS) NULL) == ERROR_SUCCESS)
{ {
LoadDynamicContextMenuHandler(hKey, &clsid); LoadDynamicContextMenuHandler(hKey, &clsid);
} }

14
reactos/dll/win32/shell32/dialogs/drvdefext.cpp
View file

@ -366,12 +366,12 @@ CDrvDefExt::GeneralPageProc(
DWORD cbBuf = sizeof(wszBuf); DWORD cbBuf = sizeof(wszBuf);
if (RegGetValueW(HKEY_LOCAL_MACHINE, if (RegGetValueW(HKEY_LOCAL_MACHINE,
L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\CleanupPath", L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\CleanupPath",
NULL, NULL,
RRF_RT_REG_SZ, RRF_RT_REG_SZ,
NULL, NULL,
(PVOID)wszBuf, (PVOID)wszBuf,
&cbBuf) == ERROR_SUCCESS) &cbBuf) == ERROR_SUCCESS)
{ {
WCHAR wszCmd[MAX_PATH]; WCHAR wszCmd[MAX_PATH];
@ -460,7 +460,7 @@ CDrvDefExt::ExtraPageProc(
if (RegGetValueW(HKEY_LOCAL_MACHINE, if (RegGetValueW(HKEY_LOCAL_MACHINE,
L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\BackupPath", L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\BackupPath",
NULL, NULL,
RRF_RT_REG_EXPAND_SZ, RRF_RT_REG_SZ,
NULL, NULL,
(PVOID)wszBuf, (PVOID)wszBuf,
&cbBuf) == ERROR_SUCCESS) &cbBuf) == ERROR_SUCCESS)

12
reactos/dll/win32/shell32/folders/CFSFolder.cpp
View file

@ -1810,12 +1810,12 @@ HRESULT WINAPI CFSFolder::_LoadDynamicDropTargetHandlerForKey(HKEY hRootKey, LPC
if (m_bGroupPolicyActive) if (m_bGroupPolicyActive)
{ {
if (RegGetValueW(HKEY_LOCAL_MACHINE, if (RegGetValueW(HKEY_LOCAL_MACHINE,
L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved",
pwszClsid, pwszClsid,
RRF_RT_REG_SZ, RRF_RT_REG_SZ,
NULL, NULL,
NULL, NULL,
NULL) == ERROR_SUCCESS) NULL) == ERROR_SUCCESS)
{ {
hr = _LoadDynamicDropTargetHandler(&clsid, pwcsname, ppvOut); hr = _LoadDynamicDropTargetHandler(&clsid, pwcsname, ppvOut);
} }

2
reactos/dll/win32/shell32/folders/CRecycleBin.cpp
View file

@ -1639,7 +1639,7 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags)
ret = RegGetValueW(HKEY_CURRENT_USER, ret = RegGetValueW(HKEY_CURRENT_USER,
L"AppEvents\\Schemes\\Apps\\Explorer\\EmptyRecycleBin\\.Current", L"AppEvents\\Schemes\\Apps\\Explorer\\EmptyRecycleBin\\.Current",
NULL, NULL,
RRF_RT_REG_EXPAND_SZ, RRF_RT_REG_SZ,
&dwType, &dwType,
(PVOID)szPath, (PVOID)szPath,
&dwSize); &dwSize);