Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Enable Windows 10 ARM64 support

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2020-03-14 23:57:41 +01:00
parent 0b586aa141
commit 59493b998e
10 changed files with 65 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MSI/MSIBuild

@ -1 +1 @@
Subproject commit e1a01465701da2f554e27a9eaccf7a2a5da0f23b Subproject commit 538cea09453a2ee52f918036f7b2e7b51347d7cc

2
MSI/MSICA

@ -1 +1 @@
Subproject commit 1e48c204063258c12615033e5bc66fc39c0d081a Subproject commit 757ad1497554500e2369348455225aa454e2c4e9

BIN
MSI/ZRCola/Main/Makefile
View File

Binary file not shown.

38
Makefile
View File

@ -240,19 +240,25 @@ UnregisterShortcuts ::
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\catalog.xml" : \ "$(OUTPUT_DIR)\catalog.xml" : \
"$(OUTPUT_DIR)\ZRColaEn32.msi" \ "$(OUTPUT_DIR)\ZRColaEn-x86.msi" \
"$(OUTPUT_DIR)\ZRColaEn64.msi" \ "$(OUTPUT_DIR)\ZRColaEn-amd64.msi" \
"$(OUTPUT_DIR)\ZRColaRu32.msi" \ "$(OUTPUT_DIR)\ZRColaEn-arm64.msi" \
"$(OUTPUT_DIR)\ZRColaRu64.msi" \ "$(OUTPUT_DIR)\ZRColaRu-x86.msi" \
"$(OUTPUT_DIR)\ZRColaSl32.msi" \ "$(OUTPUT_DIR)\ZRColaRu-amd64.msi" \
"$(OUTPUT_DIR)\ZRColaSl64.msi" "$(OUTPUT_DIR)\ZRColaRu-arm64.msi" \
"$(OUTPUT_DIR)\ZRColaSl-x86.msi" \
"$(OUTPUT_DIR)\ZRColaSl-amd64.msi" \
"$(OUTPUT_DIR)\ZRColaSl-arm64.msi"
copy /y "$(PUBLISH_DIR)\catalog-0001.xml" "$(@:"=).tmp" > NUL copy /y "$(PUBLISH_DIR)\catalog-0001.xml" "$(@:"=).tmp" > NUL
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\ZRColaEn32.msi" "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn-x86.msi" -f "$(OUTPUT_DIR)\ZRColaEn-x86.msi"
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\ZRColaEn64.msi" "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn-amd64.msi" -f "$(OUTPUT_DIR)\ZRColaEn-amd64.msi"
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu32.msi" -f "$(OUTPUT_DIR)\ZRColaRu32.msi" "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-arm64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn-arm64.msi" -f "$(OUTPUT_DIR)\ZRColaEn-arm64.msi"
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu64.msi" -f "$(OUTPUT_DIR)\ZRColaRu64.msi" "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu-x86.msi" -f "$(OUTPUT_DIR)\ZRColaRu-x86.msi"
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl32.msi" -f "$(OUTPUT_DIR)\ZRColaSl32.msi" "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu-amd64.msi" -f "$(OUTPUT_DIR)\ZRColaRu-amd64.msi"
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl64.msi" -f "$(OUTPUT_DIR)\ZRColaSl64.msi" "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-arm64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu-arm64.msi" -f "$(OUTPUT_DIR)\ZRColaRu-arm64.msi"
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl-x86.msi" -f "$(OUTPUT_DIR)\ZRColaSl-x86.msi"
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl-amd64.msi" -f "$(OUTPUT_DIR)\ZRColaSl-amd64.msi"
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-arm64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl-arm64.msi" -f "$(OUTPUT_DIR)\ZRColaSl-arm64.msi"
"$(OUTPUT_DIR)\$(PLAT).Release\UpdSignXML.exe" "$(@:"=).tmp" $@ "$(OUTPUT_DIR)\$(PLAT).Release\UpdSignXML.exe" "$(@:"=).tmp" $@
-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp" -if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
@ -263,11 +269,15 @@ UnregisterShortcuts ::
###################################################################### ######################################################################
PLAT=Win32 PLAT=Win32
PLAT_SUFFIX=32 PLAT_SUFFIX=-x86
!INCLUDE "MakefilePlat.mak" !INCLUDE "MakefilePlat.mak"
PLAT=x64 PLAT=x64
PLAT_SUFFIX=64 PLAT_SUFFIX=-amd64
!INCLUDE "MakefilePlat.mak"
PLAT=ARM64
PLAT_SUFFIX=-arm64
!INCLUDE "MakefilePlat.mak" !INCLUDE "MakefilePlat.mak"

BIN
MakefileLang.mak
View File

Binary file not shown.

2
Updater

@ -1 +1 @@
Subproject commit dc4cc1b22e46b376d273d420a50ea4d4c588ec3a Subproject commit 67124a8434e253efdf423f1b4e5467b62fc674b7

12
ZRColaInstall/ZRColaInstall.props
View File

@ -7,19 +7,7 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<OutDir>..\output\$(Platform).$(Configuration)\</OutDir> <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<CompileAsManaged>false</CompileAsManaged>
<BufferSecurityCheck>false</BufferSecurityCheck>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<SmallerTypeCheck>false</SmallerTypeCheck>
</ClCompile>
<Link>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'"> <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
<ClCompile> <ClCompile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

62
ZRColaInstall/main.cpp
View File

@ -23,35 +23,47 @@
/// ///
/// Main function /// Main function
/// ///
extern "C" void WinMainCRTStartup() int CALLBACK WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPSTR lpCmdLine, _In_ int nCmdShow)
{ {
// Load "KERNEL32.DLL". UNREFERENCED_PARAMETER(hInstance);
HMODULE hKernel32 = LoadLibrary(TEXT("KERNEL32.DLL")); UNREFERENCED_PARAMETER(hPrevInstance);
if (!hKernel32) UNREFERENCED_PARAMETER(lpCmdLine);
ExitProcess(1); UNREFERENCED_PARAMETER(nCmdShow);
// Get IsWow64Process() address. TCHAR szArchProc[MAX_PATH];
BOOL (WINAPI *_IsWow64Process)(__in HANDLE hProcess, __out PBOOL Wow64Process) = (BOOL(WINAPI*)(__in HANDLE, __out PBOOL))::GetProcAddress(hKernel32, "IsWow64Process"); if (!GetEnvironmentVariable(TEXT("PROCESSOR_ARCHITECTURE"), szArchProc, _countof(szArchProc)))
szArchProc[0] = 0;
szArchProc[_countof(szArchProc) - 1] = 0;
BOOL bIs64Bit; TCHAR szArchWin[MAX_PATH];
#ifndef _WIN64 if (!GetEnvironmentVariable(TEXT("PROCESSOR_ARCHITEW6432"), szArchWin, _countof(szArchWin)))
// Determine if this is a 32-bit process under Windows-over-Windows64. szArchWin[0] = 0;
if (_IsWow64Process) { szArchWin[_countof(szArchWin) - 1] = 0;
// See what IsWow64Process() says.
if (!_IsWow64Process(::GetCurrentProcess(), &bIs64Bit)) { // If PROCESSOR_ARCHITEW6432 is defined, this is a Windows-on-Windows
// IsWow64Process() returned an error. Assume not 64-bit Windows. // guest of some kind. szArchWin is the host's architecture and szArchProc
bIs64Bit = FALSE; // is the current process' architecture.
}
} else { // If PROCESSOR_ARCHITEW6432 is not defined, then PROCESSOR_ARCHITECTURE
// This platform does not have IsWow64Process(). Therefore, this is definitely not 64-bit Windows. // is both the process and OS architecture.
bIs64Bit = FALSE; if (szArchWin[0] == 0)
memcpy_s(szArchWin, sizeof(szArchWin), szArchProc, sizeof(szArchProc));
// If PROCESSOR_ARCHITECTURE is not defined, then either we're running on
// Windows 9x or something is messing with the environment. Make the
// Windows 9x assumption.
if (szArchProc[0] == 0) {
memcpy_s(szArchProc, sizeof(szArchProc), TEXT("x86"), sizeof(TEXT("x86")));
memcpy_s(szArchWin , sizeof(szArchWin ), TEXT("x86"), sizeof(TEXT("x86")));
} }
#else
// This is a running 64-bit process. The Windows must be 64 bit then.
bIs64Bit = TRUE;
#endif
FreeLibrary(hKernel32); LPCTSTR pszPlatSuffix;
if (_tcsicmp(szArchWin, TEXT("amd64")) == 0)
pszPlatSuffix = TEXT("-amd64");
else if (_tcsicmp(szArchWin, TEXT("arm64")) == 0)
pszPlatSuffix = TEXT("-arm64");
else
pszPlatSuffix = TEXT("-x86");
// Get temporary folder path. // Get temporary folder path.
static const LPTSTR pszTempFolderDefault = TEXT(""); static const LPTSTR pszTempFolderDefault = TEXT("");
@ -74,7 +86,7 @@ extern "C" void WinMainCRTStartup()
LPTSTR pszParams; LPTSTR pszParams;
DWORD_PTR aArgs[] = { DWORD_PTR aArgs[] = {
(DWORD_PTR)TEXT(ZRCOLA_INSTALL_LANG), (DWORD_PTR)TEXT(ZRCOLA_INSTALL_LANG),
(DWORD_PTR)(bIs64Bit ? TEXT("64") : TEXT("32")), (DWORD_PTR)pszPlatSuffix,
(DWORD_PTR)pszTempFolder, (DWORD_PTR)pszTempFolder,
}; };
FormatMessage( FormatMessage(

1
ZRColaInstall/pch.h
View File

@ -20,3 +20,4 @@
#pragma once #pragma once
#include <Windows.h> #include <Windows.h>
#include <tchar.h>

BIN
include/MSIBuildCfg.mak
View File

Binary file not shown.