Skip to content

Commit 0327c08

Browse files
ge0rdige0rdi
committed
Change suffix of ARM64 binaries
1 parent 5ea1ae2 commit 0327c08

15 files changed

+33
-30
lines changed

‎Src/ClassicExplorer/ClassicExplorer.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<TargetName>$(ProjectName)64</TargetName>
6767
</PropertyGroup>
6868
<PropertyGroup Condition="'$(Platform)'=='ARM64'">
69-
<TargetName>$(ProjectName)ARM64</TargetName>
69+
<TargetName>$(ProjectName)A64</TargetName>
7070
</PropertyGroup>
7171
<PropertyGroup>
7272
<IgnoreImportLibrary>true</IgnoreImportLibrary>
@@ -113,7 +113,7 @@
113113
<None Include="ClassicExplorer.rgs" />
114114
<None Include="ClassicExplorer32.def" />
115115
<None Include="ClassicExplorer64.def" />
116-
<None Include="ClassicExplorerARM64.def" />
116+
<None Include="ClassicExplorerA64.def" />
117117
<None Include="ExplorerBand.rgs" />
118118
<None Include="ExplorerBHO.rgs" />
119119
<None Include="ExplorerL10N.ini">

‎Src/ClassicExplorer/ClassicExplorer.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<None Include="ShareOverlay.rgs">
8181
<Filter>Resource Files</Filter>
8282
</None>
83-
<None Include="ClassicExplorerARM64.def">
83+
<None Include="ClassicExplorerA64.def">
8484
<Filter>Source Files</Filter>
8585
</None>
8686
</ItemGroup>

‎Src/ClassicExplorer/ClassicExplorerARM64.def renamed to ‎Src/ClassicExplorer/ClassicExplorerA64.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; ClassicExplorer.def : Declares the module parameters.
22

3-
LIBRARY "ClassicExplorerARM64.DLL"
3+
LIBRARY "ClassicExplorerA64.DLL"
44

55
EXPORTS
66
DllCanUnloadNow PRIVATE

‎Src/ClassicIE/ClassicIE.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
192192
#if defined(_M_AMD64)
193193
HMODULE hHookModule=GetModuleHandle(L"ClassicIEDLL_64.dll");
194194
#elif defined(_M_ARM64)
195-
HMODULE hHookModule=GetModuleHandle(L"ClassicIEDLL_ARM64.dll");
195+
HMODULE hHookModule=GetModuleHandle(L"ClassicIEDLL_A64.dll");
196196
#else
197197
HMODULE hHookModule=GetModuleHandle(L"ClassicIEDLL_32.dll");
198198
#endif

‎Src/ClassicIE/ClassicIE.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<TargetName>$(ProjectName)_64</TargetName>
6767
</PropertyGroup>
6868
<PropertyGroup Condition="'$(Platform)'=='ARM64'">
69-
<TargetName>$(ProjectName)_ARM64</TargetName>
69+
<TargetName>$(ProjectName)_A64</TargetName>
7070
</PropertyGroup>
7171
<ItemDefinitionGroup>
7272
<ClCompile>

‎Src/ClassicIE/ClassicIEDLL/ClassicIEBHO.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static DWORD StartBroker( bool bWait, const wchar_t *param )
5353
#if defined(_M_AMD64) || defined(_M_IX86)
5454
PathAppend(path,L"ClassicIE_64.exe");
5555
#elif defined(_M_ARM64)
56-
PathAppend(path,L"ClassicIE_ARM64.exe");
56+
PathAppend(path,L"ClassicIE_A64.exe");
5757
#endif
5858

5959
wchar_t cmdLine[1024];

‎Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<TargetName>$(ProjectName)_64</TargetName>
6767
</PropertyGroup>
6868
<PropertyGroup Condition="'$(Platform)'=='ARM64'">
69-
<TargetName>$(ProjectName)_ARM64</TargetName>
69+
<TargetName>$(ProjectName)_A64</TargetName>
7070
</PropertyGroup>
7171
<ItemDefinitionGroup>
7272
<ClCompile>
@@ -107,7 +107,7 @@
107107
<None Include="ClassicIEDLL.rgs" />
108108
<None Include="ClassicIEDLL_32.def" />
109109
<None Include="ClassicIEDLL_64.def" />
110-
<None Include="ClassicIEDLL_ARM64.def" />
110+
<None Include="ClassicIEDLL_A64.def" />
111111
</ItemGroup>
112112
<ItemGroup>
113113
<ClInclude Include="ClassicIEBHO.h" />

‎Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<None Include="ClassicIEDLL.rgs">
5959
<Filter>Resource Files</Filter>
6060
</None>
61-
<None Include="ClassicIEDLL_ARM64.def">
61+
<None Include="ClassicIEDLL_A64.def">
6262
<Filter>Source Files</Filter>
6363
</None>
6464
</ItemGroup>

‎Src/ClassicIE/ClassicIEDLL/ClassicIEDLL_ARM64.def renamed to ‎Src/ClassicIE/ClassicIEDLL/ClassicIEDLL_A64.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; ClassicIEDLL.def : Declares the module parameters.
22

3-
LIBRARY "ClassicIEDLL_ARM64.DLL"
3+
LIBRARY "ClassicIEDLL_A64.DLL"
44

55
EXPORTS
66
DllCanUnloadNow PRIVATE

‎Src/Setup/Setup.wxs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<ComponentRef Id="ClassicExplorer64.dll" />
6969
<?endif ?>
7070
<?if $(var.ARM64)=1 ?>
71-
<ComponentRef Id="ClassicExplorerARM64.dll" />
71+
<ComponentRef Id="ClassicExplorerA64.dll" />
7272
<?endif ?>
7373
<ComponentRef Id="ExplorerL10N.ini" />
7474
<ComponentRef Id="ClassicExplorerSettings.exe" />
@@ -83,7 +83,7 @@
8383
<ComponentRef Id="StartMenuHelper64.dll" />
8484
<?endif ?>
8585
<?if $(var.ARM64)=1 ?>
86-
<ComponentRef Id="StartMenuHelperARM64.dll" />
86+
<ComponentRef Id="StartMenuHelperA64.dll" />
8787
<?endif ?>
8888
<ComponentRef Id="StartScreenLink" />
8989
<ComponentRef Id="StartMenuHelperL10N.ini" />
@@ -113,8 +113,8 @@
113113
<ComponentRef Id="ClassicIEDLL_64.dll" />
114114
<ComponentRef Id="ClassicIE_64.exe" />
115115
<?elseif $(var.ARM64)=1 ?>
116-
<ComponentRef Id="ClassicIEDLL_ARM64.dll" />
117-
<ComponentRef Id="ClassicIE_ARM64.exe" />
116+
<ComponentRef Id="ClassicIEDLL_A64.dll" />
117+
<ComponentRef Id="ClassicIE_A64.exe" />
118118
<?endif ?>
119119
<ComponentRef Id="IESettingsLink" />
120120
</Feature>
@@ -458,14 +458,14 @@
458458
<File Id="StartMenuDLL.dll" Checksum="yes" KeyPath="yes" Source="Output\x64\StartMenuDLL.dll" Vital="yes" />
459459
</Component>
460460
<?elseif $(var.ARM64)=1 ?>
461-
<Component Id="ClassicExplorerARM64.dll" Guid="2C25783D-394D-4E5B-9259-1650F561E2CE" Win64="yes" DiskId="2">
462-
<File Id="ClassicExplorerARM64.dll" KeyPath="yes" Source="Output\ARM64\ClassicExplorerARM64.dll" Checksum="yes" SelfRegCost="0" Vital="yes" />
461+
<Component Id="ClassicExplorerA64.dll" Guid="2C25783D-394D-4E5B-9259-1650F561E2CE" Win64="yes" DiskId="2">
462+
<File Id="ClassicExplorerA64.dll" KeyPath="yes" Source="Output\ARM64\ClassicExplorerA64.dll" Checksum="yes" SelfRegCost="0" Vital="yes" />
463463
</Component>
464-
<Component Id="ClassicIEDLL_ARM64.dll" Guid="43E62408-40EB-4FBB-98CC-7463F5B78266" Win64="yes" DiskId="2">
465-
<File Id="ClassicIEDLL_ARM64.dll" KeyPath="yes" Source="Output\ARM64\ClassicIEDLL_ARM64.dll" Checksum="yes" SelfRegCost="0" Vital="yes" />
464+
<Component Id="ClassicIEDLL_A64.dll" Guid="43E62408-40EB-4FBB-98CC-7463F5B78266" Win64="yes" DiskId="2">
465+
<File Id="ClassicIEDLL_A64.dll" KeyPath="yes" Source="Output\ARM64\ClassicIEDLL_A64.dll" Checksum="yes" SelfRegCost="0" Vital="yes" />
466466
</Component>
467-
<Component Id="ClassicIE_ARM64.exe" Guid="E822E720-8477-4511-AD93-172313EFA636" Win64="yes" DiskId="2">
468-
<File Id="ClassicIE_ARM64.exe" KeyPath="yes" Source="Output\ARM64\ClassicIE_ARM64.exe" Checksum="yes" Vital="yes" />
467+
<Component Id="ClassicIE_A64.exe" Guid="E822E720-8477-4511-AD93-172313EFA636" Win64="yes" DiskId="2">
468+
<File Id="ClassicIE_A64.exe" KeyPath="yes" Source="Output\ARM64\ClassicIE_A64.exe" Checksum="yes" Vital="yes" />
469469
</Component>
470470
<Component Id="StartMenu.exe" Guid="FC69E080-4232-4161-A1E5-20E255FB2F6B" Win64="yes" DiskId="2">
471471
<File Id="StartMenu.exe" KeyPath="yes" Checksum="yes" Source="Output\ARM64\StartMenu.exe" Vital="yes" />
@@ -658,8 +658,8 @@
658658
</Component>
659659
<?endif ?>
660660
<?if $(var.ARM64)=1 ?>
661-
<Component Id="StartMenuHelperARM64.dll" Guid="108B11E8-2F76-4C37-A274-62BAE6240490" Win64="yes" DiskId="2">
662-
<File Id="StartMenuHelperARM64.dll" KeyPath="yes" Source="Output\ARM64\StartMenuHelperARM64.dll" Checksum="yes" SelfRegCost="0" Vital="yes" />
661+
<Component Id="StartMenuHelperA64.dll" Guid="108B11E8-2F76-4C37-A274-62BAE6240490" Win64="yes" DiskId="2">
662+
<File Id="StartMenuHelperA64.dll" KeyPath="yes" Source="Output\ARM64\StartMenuHelperA64.dll" Checksum="yes" SelfRegCost="0" Vital="yes" />
663663
</Component>
664664
<?endif ?>
665665
</DirectoryRef>

‎Src/Setup/Utility/ManualUninstall.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static const wchar_t *g_InstalledFiles[]=
5050
{
5151
L"ClassicExplorer32.dll",
5252
L"ClassicExplorer64.dll",
53-
L"ClassicExplorerARM64.dll",
53+
L"ClassicExplorerA64.dll",
5454
L"ClassicExplorerSettings.exe",
5555
L"ClassicIEDLL_32.dll",
5656
L"ClassicIEDLL_64.dll",
@@ -1168,7 +1168,7 @@ static void ManualUninstallInternal( void )
11681168
{
11691169
// 64-bit OS
11701170
wchar_t path[_MAX_PATH];
1171-
Sprintf(path,_countof(path),L"%s\\System32\\StartMenuHelper%s64.dll",winDir,bArm64System?L"ARM":L"");
1171+
Sprintf(path,_countof(path),L"%s\\System32\\StartMenuHelper%s64.dll",winDir,bArm64System?L"A":L"");
11721172
Wow64EnableWow64FsRedirection(FALSE);
11731173
DeleteFileEx(path,true);
11741174
Sprintf(path,_countof(path),L"%s\\SysWOW64\\StartMenuHelper32.dll",winDir);

‎Src/StartMenu/StartMenu.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ void RunOsUpgradeTaskAsAdmin()
299299
#if defined(_M_AMD64)
300300
wchar_t path[_MAX_PATH] = L"%windir%\\System32\\StartMenuHelper64.dll";
301301
#elif defined(_M_ARM64)
302-
wchar_t path[_MAX_PATH] = L"%windir%\\System32\\StartMenuHelperARM64.dll";
302+
wchar_t path[_MAX_PATH] = L"%windir%\\System32\\StartMenuHelperA64.dll";
303303
#else
304304
wchar_t path[_MAX_PATH] = L"%windir%\\System32\\StartMenuHelper32.dll";
305305
#endif
@@ -326,7 +326,7 @@ DWORD PerformOsUpgradeTask(bool silent)
326326
#if defined(_M_AMD64)
327327
wchar_t cmdLine[_MAX_PATH] = L"regsvr32 /s \"%windir%\\System32\\StartMenuHelper64.dll\"";
328328
#elif defined(_M_ARM64)
329-
wchar_t cmdLine[_MAX_PATH] = L"regsvr32 /s \"%windir%\\System32\\StartMenuHelperARM64.dll\"";
329+
wchar_t cmdLine[_MAX_PATH] = L"regsvr32 /s \"%windir%\\System32\\StartMenuHelperA64.dll\"";
330330
#else
331331
wchar_t cmdLine[_MAX_PATH] = L"regsvr32 /s \"%windir%\\System32\\StartMenuHelper32.dll\"";
332332
#endif

‎Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<TargetName>$(ProjectName)64</TargetName>
6767
</PropertyGroup>
6868
<PropertyGroup Condition="'$(Platform)'=='ARM64'">
69-
<TargetName>$(ProjectName)ARM64</TargetName>
69+
<TargetName>$(ProjectName)A64</TargetName>
7070
</PropertyGroup>
7171
<ItemDefinitionGroup>
7272
<ClCompile>
@@ -110,7 +110,7 @@
110110
<None Include="StartMenuHelper.rgs" />
111111
<None Include="StartMenuHelper32.def" />
112112
<None Include="StartMenuHelper64.def" />
113-
<None Include="StartMenuHelperARM64.def" />
113+
<None Include="StartMenuHelperA64.def" />
114114
<None Include="StartMenuHelperL10N.ini">
115115
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
116116
</None>

‎Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656
<None Include="StartMenuHelper64.def">
5757
<Filter>Source Files</Filter>
5858
</None>
59+
<None Include="StartMenuHelperA64.def">
60+
<Filter>Source Files</Filter>
61+
</None>
5962
<None Include="StartMenuExt.rgs">
6063
<Filter>Resource Files</Filter>
6164
</None>

‎Src/StartMenu/StartMenuHelper/StartMenuHelperARM64.def renamed to ‎Src/StartMenu/StartMenuHelper/StartMenuHelperA64.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; StartMenuHelper.def : Declares the module parameters.
22

3-
LIBRARY "StartMenuHelperARM64.DLL"
3+
LIBRARY "StartMenuHelperA64.DLL"
44

55
EXPORTS
66
DllCanUnloadNow PRIVATE

0 commit comments

Comments
 (0)