[Libreoffice-commits] core.git: vcl/opengl

Tomaž Vajngerl tomaz.vajngerl at collabora.com
Thu Nov 19 08:12:58 PST 2015


 vcl/opengl/win/WinDeviceInfo.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 85c5baae7b3e09e62ed4028fc434e7245a9f97bb
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Thu Nov 19 17:11:39 2015 +0100

    opengl: use correct hex number for Win 10 (Major 10 -> hex A)
    
    Change-Id: Ib54fe6394173e905ef8c395ced86692290959369

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 5083f46..c524398 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -200,13 +200,13 @@ uint32_t ParseIDFromDeviceID(const OUString &key, const char *prefix, int length
 // based on http://msdn.microsoft.com/en-us/library/ms724834(VS.85).aspx
 enum {
     kWindowsUnknown = 0,
-    kWindowsXP = 0x50001,
-    kWindowsServer2003 = 0x50002,
-    kWindowsVista = 0x60000,
-    kWindows7 = 0x60001,
-    kWindows8 = 0x60002,
-    kWindows8_1 = 0x60003,
-    kWindows10 = 0x100000
+    kWindowsXP =         0x00050001,
+    kWindowsServer2003 = 0x00050002,
+    kWindowsVista =      0x00060000,
+    kWindows7 =          0x00060001,
+    kWindows8 =          0x00060002,
+    kWindows8_1 =        0x00060003,
+    kWindows10 =         0x000A0000  // Major 10 Minor 0
 };
 
 


More information about the Libreoffice-commits mailing list