Skip to content

W
wine-winehq
Commit 407468e8 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

msi: Link the WindowsInstaller.Installer ProgId back to the right CLSID.

parent b7a2699b
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 2 deletions
dlls/msi/regsvr.c
View file @ 407468e8
......@@ -72,11 +72,15 @@ struct regsvr_coclass {
LPCSTR ips; /* can be NULL to omit */
LPCSTR ips32; /* can be NULL to omit */
LPCSTR ips32_tmodel; /* can be NULL to omit, if apartment, iph32 must be set */
DWORD flags;
LPCSTR progid; /* can be NULL to omit */
LPCSTR viprogid; /* can be NULL to omit */
LPCSTR progid_extra; /* can be NULL to omit */
};
/* flags for regsvr_coclass.flags */
#define PROGID_CLSID 0x00000010
static HRESULT register_coclasses(struct regsvr_coclass const *list);
static HRESULT unregister_coclasses(struct regsvr_coclass const *list);
......@@ -296,7 +300,8 @@ static HRESULT register_coclasses(struct regsvr_coclass const *list) {
list->progid);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
res = register_progid(buf, list->progid, NULL,
res = register_progid(list->flags & PROGID_CLSID ? buf : NULL,
list->progid, NULL,
list->name, list->progid_extra);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
}
......@@ -306,7 +311,8 @@ static HRESULT register_coclasses(struct regsvr_coclass const *list) {
list->viprogid);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
res = register_progid(buf, list->viprogid, list->progid,
res = register_progid(list->flags & PROGID_CLSID ? buf : NULL,
list->viprogid, list->progid,
list->name, list->progid_extra);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
}
......@@ -526,6 +532,7 @@ static struct regsvr_coclass const coclass_list[] = {
NULL,
"msi.dll",
"Apartment",
PROGID_CLSID,
"IMsiServer",
NULL
},
......@@ -536,6 +543,7 @@ static struct regsvr_coclass const coclass_list[] = {
NULL,
"msi.dll",
NULL,
PROGID_CLSID,
"WindowsInstaller.Message",
NULL
},
......@@ -546,6 +554,7 @@ static struct regsvr_coclass const coclass_list[] = {
NULL,
"msi.dll",
"Apartment",
0,
"WindowsInstaller.Installer",
NULL
},
......@@ -556,6 +565,7 @@ static struct regsvr_coclass const coclass_list[] = {
NULL,
"msi.dll",
"Apartment",
PROGID_CLSID,
"WindowsInstaller.Installer",
NULL
},
......@@ -566,6 +576,7 @@ static struct regsvr_coclass const coclass_list[] = {
NULL,
"msi.dll",
"Apartment",
0,
"WindowsInstaller.Installer",
NULL
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment