[FREELDR:APPLETV] Fix MSVC build (don't msvc build; disk access is still broken)

Author: DistroHopper39B

boot/freeldr/freeldr/arch/i386/appletv/appletventry.S

@@ -9,6 +9,9 @@
 #include <arch/pc/x86common.h>
 #include <arch/pc/pcbios.h>
 
+EXTERN _InitIdt:PROC
+EXTERN _i386Idt:DWORD
+
 #ifdef _USE_ML
 EXTERN __bss_start__:DWORD
 EXTERN __bss_end__:DWORD
@@ -17,10 +20,7 @@ EXTERN __bss_end__:DWORD
 #define APPLETV_COMMAND_LINE_OFFSET 4
 
 /* VOID __cdecl BootMain(IN PCCH CmdLine) */
-EXTERN _BootMain
-
-/* Align to 32 bits boundary */
-.align 4
+EXTERN _BootMain:PROC
 
 .code32
 ASSUME ES:NOTHING, FS:NOTHING, GS:NOTHING
@@ -128,4 +128,4 @@ i386idtptr:
     .word 255           /* Limit */
     .long _i386Idt      /* Base Address */
 
-END
+END

boot/freeldr/freeldr/include/arch/appletv/boot_args.h

@@ -12,21 +12,27 @@
 #define DISPLAY_MODE_GRAPHICS 1
 #define DISPLAY_MODE_TEXT 2
 
+#ifdef _MSC_VER
+#define ALIGNED(a) __declspec(align(a))
+#else
+#define ALIGNED(a) __attribute__((aligned(a)))
+#endif
+
 /* Video parameters passed to kernel. */
-typedef struct {
+typedef struct ALIGNED(4) {
     UINT32 BaseAddress; /* Base video address */
     UINT32 DisplayMode; /* Display mode specifier */
     UINT32 Pitch; /* Bytes per row */
     UINT32 Width; /* Display width in pixels */
     UINT32 Height; /* Display height in pixels */
     UINT32 Depth; /* Display depth in bits */
-} __attribute__((aligned(4))) MACH_VIDEO, *PMACH_VIDEO;
+} MACH_VIDEO, *PMACH_VIDEO;
 
 /* Boot arguments struct passed into loader. A pointer to this struct is located in the EAX register upon kernel load.
  * See xnu-1228 pexpert/pexpert/i386/boot.h.
  */
 
-typedef struct {
+typedef struct ALIGNED(4) {
     UINT16 Revision; /* Revision of this structure */
     UINT16 Version; /* Version of this structure */
 
@@ -53,6 +59,6 @@ typedef struct {
 
     UINT8 __reserved1[3];
     UINT8 __reserved2[7];
-} __attribute__((aligned(4))) MACH_BOOTARGS, *PMACH_BOOTARGS;
+} MACH_BOOTARGS, *PMACH_BOOTARGS;
 
 extern PMACH_BOOTARGS BootArgs;

sdk/tools/pe2macho/pe2macho.c

@@ -57,7 +57,7 @@ FindOptionalHeaderFromFileHeader(PIMAGE_FILE_HEADER FileHeader)
 
 static
 PMACHO_HEADER
-CreateMachOHeaderFromPeHeader(PIMAGE_OPTIONAL_HEADER32 OptionalHeader, PUINT Size)
+CreateMachOHeaderFromPeHeader(PIMAGE_OPTIONAL_HEADER32 OptionalHeader, UINT32 PeSize, PUINT Size)
 {
     UINT32                      MachoInfoSize;
     PMACHO_HEADER               MachoHeader;
@@ -83,7 +83,7 @@ CreateMachOHeaderFromPeHeader(PIMAGE_OPTIONAL_HEADER32 OptionalHeader, PUINT Siz
 
     memset(MachoHeader, 0, MachoInfoSize);
 
-    SizeOfExecData = OptionalHeader->SizeOfInitializedData - 1;
+    SizeOfExecData = PeSize - 0x1000 - 1;
 
     // Fill out Mach-O header.
     MachoHeader->MagicNumber    = MACHO_MAGIC;
@@ -239,7 +239,7 @@ main(INT argc, PCHAR argv[])
     }
 
     // Convert PE executable header to Mach-O
-    MachoHeader = CreateMachOHeaderFromPeHeader(PeOptionalHeader, &MachoSize);
+    MachoHeader = CreateMachOHeaderFromPeHeader(PeOptionalHeader, InputFileLength, &MachoSize);
     if (!MachoHeader)
     {
         fprintf(stderr, "Failed to create Mach-O header!\n");