Changeset 1516

Timestamp:

10/17/08 16:59:32 (3 months ago)

Author:

astormont

Message:

A few hacks to let wine-doors run msi uninstallers (The ones using classid)

Files:

• wine-doors/trunk/src/application.py (modified) (3 diffs)
• wine-doors/trunk/src/wine.py (modified) (3 diffs)

wine-doors/trunk/src/application.py

@@ -537 +537 @@
-        self.Parse()
-        
+        allowed = [ "msiexec" ]
+
-        reg = re.compile("^HK")
-        if not self.app_pack['uninstall']:
@@ -544 +546 @@
-        elif self.app_pack['uninstall'].lower().startswith("c:"):
-            uninstaller = self.app_pack['uninstall']
+        elif self.app_pack['uninstall'].lower().split(" ")[0] in allowed:
+            uninstaller = self.app_pack['uninstall']
-        else:
-            uninstaller = self.pack_path + self.app_pack['uninstall']
@@ -556 +560 @@
-            args = None
-            
-
+
+
+
-            self.status = wine.Execute(uninstaller, args)
-        else:

wine-doors/trunk/src/wine.py

@@ -274 +274 @@
-        filefound = False
-
-        if executable == "regedit" and not argstring:
-            return
-
-        if not argstring:
-            argstring = ""
-        else:
-            argstring = " "+argstring 
+
+        # hard coded list of things to "just let through"
+        allowed = [ "regedit", "winver", "msiexec" ]
-
-        # fix file:// URI's
@@ -291 +291 @@
-            oldcwd = os.getcwd()
-            os.chdir( os.path.expanduser( "~/" ) )
-
+
-        # Various tests to locate the file, if we still fail return with an error
-executable != "regedit" and executable != "winver"
+not executable.lower().split(" ")[0] in allowed
-            log.Warn("Can't find executable %s, Assuming CD drive path" % executable)
-            cd = GetCDMountPoint()
@@ -309 +309 @@
-
-        # Determine the executable, and construct an executable command                
-
-
-
+
-            executable = "C:\\windows\\system32\\winver.exe"
+        elif executable.lower().split(" ")[0] in allowed:
+            run = executable
-        elif re.search("\.msi", executable):
-            run = "msiexec /i " + executable