Nikolay Sivov : msi: MsiInstaller coclass is not included in a typelib.
Alexandre Julliard
julliard at winehq.org
Thu Mar 20 16:22:51 CDT 2014
Module: wine
Branch: master
Commit: 117ae2576496df1b03b7d8283093d608e94b3d9e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=117ae2576496df1b03b7d8283093d608e94b3d9e
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Mar 20 14:09:14 2014 +0400
msi: MsiInstaller coclass is not included in a typelib.
---
dlls/msi/msiserver.idl | 17 ++++++++---------
dlls/msi/msiserver.rgs | 7 ++++++-
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl
index f351ab1..5052602 100644
--- a/dlls/msi/msiserver.idl
+++ b/dlls/msi/msiserver.idl
@@ -153,6 +153,14 @@ coclass MsiServerMessage { interface IMsiMessage; }
coclass PSFactoryBuffer { interface IPSFactoryBuffer; }
[
+ helpstring("Microsoft Windows Installer"),
+ threading(apartment),
+ progid("WindowsInstaller.Installer"),
+ uuid(000c1090-0000-0000-c000-000000000046)
+]
+coclass MsiInstaller { interface Installer; }
+
+[
uuid(000c1082-0000-0000-c000-000000000046)
]
coclass MsiTransform { }
@@ -184,7 +192,6 @@ coclass WineMsiRemoteCustomAction { interface WineMsiRemoteCustomAction; }
]
coclass WineMsiRemotePackage { interface WineMsiRemotePackage; }
-
[ uuid(000C1092-0000-0000-C000-000000000046), version(1.0) ]
library WindowsInstaller
{
@@ -551,12 +558,4 @@ library WindowsInstaller
properties:
methods:
}
-
- [
- helpstring("Microsoft Windows Installer"),
- threading(apartment),
- progid("WindowsInstaller.Installer"),
- uuid(000c1090-0000-0000-c000-000000000046)
- ]
- coclass MsiInstaller { interface Installer; }
}
diff --git a/dlls/msi/msiserver.rgs b/dlls/msi/msiserver.rgs
index 9f408db..c77ad2b 100644
--- a/dlls/msi/msiserver.rgs
+++ b/dlls/msi/msiserver.rgs
@@ -3,6 +3,11 @@ HKCR
NoRemove CLSID
{
'{000C101D-0000-0000-C000-000000000046}' { DllVersion = s '3.1.4000' }
- '{000C1090-0000-0000-C000-000000000046}' { InProcHandler32 = s 'ole32.dll' }
+ '{000C1090-0000-0000-C000-000000000046}'
+ {
+ TypeLib = s '{000C1092-0000-0000-C000-000000000046}'
+ Version = s '1.0'
+ InProcHandler32 = s 'ole32.dll'
+ }
}
}
More information about the wine-cvs
mailing list