Changeset 101296 in vbox for trunk/src

Timestamp:

Sep 27, 2023 3:12:22 PM (15 months ago)

Author:

vboxsync

Message:

EFI/FirmwareNew: Fix building with msvc, RUNTIME_FUNCTION is redefined from winnt.h with our SDK, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• Config.kmk (modified) (1 diff)
• EfiModules.kmk (modified) (2 diffs)
• MdePkg/Include/IndustryStandard/PeImage.h (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/Config.kmk

@@ -117 +117 @@
  TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4313 # dlg\dlg_p.c(874): warning C4313: 'fprintf': '%x' in format string conflicts with argument 1 of type '_nfa_node *'
  TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4459 # antlr\gen.c(756): warning C4459: declaration of 'output' hides global declaration
+ TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4668 # winioctl.h(10983): warning C4668: '_WIN32_WINNT_WIN10_TH2' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
 endif
 TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win  = $(TEMPLATE_VBoxBldProg_CXXFLAGS.win)

trunk/src/VBox/Devices/EFI/FirmwareNew/EfiModules.kmk

@@ -66 +66 @@
         MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe/$(VBOX_EFI_DEBUG_DIR)/PciHostBridgeDxe \
         MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe/$(VBOX_EFI_DEBUG_DIR)/PciSioSerialDxe \
+        MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe/$(VBOX_EFI_DEBUG_DIR)/SataController \
         MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe/$(VBOX_EFI_DEBUG_DIR)/UhciDxe \
         MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe/$(VBOX_EFI_DEBUG_DIR)/XhciDxe \
@@ -129 +130 @@
         OvmfPkg/PlatformPei/PlatformPei/$(VBOX_EFI_DEBUG_DIR)/PlatformPei \
         OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/FvbServicesRuntimeDxe \
-        OvmfPkg/SataControllerDxe/SataControllerDxe/$(VBOX_EFI_DEBUG_DIR)/SataController \
         OvmfPkg/Sec/SecMain/$(VBOX_EFI_DEBUG_DIR)/SecMain \
         OvmfPkg/SioBusDxe/SioBusDxe/$(VBOX_EFI_DEBUG_DIR)/SioBusDxe \

trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Include/IndustryStandard/PeImage.h

@@ -682 +682 @@
 // .pdata entries for X64
 //
+#if !defined(VBOX) || !defined(_WINNT_)
 typedef struct {
   UINT32    FunctionStartAddress;
@@ -687 +688 @@
   UINT32    UnwindInfoAddress;
 } RUNTIME_FUNCTION;
+#endif
 
 typedef struct {