Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-23 11:04:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Rename functions to fix ambiguity

Browse source
This commit is contained in:
Mark Jansen 2022-02-06 21:08:52 +01:00
parent bc5603d9d0
commit ce306b83db
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1511,7 +1511,7 @@ static HRESULT shellex_get_contextmenu(LPSHELLEXECUTEINFOW sei, CComPtr<IContext
return shf->GetUIObjectOf(NULL, 1, &pidllast, IID_NULL_PPV_ARG(IContextMenu, &cm)); return shf->GetUIObjectOf(NULL, 1, &pidllast, IID_NULL_PPV_ARG(IContextMenu, &cm));
} }
static HRESULT IContextMenu_exec(LPSHELLEXECUTEINFOW sei) static HRESULT ShellExecute_ContextMenuVerb(LPSHELLEXECUTEINFOW sei)
{ {
TRACE("%p\n", sei); TRACE("%p\n", sei);
@ -1564,7 +1564,7 @@ static HRESULT IContextMenu_exec(LPSHELLEXECUTEINFOW sei)
/************************************************************************* /*************************************************************************
* ShellExecute_FromContextMenu [Internal] * ShellExecute_FromContextMenu [Internal]
*/ */
static LONG ShellExecute_FromContextMenu( LPSHELLEXECUTEINFOW sei ) static LONG ShellExecute_FromContextMenuHandlers( LPSHELLEXECUTEINFOW sei )
{ {
HKEY hkey, hkeycm = 0; HKEY hkey, hkeycm = 0;
WCHAR szguid[39]; WCHAR szguid[39];
@ -1983,7 +1983,7 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc)
if ((sei_tmp.fMask & SEE_MASK_INVOKEIDLIST) == SEE_MASK_INVOKEIDLIST) if ((sei_tmp.fMask & SEE_MASK_INVOKEIDLIST) == SEE_MASK_INVOKEIDLIST)
{ {
HRESULT hr = IContextMenu_exec(&sei_tmp); HRESULT hr = ShellExecute_ContextMenuVerb(&sei_tmp);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
sei->hInstApp = (HINSTANCE)42; sei->hInstApp = (HINSTANCE)42;
@ -1997,7 +1997,7 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc)
} }
if (ERROR_SUCCESS == ShellExecute_FromContextMenu(&sei_tmp)) if (ERROR_SUCCESS == ShellExecute_FromContextMenuHandlers(&sei_tmp))
{ {
sei->hInstApp = (HINSTANCE) 33; sei->hInstApp = (HINSTANCE) 33;
HeapFree(GetProcessHeap(), 0, wszApplicationName); HeapFree(GetProcessHeap(), 0, wszApplicationName);