Changeset 1499

Show
Ignore:
Timestamp:
10/14/08 12:15:32 (3 months ago)
Author:
astormont
Message:

Improved winver detection

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • wine-doors/trunk/src/ui.py

    r1494 r1499  
    165165            os.chmod( os.path.expanduser("~/.local/share/applications/wine"), 0755) 
    166166 
     167        # Set winver 
     168        selected_win_version = wine.GetWindowsVersions()[wn_prefs['cb_winver'].get_active()] 
     169        print selected_win_version 
     170 
    167171        # Set audio backend 
    168         wine.SetAudioSystem( wn_prefs['cb_audio'].get_active_text() ) 
     172        selected_audio_backend = wn_prefs['cb_audio'].get_active_text() 
     173        if selected_audio_backend != wine.GetAudioSystem(): 
     174            wine.SetAudioSystem( selected_audio_backend ) 
     175        del selected_audio_backend 
    169176 
    170177        # Refresh ctile 
    …… 
    392399        # Do winver 
    393400        win_versions_model = gtk.ListStore( gobject.TYPE_STRING, # Display name 
    394                                       gobject.TYPE_STRING, # CurrentVersion 
    395                                       gobject.TYPE_INT,    # Platform 
    396                                       gobject.TYPE_STRING )# Service Pack 
     401                                            gobject.TYPE_STRING, # CurrentVersion 
     402                                            gobject.TYPE_INT,    # Platform 
     403                                            gobject.TYPE_STRING )# Service Pack 
    397404        win_versions = wine.GetWindowsVersions() 
     405        set_win_version = wine.GetWindowsVersion() 
    398406        wn_prefs['cb_winver'].set_model( win_versions_model ) 
    399407        for i in range( len( win_versions ) ): 
    400408            win_versions_model.append( win_versions[i] ) 
    401             win_version = wine.GetWindowsVersion()  
    402             if win_version == [ win_versions[i][1], win_versions[i][2], win_versions[i][3] ]: 
     409            if set_win_version == win_versions[i]: 
    403410                wn_prefs['cb_winver'].set_active( i ) 
    404411 

  • wine-doors/trunk/src/wine.py

    r1494 r1499  
    5151        win32_windows = self.getRegistry( "HKLM\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion", "VersionNumber" ) 
    5252        if win32_windows != "": 
    53             return [ win32_windows,  
    54                      self.WIN32_WINDOWS_PLATFORM, 
    55                      self.getRegistry( "HKLM\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion", "CSDVersion" ) ] 
    56         else: 
    57             return [ self.getRegistry( "HKLM\\\\Software\\\\Microsoft\\\\Windows NT\\\\CurrentVersion", "CurrentVersion" ),  
    58                      self.WIN32_NT_PLATFORM, 
    59                      self.getRegistry( "HKLM\\\\Software\\\\Microsoft\\\\Windows NT\\\\CurrentVersion", "CSDVersion" ) ] 
     53            output = [ win32_windows,  
     54                       self.WIN32_WINDOWS_PLATFORM, 
     55                       self.getRegistry( "HKLM\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion", "SubVersionNumber" ) ] 
     56        else: 
     57            output = [ self.getRegistry( "HKLM\\\\Software\\\\Microsoft\\\\Windows NT\\\\CurrentVersion", "CurrentVersion" ),  
     58                       self.WIN32_NT_PLATFORM, 
     59                       self.getRegistry( "HKLM\\\\Software\\\\Microsoft\\\\Windows NT\\\\CurrentVersion", "CSDVersion" ) ] 
     60 
     61        for win_version in self.GetWindowsVersions(): 
     62            if [ win_version[1], win_version[2], win_version[3] ] == output: 
     63                return [ win_version[0] ] + output 
    6064 
    6165    def SetWindowsVersion( self, version, platform, service_pack = False ):