Commit: 9cfe38c06308573d9964e4e1d16d87d1b884930c - nlite (git)

Commit MetaInfo

• Revision: 9cfe38c06308573d9964e4e1d16d87d1b884930c (tree)
• Time: 2012-03-13 01:04:01
• Author: qwerty2501 <qwerty2501@user...>
• Commiter: qwerty2501

Log Message

一旦もとに戻す

Change Summary

• modified: nlite.suo
• modified: nlite/nlite.cpp
• modified: nlite/nlite.exe.manifest
• modified: nlite/nlite.rc
• modified: nlite/nlite.vcxproj
• modified: nlite/stdafx.h

Incremental Difference

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

--- a/nlite/nlite.cpp
+++ b/nlite/nlite.cpp
@@ -19,20 +19,16 @@ CAppModule _Module;
 int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE,
 	LPTSTR lpCmdLine, int nCmdShow)
 {
-	
-	AtlInitCommonControls(ICC_COOL_CLASSES | ICC_WIN95_CLASSES);
 	HINSTANCE hRich = LoadLibrary(CRichEditCtrl::GetLibraryName());
 	int nRet = -1;
 	try{
-		
-		
-		
+
 		//
 		//アプリケケーション初期化処理
 		//
 		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.exe.manifest
+++ b/nlite/nlite.exe.manifest
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity
-      version="1.0.0.0"
-      processorArchitecture="X86"
-      name="CompanyName.ProductName.nlite"
-      type="win32">
-    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-      <security>
-        <requestedPrivileges>
-          <requestedExecutionLevel level="asInvoker"/>
-        </requestedPrivileges>
-      </security>
-    </trustInfo>
-  </assemblyIdentity>
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="X86"
+    name="CompanyName.ProductName.nlite"
+    type="win32"
+/>
 <description>アプリケーションの説明</description>
 <dependency>
     <dependentAssembly>

--- a/nlite/nlite.rc
+++ b/nlite/nlite.rc
@@ -1,5 +1,5 @@
-// Generated by ResEdit 1.5.10
-// Copyright (C) 2006-2012
+// Generated by ResEdit 1.5.9
+// Copyright (C) 2006-2011
 // http://www.resedit.net
 
 #include <windows.h>
@@ -208,4 +208,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 // Manifest resources
 //
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-2                  RT_MANIFEST    ".\\nlite.exe.manifest"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST    "nlite.exe.manifest"

--- a/nlite/nlite.vcxproj
+++ b/nlite/nlite.vcxproj
@@ -72,28 +72,31 @@
     <EmbedManifest>false</EmbedManifest>
     <CustomBuildAfterTargets>
     </CustomBuildAfterTargets>
-    <GenerateManifest>false</GenerateManifest>
-    <LibraryPath>$(SolutionDir)$(Configuration);$(LibraryPath);$(WinDDK)lib\ATL\i386</LibraryPath>
+    <ReferencePath>$(Projectdir)$(configuration);$(ReferencePath);$(ReferencePath)</ReferencePath>
+    <LibraryPath>$(solutiondir)$(configuration);$(LibraryPath)</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>
+    <ReferencePath>$(Projectdir)$(configuration);$(ReferencePath);$(ReferencePath)</ReferencePath>
+    <LibraryPath>$(solutiondir)$(configuration);$(LibraryPath)</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>
+    <ReferencePath>$(Projectdir)$(configuration);$(ReferencePath);$(ReferencePath)</ReferencePath>
+    <LibraryPath>$(solutiondir)$(configuration);$(LibraryPath)</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>
+    <ReferencePath>$(ReferencePath);$(ReferencePath)</ReferencePath>
+    <LibraryPath>$(solutiondir)$(configuration);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -119,9 +122,6 @@
       <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>
@@ -147,9 +147,6 @@ 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>
@@ -180,9 +177,6 @@ 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>
@@ -216,10 +210,6 @@ copy "$(targetdir)nlite.exe"  "$(targetdir)nlite_preview\" /y
 
 </Command>
     </PostBuildEvent>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <None Include="nlite.ico" />
@@ -272,9 +262,7 @@ copy "$(targetdir)nlite.exe"  "$(targetdir)nlite_preview\" /y
     <ResourceCompile Include="nlite.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Manifest Include="nlite.exe.manifest">
-      <SubType>Designer</SubType>
-    </Manifest>
+    <Manifest Include="nlite.exe.manifest" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

--- a/nlite/stdafx.h
+++ b/nlite/stdafx.h
@@ -76,6 +76,8 @@ extern CAppModule _Module;
 #include <exdispid.h>
 #include <xmllite.h>
 
+
+
 #pragma comment(lib, "xmllite.lib")
 #pragma comment(lib,"ComCtl32.lib")
 #pragma comment(lib,"atlthunk.lib")