some fixes for MSFT

Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
Ricolila · Apr 30, 2022 · 777e694 · 777e694
1 parent 4ba4084
commit 777e694
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/BaseTools/Source/C/Include/Ia32/ProcessorBind.h b/BaseTools/Source/C/Include/Ia32/ProcessorBind.h
@@ -135,6 +135,7 @@ typedef INT32   INTN;
   // Microsoft* compiler requires _EFIAPI usage, __cdecl is Microsoft* specific C.
   //
   #define EFIAPI __cdecl
+
 #endif
 
 #if __GNUC__

diff --git a/Include/Guid/AppleApfsInfo.h b/Include/Guid/AppleApfsInfo.h
@@ -12,9 +12,9 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-**/
-
-#ifndef APPLE_APFS_INFO_H_
+**/
+
+#ifndef APPLE_APFS_INFO_H_
 #define APPLE_APFS_INFO_H_
 
 #define APFS_GPT_PARTITION_UUID  \
@@ -214,6 +214,6 @@ typedef struct {
   APPLE_APFS_VOLUME_ROLE Role;
 } APPLE_APFS_VOLUME_INFO;
 
-extern EFI_GUID gAppleApfsVolumeInfoGuid;
-
-#endif // APPLE_APFS_H_
+extern EFI_GUID gAppleApfsVolumeInfoGuid;
+
+#endif // APPLE_APFS_H_
diff --git a/MdePkg/Include/IndustryStandard/Acpi10.h b/MdePkg/Include/IndustryStandard/Acpi10.h
@@ -24,10 +24,10 @@ typedef struct {
 /// The common ACPI description table header.  This structure prefaces most ACPI tables.
 ///
 typedef struct {
-  union {
+//  union {
     UINT32  Signature;
-    CHAR8   SignatureAs4Char[4];
-  };
+//    CHAR8   SignatureAs4Char[4];
+//  };
   UINT32  Length;
   UINT8   Revision;
   UINT8   Checksum;

diff --git a/OpenCorePkg b/OpenCorePkg
diff --git a/cbuild.bat b/cbuild.bat
@@ -18,7 +18,7 @@ set EDK_BUILDINFOS=
 set EDK2SHELL=
 set BUILD_IA32=
 set BUILD_X64=
-set EDK2_BUILD_OPTIONS=-D NO_GRUB_DRIVERS -D MDEPKG_NDEBUG
+set EDK2_BUILD_OPTIONS=-D NO_GRUB_DRIVERS -D MDEPKG_NDEBUG -D MSFT
 set VBIOSPATCHCLOVEREFI=0
 set ONLY_SATA_0=0
 set USE_BIOS_BLOCKIO=0
-Original file line number
+Diff line change
@@ Expand Up / @@ -135,6 +135,7 @@ typedef INT32 INTN; @@
       // Microsoft* compiler requires _EFIAPI usage, __cdecl is Microsoft* specific C.
       //
       #define EFIAPI __cdecl
     #endif
     #if __GNUC__
@@ Expand Down @@
+2 −2		Library/OcAcpiLib/OcAcpiLib.c
+13 −13		Library/OcAppleChunklistLib/OcAppleChunklistLib.c
+1 −1		Library/OcAppleEventLib/OcAppleEventLib.c
+6 −6		Library/OcAppleEventLib/PointerHandler.c
+4 −4		Library/OcAppleImageConversionLib/OcAppleImageConversionLib.c
+33 −36		Library/OcAppleKernelLib/CommonPatches.c
+3 −241		Library/OcAppleKernelLib/CpuidPatches.c
+2 −2		Library/OcAppleKernelLib/PrelinkedKext.c
+1 −1		Library/OcDeviceMiscLib/SetResizableBar.c
+14 −16		Library/OcMachoLib/HeaderX.h
+3 −3		Library/OcMainLib/OpenCoreKernel.c
+2 −2		Library/OcMainLib/OpenCoreKernelPatch.c
+1 −4		Library/OcMainLib/OpenCoreUefi.c
+10 −9		Library/OcStringLib/OcAsciiLib.c
+8 −4		Library/OcVirtualFsLib/VirtualDir.c
+8 −5		Library/OcVirtualFsLib/VirtualFile.c