Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxCoTaskMemPtr<> instead of manual ::CoTaskMemFree()

Browse Source 
No real changes, just use a smart pointer instead of manual memory
management calls.
This commit is contained in:
Vadim Zeitlin
2020-07-10 03:40:53 +02:00
parent 83aa1a19a5
commit d8f460200a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/dirdlg.cpp
View File

@@ -40,6 +40,7 @@
#include "wx/msw/private.h" #include "wx/msw/private.h"
#include "wx/msw/wrapshl.h" #include "wx/msw/wrapshl.h"
#include "wx/msw/private/comptr.h" #include "wx/msw/private/comptr.h"
#include "wx/msw/private/cotaskmemptr.h"
#include "wx/dynlib.h" #include "wx/dynlib.h"
#include <initguid.h> #include <initguid.h>
@@ -483,8 +484,8 @@ bool GetPathsFromIFileOpenDialog(const wxCOMPtr<IFileOpenDialog>& fileDialog, bo
// helper function for wxDirDialog::ShowIFileOpenDialog() // helper function for wxDirDialog::ShowIFileOpenDialog()
bool ConvertIShellItemToPath(const wxCOMPtr<IShellItem>& item, wxString& path) bool ConvertIShellItemToPath(const wxCOMPtr<IShellItem>& item, wxString& path)
{ {
LPOLESTR pathOLE = NULL; wxCoTaskMemPtr<WCHAR> pOLEPath;
const HRESULT hr = item->GetDisplayName(SIGDN_FILESYSPATH, &pathOLE); const HRESULT hr = item->GetDisplayName(SIGDN_FILESYSPATH, &pOLEPath);
if ( FAILED(hr) ) if ( FAILED(hr) )
{ {
@@ -492,8 +493,7 @@ bool ConvertIShellItemToPath(const wxCOMPtr<IShellItem>& item, wxString& path)
return false; return false;
} }
path = pathOLE; path = pOLEPath;
CoTaskMemFree(pathOLE);
return true; return true;
} }