Make CompareGuid match EDK2 ABI

* return BOOLEAN instead of INTN * Use EFIAPI * Opposite return codes Signed-off-by: Callum Farmer <[email protected]>
ncroxon · Aug 3, 2024 · a093fe0 · a093fe0
1 parent 13c46e4
commit a093fe0
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 16 deletions.
diff --git a/inc/efilib.h b/inc/efilib.h
@@ -495,10 +495,11 @@ ReleaseLock (
     );
 
 
-INTN
-CompareGuid(
-    IN EFI_GUID     *Guid1,
-    IN EFI_GUID     *Guid2
+BOOLEAN
+EFIAPI
+CompareGuid_1 (
+    IN CONST EFI_GUID     *Guid1,
+    IN CONST EFI_GUID     *Guid2
     );
 
 VOID *

diff --git a/inc/efirtlib.h b/inc/efirtlib.h
@@ -151,11 +151,12 @@ RtStrSize (
     IN CONST CHAR16   *s1
     );
 
-INTN
+BOOLEAN
+EFIAPI
 RUNTIMEFUNCTION
 RtCompareGuid (
-    IN EFI_GUID     *Guid1,
-    IN EFI_GUID     *Guid2
+    IN CONST EFI_GUID     *Guid1,
+    IN CONST EFI_GUID     *Guid2
     );
 
 UINT8

diff --git a/inc/legacy.h b/inc/legacy.h
@@ -57,5 +57,39 @@ ReallocatePool_0 (
 
 /* end CopyMem */
 
+/* CompareGuid */
+
+#ifndef GNU_EFI_USE_COMPAREGUID_ABI
+#define GNU_EFI_USE_COMPAREGUID_ABI 1
+#endif
+
+#if GNU_EFI_USE_COMPAREGUID_ABI == 0
+#define CompareGuid CompareGuid_0
+#else
+#define CompareGuid CompareGuid_1
 #endif
 
+/* prevent circular headers */
+BOOLEAN
+EFIAPI
+CompareGuid_1 (
+    IN CONST EFI_GUID     *Guid1,
+    IN CONST EFI_GUID     *Guid2
+);
+
+static
+inline
+INTN
+EFIAPI
+CompareGuid_0 (
+    IN EFI_GUID     *Guid1,
+    IN EFI_GUID     *Guid2)
+{
+    if (CompareGuid_1(Guid1, Guid2)) {
+        return 0;
+    } else {
+        return 1;
+    }
+}
+
+#endif
diff --git a/lib/guid.c b/lib/guid.c
@@ -114,10 +114,11 @@ InitializeGuid (
 {
 }
 
-INTN
-CompareGuid(
-    IN EFI_GUID     *Guid1,
-    IN EFI_GUID     *Guid2
+BOOLEAN
+EFIAPI
+CompareGuid_1 (
+    IN CONST EFI_GUID     *Guid1,
+    IN CONST EFI_GUID     *Guid2
     )
 /*++
 

diff --git a/lib/runtime/efirtlib.c b/lib/runtime/efirtlib.c
@@ -134,11 +134,12 @@ RtCompareMem (
 #ifndef __GNUC__
 #pragma RUNTIME_CODE(RtCompareGuid)
 #endif
-INTN
+BOOLEAN
+EFIAPI
 RUNTIMEFUNCTION
 RtCompareGuid (
-    IN EFI_GUID     *Guid1,
-    IN EFI_GUID     *Guid2
+    IN CONST EFI_GUID     *Guid1,
+    IN CONST EFI_GUID     *Guid2
     )
 /*++
 
@@ -152,7 +153,7 @@ Routine Description:
     Guid2       - guid to compare
 
 Returns:
-    = 0     if Guid1 == Guid2
+    = 1     if Guid1 == Guid2
 
 --*/
 {
@@ -170,7 +171,11 @@ Routine Description:
     r |= g1[2] - g2[2];
     r |= g1[3] - g2[3];
 
-    return r;
+    if (r==0) {
+        return 1;
+    } else {
+        return 0;
+    }
 }