Skip to content

Commit 3362b21

Browse files
ChrisChris
authored andcommitted
Ensure 64 bit installer properly installs 32 bit dll as well as updates the wow6432node registry locations.
1 parent 1394f8e commit 3362b21

File tree

5 files changed

+329
-97
lines changed

5 files changed

+329
-97
lines changed

PIFShellExtensions/PIFShellExtensions.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<LinkIncremental>false</LinkIncremental>
9292
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\PIFShellExtensionsLib;..\PPMExtensionLib</IncludePath>
9393
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
94-
<IntDir>$(Configuration)</IntDir>
94+
<IntDir>$(Configuration)\</IntDir>
9595
<TargetName>$(ProjectName)32</TargetName>
9696
<CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
9797
<RunCodeAnalysis>true</RunCodeAnalysis>
@@ -120,7 +120,7 @@
120120
<SubSystem>Windows</SubSystem>
121121
<GenerateDebugInformation>true</GenerateDebugInformation>
122122
<ModuleDefinitionFile>Source.def</ModuleDefinitionFile>
123-
<AdditionalDependencies>kernel32.lib;user32.lib;shlwapi.lib;gdi32.lib;gdiplus.lib;propsys.lib;$(OutDir)PIFShellExtensionsLib.lib;$(OutDir)PIFShellExtensionsLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
123+
<AdditionalDependencies>kernel32.lib;user32.lib;shlwapi.lib;gdi32.lib;gdiplus.lib;propsys.lib;$(OutDir)PIFShellExtensionsLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
124124
</Link>
125125
<Bscmake>
126126
<PreserveSbr>true</PreserveSbr>
@@ -141,7 +141,7 @@
141141
<SubSystem>Windows</SubSystem>
142142
<GenerateDebugInformation>true</GenerateDebugInformation>
143143
<ModuleDefinitionFile>Source.def</ModuleDefinitionFile>
144-
<AdditionalDependencies>kernel32.lib;user32.lib;shlwapi.lib;gdi32.lib;gdiplus.lib;propsys.lib;$(OutDir)PIFShellExtensionsLib.lib;$(OutDir)PIFShellExtensionLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
144+
<AdditionalDependencies>kernel32.lib;user32.lib;shlwapi.lib;gdi32.lib;gdiplus.lib;propsys.lib;$(OutDir)PIFShellExtensionLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
145145
</Link>
146146
</ItemDefinitionGroup>
147147
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -187,7 +187,7 @@
187187
<OptimizeReferences>true</OptimizeReferences>
188188
<GenerateDebugInformation>true</GenerateDebugInformation>
189189
<ModuleDefinitionFile>Source.def</ModuleDefinitionFile>
190-
<AdditionalDependencies>kernel32.lib;user32.lib;shlwapi.lib;gdi32.lib;gdiplus.lib;propsys.lib;$(OutDir)PIFShellExtensionsLib.lib;$(OutDir)PIFExtLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
190+
<AdditionalDependencies>kernel32.lib;user32.lib;shlwapi.lib;gdi32.lib;gdiplus.lib;propsys.lib;$(OutDir)PIFShellExtensionsLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
191191
<AdditionalLibraryDirectories>..\PPMExtensionLib</AdditionalLibraryDirectories>
192192
<Version>0.2</Version>
193193
</Link>

PIFShellExtensionsInstaller32/PIFShellExtensionsInstaller32.vdproj

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
"SccProvider" = "8:"
1414
"Hierarchy"
1515
{
16+
"Entry"
17+
{
18+
"MsmKey" = "8:_DCE3354646FC4A57A0584FF7C7570380"
19+
"OwnerKey" = "8:_UNDEFINED"
20+
"MsmSig" = "8:_UNDEFINED"
21+
}
1622
}
1723
"Configurations"
1824
{
@@ -100,6 +106,26 @@
100106
}
101107
"File"
102108
{
109+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DCE3354646FC4A57A0584FF7C7570380"
110+
{
111+
"SourcePath" = "8:..\\Win32\\Release\\PIFShellExtensions32.dll"
112+
"TargetName" = "8:PIFShellExtensions32.dll"
113+
"Tag" = "8:"
114+
"Folder" = "8:_DEF88850782F4B4D8EB738ECB05EDB69"
115+
"Condition" = "8:"
116+
"Transitive" = "11:FALSE"
117+
"Vital" = "11:TRUE"
118+
"ReadOnly" = "11:FALSE"
119+
"Hidden" = "11:FALSE"
120+
"System" = "11:FALSE"
121+
"Permanent" = "11:FALSE"
122+
"SharedLegacy" = "11:FALSE"
123+
"PackageAs" = "3:1"
124+
"Register" = "3:1"
125+
"Exclude" = "11:FALSE"
126+
"IsDependency" = "11:FALSE"
127+
"IsolateTo" = "8:"
128+
}
103129
}
104130
"FileType"
105131
{
@@ -157,7 +183,7 @@
157183
"Name" = "8:Microsoft Visual Studio"
158184
"ProductName" = "8:Portable Image Format Windows Shell Extension"
159185
"ProductCode" = "8:{AEFF6D1E-0CFC-4BE9-B55E-625ED19EE615}"
160-
"PackageCode" = "8:{BE456AAB-E2FD-4D5D-8038-FC689E088EBB}"
186+
"PackageCode" = "8:{3C82E041-5B4E-4C7A-9867-1D3493F0C17C}"
161187
"UpgradeCode" = "8:{DAE6DEC5-EED7-4743-BA34-BEAFA8BC7CE8}"
162188
"AspNetVersion" = "8:4.0.30319.0"
163189
"RestartWWWService" = "11:FALSE"
@@ -1812,34 +1838,6 @@
18121838
}
18131839
"ProjectOutput"
18141840
{
1815-
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_6265A844127044B4B8B72011E8ADA5C4"
1816-
{
1817-
"SourcePath" = "8:"
1818-
"TargetName" = "8:"
1819-
"Tag" = "8:"
1820-
"Folder" = "8:_DEF88850782F4B4D8EB738ECB05EDB69"
1821-
"Condition" = "8:"
1822-
"Transitive" = "11:FALSE"
1823-
"Vital" = "11:TRUE"
1824-
"ReadOnly" = "11:FALSE"
1825-
"Hidden" = "11:FALSE"
1826-
"System" = "11:FALSE"
1827-
"Permanent" = "11:FALSE"
1828-
"SharedLegacy" = "11:FALSE"
1829-
"PackageAs" = "3:1"
1830-
"Register" = "3:1"
1831-
"Exclude" = "11:FALSE"
1832-
"IsDependency" = "11:FALSE"
1833-
"IsolateTo" = "8:"
1834-
"ProjectOutputGroupRegister" = "3:1"
1835-
"OutputConfiguration" = "8:Release|Win32"
1836-
"OutputGroupCanonicalName" = "8:Built"
1837-
"OutputProjectGuid" = "8:{73E69D94-C385-4703-AD0B-BB2FE6905F46}"
1838-
"ShowKeyOutput" = "11:TRUE"
1839-
"ExcludeFilters"
1840-
{
1841-
}
1842-
}
18431841
}
18441842
}
18451843
}

0 commit comments

Comments
 (0)