Changeset 53008 in vbox for trunk/src/VBox/Additions

Timestamp:

Oct 9, 2014 11:34:57 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96474

Message:

include,Additions: Windows 10 tweaks.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Graphics/Video/mp/common/VBoxMPUtils.cpp (modified) (2 diffs)
• WINNT/Graphics/Video/mp/common/VBoxMPUtils.h (modified) (1 diff)
• WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp (modified) (2 diffs)
• WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (1 diff)
• WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp (modified) (2 diffs)
• WINNT/Graphics/Video/mp/xpdm/VBoxMPInternal.cpp (modified) (1 diff)
• WINNT/Graphics/Video/mp/xpdm/VBoxMPVideoPortAPI.cpp (modified) (1 diff)
• WINNT/Installer/VBoxGuestAdditions.nsi (modified) (4 diffs)
• WINNT/Installer/VBoxGuestAdditionsCommon.nsh (modified) (3 diffs)
• WINNT/Installer/VBoxGuestAdditionsUninstall.nsh (modified) (2 diffs)
• WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh (modified) (4 diffs)
• WINNT/Installer/winver.nsh (modified) (2 diffs)
• common/VBoxGuest/VBoxGuest-win.cpp (modified) (2 diffs)
• common/VBoxGuest/VBoxGuest-win.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPUtils.cpp

@@ -52 +52 @@
     ULONG major, minor, build;
     BOOLEAN checkedBuild;
-    static vboxWinVersion_t s_WinVersion = UNKNOWN_WINVERSION;
-
-    if (s_WinVersion != UNKNOWN_WINVERSION)
+    static vboxWinVersion_t s_WinVersion = WINVERSION_UNKNOWN;
+
+    if (s_WinVersion != WINVERSION_UNKNOWN)
         return s_WinVersion;
 
@@ -60 +60 @@
     LOG(("running on version %d.%d, build %d(checked=%d)", major, minor, build, (int)checkedBuild));
 
-    if(major == 6)
-    {
-        if (minor == 3)
-            s_WinVersion = WIN81;
+    if (major == 6)
+    {
+        if (minor >= 4)
+            s_WinVersion = WINVERSION_10;
+        else if (minor == 3)
+            s_WinVersion = WINVERSION_81;
         else if (minor == 2)
-            s_WinVersion = WIN8;
+            s_WinVersion = WINVERSION_8;
         else if (minor == 1)
-            s_WinVersion = WIN7;
+            s_WinVersion = WINVERSION_7;
         else if (minor == 0)
-            s_WinVersion = WINVISTA; /* Or Windows Server 2008. */
+            s_WinVersion = WINVERSION_VISTA; /* Or Windows Server 2008. */
     }
     else if (major == 5)
-        s_WinVersion = (minor>=1) ? WINXP:WIN2K;
+        s_WinVersion = (minor>=1) ? WINVERSION_XP: WINVERSION_2K;
     else if (major == 4)
-        s_WinVersion = WINNT4;
+        s_WinVersion = WINVERSION_NT4;
     else
         WARN(("NT4 required!"));

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPUtils.h

@@ -88 +88 @@
 typedef enum
 {
-    UNKNOWN_WINVERSION = 0,
-    WINNT4    = 1,
-    WIN2K     = 2,
-    WINXP     = 3,
-    WINVISTA  = 4,
-    WIN7      = 5,
-    WIN8      = 6,
-    WIN81     = 7
+    WINVERSION_UNKNOWN = 0,
+    WINVERSION_NT4     = 1,
+    WINVERSION_2K      = 2,
+    WINVERSION_XP      = 3,
+    WINVERSION_VISTA   = 4,
+    WINVERSION_7       = 5,
+    WINVERSION_8       = 6,
+    WINVERSION_81      = 7,
+    WINVERSION_10      = 8
 } vboxWinVersion_t;
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp

@@ -619 +619 @@
 
     vboxWinVersion_t ver = VBoxQueryWinVersion();
-    if (ver == WINVISTA)
+    if (ver == WINVERSION_VISTA)
     {
         pKeyPrefix = VBOXWDDM_REG_DISPLAYSETTINGSKEY_PREFIX_VISTA;
@@ -626 +626 @@
     else
     {
-        Assert(ver == WIN7 || ver == WIN8 || ver == WIN81);
+        Assert(ver > WINVERSION_VISTA);
         pKeyPrefix = VBOXWDDM_REG_DISPLAYSETTINGSKEY_PREFIX_WIN7;
         cbKeyPrefix = sizeof (VBOXWDDM_REG_DISPLAYSETTINGSKEY_PREFIX_WIN7);

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -7431 +7431 @@
         else if (major == 6)
         {
-            if (minor > 3)
+            if (minor > 4)
             {
                 WARN(("Unknow win version, newer minor release, assuming 3D check is required"));

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp

@@ -104 +104 @@
         VideoPortZeroMemory(tmpRanges, sizeof(tmpRanges));
 
-        if (VBoxQueryWinVersion() == WINNT4)
+        if (VBoxQueryWinVersion() == WINVERSION_NT4)
         {
             /* NT crashes if either of 'vendorId, 'deviceId' or 'slot' parameters is NULL,
@@ -758 +758 @@
     switch (VBoxQueryWinVersion())
     {
-        case WINNT4:
-            LOG(("WINNT4"));
+        case WINVERSION_NT4:
+            LOG(("WINVERSION_NT4"));
             vhwData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA;
             break;
-        case WIN2K:
-            LOG(("WIN2K"));
+        case WINVERSION_2K:
+            LOG(("WINVERSION_2K"));
             vhwData.HwInitDataSize = SIZE_OF_W2K_VIDEO_HW_INITIALIZATION_DATA;
             break;

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPInternal.cpp

@@ -427 +427 @@
     if (pContext)
     {
-        VideoPortZeroMemory(pContext, size);
+        VideoPortZeroMemory(pContext, (ULONG)size);
         pContext->cContexts = cDisplays;
         pContext->pCommon = pCommon;

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPVideoPortAPI.cpp

@@ -89 +89 @@
     VideoPortZeroMemory(pAPI, sizeof(VBOXVIDEOPORTPROCS));
 
-    if (VBoxQueryWinVersion() <= WINNT4)
+    if (VBoxQueryWinVersion() <= WINVERSION_NT4)
     {
         /* VideoPortGetProcAddress is available for >= win2k */

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -665 +665 @@
   StrCmp $g_strWinVersion "8" vista     ; Windows 8
   StrCmp $g_strWinVersion "8_1" vista   ; Windows 8.1 / Windows 2012 Server R2
+  StrCmp $g_strWinVersion "10" vista    ; Windows 10
 
   ${If} $g_bForceInstall == "true"
@@ -762 +763 @@
   ${OrIf} $R0 == '8'     ; Windows 8.
   ${OrIf} $R0 == '8_1'   ; Windows 8.1 / Windows Server 2012 R2.
+  ${OrIf} $R0 == '10'    ; Windows 10.
     ; Use VBoxCredProv on Vista and up.
     ${LogVerbose} "Installing VirtualBox credential provider ..."
@@ -1026 +1028 @@
     ${If}   $g_strWinVersion != "8"   ; On Windows 8 WDDM is mandatory
     ${AndIf} $g_strWinVersion != "8_1" ; ... also on Windows 8.1 / Windows 2012 Server R2
+    ${AndIf} $g_strWinVersion != "10" ; ... also on Windows 10
       StrCpy $g_bWithWDDM "false"
     ${EndIf}
@@ -1204 +1207 @@
     !insertmacro SelectSection ${SEC03}
   ${EndIf}
-  ; On Windows 8 / 8.1 / Windows Server 2012 R2 we always select the 3D
+  ; On Windows 8 / 8.1 / Windows Server 2012 R2 and newer we always select the 3D
   ; section and disable it so that it cannot be deselected again
   ${If}   $g_strWinVersion == "8"
   ${OrIf} $g_strWinVersion == "8_1"
+  ${OrIf} $g_strWinVersion == "10"
     IntOp $0 ${SF_SELECTED} | ${SF_RO}
     SectionSetFlags ${SEC03} $0

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh

@@ -545 +545 @@
   ${OrIf} $g_strWinVersion == "8"
   ${OrIf} $g_strWinVersion == "8_1"
+  ${OrIf} $g_strWinVersion == "10"
     StrCpy $g_bCapWDDM "true"
     ${LogVerbose} "OS is WDDM driver capable"
@@ -552 +553 @@
   ${If}   $g_strWinVersion == "8"
   ${OrIf} $g_strWinVersion == "8_1"
+  ${OrIf} $g_strWinVersion == "10"
     StrCpy $g_bWithWDDM "true"
     ${LogVerbose} "OS needs WDDM driver by default"
@@ -576 +578 @@
   ${OrIf} $g_strWinVersion == "8"
   ${OrIf} $g_strWinVersion == "8_1"
+  ${OrIf} $g_strWinVersion == "10"
     StrCpy $g_bCapDllCache "true"
     ${LogVerbose}  "OS has a DLL cache"

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstall.nsh

@@ -87 +87 @@
   StrCmp $g_strWinVersion "8" vista     ; Windows 8
   StrCmp $g_strWinVersion "8_1" vista   ; Windows 8.1 / Windows Server 2012 R2
+  StrCmp $g_strWinVersion "10" vista    ; Windows 10
 
   ${If} $g_bForceInstall == "true"
@@ -146 +147 @@
   StrCmp $g_strWinVersion "8" vista     ; Windows 8
   StrCmp $g_strWinVersion "8_1" vista   ; Windows 8.1 / Windows Server 2012 R2
+  StrCmp $g_strWinVersion "10" vista    ; Windows 10
 
   ${If} $g_bForceInstall == "true"

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

@@ -122 +122 @@
   ${OrIf} $g_strWinVersion == "8"
   ${OrIf} $g_strWinVersion == "8_1"
+  ${OrIf} $g_strWinVersion == "10"
     StrCpy $reg_path_device "SYSTEM\CurrentControlSet\Control\Video\$dev_id\0000"
     StrCpy $reg_path_monitor "SYSTEM\CurrentControlSet\Control\VIDEO\$dev_id\0000\Mon00000001"
@@ -235 +236 @@
     ${If} $g_strWinVersion == "8"
     ${OrIf} $g_strWinVersion == "8_1"
+    ${OrIf} $g_strWinVersion == "10"
       !ifdef VBOX_SIGN_ADDITIONS
         FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.cat"
@@ -396 +398 @@
       ${If} $g_strWinVersion == "8"
       ${OrIf} $g_strWinVersion == "8_1"
-        ${LogVerbose} "Installing WDDM video driver for Windows 8..."
+      ${OrIf} $g_strWinVersion == "10"
+        ${LogVerbose} "Installing WDDM video driver for Windows 8 or newer..."
         ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideoW8.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
       ${Else}
@@ -466 +469 @@
     SetRegView 32
     ; Write additional keys required for Windows XP, Vista and 7 64-bit (but for 32-bit stuff)
-    ${If} $g_strWinVersion   == '8_1'
+    ${If} $g_strWinVersion   == '10'
+    ${OrIf} $g_strWinVersion == '8_1'
     ${OrIf} $g_strWinVersion == '8'
     ${OrIf} $g_strWinVersion == '7'

trunk/src/VBox/Additions/WINNT/Installer/winver.nsh

@@ -67 +67 @@
   StrCmp $R1 '6.1' lbl_winnt_7
   StrCmp $R1 '6.2' lbl_winnt_8
-  StrCmp $R1 '6.3' lbl_winnt_8_1 lbl_error
+  StrCmp $R1 '6.3' lbl_winnt_8_1
+  StrCmp $R1 '6.4' lbl_winnt_10 lbl_error
 
   lbl_winnt_x:
@@ -101 +102 @@
   Goto lbl_done
 
+  lbl_winnt_10:
+    Strcpy $R0 '10'
+  Goto lbl_done
+
   lbl_error:
     Strcpy $R0 ''

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp

@@ -130 +130 @@
                 case 3:
                     g_enmVbgdNtVer = VBGDNTVER_WIN81;
+                    break;
+                case 4:
+                    g_enmVbgdNtVer = VBGDNTVER_WIN10;
                     break;
                 default:
@@ -1311 +1314 @@
             break;
 
+        case VBGDNTVER_WIN10:
+#if ARCH_BITS == 64
+            enmOsType = VBOXOSTYPE_Win10_x64;
+#else
+            enmOsType = VBOXOSTYPE_Win10;
+#endif
+            break;
+
         default:
             /* We don't know, therefore NT family. */

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h

@@ -137 +137 @@
     VBGDNTVER_WIN8,
     VBGDNTVER_WIN81,
+    VBGDNTVER_WIN10
 } VBGDNTVER;
 extern VBGDNTVER g_enmVbgdNtVer;