From e2acd66c46400aa058497ec70f92b1241da36b69 Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Wed, 25 Aug 2021 11:37:35 -0700
Subject: [PATCH] Fixes Guid formatting

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
 Code/Editor/Util/GuidUtil.h              | 4 ++--
 Code/Framework/AzCore/AzCore/Math/Guid.h | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Code/Editor/Util/GuidUtil.h b/Code/Editor/Util/GuidUtil.h
index c53589b6ca..de2bad8759 100644
--- a/Code/Editor/Util/GuidUtil.h
+++ b/Code/Editor/Util/GuidUtil.h
@@ -48,7 +48,7 @@ inline bool GuidUtil::IsEmpty(REFGUID guid)
 inline const char* GuidUtil::ToString(REFGUID guid)
 {
     static char guidString[64];
-    sprintf_s(guidString, "{%.8lX-%.4X-%.4X-%.2X%.2X-%.2X%.2X%.2X%.2X%.2X%.2X}", guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1],
+    sprintf_s(guidString, "{%.8" GUID_FORMAT_DATA1 "-%.4X-%.4X-%.2X%.2X-%.2X%.2X%.2X%.2X%.2X%.2X}", guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1],
         guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]);
     return guidString;
 }
@@ -62,7 +62,7 @@ inline GUID GuidUtil::FromString(const char* guidString)
     guid.Data1 = 0;
     guid.Data2 = 0;
     guid.Data3 = 0;
-    azsscanf(guidString, "{%8lX-%4hX-%4hX-%2X%2X-%2X%2X%2X%2X%2X%2X}",
+    azsscanf(guidString, "{%8" GUID_FORMAT_DATA1 "-%4hX-%4hX-%2X%2X-%2X%2X%2X%2X%2X%2X}",
         &guid.Data1, &guid.Data2, &guid.Data3, &d[0], &d[1], &d[2], &d[3], &d[4], &d[5], &d[6], &d[7]);
     guid.Data4[0] = static_cast<unsigned char>(d[0]);
     guid.Data4[1] = static_cast<unsigned char>(d[1]);
diff --git a/Code/Framework/AzCore/AzCore/Math/Guid.h b/Code/Framework/AzCore/AzCore/Math/Guid.h
index a061858265..b1cd91716b 100644
--- a/Code/Framework/AzCore/AzCore/Math/Guid.h
+++ b/Code/Framework/AzCore/AzCore/Math/Guid.h
@@ -8,7 +8,9 @@
 #ifndef AZ_CORE_GUID_H
 #define AZ_CORE_GUID_H 1
 
-#ifndef GUID_DEFINED
+#if defined(GUID_DEFINED)
+#define GUID_FORMAT_DATA1 "lX"
+#else
 #define GUID_DEFINED
 typedef struct _GUID {
     _GUID(unsigned long d1, unsigned short d2, unsigned short d3, std::initializer_list<unsigned char> d4)
@@ -22,11 +24,12 @@ typedef struct _GUID {
 
     _GUID() = default;
 
-    unsigned long  Data1;
+    uint32_t  Data1;
     unsigned short Data2;
     unsigned short Data3;
     unsigned char  Data4[ 8 ];
 } GUID;
+#define GUID_FORMAT_DATA1 "X"
 #endif // GUID_DEFINED
 
 #if !defined _SYS_GUID_OPERATOR_EQ_ && !defined _NO_SYS_GUID_OPERATOR_EQ_