* Shell Library Functions
*
* Copyright 2005 Johannes Anderwald
+ * Copyright 2017 Katayama Hirofumi MZ
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
UINT DriveType;
} DRIVE_PROP_PAGE;
-BOOL
+HRESULT
SH_ShowDriveProperties(WCHAR *pwszDrive, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl)
{
HPSXA hpsx = NULL;
LPITEMIDLIST completePidl = ILCombine(pidlFolder, apidl[0]);
if (!completePidl)
- return FALSE;
+ return E_OUTOFMEMORY;
if (ILGetDisplayNameExW(NULL, completePidl, wszName, ILGDN_NORMAL))
{
SHAddFromPropSheetExtArray(hpsx, (LPFNADDPROPSHEETPAGE)AddPropSheetPageCallback, (LPARAM)&psh);
}
- HWND hwnd = (HWND)PropertySheetW(&psh);
+ // NOTE: Currently property sheet is modal. If we make it modeless, then it returns HWND.
+ INT_PTR ret = PropertySheetW(&psh);
if (hpsx)
SHDestroyPropSheetExtArray(hpsx);
if (pDrvDefExt)
pDrvDefExt->Release();
- if (!hwnd)
- return FALSE;
- return TRUE;
+ if (ret > 0)
+ return S_OK;
+ if (ret == 0)
+ return S_FALSE;
+ return E_FAIL;
}
static VOID
*
* Copyright 2005 Johannes Anderwald
* Copyright 2012 Rafal Harabien
+ * Copyright 2017 Katayama Hirofumi MZ
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
/* Handle drives */
if (PathIsRootW(wszPath))
- return SH_ShowDriveProperties(wszPath, pidlFolder, apidl);
+ return SUCCEEDED(SH_ShowDriveProperties(wszPath, pidlFolder, apidl));
/* Handle files and folders */
PROPSHEETHEADERW Header;
if (wParam == DFM_CMD_PROPERTIES)
{
- if (!SH_ShowDriveProperties(wszBuf, pidlFolder, apidl))
+ hr = SH_ShowDriveProperties(wszBuf, pidlFolder, apidl);
+ if (FAILED(hr))
{
- hr = E_FAIL;
dwError = ERROR_CAN_NOT_COMPLETE;
nStringID = IDS_CANTSHOWPROPERTIES;
}
INT_PTR CALLBACK SH_FileGeneralDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK SH_FileVersionDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
HPROPSHEETPAGE SH_CreatePropertySheetPage(WORD wDialogId, DLGPROC pfnDlgProc, LPARAM lParam, LPCWSTR pwszTitle);
-BOOL SH_ShowDriveProperties(WCHAR *drive, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl);
+HRESULT SH_ShowDriveProperties(WCHAR *drive, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl);
BOOL SH_ShowRecycleBinProperties(WCHAR sDrive);
BOOL SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl);
LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT cchBuf);