UNICODEビルド、X64ビルドでコンパイルエラーが発生しないように修正した。

[seraphyscrtools/SeraphyScriptTools.git] / Shell.h

diff --git a/Shell.h b/Shell.h
index cd42fe0..75c7af8 100644 (file)
--- a/Shell.h
+++ b/Shell.h
@@ -5,6 +5,8 @@
 
 #include "resource.h"       // \83\81\83C\83\93 \83V\83\93\83{\83\8b
 
+#include <vector>
+
 /////////////////////////////////////////////////////////////////////////////
 // CShell
 class ATL_NO_VTABLE CShell : 
@@ -62,7 +64,7 @@ public:
        BOOL m_bSilent;
        BOOL m_bConfirm;
        HRESULT FileOperationCore(UINT wFunc,FILEOP_FLAGS flag,VARIANT* from,VARIANT* to,VARIANT* pResult);
-       LPSTR CreateDNStringFromVariant(VARIANT& from);
+       bool CreateDNStringFromVariant(VARIANT& from, std::vector<TCHAR> &buf);
        STDMETHOD(get_Silent)(/*[out, retval]*/ BOOL *pVal);
        STDMETHOD(put_Silent)(/*[in]*/ BOOL newVal);
        STDMETHOD(get_Confirm)(/*[out, retval]*/ BOOL *pVal);
@@ -162,7 +164,7 @@ public:
        STDMETHOD(put_FileName)(/*[in]*/ BSTR newVal);
        STDMETHOD(get_PathName)(/*[out, retval]*/ BSTR *pVal);
        STDMETHOD(put_PathName)(/*[in]*/ BSTR newVal);
-       _bstr_t m_bstr_path;
+       CComBSTR m_bstr_path;
 };
 
 #endif //__SHELL_H_