Changeset 81600 in vbox

Timestamp:

Oct 30, 2019 8:58:44 PM (5 years ago)

Author:

vboxsync

Message:

VBoxApfsJmpStartDxe: Make cl.exe happy

File:

• trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxApfsJmpStartDxe/VBoxApfsJmpStartDxe.c (modified) (4 diffs)

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxApfsJmpStartDxe/VBoxApfsJmpStartDxe.c

@@ -116 +116 @@
 static EFI_STATUS vboxApfsJmpStartLoadAndExecEfiDriver(IN PAPFSJMPSTARTCTX pCtx, IN PCAPFSNXSUPERBLOCK pSb)
 {
-    uint32_t cbReadLeft = RT_LE2H_U32(pCtx->JmpStart.Hdr.cbEfiFile);
+    UINTN cbReadLeft = RT_LE2H_U32(pCtx->JmpStart.Hdr.cbEfiFile);
     EFI_STATUS rc = EFI_SUCCESS;
 
@@ -122 +122 @@
     if (pvApfsDrv)
     {
+        uint32_t i = 0;
         uint8_t *pbBuf = (uint8_t *)pvApfsDrv;
 
-        for (uint32_t i = 0; i < RT_LE2H_U32(pCtx->JmpStart.Hdr.cExtents) && !EFI_ERROR(rc) && cbReadLeft; i++)
+        for (i = 0; i < RT_LE2H_U32(pCtx->JmpStart.Hdr.cExtents) && !EFI_ERROR(rc) && cbReadLeft; i++)
         {
             PCAPFSPRANGE pRange = &pCtx->JmpStart.aExtents[i];
-            size_t cbRead = RT_MIN(cbReadLeft, RT_LE2H_U64(pRange->cBlocks) * pCtx->cbBlock);
+            UINTN cbRead = RT_MIN(cbReadLeft, RT_LE2H_U64(pRange->cBlocks) * pCtx->cbBlock);
 
             rc = vboxApfsJmpStartRead(pCtx, RT_LE2H_U64(pRange->PAddrStart), pbBuf, cbRead);
@@ -247 +248 @@
                        IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL)
 {
+    APFSJMPSTARTCTX Ctx;
+
     /* Check whether the driver was already loaded from this controller. */
     EFI_STATUS rc = gBS->OpenProtocol(ControllerHandle,
@@ -257 +260 @@
         return EFI_UNSUPPORTED;
 
-    APFSJMPSTARTCTX Ctx;
     Ctx.cbBlock = 0; /* Will get filled when the superblock was read (starting at 0 anyway). */
     Ctx.hController = ControllerHandle;