return hr;
hr = pShellMenu->Initialize(this, 0, ANCESTORDEFAULT, SMINIT_VERTICAL);
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
switch (psmd->uId)
{
LPITEMIDLIST pidlStartMenu;
IShellFolder *psfDestop;
hr = SHGetFolderLocation(NULL, csidl, 0, 0, &pidlStartMenu);
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
+
hr = SHGetDesktopFolder(&psfDestop);
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
+
hr = psfDestop->BindToObject(pidlStartMenu, NULL, IID_PPV_ARG(IShellFolder, &psfStartMenu));
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
}
hr = pShellMenu->SetShellFolder(psfStartMenu, NULL, NULL, 0);
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
+
}
else
{
if (GetMenuItemInfoW(psmd->hmenu, psmd->uId, FALSE, &mii))
{
hr = pShellMenu->SetMenu(mii.hSubMenu, NULL, SMSET_BOTTOM);
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
}
}
return pShellMenu->QueryInterface(iid, pv);
/* psf is a merged folder, so now we want to get the pidl of the programs item from the merged folder */
{
hr = SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAMS, &pidlProgramsAbsolute);
- if (FAILED(hr))
+ if (FAILED_UNEXPECTEDLY(hr))
{
WARN("USER Programs folder not found.");
hr = SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_PROGRAMS, &pidlProgramsAbsolute);
TCHAR szDisplayName[MAX_PATH];
hr = SHBindToParent(pidlProgramsAbsolute, IID_PPV_ARG(IShellFolder, &psfParent), &pcidlPrograms);
- if (FAILED(hr))
+ if (FAILED_UNEXPECTEDLY(hr))
return hr;
hr = psfParent->GetDisplayNameOf(pcidlPrograms, SHGDN_FORPARSING | SHGDN_INFOLDER, &str);
- if (FAILED(hr))
+ if (FAILED_UNEXPECTEDLY(hr))
return hr;
StrRetToBuf(&str, pcidlPrograms, szDisplayName, _countof(szDisplayName));
/* We got the display name from the fs folder and we parse it with the merged folder here */
hr = psf->ParseDisplayName(NULL, NULL, szDisplayName, NULL, &pidlPrograms, NULL);
- if (FAILED(hr))
+ if (FAILED_UNEXPECTEDLY(hr))
return hr;
}