diff --git a/Demos/bdwallpaper/BDWallPaper.vcxproj b/Demos/bdwallpaper/BDWallPaper.vcxproj index a98bfd1e..05b264ab 100644 --- a/Demos/bdwallpaper/BDWallPaper.vcxproj +++ b/Demos/bdwallpaper/BDWallPaper.vcxproj @@ -1,10 +1,18 @@  + + DebugA + Win32 + Debug Win32 + + ReleaseA + Win32 + Release Win32 @@ -29,11 +37,21 @@ false Unicode + + Application + false + MultiByte + Application false Unicode + + Application + false + MultiByte + @@ -41,27 +59,49 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\BDWallPaper\$(Configuration)\ + $(SolutionDir)temp\BDWallPaper\$(Configuration)\ true + true $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\BDWallPaper\$(Configuration)\ + $(SolutionDir)temp\BDWallPaper\$(Configuration)\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + $(ProjectName)_d + $(ProjectName)_d $(ProjectName) + $(ProjectName) @@ -103,6 +143,46 @@ .\Debug/BDWallPaper.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/BDWallPaper.tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + true + Level3 + true + ProgramDatabase + helper;controlex;helper\jsoncpp; + + + _DEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + true + true + Windows + MachineX86 + + + true + .\Debug/BDWallPaper.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -142,35 +222,88 @@ .\Release/BDWallPaper.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/BDWallPaper.tlb + + + + + MinSpace + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Use + stdafx.h + Level3 + true + helper;controlex;helper\jsoncpp; + + + NDEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + Windows + MachineX86 + + + + + true + .\Release/BDWallPaper.bsc + + NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create diff --git a/Demos/bdwallpaper/StdAfx.h b/Demos/bdwallpaper/StdAfx.h index 6191eb85..3051d1ae 100644 --- a/Demos/bdwallpaper/StdAfx.h +++ b/Demos/bdwallpaper/StdAfx.h @@ -20,13 +20,13 @@ using namespace DuiLib; # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA_d.lib") # endif #else # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA.lib") # endif #endif diff --git a/Demos/duidemo/StdAfx.h b/Demos/duidemo/StdAfx.h index 99dd11e6..ec66e8e7 100644 --- a/Demos/duidemo/StdAfx.h +++ b/Demos/duidemo/StdAfx.h @@ -19,13 +19,13 @@ using namespace DuiLib; # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA_d.lib") # endif #else # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA.lib") # endif #endif diff --git a/Demos/duidemo/duidemo.vcxproj b/Demos/duidemo/duidemo.vcxproj index 053c1f85..3213b3b2 100644 --- a/Demos/duidemo/duidemo.vcxproj +++ b/Demos/duidemo/duidemo.vcxproj @@ -1,10 +1,18 @@  + + DebugA + Win32 + Debug Win32 + + ReleaseA + Win32 + Release Win32 @@ -29,11 +37,21 @@ false Unicode + + Application + false + MultiByte + Application false Unicode + + Application + false + MultiByte + @@ -41,27 +59,49 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\duidemo\$(Configuration)\ + $(SolutionDir)temp\duidemo\$(Configuration)\ true + true $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\duidemo\$(Configuration)\ + $(SolutionDir)temp\duidemo\$(Configuration)\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + $(ProjectName)_d + $(ProjectName)_d $(ProjectName) + $(ProjectName) @@ -101,6 +141,44 @@ true + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/duidemo.tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + true + true + Windows + MachineX86 + + + true + + NDEBUG;%(PreprocessorDefinitions) @@ -138,13 +216,54 @@ true + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/duidemo.tlb + + + + + MinSpace + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Use + stdafx.h + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + Windows + MachineX86 + + + + + true + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create diff --git a/Demos/gamebox/GameBox.vcxproj b/Demos/gamebox/GameBox.vcxproj index deddddba..73907763 100644 --- a/Demos/gamebox/GameBox.vcxproj +++ b/Demos/gamebox/GameBox.vcxproj @@ -1,10 +1,18 @@  + + DebugA + Win32 + Debug Win32 + + ReleaseA + Win32 + Release Win32 @@ -29,11 +37,21 @@ false Unicode + + Application + false + MultiByte + Application false Unicode + + Application + false + MultiByte + @@ -41,27 +59,49 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\gamebox\$(Configuration)\ + $(SolutionDir)temp\gamebox\$(Configuration)\ true + true $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\gamebox\$(Configuration)\ + $(SolutionDir)temp\gamebox\$(Configuration)\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + $(ProjectName)_d + $(ProjectName)_d $(ProjectName) + $(ProjectName) @@ -102,6 +142,45 @@ .\Debug/GameBox.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/GameBox.tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + true + true + Windows + MachineX86 + + + true + .\Debug/GameBox.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -139,6 +218,43 @@ .\Release/GameBox.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/GameBox.tlb + + + + + MinSpace + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Use + stdafx.h + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + Windows + MachineX86 + libcmt.lib + + + true + .\Release/GameBox.bsc + + @@ -146,17 +262,25 @@ NotUsing + NotUsing NotUsing + NotUsing %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create NotUsing + NotUsing NotUsing + NotUsing diff --git a/Demos/gamebox/StdAfx.h b/Demos/gamebox/StdAfx.h index 99dd11e6..ec66e8e7 100644 --- a/Demos/gamebox/StdAfx.h +++ b/Demos/gamebox/StdAfx.h @@ -19,13 +19,13 @@ using namespace DuiLib; # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA_d.lib") # endif #else # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA.lib") # endif #endif diff --git a/Demos/qqsetup/StdAfx.h b/Demos/qqsetup/StdAfx.h index 99dd11e6..ec66e8e7 100644 --- a/Demos/qqsetup/StdAfx.h +++ b/Demos/qqsetup/StdAfx.h @@ -19,13 +19,13 @@ using namespace DuiLib; # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA_d.lib") # endif #else # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA.lib") # endif #endif diff --git a/Demos/qqsetup/qqsetup.vcxproj b/Demos/qqsetup/qqsetup.vcxproj index 55c9b772..61e797df 100644 --- a/Demos/qqsetup/qqsetup.vcxproj +++ b/Demos/qqsetup/qqsetup.vcxproj @@ -1,10 +1,18 @@  + + DebugA + Win32 + Debug Win32 + + ReleaseA + Win32 + Release Win32 @@ -29,11 +37,21 @@ false Unicode + + Application + false + MultiByte + Application false Unicode + + Application + false + MultiByte + @@ -41,27 +59,49 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\$(ProjectName)\$(Configuration)\ + $(SolutionDir)temp\$(ProjectName)\$(Configuration)\ true + true $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\$(ProjectName)\$(Configuration)\ + $(SolutionDir)temp\$(ProjectName)\$(Configuration)\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + $(ProjectName)_d + $(ProjectName)_d $(ProjectName) + $(ProjectName) @@ -101,6 +141,44 @@ true + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/qqsetup.tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + true + true + Windows + MachineX86 + + + true + + NDEBUG;%(PreprocessorDefinitions) @@ -137,13 +215,53 @@ true + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/qqsetup.tlb + + + + + MinSpace + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + NotUsing + stdafx.h + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + Windows + MachineX86 + libcmt.lib + + + true + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create diff --git a/DuiLib.sln b/DuiLib.sln index 84aed6c4..b4b74da5 100644 --- a/DuiLib.sln +++ b/DuiLib.sln @@ -16,29 +16,51 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + DebugA|Win32 = DebugA|Win32 Release|Win32 = Release|Win32 + ReleaseA|Win32 = ReleaseA|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.Debug|Win32.ActiveCfg = Debug|Win32 {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.Debug|Win32.Build.0 = Debug|Win32 + {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.DebugA|Win32.ActiveCfg = DebugA|Win32 + {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.DebugA|Win32.Build.0 = DebugA|Win32 {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.Release|Win32.ActiveCfg = Release|Win32 {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.Release|Win32.Build.0 = Release|Win32 + {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.ReleaseA|Win32.ActiveCfg = ReleaseA|Win32 + {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.ReleaseA|Win32.Build.0 = ReleaseA|Win32 {565089A1-60C0-4281-99D7-A459E7354EEF}.Debug|Win32.ActiveCfg = Debug|Win32 {565089A1-60C0-4281-99D7-A459E7354EEF}.Debug|Win32.Build.0 = Debug|Win32 + {565089A1-60C0-4281-99D7-A459E7354EEF}.DebugA|Win32.ActiveCfg = DebugA|Win32 + {565089A1-60C0-4281-99D7-A459E7354EEF}.DebugA|Win32.Build.0 = DebugA|Win32 {565089A1-60C0-4281-99D7-A459E7354EEF}.Release|Win32.ActiveCfg = Release|Win32 {565089A1-60C0-4281-99D7-A459E7354EEF}.Release|Win32.Build.0 = Release|Win32 + {565089A1-60C0-4281-99D7-A459E7354EEF}.ReleaseA|Win32.ActiveCfg = ReleaseA|Win32 + {565089A1-60C0-4281-99D7-A459E7354EEF}.ReleaseA|Win32.Build.0 = ReleaseA|Win32 {54019823-E923-44D0-AD60-8EB636D107DC}.Debug|Win32.ActiveCfg = Debug|Win32 {54019823-E923-44D0-AD60-8EB636D107DC}.Debug|Win32.Build.0 = Debug|Win32 + {54019823-E923-44D0-AD60-8EB636D107DC}.DebugA|Win32.ActiveCfg = DebugA|Win32 + {54019823-E923-44D0-AD60-8EB636D107DC}.DebugA|Win32.Build.0 = DebugA|Win32 {54019823-E923-44D0-AD60-8EB636D107DC}.Release|Win32.ActiveCfg = Release|Win32 {54019823-E923-44D0-AD60-8EB636D107DC}.Release|Win32.Build.0 = Release|Win32 + {54019823-E923-44D0-AD60-8EB636D107DC}.ReleaseA|Win32.ActiveCfg = ReleaseA|Win32 + {54019823-E923-44D0-AD60-8EB636D107DC}.ReleaseA|Win32.Build.0 = ReleaseA|Win32 {3EF9795D-3509-4664-8E73-8D315CC0B944}.Debug|Win32.ActiveCfg = Debug|Win32 {3EF9795D-3509-4664-8E73-8D315CC0B944}.Debug|Win32.Build.0 = Debug|Win32 + {3EF9795D-3509-4664-8E73-8D315CC0B944}.DebugA|Win32.ActiveCfg = DebugA|Win32 + {3EF9795D-3509-4664-8E73-8D315CC0B944}.DebugA|Win32.Build.0 = DebugA|Win32 {3EF9795D-3509-4664-8E73-8D315CC0B944}.Release|Win32.ActiveCfg = Release|Win32 {3EF9795D-3509-4664-8E73-8D315CC0B944}.Release|Win32.Build.0 = Release|Win32 + {3EF9795D-3509-4664-8E73-8D315CC0B944}.ReleaseA|Win32.ActiveCfg = ReleaseA|Win32 + {3EF9795D-3509-4664-8E73-8D315CC0B944}.ReleaseA|Win32.Build.0 = ReleaseA|Win32 {797901AA-9447-45C6-AF89-5D5DA54C4159}.Debug|Win32.ActiveCfg = Debug|Win32 {797901AA-9447-45C6-AF89-5D5DA54C4159}.Debug|Win32.Build.0 = Debug|Win32 + {797901AA-9447-45C6-AF89-5D5DA54C4159}.DebugA|Win32.ActiveCfg = DebugA|Win32 + {797901AA-9447-45C6-AF89-5D5DA54C4159}.DebugA|Win32.Build.0 = DebugA|Win32 {797901AA-9447-45C6-AF89-5D5DA54C4159}.Release|Win32.ActiveCfg = Release|Win32 {797901AA-9447-45C6-AF89-5D5DA54C4159}.Release|Win32.Build.0 = Release|Win32 + {797901AA-9447-45C6-AF89-5D5DA54C4159}.ReleaseA|Win32.ActiveCfg = ReleaseA|Win32 + {797901AA-9447-45C6-AF89-5D5DA54C4159}.ReleaseA|Win32.Build.0 = ReleaseA|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DuiLib.suo b/DuiLib.suo new file mode 100644 index 00000000..9029441a Binary files /dev/null and b/DuiLib.suo differ diff --git a/DuiLib/Core/UIRender.cpp b/DuiLib/Core/UIRender.cpp index 82a7c2fc..e817ae30 100644 --- a/DuiLib/Core/UIRender.cpp +++ b/DuiLib/Core/UIRender.cpp @@ -1258,10 +1258,11 @@ void CRenderEngine::DrawText(HDC hDC, CPaintManagerUI* pManager, RECT& rc, LPCTS else { stringFormat.SetLineAlignment(Gdiplus::StringAlignmentNear); } - +#ifdef UNICODE if ((uStyle & DT_CALCRECT) != 0) { Gdiplus::RectF bounds; + graphics.MeasureString(pstrText, -1, &font, rectF, &stringFormat, &bounds); // MeasureString´æÔÚ¼ÆËãÎó²î£¬ÕâÀï¼ÓÒ»ÏñËØ @@ -1272,7 +1273,27 @@ void CRenderEngine::DrawText(HDC hDC, CPaintManagerUI* pManager, RECT& rc, LPCTS { graphics.DrawString(pstrText, -1, &font, rectF, &stringFormat, &brush); } - +#else + DWORD dwSize = MultiByteToWideChar(CP_ACP, 0, pstrText, -1, NULL, 0); + WCHAR * pcwszDest = new WCHAR[dwSize + 1]; + memset(pcwszDest, 0, (dwSize + 1) * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, NULL, pstrText, -1, pcwszDest, dwSize); + if(pcwszDest != NULL) + { + if ((uStyle & DT_CALCRECT) != 0) + { + Gdiplus::RectF bounds; + graphics.MeasureString(pcwszDest, -1, &font, rectF, &stringFormat, &bounds); + rc.bottom = rc.top + (long)(bounds.Height * 1.06); + rc.right = rc.left + (long)(bounds.Width * 1.06); + } + else + { + graphics.DrawString(pcwszDest, -1, &font, rectF, &stringFormat, &brush); + } + delete []pcwszDest; + } +#endif } else { diff --git a/DuiLib/DuiLib.vcxproj b/DuiLib/DuiLib.vcxproj index 5e9899c2..8df8db8c 100644 --- a/DuiLib/DuiLib.vcxproj +++ b/DuiLib/DuiLib.vcxproj @@ -1,10 +1,18 @@  + + DebugA + Win32 + Debug Win32 + + ReleaseA + Win32 + Release Win32 @@ -19,10 +27,18 @@ DynamicLibrary Unicode + + DynamicLibrary + MultiByte + DynamicLibrary Unicode + + DynamicLibrary + MultiByte + @@ -30,30 +46,56 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 false + false false + false false + false false + false false + false false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + $(ProjectName)_d + $(ProjectName)A_d $(SolutionDir)Temp\$(Configuration)\ + $(SolutionDir)Temp\$(Configuration)\ $(SolutionDir)Temp\$(Configuration)\ + $(SolutionDir)Temp\$(Configuration)\ $(SolutionDir)Bin\ + $(SolutionDir)Bin\ $(SolutionDir)Bin\ + $(SolutionDir)Bin\ + $(ProjectName)A @@ -92,6 +134,43 @@ true + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/DuiLib.tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;UILIB_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + true + $(OutDir)$(TargetName).pdb + 0x11000000 + MachineX86 + $(SolutionDir)Lib\$(ProjectName)A_d.lib + + + true + + NDEBUG;%(PreprocessorDefinitions) @@ -128,12 +207,50 @@ true + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/DuiLib.tlb + + + + + MinSpace + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;UILIB_EXPORTS;%(PreprocessorDefinitions) + true + true + Use + Level3 + true + MultiThreadedDLL + + + NDEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + 0x11000000 + MachineX86 + $(OutDir)$(TargetName).pdb + $(SolutionDir)Lib\$(ProjectName)A.lib + + + true + + Create + Create Create + Create @@ -141,16 +258,24 @@ + + + + + + + +