Commit: 408e1bdeed398725795ea8a03c00be1ba9d5634b - nlite (git)

Commit MetaInfo

• Revision: 408e1bdeed398725795ea8a03c00be1ba9d5634b (tree)
• Time: 2012-03-13 00:46:08
• Author: qwerty2501 <qwerty2501users.sourceforge.jp>
• Commiter: qwerty2501

Log Message

初期化関数修正

Change Summary

• modified: nlite.suo
• modified: nlite/nlite.cpp
• modified: nlite/nlite.vcxproj

Incremental Difference

Binary files a/nlite.suo and b/nlite.suo differ

--- a/nlite/nlite.cpp
+++ b/nlite/nlite.cpp
@@ -19,10 +19,8 @@ CAppModule _Module;
 int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE,
 	LPTSTR lpCmdLine, int nCmdShow)
 {
-	INITCOMMONCONTROLSEX icmc;
-	icmc.dwSize = sizeof(icmc);
-	icmc.dwICC = ICC_WIN95_CLASSES;
-	InitCommonControlsEx(&icmc);
+	
+	AtlInitCommonControls(ICC_COOL_CLASSES | ICC_WIN95_CLASSES);
 	HINSTANCE hRich = LoadLibrary(CRichEditCtrl::GetLibraryName());
 	int nRet = -1;
 	try{
@@ -34,7 +32,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE,
 		//
 		HRESULT hRes = ::CoInitialize(NULL);
 		ATLASSERT(SUCCEEDED(hRes));
-		AtlInitCommonControls(ICC_COOL_CLASSES | ICC_WIN95_CLASSES);
+		
 		GUID guid;
 		if(_Module.Init(NULL, hInstance,&guid) != S_OK){
 			throw AppInitException(__LINE__,TEXT(__FILE__),TEXT(__FUNCTION__));

--- a/nlite/nlite.vcxproj
+++ b/nlite/nlite.vcxproj
@@ -72,23 +72,28 @@
     <EmbedManifest>false</EmbedManifest>
     <CustomBuildAfterTargets>
     </CustomBuildAfterTargets>
+    <GenerateManifest>false</GenerateManifest>
+    <LibraryPath>$(SolutionDir)$(Configuration);$(LibraryPath);$(WinDDK)lib\ATL\i386</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-window|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(solutiondir)\nlib;$(solutiondir)\include\WTL\include;$(solutiondir);$(solutiondir)\include;$(solutiondir)\expat;$(solutiondir)nlib\;$(solutiondir)memorypool\;$(solutiondir)shareCookie\;$(solutiondir);$(IncludePath);$(solutiondir)\speaker;$(IncludePath);$(IncludePath)</IncludePath>
     <CustomBuildAfterTargets>
     </CustomBuildAfterTargets>
+    <LibraryPath>$(SolutionDir)$(Configuration);$(LibraryPath);$(WinDDK)lib\ATL\i386</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(solutiondir)\nlib;$(solutiondir)\include\WTL\include;$(solutiondir);$(solutiondir)\include;$(solutiondir)\expat;$(WDDK)inc\atl71;$(BOOST);$(IncludePath);$(solutiondir)\speaker;$(IncludePath);$(IncludePath)</IncludePath>
     <CustomBuildAfterTargets>
     </CustomBuildAfterTargets>
+    <LibraryPath>$(SolutionDir)$(Configuration);$(LibraryPath);$(WinDDK)lib\ATL\i386</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Preview|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(solutiondir)\nlib;$(solutiondir)\include\WTL\include;$(solutiondir);$(solutiondir)\include;$(solutiondir)\expat;$(WDDK)inc\atl71;$(BOOST);$(IncludePath);$(solutiondir)\speaker;$(IncludePath);$(IncludePath)</IncludePath>
     <CustomBuildAfterTargets />
+    <LibraryPath>$(SolutionDir)$(Configuration);$(LibraryPath);$(WinDDK)lib\ATL\i386</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -114,6 +119,9 @@
       <Command>mkdir "$(targetdir)libs" /y
 xcopy "$(ProjectDir)libs" "$(targetdir)libs" /e /y</Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(Projectdir)$(TargetfileName).manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-window|Win32'">
     <ClCompile>
@@ -139,6 +147,9 @@ xcopy "$(ProjectDir)libs" "$(targetdir)libs" /e /y</Command>
       <Command>mkdir "$(targetdir)libs" /y
 xcopy "$(ProjectDir)libs" "$(targetdir)libs" /e /y</Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(Projectdir)$(TargetfileName).manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -169,6 +180,9 @@ xcopy "$(ProjectDir)libs" "$(targetdir)libs" /e /y</Command>
 xcopy "$(ProjectDir)libs" "$(targetdir)nlite\libs" /e /y
 copy "$(targetdir)nlite.exe"  "$(targetdir)nlite\" /y</Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(Projectdir)$(TargetfileName).manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Preview|Win32'">
     <ClCompile>
@@ -202,6 +216,10 @@ copy "$(targetdir)nlite.exe"  "$(targetdir)nlite_preview\" /y
 
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <None Include="nlite.ico" />