Changeset 1494

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

Better detection of wines emulated winver

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1492 r1494  
    399399        for i in range( len( win_versions ) ): 
    400400            win_versions_model.append( win_versions[i] ) 
    401             if wine.GetWindowsVersion() == [ win_versions[i][1], win_versions[i][2] ]: 
     401            win_version = wine.GetWindowsVersion()  
     402            if win_version == [ win_versions[i][1], win_versions[i][2], win_versions[i][3] ]: 
    402403                wn_prefs['cb_winver'].set_active( i ) 
    403404 

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

    r1493 r1494  
    5151        win32_windows = self.getRegistry( "HKLM\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion", "VersionNumber" ) 
    5252        if win32_windows != "": 
    53             return [ win32_windows, self.WIN32_WINDOWS_PLATFORM ] 
     53            return [ win32_windows,  
     54                     self.WIN32_WINDOWS_PLATFORM, 
     55                     self.getRegistry( "HKLM\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion", "CSDVersion" ) ] 
    5456        else: 
    5557            return [ self.getRegistry( "HKLM\\\\Software\\\\Microsoft\\\\Windows NT\\\\CurrentVersion", "CurrentVersion" ),  
    56                      self.WIN32_NT_PLATFORM ] 
     58                     self.WIN32_NT_PLATFORM, 
     59                     self.getRegistry( "HKLM\\\\Software\\\\Microsoft\\\\Windows NT\\\\CurrentVersion", "CSDVersion" ) ] 
    5760 
    5861    def SetWindowsVersion( self, version, platform, service_pack = False ):