Changeset 77665 in vbox for trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp

Timestamp:

Mar 12, 2019 3:40:24 PM (6 years ago)

Author:

vboxsync

Message:

DBGPlugInWinNt.cpp: Unbroke 32-bit.

File:

• trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp (modified) (2 diffs)

trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp

@@ -779 +779 @@
         IMAGE_DOS_HEADER    MzHdr;
         RTUTF16             wsz[8192/2];
-        X86DESC64GATE       a32Gates[X86_XCPT_PF + 1];
+        X86DESCGATE         a32Gates[X86_XCPT_PF + 1];
         X86DESC64GATE       a64Gates[X86_XCPT_PF + 1];
     } u;
@@ -832 +832 @@
     else
     {
-        uint32_t uHandler = u.a32Gates[X86_XCPT_PF].u16OffsetLow
-                          | ((uint32_t)u.a64Gates[X86_XCPT_PF].u16OffsetHigh << 16);
+        uint32_t uHandler = RT_MAKE_U32(u.a32Gates[X86_XCPT_PF].u16OffsetLow, u.a32Gates[X86_XCPT_PF].u16OffsetHigh);
         if (uHandler < uStart || uHandler > uEnd)
             return false;