From f0f3ce75d00942bc89d7a3f0e9d7d5485f261401 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Mon, 24 Feb 2020 13:35:49 +0100
Subject: [PATCH] Revert "Unify component GUIDs across platforms"

This reverts commit 2363016a76a1fdc1bac30e4b4771a4a97f058a81.

Due to Active Setup StubPath bug in already deployed MSI packages we can
fix automatically using minor update only, we cannot change the
component GUIDs just yet.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 Updater                  |  2 +-
 ZRCola/MSIBuild/Makefile | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Updater b/Updater
index 278cce1..fbbf89b 160000
--- a/Updater
+++ b/Updater
@@ -1 +1 @@
-Subproject commit 278cce1b4c17c8da9e615bae986bc9fe6eb670b3
+Subproject commit fbbf89ba55004c6b94b5f5b3d149d0176ca83477
diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile
index 4a48632..67f95d6 100644
--- a/ZRCola/MSIBuild/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -86,7 +86,12 @@ All :: "$(LANG).$(PLAT).$(CFG).CompLocator-1.idt"
 Signature_	ComponentId	Type
 s$(MSIBUILD_LENGTH_ID)	s38	I2
 CompLocator	Signature_
-clZRCola.exe.$(PLAT)	{6DB513F9-BC90-4CE7-821$(MSIBUILD_PLAT_GUID)-AA50BF31F34E}	1
+!IF "$(PLAT)" == "Win32"
+clZRCola.exe.Win32	{F30B6545-6203-4B7D-8575-85245A0F90E5}	1
+!ENDIF
+!IF "$(PLAT)" == "x64"
+clZRCola.exe.x64	{D45B105D-2303-459A-AF4B-52AC3AAD5510}	1
+!ENDIF
 <<NOKEEP
 
 
@@ -101,7 +106,12 @@ All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
 Component	ComponentId	Directory_	Attributes	Condition	KeyPath
 s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
 Component	Component
-compZRCola.exe.$(PLAT)	{6DB513F9-BC90-4CE7-821$(MSIBUILD_PLAT_GUID)-AA50BF31F34E}	ZRCOLABINDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.exe.$(PLAT)
+!IF "$(PLAT)" == "Win32"
+compZRCola.exe.Win32	{F30B6545-6203-4B7D-8575-85245A0F90E5}	ZRCOLABINDIR	0		fileZRCola.exe.Win32
+!ENDIF
+!IF "$(PLAT)" == "x64"
+compZRCola.exe.x64	{D45B105D-2303-459A-AF4B-52AC3AAD5510}	ZRCOLABINDIR	256		fileZRCola.exe.x64
+!ENDIF
 !IF "$(LANG)" == "ru_RU"
 compZRCola.mo.ru_RU	{DEA5D11C-2B0E-4B85-ACE3-D76334866F50}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.ru_RU
 !ENDIF