Alexandre Julliard : oleaut32: Generate a few more coclass registrations from idl.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Tue Aug  2 23:25:17 2011 +0200

oleaut32: Generate a few more coclass registrations from idl.

---

dlls/oleaut32/oleaut32.rgs       |   46 +++++------------------------------
 dlls/oleaut32/oleaut32_ocidl.idl |   48 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/dlls/oleaut32/oleaut32.rgs b/dlls/oleaut32/oleaut32.rgs
index 1c558e7..87a848c 100644
--- a/dlls/oleaut32/oleaut32.rgs
+++ b/dlls/oleaut32/oleaut32.rgs
@@ -2,45 +2,13 @@ HKCR
 {
     NoRemove CLSID
     {
-        ForceRemove '{0000002F-0000-0000-C000-000000000046}' = s 'CLSID_RecordInfo'
-        {
-            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
-        }
-        ForceRemove '{00020420-0000-0000-C000-000000000046}' = s 'PSDispatch'
-        {
-            InprocServer = s 'ole2disp.dll'
-            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
-        }
-        ForceRemove '{00020421-0000-0000-C000-000000000046}' = s 'PSEnumVariant'
-        {
-            InprocServer = s 'ole2disp.dll'
-            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
-        }
-        ForceRemove '{00020422-0000-0000-C000-000000000046}' = s 'PSTypeInfo'
-        {
-            InprocServer = s 'ole2disp.dll'
-            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
-        }
-        ForceRemove '{00020423-0000-0000-C000-000000000046}' = s 'PSTypeLib'
-        {
-            InprocServer = s 'ole2disp.dll'
-            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
-        }
-        ForceRemove '{00020424-0000-0000-C000-000000000046}' = s 'PSOAInterface'
-        {
-            InprocServer = s 'ole2disp.dll'
-            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
-        }
-        ForceRemove '{00020425-0000-0000-C000-000000000046}' = s 'PSTypeComp'
-        {
-            InprocServer = s 'ole2disp.dll'
-            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
-        }
-        ForceRemove '{DF0B3D60-548F-101B-8E65-08002B2BD119}' = s 'PSSupportErrorInfo'
-        {
-            InprocServer = s 'ole2disp.dll'
-            InprocServer32 = s '%MODULE%'
-        }
+        '{00020420-0000-0000-C000-000000000046}' { InprocServer = s 'ole2disp.dll' }
+        '{00020421-0000-0000-C000-000000000046}' { InprocServer = s 'ole2disp.dll' }
+        '{00020422-0000-0000-C000-000000000046}' { InprocServer = s 'ole2disp.dll' }
+        '{00020423-0000-0000-C000-000000000046}' { InprocServer = s 'ole2disp.dll' }
+        '{00020424-0000-0000-C000-000000000046}' { InprocServer = s 'ole2disp.dll' }
+        '{00020425-0000-0000-C000-000000000046}' { InprocServer = s 'ole2disp.dll' }
+        '{DF0B3D60-548F-101B-8E65-08002B2BD119}' { InprocServer = s 'ole2disp.dll' }
     }
     NoRemove Interface
     {
diff --git a/dlls/oleaut32/oleaut32_ocidl.idl b/dlls/oleaut32/oleaut32_ocidl.idl
index 514e5d9..fad3741 100644
--- a/dlls/oleaut32/oleaut32_ocidl.idl
+++ b/dlls/oleaut32/oleaut32_ocidl.idl
@@ -47,3 +47,51 @@ coclass OldFont { interface IFont; }
     uuid(0be35204-8f91-11ce-9de3-00aa004bb851)
 ]
 coclass StdPicture { interface IPicture; }
+
+[
+    threading(both),
+    uuid(00020420-0000-0000-c000-000000000046)
+]
+coclass PSDispatch { }
+
+[
+    threading(both),
+    uuid(00020421-0000-0000-c000-000000000046)
+]
+coclass PSEnumVariant { }
+
+[
+    threading(both),
+    uuid(00020422-0000-0000-c000-000000000046)
+]
+coclass PSTypeInfo { }
+
+[
+    threading(both),
+    uuid(00020423-0000-0000-c000-000000000046)
+]
+coclass PSTypeLib { }
+
+[
+    threading(both),
+    uuid(00020424-0000-0000-c000-000000000046)
+]
+coclass PSOAInterface { }
+
+[
+    threading(both),
+    uuid(00020425-0000-0000-c000-000000000046)
+]
+coclass PSTypeComp { }
+
+[
+    threading(both),
+    uuid(df0b3d60-548f-101b-8e65-08002b2bd119)
+]
+coclass PSSupportErrorInfo { }
+
+[
+    threading(both),
+    uuid(0000002f-0000-0000-c000-000000000046)
+]
+coclass CLSID_RecordInfo { }