https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce306b83dbd7c73e815203239f4f1767e39a8281
commit ce306b83dbd7c73e815203239f4f1767e39a8281 Author: Mark Jansen <[email protected]> AuthorDate: Sun Feb 6 21:08:52 2022 +0100 Commit: Mark Jansen <[email protected]> CommitDate: Mon Feb 7 20:56:46 2022 +0100 [SHELL32] Rename functions to fix ambiguity --- dll/win32/shell32/shlexec.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index a3a4a05a2c3..b8f3bb2ca16 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -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)); } -static HRESULT IContextMenu_exec(LPSHELLEXECUTEINFOW sei) +static HRESULT ShellExecute_ContextMenuVerb(LPSHELLEXECUTEINFOW sei) { TRACE("%p\n", sei); @@ -1564,7 +1564,7 @@ static HRESULT IContextMenu_exec(LPSHELLEXECUTEINFOW sei) /************************************************************************* * ShellExecute_FromContextMenu [Internal] */ -static LONG ShellExecute_FromContextMenu( LPSHELLEXECUTEINFOW sei ) +static LONG ShellExecute_FromContextMenuHandlers( LPSHELLEXECUTEINFOW sei ) { HKEY hkey, hkeycm = 0; 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) { - HRESULT hr = IContextMenu_exec(&sei_tmp); + HRESULT hr = ShellExecute_ContextMenuVerb(&sei_tmp); if (SUCCEEDED(hr)) { 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; HeapFree(GetProcessHeap(), 0, wszApplicationName);
