Changeset 72286 in vbox for trunk/src/VBox/VMM

Timestamp:

May 22, 2018 2:02:15 PM (7 years ago)

Author:

vboxsync

Message:

NEM/win: Updated SDK.

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (1 diff)
• VMMR3/NEMR3Native-win.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -316 +316 @@
  VMMR3/NEMR3Native-win.cpp_DEFS.amd64 = _AMD64_
  VMMR3/NEMR3Native-win.cpp_INCS = \
-        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17083.0/include/10.0.17083.0/um \
-        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17083.0/include/10.0.17083.0/shared
+        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/um \
+        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/shared
 endif
 

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp

@@ -73 +73 @@
 /** VID I/O control detection: Fake timeout input. */
 #define NEM_WIN_IOCTL_DETECTOR_FAKE_TIMEOUT         UINT32_C(0x00080286)
-
-
-/*********************************************************************************************************************************
-*   Structures and Typedefs                                                                                                      *
-*********************************************************************************************************************************/
-#ifndef NEM_WIN_USE_17110_PLUS_WDK
-typedef HRESULT (WINAPI *PFNWHVGETCAPABILITY_17110)(WHV_CAPABILITY_CODE, void *, uint32_t, uint32_t *);
-typedef HRESULT (WINAPI *PFNWHVSETPARTITIONPROPERTY_17110)(WHV_PARTITION_HANDLE, WHV_PARTITION_PROPERTY_CODE, void *, uint32_t);
-# define WHvCapabilityCodeExceptionExitBitmap ((WHV_CAPABILITY_CODE)0x00000003)
-#endif
 
 
@@ -124 +114 @@
 
 /** The Windows build number. */
-static uint32_t g_uBuildNo = 17110;
+static uint32_t g_uBuildNo = 17134;
 
 
@@ -530 +520 @@
 DECLINLINE(HRESULT) WHvGetCapabilityWrapper(WHV_CAPABILITY_CODE enmCap, WHV_CAPABILITY *pOutput, uint32_t cbOutput)
 {
-#ifdef NEM_WIN_USE_17110_PLUS_WDK
     return g_pfnWHvGetCapability(enmCap, pOutput, cbOutput, NULL);
-#else
-    if (g_uBuildNo >= 17110)
-    {
-        PFNWHVGETCAPABILITY_17110 pfnNewVersion = (PFNWHVGETCAPABILITY_17110)g_pfnWHvGetCapability;
-        return pfnNewVersion(enmCap, &pOutput->HypervisorPresent, cbOutput - RT_OFFSETOF(WHV_CAPABILITY, HypervisorPresent), NULL);
-    }
-    return g_pfnWHvGetCapability(enmCap, pOutput, cbOutput);
-#endif
 }
 
@@ -1032 +1013 @@
                                                    WHV_PARTITION_PROPERTY *pInput, uint32_t cbInput)
 {
-#ifdef NEM_WIN_USE_17110_PLUS_WDK
-    return g_pfnWHvSetPartitionProperty(hPartition, enmProp, pInput, cbInput, NULL);
-#else
-    pInput->PropertyCode = enmProp;
-    if (g_uBuildNo >= 17110)
-    {
-        PFNWHVSETPARTITIONPROPERTY_17110 pfnNewVersion = (PFNWHVSETPARTITIONPROPERTY_17110)g_pfnWHvSetPartitionProperty;
-        return pfnNewVersion(hPartition, enmProp, &pInput->ExtendedVmExits,
-                             cbInput - RT_UOFFSETOF(WHV_PARTITION_PROPERTY, ExtendedVmExits));
-    }
-    return g_pfnWHvSetPartitionProperty(hPartition, pInput, cbInput);
-#endif
+    return g_pfnWHvSetPartitionProperty(hPartition, enmProp, pInput, cbInput - RT_UOFFSETOF(WHV_PARTITION_PROPERTY, ExtendedVmExits));
 }
 
@@ -1554 +1524 @@
         if (fExitInstr && pExitReason->IoPortAccess.InstructionByteCount > 0)
             Log2(("Exit: + Instruction %.*Rhxs\n",
-                  pExitReason->IoPortAccess.InstructionByteCount,
-                  &pExitReason->IoPortAccess.InstructionBytes[g_uBuildNo >= 17110 ? 3 : 0]));
+                  pExitReason->IoPortAccess.InstructionByteCount, &pExitReason->IoPortAccess.InstructionBytes[0]));
     }
 }
@@ -1674 +1643 @@
     if (pMemCtx->InstructionByteCount > 0)
         rcStrict = IEMExecOneWithPrefetchedByPC(pVCpu, CPUMCTX2CORE(pCtx), pMemCtx->VpContext.Rip,
-                                                &pMemCtx->InstructionBytes[g_uBuildNo >= 17110 ? 3 : 0],
-                                                pMemCtx->InstructionByteCount);
+                                                &pMemCtx->InstructionBytes[0], pMemCtx->InstructionByteCount);
     else
         rcStrict = IEMExecOne(pVCpu);