Skip to content

Commit 9163a67

Browse files
ChrisChris
Chris
authored and
Chris
committed
add version info to dll. Cleanup vcproj files
1 parent 3732b87 commit 9163a67

20 files changed

+125
-864
lines changed

‎PIFShellExtensions.sln‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PIFShellExtensions", "PIFShellExtensions\PIFShellExtensions.vcxproj", "{73E69D94-C385-4703-AD0B-BB2FE6905F46}"
77
ProjectSection(ProjectDependencies) = postProject
@@ -16,9 +16,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PIFShellExtensionsTests", "
1616
{73E69D94-C385-4703-AD0B-BB2FE6905F46} = {73E69D94-C385-4703-AD0B-BB2FE6905F46}
1717
EndProjectSection
1818
EndProject
19-
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "PIFShellExtensionsSetup64", "PIFShellExtensionsInstaller32\PIFShellExtensionsInstaller32.vdproj", "{43B95D11-3CFF-4286-B075-CF222158561F}"
19+
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "PIFShellExtensionsSetup32", "PIFShellExtensionsInstaller32\PIFShellExtensionsInstaller32.vdproj", "{AE483C99-DC19-4BED-81DF-7DC33FAD8C45}"
2020
EndProject
21-
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "PIFShellExtensionsSetup32", "PIFShellExtensionsInstaller64\PIFShellExtensionsInstaller64.vdproj", "{AE483C99-DC19-4BED-81DF-7DC33FAD8C45}"
21+
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "PIFShellExtensionsSetup64", "PIFShellExtensionsInstaller64\PIFShellExtensionsInstaller64.vdproj", "{28989AEC-E6F1-4D5C-85CF-F6925DA8910B}"
2222
EndProject
2323
Global
2424
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -53,14 +53,6 @@ Global
5353
{8E105821-E661-439F-BB4D-0745753A8CDA}.Release|x64.Build.0 = Release|x64
5454
{8E105821-E661-439F-BB4D-0745753A8CDA}.Release|x86.ActiveCfg = Release|Win32
5555
{8E105821-E661-439F-BB4D-0745753A8CDA}.Release|x86.Build.0 = Release|Win32
56-
{43B95D11-3CFF-4286-B075-CF222158561F}.Debug|x64.ActiveCfg = Debug
57-
{43B95D11-3CFF-4286-B075-CF222158561F}.Debug|x64.Build.0 = Debug
58-
{43B95D11-3CFF-4286-B075-CF222158561F}.Debug|x86.ActiveCfg = Debug
59-
{43B95D11-3CFF-4286-B075-CF222158561F}.Debug|x86.Build.0 = Debug
60-
{43B95D11-3CFF-4286-B075-CF222158561F}.Release|x64.ActiveCfg = Release
61-
{43B95D11-3CFF-4286-B075-CF222158561F}.Release|x64.Build.0 = Release
62-
{43B95D11-3CFF-4286-B075-CF222158561F}.Release|x86.ActiveCfg = Release
63-
{43B95D11-3CFF-4286-B075-CF222158561F}.Release|x86.Build.0 = Release
6456
{AE483C99-DC19-4BED-81DF-7DC33FAD8C45}.Debug|x64.ActiveCfg = Debug
6557
{AE483C99-DC19-4BED-81DF-7DC33FAD8C45}.Debug|x64.Build.0 = Debug
6658
{AE483C99-DC19-4BED-81DF-7DC33FAD8C45}.Debug|x86.ActiveCfg = Debug
@@ -69,6 +61,14 @@ Global
6961
{AE483C99-DC19-4BED-81DF-7DC33FAD8C45}.Release|x64.Build.0 = Release
7062
{AE483C99-DC19-4BED-81DF-7DC33FAD8C45}.Release|x86.ActiveCfg = Release
7163
{AE483C99-DC19-4BED-81DF-7DC33FAD8C45}.Release|x86.Build.0 = Release
64+
{28989AEC-E6F1-4D5C-85CF-F6925DA8910B}.Debug|x64.ActiveCfg = Debug
65+
{28989AEC-E6F1-4D5C-85CF-F6925DA8910B}.Debug|x64.Build.0 = Debug
66+
{28989AEC-E6F1-4D5C-85CF-F6925DA8910B}.Debug|x86.ActiveCfg = Debug
67+
{28989AEC-E6F1-4D5C-85CF-F6925DA8910B}.Debug|x86.Build.0 = Debug
68+
{28989AEC-E6F1-4D5C-85CF-F6925DA8910B}.Release|x64.ActiveCfg = Release
69+
{28989AEC-E6F1-4D5C-85CF-F6925DA8910B}.Release|x64.Build.0 = Release
70+
{28989AEC-E6F1-4D5C-85CF-F6925DA8910B}.Release|x86.ActiveCfg = Release
71+
{28989AEC-E6F1-4D5C-85CF-F6925DA8910B}.Release|x86.Build.0 = Release
7272
EndGlobalSection
7373
GlobalSection(SolutionProperties) = preSolution
7474
HideSolutionNode = FALSE

‎PIFShellExtensions/DllMain.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
LONG g_cRef;
55
HINSTANCE g_hinst;
66

7+
_Check_return_
78
STDAPI DllGetClassObject(_In_ REFCLSID rclsid, _In_ REFIID riid, _Outptr_ LPVOID FAR* ppv)
89
{
910
HRESULT hr;

‎PIFShellExtensions/PIFShellExtensions.rc‎

4.6 KB
Binary file not shown.

‎PIFShellExtensions/PIFShellExtensions.vcxproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
</PropertyGroup>
9090
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
9191
<LinkIncremental>false</LinkIncremental>
92-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\PIFShellExtensionsLib\;..\PPMExtensionLib\</IncludePath>
92+
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\PIFShellExtensionsLib;..\PPMExtensionLib</IncludePath>
9393
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
9494
<IntDir>$(Configuration)</IntDir>
9595
<TargetName>$(ProjectName)32</TargetName>
@@ -98,7 +98,7 @@
9898
</PropertyGroup>
9999
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
100100
<LinkIncremental>false</LinkIncremental>
101-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\PIFShellExtensionsLib\;..\PPMExtensionLib\</IncludePath>
101+
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\PIFShellExtensionsLib;..\PPMExtensionLib</IncludePath>
102102
<IntDir>$(Configuration)</IntDir>
103103
<TargetName>$(ProjectName)64</TargetName>
104104
<CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -165,6 +165,7 @@
165165
<ModuleDefinitionFile>Source.def</ModuleDefinitionFile>
166166
<AdditionalDependencies>kernel32.lib;user32.lib;shlwapi.lib;gdi32.lib;gdiplus.lib;propsys.lib;$(OutDir)PIFExtLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
167167
<AdditionalLibraryDirectories>..\PPMExtensionLib</AdditionalLibraryDirectories>
168+
<Version>0.2</Version>
168169
</Link>
169170
</ItemDefinitionGroup>
170171
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -188,9 +189,11 @@
188189
<ModuleDefinitionFile>Source.def</ModuleDefinitionFile>
189190
<AdditionalDependencies>kernel32.lib;user32.lib;shlwapi.lib;gdi32.lib;gdiplus.lib;propsys.lib;$(OutDir)PIFExtLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
190191
<AdditionalLibraryDirectories>..\PPMExtensionLib</AdditionalLibraryDirectories>
192+
<Version>0.2</Version>
191193
</Link>
192194
</ItemDefinitionGroup>
193195
<ItemGroup>
196+
<ClInclude Include="resource.h" />
194197
<ClInclude Include="stdafx.h" />
195198
<ClInclude Include="targetver.h" />
196199
</ItemGroup>
@@ -206,6 +209,9 @@
206209
<ItemGroup>
207210
<None Include="Source.def" />
208211
</ItemGroup>
212+
<ItemGroup>
213+
<ResourceCompile Include="PIFShellExtensions.rc" />
214+
</ItemGroup>
209215
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
210216
<ImportGroup Label="ExtensionTargets">
211217
</ImportGroup>

‎PIFShellExtensions/resource.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//{{NO_DEPENDENCIES}}
2+
// Microsoft Visual C++ generated include file.
3+
// Used by PIFShellExtensions.rc
4+
5+
// Next default values for new objects
6+
//
7+
#ifdef APSTUDIO_INVOKED
8+
#ifndef APSTUDIO_READONLY_SYMBOLS
9+
#define _APS_NEXT_RESOURCE_VALUE 101
10+
#define _APS_NEXT_COMMAND_VALUE 40001
11+
#define _APS_NEXT_CONTROL_VALUE 1001
12+
#define _APS_NEXT_SYMED_VALUE 101
13+
#endif
14+
#endif

‎PIFShellExtensions/stdafx.h‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
// stdafx.h : include file for standard system include files,
2-
// or project specific include files that are used frequently, but
3-
// are changed infrequently
4-
//
5-
61
#pragma once
72

83
#include "targetver.h"
94

105
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
11-
// Windows Header Files:
6+
127
#include <windows.h>
138
#include <shlobj.h>
149
#include <shellapi.h>

‎PIFShellExtensionsInstaller32/PIFShellExtensionsInstaller32.vdproj‎

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"VSVersion" = "3:800"
44
"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
55
"IsWebType" = "8:FALSE"
6-
"ProjectName" = "8:PIFShellExtensionsSetup64"
6+
"ProjectName" = "8:PIFShellExtensionsSetup32"
77
"LanguageId" = "3:1033"
88
"CodePage" = "3:1252"
99
"UILanguageId" = "3:1033"
@@ -13,12 +13,6 @@
1313
"SccProvider" = "8:"
1414
"Hierarchy"
1515
{
16-
"Entry"
17-
{
18-
"MsmKey" = "8:_B768E87047984DA89660198D73DE6A8F"
19-
"OwnerKey" = "8:_UNDEFINED"
20-
"MsmSig" = "8:_UNDEFINED"
21-
}
2216
}
2317
"Configurations"
2418
{
@@ -27,7 +21,7 @@
2721
"DisplayName" = "8:Debug"
2822
"IsDebugOnly" = "11:TRUE"
2923
"IsReleaseOnly" = "11:FALSE"
30-
"OutputFilename" = "8:Debug\\PIFShellExtensionsSetup64.msi"
24+
"OutputFilename" = "8:Debug\\PIFShellExtensionsSetup32.msi"
3125
"PackageFilesAs" = "3:2"
3226
"PackageFileSize" = "3:-2147483648"
3327
"CabType" = "3:1"
@@ -59,7 +53,7 @@
5953
"DisplayName" = "8:Release"
6054
"IsDebugOnly" = "11:FALSE"
6155
"IsReleaseOnly" = "11:TRUE"
62-
"OutputFilename" = "8:Release\\x64\\PIFShellExtensionsSetup64.msi"
56+
"OutputFilename" = "8:Release\\win32\\PIFShellExtensionsSetup32.msi"
6357
"PackageFilesAs" = "3:2"
6458
"PackageFileSize" = "3:-2147483648"
6559
"CabType" = "3:1"
@@ -163,7 +157,7 @@
163157
"Name" = "8:Microsoft Visual Studio"
164158
"ProductName" = "8:Portable Image Format Windows Shell Extension"
165159
"ProductCode" = "8:{AEFF6D1E-0CFC-4BE9-B55E-625ED19EE615}"
166-
"PackageCode" = "8:{70F6C9DC-C1AC-4EB7-B3E6-FA7C78850183}"
160+
"PackageCode" = "8:{BE456AAB-E2FD-4D5D-8038-FC689E088EBB}"
167161
"UpgradeCode" = "8:{DAE6DEC5-EED7-4743-BA34-BEAFA8BC7CE8}"
168162
"AspNetVersion" = "8:4.0.30319.0"
169163
"RestartWWWService" = "11:FALSE"
@@ -184,7 +178,7 @@
184178
"ARPIconIndex" = "3:0"
185179
"SearchPath" = "8:"
186180
"UseSystemSearchPath" = "11:TRUE"
187-
"TargetPlatform" = "3:1"
181+
"TargetPlatform" = "3:0"
188182
"PreBuildEvent" = "8:"
189183
"PostBuildEvent" = "8:"
190184
"RunPostBuildEvent" = "3:0"
@@ -679,7 +673,7 @@
679673
"Condition" = "8:"
680674
"Transitive" = "11:FALSE"
681675
"ValueTypes" = "3:1"
682-
"Value" = "8:[TARGETDIR]PIFShellExtensions64.dll"
676+
"Value" = "8:[TARGETDIR]PIFShellExtensions32.dll"
683677
}
684678
"{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_87B4FA1ABCC042E388FC09145515B6F4"
685679
{
@@ -1818,7 +1812,7 @@
18181812
}
18191813
"ProjectOutput"
18201814
{
1821-
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_62C7E43DC5C24F0AB7B178689623E7E1"
1815+
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_6265A844127044B4B8B72011E8ADA5C4"
18221816
{
18231817
"SourcePath" = "8:"
18241818
"TargetName" = "8:"
@@ -1838,34 +1832,6 @@
18381832
"IsDependency" = "11:FALSE"
18391833
"IsolateTo" = "8:"
18401834
"ProjectOutputGroupRegister" = "3:1"
1841-
"OutputConfiguration" = "8:Release|x64"
1842-
"OutputGroupCanonicalName" = "8:Built"
1843-
"OutputProjectGuid" = "8:{73E69D94-C385-4703-AD0B-BB2FE6905F46}"
1844-
"ShowKeyOutput" = "11:TRUE"
1845-
"ExcludeFilters"
1846-
{
1847-
}
1848-
}
1849-
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B768E87047984DA89660198D73DE6A8F"
1850-
{
1851-
"SourcePath" = "8:..\\Win32\\Release\\PIFShellExtensions32.dll"
1852-
"TargetName" = "8:"
1853-
"Tag" = "8:"
1854-
"Folder" = "8:_DEF88850782F4B4D8EB738ECB05EDB69"
1855-
"Condition" = "8:"
1856-
"Transitive" = "11:FALSE"
1857-
"Vital" = "11:TRUE"
1858-
"ReadOnly" = "11:FALSE"
1859-
"Hidden" = "11:FALSE"
1860-
"System" = "11:FALSE"
1861-
"Permanent" = "11:FALSE"
1862-
"SharedLegacy" = "11:FALSE"
1863-
"PackageAs" = "3:1"
1864-
"Register" = "3:1"
1865-
"Exclude" = "11:FALSE"
1866-
"IsDependency" = "11:FALSE"
1867-
"IsolateTo" = "8:"
1868-
"ProjectOutputGroupRegister" = "3:1"
18691835
"OutputConfiguration" = "8:Release|Win32"
18701836
"OutputGroupCanonicalName" = "8:Built"
18711837
"OutputProjectGuid" = "8:{73E69D94-C385-4703-AD0B-BB2FE6905F46}"

‎PIFShellExtensionsInstaller64/PIFShellExtensionsInstaller64.vdproj‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"VSVersion" = "3:800"
44
"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
55
"IsWebType" = "8:FALSE"
6-
"ProjectName" = "8:PIFShellExtensionsSetup32"
6+
"ProjectName" = "8:PIFShellExtensionsSetup64"
77
"LanguageId" = "3:1033"
88
"CodePage" = "3:1252"
99
"UILanguageId" = "3:1033"
@@ -13,6 +13,12 @@
1313
"SccProvider" = "8:"
1414
"Hierarchy"
1515
{
16+
"Entry"
17+
{
18+
"MsmKey" = "8:_1FF91C6FA76144A2ADE1849196CD18C7"
19+
"OwnerKey" = "8:_UNDEFINED"
20+
"MsmSig" = "8:_UNDEFINED"
21+
}
1622
}
1723
"Configurations"
1824
{
@@ -21,7 +27,7 @@
2127
"DisplayName" = "8:Debug"
2228
"IsDebugOnly" = "11:TRUE"
2329
"IsReleaseOnly" = "11:FALSE"
24-
"OutputFilename" = "8:Debug\\PIFShellExtensionsSetup32.msi"
30+
"OutputFilename" = "8:Debug\\PIFShellExtensionsSetup64.msi"
2531
"PackageFilesAs" = "3:2"
2632
"PackageFileSize" = "3:-2147483648"
2733
"CabType" = "3:1"
@@ -53,7 +59,7 @@
5359
"DisplayName" = "8:Release"
5460
"IsDebugOnly" = "11:FALSE"
5561
"IsReleaseOnly" = "11:TRUE"
56-
"OutputFilename" = "8:Release\\win32\\PIFShellExtensionsSetup32.msi"
62+
"OutputFilename" = "8:Release\\x64\\PIFShellExtensionsSetup64.msi"
5763
"PackageFilesAs" = "3:2"
5864
"PackageFileSize" = "3:-2147483648"
5965
"CabType" = "3:1"
@@ -178,7 +184,7 @@
178184
"ARPIconIndex" = "3:0"
179185
"SearchPath" = "8:"
180186
"UseSystemSearchPath" = "11:TRUE"
181-
"TargetPlatform" = "3:0"
187+
"TargetPlatform" = "3:1"
182188
"PreBuildEvent" = "8:"
183189
"PostBuildEvent" = "8:"
184190
"RunPostBuildEvent" = "3:0"
@@ -1812,6 +1818,34 @@
18121818
}
18131819
"ProjectOutput"
18141820
{
1821+
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1FF91C6FA76144A2ADE1849196CD18C7"
1822+
{
1823+
"SourcePath" = "8:..\\x64\\Release\\PIFShellExtensions64.dll"
1824+
"TargetName" = "8:"
1825+
"Tag" = "8:"
1826+
"Folder" = "8:_DEF88850782F4B4D8EB738ECB05EDB69"
1827+
"Condition" = "8:"
1828+
"Transitive" = "11:FALSE"
1829+
"Vital" = "11:TRUE"
1830+
"ReadOnly" = "11:FALSE"
1831+
"Hidden" = "11:FALSE"
1832+
"System" = "11:FALSE"
1833+
"Permanent" = "11:FALSE"
1834+
"SharedLegacy" = "11:FALSE"
1835+
"PackageAs" = "3:1"
1836+
"Register" = "3:1"
1837+
"Exclude" = "11:FALSE"
1838+
"IsDependency" = "11:FALSE"
1839+
"IsolateTo" = "8:"
1840+
"ProjectOutputGroupRegister" = "3:1"
1841+
"OutputConfiguration" = "8:Release|x64"
1842+
"OutputGroupCanonicalName" = "8:Built"
1843+
"OutputProjectGuid" = "8:{73E69D94-C385-4703-AD0B-BB2FE6905F46}"
1844+
"ShowKeyOutput" = "11:TRUE"
1845+
"ExcludeFilters"
1846+
{
1847+
}
1848+
}
18151849
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_6265A844127044B4B8B72011E8ADA5C4"
18161850
{
18171851
"SourcePath" = "8:"

0 commit comments

Comments
 (0)