Hans Leidekker : msi: Set install properties just once.

Alexandre Julliard julliard at winehq.org
Tue May 11 12:09:39 CDT 2010


Module: wine
Branch: master
Commit: 347bb13fc7e4f8a884e3fb3265209351e4ee1ff2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=347bb13fc7e4f8a884e3fb3265209351e4ee1ff2

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Tue May 11 14:02:50 2010 +0200

msi: Set install properties just once.

---

 dlls/msi/action.c |   19 -------------------
 1 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 6ed1417..30e8d8d 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -4559,21 +4559,14 @@ static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey)
         {'P','r','o','d','u','c','t','L','a','n','g','u','a','g','e',0};
     static const WCHAR szProductVersion[] =
         {'P','r','o','d','u','c','t','V','e','r','s','i','o','n',0};
-    static const WCHAR szProductName[] =
-        {'P','r','o','d','u','c','t','N','a','m','e',0};
-    static const WCHAR szDisplayName[] =
-        {'D','i','s','p','l','a','y','N','a','m','e',0};
     static const WCHAR szDisplayVersion[] =
         {'D','i','s','p','l','a','y','V','e','r','s','i','o','n',0};
-    static const WCHAR szManufacturer[] =
-        {'M','a','n','u','f','a','c','t','u','r','e','r',0};
 
     static const LPCSTR propval[] = {
         "ARPAUTHORIZEDCDFPREFIX", "AuthorizedCDFPrefix",
         "ARPCONTACT",             "Contact",
         "ARPCOMMENTS",            "Comments",
         "ProductName",            "DisplayName",
-        "ProductVersion",         "DisplayVersion",
         "ARPHELPLINK",            "HelpLink",
         "ARPHELPTELEPHONE",       "HelpTelephone",
         "ARPINSTALLLOCATION",     "InstallLocation",
@@ -4608,18 +4601,6 @@ static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey)
     /* FIXME: Write real Estimated Size when we have it */
     msi_reg_set_val_dword(hkey, szEstimatedSize, 0);
 
-    buffer = msi_dup_property(package->db, szProductName);
-    msi_reg_set_val_str(hkey, szDisplayName, buffer);
-    msi_free(buffer);
-
-    buffer = msi_dup_property(package->db, cszSourceDir);
-    msi_reg_set_val_str(hkey, INSTALLPROPERTY_INSTALLSOURCEW, buffer);
-    msi_free(buffer);
-
-    buffer = msi_dup_property(package->db, szManufacturer);
-    msi_reg_set_val_str(hkey, INSTALLPROPERTY_PUBLISHERW, buffer);
-    msi_free(buffer);
-
     GetLocalTime(&systime);
     sprintfW(date, date_fmt, systime.wYear, systime.wMonth, systime.wDay);
     msi_reg_set_val_str(hkey, INSTALLPROPERTY_INSTALLDATEW, date);




More information about the wine-cvs mailing list