Changeset 84675 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 4, 2020 12:04:10 PM (5 years ago)

Author:

vboxsync

Message:

EFI: VBoxVgaDxe/Edid: offsetof is not present with VC++ 14+, use OFFSET_OF (EFI) instead. bugref:8489

File:

• trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/Edid.c (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/Edid.c

@@ -365 +365 @@
   Index = VBoxVgaVideoModeCount - 16;
   VideoMode = &VBoxVgaVideoModes[Index];
-  vmode = in_word(VBE_EXTRA_PORT, cur_info_ofs + offsetof(ModeInfoListItem, mode));
+  vmode = in_word(VBE_EXTRA_PORT, cur_info_ofs + OFFSET_OF(ModeInfoListItem, mode));
   while (vmode != VBE_VESA_MODE_END_OF_LIST)
   {
-    xres = in_word(VBE_EXTRA_PORT, cur_info_ofs + offsetof(ModeInfoListItem, info.XResolution));
-    yres = in_word(VBE_EXTRA_PORT, cur_info_ofs + offsetof(ModeInfoListItem, info.YResolution));
+    xres = in_word(VBE_EXTRA_PORT, cur_info_ofs + OFFSET_OF(ModeInfoListItem, info.XResolution));
+    yres = in_word(VBE_EXTRA_PORT, cur_info_ofs + OFFSET_OF(ModeInfoListItem, info.YResolution));
 
     if (vmode >= VBE_VBOX_MODE_CUSTOM1 && vmode <= VBE_VBOX_MODE_CUSTOM16 && xres && yres && Index < VBoxVgaVideoModeCount) {
@@ -382 +382 @@
 
     cur_info_ofs += sizeof(ModeInfoListItem);
-    vmode = in_word(VBE_EXTRA_PORT, cur_info_ofs + offsetof(ModeInfoListItem, mode));
+    vmode = in_word(VBE_EXTRA_PORT, cur_info_ofs + OFFSET_OF(ModeInfoListItem, mode));
   }
   return EFI_SUCCESS;