Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-13 05:14:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] ShellExecute: Re-work Part 2 (#6882)

Browse source 
Follow-up to #6871. Reduce indentation level.
JIRA issue: CORE-17482
In ShellExecuteExW, early check the structure
size and return on failure before
SHCoInitializeAnyApartment call.
This commit is contained in:
Katayama Hirofumi MZ 2024-05-14 23:00:54 +09:00 • committed by GitHub
parent a0776922f4
commit 3e97f76a33
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dll/win32/shell32/shlexec.cpp
View file

@ -2431,15 +2431,15 @@ ShellExecuteExW(LPSHELLEXECUTEINFOW sei)
DWORD dwError; DWORD dwError;
ULONG fOldMask; ULONG fOldMask;
hrCoInit = SHCoInitializeAnyApartment();
if (sei->cbSize != sizeof(SHELLEXECUTEINFOW)) if (sei->cbSize != sizeof(SHELLEXECUTEINFOW))
{ {
dwError = ERROR_ACCESS_DENIED; sei->hInstApp = (HINSTANCE)UlongToHandle(SE_ERR_ACCESSDENIED);
sei->hInstApp = (HINSTANCE)ERROR_ACCESS_DENIED; SetLastError(ERROR_ACCESS_DENIED);
return FALSE;
} }
else
{ hrCoInit = SHCoInitializeAnyApartment();
if (SHRegGetBoolUSValueW(L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", if (SHRegGetBoolUSValueW(L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer",
L"MaximizeApps", FALSE, FALSE)) L"MaximizeApps", FALSE, FALSE))
{ {
@ -2467,7 +2467,6 @@ ShellExecuteExW(LPSHELLEXECUTEINFOW sei)
ShellExecute_ShowError(sei, NULL, dwError); ShellExecute_ShowError(sei, NULL, dwError);
sei->fMask = fOldMask; sei->fMask = fOldMask;
}
if (SUCCEEDED(hrCoInit)) if (SUCCEEDED(hrCoInit))
CoUninitialize(); CoUninitialize();