Changeset 1492

Timestamp:

10/09/08 08:39:34 (3 months ago)

Author:

astormont

Message:

GUI supports fetching of windows version from registry on wine 1.0 - must check previous versions

Files:

• wine-doors/trunk/src/ui.py (modified) (2 diffs)
• wine-doors/trunk/src/wine.py (modified) (2 diffs)
• wine-doors/trunk/src/winedoors.glade (modified) (2 diffs)

wine-doors/trunk/src/ui.py

@@ -390 +390 @@
-        #        wn_prefs['cb_winever'].prepend_text( engine.replace("winex", "cedega") )
-
+        # Do winver
+        win_versions_model = gtk.ListStore( gobject.TYPE_STRING, # Display name
+                                      gobject.TYPE_STRING, # CurrentVersion
+                                      gobject.TYPE_INT,    # Platform
+                                      gobject.TYPE_STRING )# Service Pack
+        win_versions = wine.GetWindowsVersions()
+        wn_prefs['cb_winver'].set_model( win_versions_model )
+        for i in range( len( win_versions ) ):
+            win_versions_model.append( win_versions[i] )
+            if wine.GetWindowsVersion() == [ win_versions[i][1], win_versions[i][2] ]:
+                wn_prefs['cb_winver'].set_active( i )
+
-        # Detect wineversion and leave it at that
-
-
-
+e
+e
+e
-        wn_prefs['cb_winever'].set_active(0)
-
@@ -400 +412 @@
-        audio_systems = wine.GetAudioSystems()
-        wn_prefs['cb_audio'].set_model( audio_model )
-- 1 
+
-            audio_model.append( [ audio_systems[i] ] )
-            if audio_systems[i] == wine.GetAudioSystem():

wine-doors/trunk/src/wine.py

@@ -18 +18 @@
-
-class Wine:
+
+    [ WIN32S_PLATFORM, WIN32_WINDOWS_PLATFORM, WIN32_NT_PLATFORM ] = range( 3 ) 
+
-    def __init__( self ):
-        self.gui = True
@@ -44 +47 @@
-            audio_sys.append( "esd" )
-        return audio_sys
+
+    def GetWindowsVersion( self ):
+        win32_windows = self.getRegistry( "HKLM\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion", "VersionNumber" )
+        if win32_windows != "":
+            return [ win32_windows, self.WIN32_WINDOWS_PLATFORM ]
+        else:
+            return [ self.getRegistry( "HKLM\\\\Software\\\\Microsoft\\\\Windows NT\\\\CurrentVersion", "CurrentVersion" ), 
+                     self.WIN32_NT_PLATFORM ]
+
+    def SetWindowsVersion( self, version, platform, service_pack = False ):
+        if platform == self.WIN32_WINDOWS_PLATFORM:
+            current_version =  "HKLM\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\VersionNumber"
+            csd_version = "HKLM\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\CSDVersion"
+        elif platform == self.WIN32_NT_PLATFORM:
+            current_version =  "HKLM\\\\Software\\\\Microsoft\\\\Windows NT\\\\CurrentVersion\\\\CurrentVersion"
+            csd_version = "HKLM\\\\Software\\\\Microsoft\\\\Windows NT\\\\CurrentVersion\\\\CSDVersion"
+
+        if not current_version:
+            log.Warn( "Setting of windows platform to %s not implemented" % platform )
+            return
+        else:
+            self.setRegistry( current_version, version )
+
+        if service_pack:
+            self.setRegistry( csd_version, service_pack )
+
+    def GetWindowsVersions( self ):
+        """ Returns list of windows names and versions """
+        # Display Name, CurrentVersion, Platform, Service Pack
+        return [ [ "Windows 2008", "win2008", self.WIN32_NT_PLATFORM, "Service Pack 1" ],
+                 [ "Windows Vista", "vista", self.WIN32_NT_PLATFORM, " " ],
+                 [ "Windows 2003", "win2003", self.WIN32_NT_PLATFORM, "Service Pack 1" ],
+                 [ "Windows XP", "winxp", self.WIN32_NT_PLATFORM, "Service Pack 2" ],
+                 [ "Windows 2000", "5.0", self.WIN32_NT_PLATFORM, "Service Pack 4" ],
+                 [ "Windows ME", "4.90.3000", self.WIN32_WINDOWS_PLATFORM, " " ],
+                 [ "Windows 98", "4.10.2222", self.WIN32_WINDOWS_PLATFORM, " A " ],
+                 [ "Windows 95", "4.0.950", self.WIN32_WINDOWS_PLATFORM, "" ],
+                 [ "Windows NT 4.0", "4.0", self.WIN32_NT_PLATFORM, "Service Pack 6a" ],
+                 [ "Windows NT 3.5", "3.51", self.WIN32_NT_PLATFORM, "Service Pack 2" ],
+                 #[ "Windows 3.1", "win31", self.WIN32S_PLATFORM, "Win32s 1.3" ],
+                 #[ "Windows 3.0", "win30", self.WIN32S_PLATFORM, "Win32s 1.3" ],
+                 #[ "Windows 2.0", "win20", self.WIN32S_PLATFORM, "Win32s 1.3" ]
+               ]
-
-    def SetRegOwner( self, name ):

wine-doors/trunk/src/winedoors.glade

@@ -1002 +1002 @@
-                  <widget class="GtkComboBox" id="cb_winver">
-                    <property name="visible">True</property>
-
+<!--
-Windows 98
-Windows ME
@@ -1008 +1008 @@
-Windows NT 4
-Windows 2000
-
+-->
-                  </widget>
-                  <packing>