yyc12345/YYCCommonplace
1
0
Fork 0
Code Activity

fix: improve dialog helper

Browse Source 
- remove template for CoTaskMemDeleter due to previous confusion.
- use std::remove_pointer_t instead of directly writting underlying type.
This commit is contained in:
yyc12345
2024-05-27 19:48:25 +08:00
parent cebe2f004d
commit efcc371e31
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/DialogHelper.cpp
View File

@ -161,7 +161,7 @@ namespace YYCC::DialogHelper {
bool ExtractDisplayName(IShellItem* item, std::string& ret) { bool ExtractDisplayName(IShellItem* item, std::string& ret) {
// fetch display name from IShellItem* // fetch display name from IShellItem*
WCHAR* _name; LPWSTR _name;
HRESULT hr = item->GetDisplayName(SIGDN_FILESYSPATH, &_name); HRESULT hr = item->GetDisplayName(SIGDN_FILESYSPATH, &_name);
if (FAILED(hr)) return false; if (FAILED(hr)) return false;
SmartLPWSTR display_name(_name); SmartLPWSTR display_name(_name);

5
src/DialogHelper.hpp
View File

@ -32,18 +32,17 @@ namespace YYCC::DialogHelper {
using SmartIShellItemArray = std::unique_ptr<IShellItemArray, ComPtrDeleter>; using SmartIShellItemArray = std::unique_ptr<IShellItemArray, ComPtrDeleter>;
using SmartIShellFolder = std::unique_ptr<IShellFolder, ComPtrDeleter>; using SmartIShellFolder = std::unique_ptr<IShellFolder, ComPtrDeleter>;
template<typename _Ty>
class CoTaskMemDeleter { class CoTaskMemDeleter {
public: public:
CoTaskMemDeleter() {} CoTaskMemDeleter() {}
void operator() (_Ty* com_ptr) { void operator() (void* com_ptr) {
if (com_ptr != nullptr) { if (com_ptr != nullptr) {
CoTaskMemFree(com_ptr); CoTaskMemFree(com_ptr);
} }
} }
}; };
using SmartLPWSTR = std::unique_ptr<WCHAR, CoTaskMemDeleter<WCHAR>>; using SmartLPWSTR = std::unique_ptr<std::remove_pointer_t<LPWSTR>, CoTaskMemDeleter>;
#pragma endregion #pragma endregion