diff --git a/TestLibDlg/TestLibDlg.sln b/TestLibDlg/TestLibDlg.sln index a95fff3..43b017c 100644 --- a/TestLibDlg/TestLibDlg.sln +++ b/TestLibDlg/TestLibDlg.sln @@ -1,10 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.12.35707.178 d17.12 +VisualStudioVersion = 17.12.35707.178 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibDlg", "TestLibDlg\TestLibDlg.vcxproj", "{FC9D3553-56B2-4453-AB34-94CF67213CE2}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IncSourceTestDlg", "IncSourceTestDlg\IncSourceTestDlg.vcxproj", "{44739900-23B0-7EA4-48FA-099C6C559D77}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -21,8 +23,19 @@ Global {FC9D3553-56B2-4453-AB34-94CF67213CE2}.Release|x64.Build.0 = Release|x64 {FC9D3553-56B2-4453-AB34-94CF67213CE2}.Release|x86.ActiveCfg = Release|Win32 {FC9D3553-56B2-4453-AB34-94CF67213CE2}.Release|x86.Build.0 = Release|Win32 + {44739900-23B0-7EA4-48FA-099C6C559D77}.Debug|x64.ActiveCfg = Debug|x64 + {44739900-23B0-7EA4-48FA-099C6C559D77}.Debug|x64.Build.0 = Debug|x64 + {44739900-23B0-7EA4-48FA-099C6C559D77}.Debug|x86.ActiveCfg = Debug|Win32 + {44739900-23B0-7EA4-48FA-099C6C559D77}.Debug|x86.Build.0 = Debug|Win32 + {44739900-23B0-7EA4-48FA-099C6C559D77}.Release|x64.ActiveCfg = Release|x64 + {44739900-23B0-7EA4-48FA-099C6C559D77}.Release|x64.Build.0 = Release|x64 + {44739900-23B0-7EA4-48FA-099C6C559D77}.Release|x86.ActiveCfg = Release|Win32 + {44739900-23B0-7EA4-48FA-099C6C559D77}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0D32EA4D-1327-480B-8823-12A6AF47A130} + EndGlobalSection EndGlobal diff --git a/TestLibDlg/TestLibDlg/TestLibDlg.aps b/TestLibDlg/TestLibDlg/TestLibDlg.aps index 1edc7b1..2d76be9 100644 Binary files a/TestLibDlg/TestLibDlg/TestLibDlg.aps and b/TestLibDlg/TestLibDlg/TestLibDlg.aps differ diff --git a/TestLibDlg/TestLibDlg/TestLibDlg.vcxproj b/TestLibDlg/TestLibDlg/TestLibDlg.vcxproj index bfef79d..98fc886 100644 --- a/TestLibDlg/TestLibDlg/TestLibDlg.vcxproj +++ b/TestLibDlg/TestLibDlg/TestLibDlg.vcxproj @@ -36,7 +36,7 @@ Application false - v143 + v142 true Unicode Dynamic diff --git a/TestLibDlg/TestLibDlg/TestLibDlgDlg.cpp b/TestLibDlg/TestLibDlg/TestLibDlgDlg.cpp index efd7318..f2bc46b 100644 --- a/TestLibDlg/TestLibDlg/TestLibDlgDlg.cpp +++ b/TestLibDlg/TestLibDlg/TestLibDlgDlg.cpp @@ -580,6 +580,7 @@ void CTestLibDlgDlg::OnBnClickedButtonOpen() std::wstring strPath = dlg.GetPathName().GetBuffer(); std::string strA2lPath; + strA2lPath.assign(strPath.begin(), strPath.end()); loadA2lFile(strA2lPath.c_str()); diff --git a/TestLibDlg/TestLibDlg/TestLibDlg_h.h b/TestLibDlg/TestLibDlg/TestLibDlg_h.h deleted file mode 100644 index 3b4019d..0000000 --- a/TestLibDlg/TestLibDlg/TestLibDlg_h.h +++ /dev/null @@ -1,226 +0,0 @@ - - -/* this ALWAYS GENERATED file contains the definitions for the interfaces */ - - - /* File created by MIDL compiler version 8.01.0628 */ -/* at Tue Jan 19 12:14:07 2038 - */ -/* Compiler settings for TestLibDlg.idl: - Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.01.0628 - protocol : dce , ms_ext, c_ext, robust - error checks: allocation ref bounds_check enum stub_data - VC __declspec() decoration level: - __declspec(uuid()), __declspec(selectany), __declspec(novtable) - DECLSPEC_UUID(), MIDL_INTERFACE() -*/ -/* @@MIDL_FILE_HEADING( ) */ - - - -/* verify that the version is high enough to compile this file*/ -#ifndef __REQUIRED_RPCNDR_H_VERSION__ -#define __REQUIRED_RPCNDR_H_VERSION__ 500 -#endif - -#include "rpc.h" -#include "rpcndr.h" - -#ifndef __RPCNDR_H_VERSION__ -#error this stub requires an updated version of -#endif /* __RPCNDR_H_VERSION__ */ - - -#ifndef __TestLibDlg_h_h__ -#define __TestLibDlg_h_h__ - -#if defined(_MSC_VER) && (_MSC_VER >= 1020) -#pragma once -#endif - -#ifndef DECLSPEC_XFGVIRT -#if defined(_CONTROL_FLOW_GUARD_XFG) -#define DECLSPEC_XFGVIRT(base, func) __declspec(xfg_virtual(base, func)) -#else -#define DECLSPEC_XFGVIRT(base, func) -#endif -#endif - -/* Forward Declarations */ - -#ifndef __ITestLibDlg_FWD_DEFINED__ -#define __ITestLibDlg_FWD_DEFINED__ -typedef interface ITestLibDlg ITestLibDlg; - -#endif /* __ITestLibDlg_FWD_DEFINED__ */ - - -#ifndef __TestLibDlg_FWD_DEFINED__ -#define __TestLibDlg_FWD_DEFINED__ - -#ifdef __cplusplus -typedef class TestLibDlg TestLibDlg; -#else -typedef struct TestLibDlg TestLibDlg; -#endif /* __cplusplus */ - -#endif /* __TestLibDlg_FWD_DEFINED__ */ - - -#ifdef __cplusplus -extern "C"{ -#endif - - - -#ifndef __TestLibDlg_LIBRARY_DEFINED__ -#define __TestLibDlg_LIBRARY_DEFINED__ - -/* library TestLibDlg */ -/* [version][uuid] */ - - -EXTERN_C const IID LIBID_TestLibDlg; - -#ifndef __ITestLibDlg_DISPINTERFACE_DEFINED__ -#define __ITestLibDlg_DISPINTERFACE_DEFINED__ - -/* dispinterface ITestLibDlg */ -/* [uuid] */ - - -EXTERN_C const IID DIID_ITestLibDlg; - -#if defined(__cplusplus) && !defined(CINTERFACE) - - MIDL_INTERFACE("3d30aa0d-19ce-4ca6-92b1-70a7403d578c") - ITestLibDlg : public IDispatch - { - }; - -#else /* C style interface */ - - typedef struct ITestLibDlgVtbl - { - BEGIN_INTERFACE - - DECLSPEC_XFGVIRT(IUnknown, QueryInterface) - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( - ITestLibDlg * This, - /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ - _COM_Outptr_ void **ppvObject); - - DECLSPEC_XFGVIRT(IUnknown, AddRef) - ULONG ( STDMETHODCALLTYPE *AddRef )( - ITestLibDlg * This); - - DECLSPEC_XFGVIRT(IUnknown, Release) - ULONG ( STDMETHODCALLTYPE *Release )( - ITestLibDlg * This); - - DECLSPEC_XFGVIRT(IDispatch, GetTypeInfoCount) - HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( - ITestLibDlg * This, - /* [out] */ UINT *pctinfo); - - DECLSPEC_XFGVIRT(IDispatch, GetTypeInfo) - HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( - ITestLibDlg * This, - /* [in] */ UINT iTInfo, - /* [in] */ LCID lcid, - /* [out] */ ITypeInfo **ppTInfo); - - DECLSPEC_XFGVIRT(IDispatch, GetIDsOfNames) - HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( - ITestLibDlg * This, - /* [in] */ REFIID riid, - /* [size_is][in] */ LPOLESTR *rgszNames, - /* [range][in] */ UINT cNames, - /* [in] */ LCID lcid, - /* [size_is][out] */ DISPID *rgDispId); - - DECLSPEC_XFGVIRT(IDispatch, Invoke) - /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( - ITestLibDlg * This, - /* [annotation][in] */ - _In_ DISPID dispIdMember, - /* [annotation][in] */ - _In_ REFIID riid, - /* [annotation][in] */ - _In_ LCID lcid, - /* [annotation][in] */ - _In_ WORD wFlags, - /* [annotation][out][in] */ - _In_ DISPPARAMS *pDispParams, - /* [annotation][out] */ - _Out_opt_ VARIANT *pVarResult, - /* [annotation][out] */ - _Out_opt_ EXCEPINFO *pExcepInfo, - /* [annotation][out] */ - _Out_opt_ UINT *puArgErr); - - END_INTERFACE - } ITestLibDlgVtbl; - - interface ITestLibDlg - { - CONST_VTBL struct ITestLibDlgVtbl *lpVtbl; - }; - - - -#ifdef COBJMACROS - - -#define ITestLibDlg_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) - -#define ITestLibDlg_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) - -#define ITestLibDlg_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) - - -#define ITestLibDlg_GetTypeInfoCount(This,pctinfo) \ - ( (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) ) - -#define ITestLibDlg_GetTypeInfo(This,iTInfo,lcid,ppTInfo) \ - ( (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) ) - -#define ITestLibDlg_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) \ - ( (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) ) - -#define ITestLibDlg_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) \ - ( (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) ) - -#endif /* COBJMACROS */ - - -#endif /* C style interface */ - - -#endif /* __ITestLibDlg_DISPINTERFACE_DEFINED__ */ - - -EXTERN_C const CLSID CLSID_TestLibDlg; - -#ifdef __cplusplus - -class DECLSPEC_UUID("faa0893c-64ec-4ba5-b1f0-18ed8cb7f106") -TestLibDlg; -#endif -#endif /* __TestLibDlg_LIBRARY_DEFINED__ */ - -/* Additional Prototypes for ALL interfaces */ - -/* end of Additional Prototypes */ - -#ifdef __cplusplus -} -#endif - -#endif - - diff --git a/TestLibDlg/TestLibDlg/TestLibDlg_i.c b/TestLibDlg/TestLibDlg/TestLibDlg_i.c deleted file mode 100644 index 4766411..0000000 --- a/TestLibDlg/TestLibDlg/TestLibDlg_i.c +++ /dev/null @@ -1,84 +0,0 @@ - - -/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */ - -/* link this file in with the server and any clients */ - - - /* File created by MIDL compiler version 8.01.0628 */ -/* at Tue Jan 19 12:14:07 2038 - */ -/* Compiler settings for TestLibDlg.idl: - Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.01.0628 - protocol : dce , ms_ext, c_ext, robust - error checks: allocation ref bounds_check enum stub_data - VC __declspec() decoration level: - __declspec(uuid()), __declspec(selectany), __declspec(novtable) - DECLSPEC_UUID(), MIDL_INTERFACE() -*/ -/* @@MIDL_FILE_HEADING( ) */ - - - -#ifdef __cplusplus -extern "C"{ -#endif - - -#include -#include - -#ifdef _MIDL_USE_GUIDDEF_ - -#ifndef INITGUID -#define INITGUID -#include -#undef INITGUID -#else -#include -#endif - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \ - DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) - -#else // !_MIDL_USE_GUIDDEF_ - -#ifndef __IID_DEFINED__ -#define __IID_DEFINED__ - -typedef struct _IID -{ - unsigned long x; - unsigned short s1; - unsigned short s2; - unsigned char c[8]; -} IID; - -#endif // __IID_DEFINED__ - -#ifndef CLSID_DEFINED -#define CLSID_DEFINED -typedef IID CLSID; -#endif // CLSID_DEFINED - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \ - EXTERN_C __declspec(selectany) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} - -#endif // !_MIDL_USE_GUIDDEF_ - -MIDL_DEFINE_GUID(IID, LIBID_TestLibDlg,0xe6371bfe,0x4bde,0x4d88,0xb4,0x04,0x1d,0x2f,0x22,0x2f,0x1d,0xdf); - - -MIDL_DEFINE_GUID(IID, DIID_ITestLibDlg,0x3d30aa0d,0x19ce,0x4ca6,0x92,0xb1,0x70,0xa7,0x40,0x3d,0x57,0x8c); - - -MIDL_DEFINE_GUID(CLSID, CLSID_TestLibDlg,0xfaa0893c,0x64ec,0x4ba5,0xb1,0xf0,0x18,0xed,0x8c,0xb7,0xf1,0x06); - -#undef MIDL_DEFINE_GUID - -#ifdef __cplusplus -} -#endif - - -