mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Jinhao 2018-06-27 04:28:06 +08:00
commit 3356898833
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/detail/mswin/platform_spec.hpp
View File

@ -128,6 +128,8 @@ namespace detail
public: public:
co_initializer(); co_initializer();
~co_initializer(); ~co_initializer();
void task_mem_free(void* p);
private: private:
HMODULE ole32_; HMODULE ole32_;
}; };

12
source/detail/platform_spec_windows.cpp
View File

@ -100,6 +100,18 @@ namespace detail
} }
} }
void platform_spec::co_initializer::task_mem_free(void* p)
{
if (ole32_)
{
using CoTaskMemFree_t = void (__stdcall *)(LPVOID pv);
CoTaskMemFree_t free_fn = reinterpret_cast<CoTaskMemFree_t>(::GetProcAddress(ole32_, "CoTaskMemFree"));
if (free_fn)
free_fn(p);
}
}
struct platform_spec::implementation struct platform_spec::implementation
{ {
std::map<native_window_type, window_icons> iconbase; std::map<native_window_type, window_icons> iconbase;

7
source/gui/filebox.cpp
View File

@ -16,6 +16,7 @@
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)
# include <windows.h> # include <windows.h>
# include "../detail/mswin/platform_spec.hpp"
# ifndef NANA_MINGW //<Shobjidl.h> isn't supported well on MinGW # ifndef NANA_MINGW //<Shobjidl.h> isn't supported well on MinGW
# include <Shobjidl.h> # include <Shobjidl.h>
# else # else
@ -1247,7 +1248,7 @@ namespace nana
#ifdef NANA_WINDOWS #ifdef NANA_WINDOWS
std::optional<folderbox::path_type> target; std::optional<folderbox::path_type> target;
::CoInitialize(nullptr); nana::detail::platform_spec::co_initializer co_init;
#ifndef NANA_MINGW #ifndef NANA_MINGW
IFileDialog *fd(nullptr); IFileDialog *fd(nullptr);
HRESULT hr = CoCreateInstance(CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&fd)); HRESULT hr = CoCreateInstance(CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&fd));
@ -1294,11 +1295,9 @@ namespace nana
if (FALSE != SHGetPathFromIDList(pidl, folder_path)) if (FALSE != SHGetPathFromIDList(pidl, folder_path))
target = folder_path; target = folder_path;
CoTaskMemFree(pidl); co_init.task_mem_free(pidl);
} }
#endif #endif
::CoUninitialize();
return target; return target;
#elif defined(NANA_POSIX) #elif defined(NANA_POSIX)