some VS2017 compatibility

Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
CloverHackyColor · Jan 23, 2022 · 718db61 · 718db61
1 parent f75f093
commit 718db61
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/Include/Intel/Protocol/CpuIo.h b/Include/Intel/Protocol/CpuIo.h
@@ -21,9 +21,16 @@ Module Name:
 
 --*/
 
+
+
 #ifndef _CPUIO_H_
 #define _CPUIO_H_
 
+#include <Uefi/UefiBaseType.h>
+
+
+
+
 #define EFI_CPU_IO_PROTOCOL_GUID \
   { \
     0xB0732526, 0x38C8, 0x4b40, { 0x88, 0x77, 0x61, 0xC7, 0xB0, 0x6A, 0xAC, 0x45 } \
@@ -59,15 +66,16 @@ typedef enum {
 //
 typedef
 EFI_STATUS
-EFIAPI
-(EFIAPI *EFI_CPU_IO_PROTOCOL_IO_MEM) (
+
+( *EFI_CPU_IO_PROTOCOL_IO_MEM) (
   IN EFI_CPU_IO_PROTOCOL                * This,
   IN  EFI_CPU_IO_PROTOCOL_WIDTH         Width,
   IN  UINT64                            Address,
   IN  UINTN                             Count,
   IN  OUT VOID                          *Buffer
   );
 
+
 //
 // *******************************************************
 // EFI_CPU_IO_PROTOCOL_ACCESS

diff --git a/Library/OcAcpiLib/OcAcpiLib.c b/Library/OcAcpiLib/OcAcpiLib.c
@@ -631,8 +631,8 @@ AcpiNormalizeTableHeaders (
 
   Modified = FALSE;
 
-  Walker = (CHAR8 *) &Table->Signature;
-  for (Index = 0; Index < sizeof (Table->Signature); ++Index) {
+  Walker = (CHAR8 *) &Table->SignatureCommon.Signature;
+  for (Index = 0; Index < sizeof (Table->SignatureCommon.Signature); ++Index) {
     if (!IsAsciiPrint (Walker[Index])) {
       Walker[Index] = '?';
       Modified = TRUE;

diff --git a/Library/OcMiscLib/DataPatcher.c b/Library/OcMiscLib/DataPatcher.c
@@ -39,13 +39,13 @@ FindPattern (
 //  ASSERT (DataOff >= 0);
 
   if (PatternSize == 0 || DataSize == 0 || *DataOff >= DataSize || DataSize - *DataOff < PatternSize) {
-    return -1;
+    return FALSE;
   }
 
   UINTN result = FindMemMask(Data + *DataOff, DataSize, Pattern, PatternSize, PatternMask, PatternSize);
   if (result != MAX_UINTN) {
     if ( result < MAX_INT32 - *DataOff ) {
-      *DataOff = result;
+      *DataOff = (UINT32)result;
       return TRUE;
     }
   }

diff --git a/Library/OcStringLib/OcStringLib.inf b/Library/OcStringLib/OcStringLib.inf
@@ -45,3 +45,4 @@
   MemoryAllocationLib
   PrintLib
   SortLib
+  OcGuardLib