Alexandre Julliard : oleaut32: Use widl to generate the coclasses registrations.
Alexandre Julliard
julliard at winehq.org
Thu Dec 2 12:23:57 CST 2010
Module: wine
Branch: master
Commit: 6b7c7467239f2800dc50a6fcf52e400f010656aa
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b7c7467239f2800dc50a6fcf52e400f010656aa
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Nov 30 12:49:15 2010 +0100
oleaut32: Use widl to generate the coclasses registrations.
---
dlls/oleaut32/oleaut32.rgs | 21 ---------------------
dlls/oleaut32/oleaut32_ocidl.idl | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/dlls/oleaut32/oleaut32.rgs b/dlls/oleaut32/oleaut32.rgs
index be78c51..36dcafd 100644
--- a/dlls/oleaut32/oleaut32.rgs
+++ b/dlls/oleaut32/oleaut32.rgs
@@ -41,24 +41,6 @@ HKCR
InprocServer = s 'ole2disp.dll'
InprocServer32 = s '%MODULE%'
}
- ForceRemove '{0BE35203-8F91-11CE-9DE3-00AA004BB851}' = s 'CLSID_StdFont'
- {
- CLSID = s 'Standard Font'
- InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
- ProgId = s 'StdFont'
- }
- ForceRemove '{46763EE0-CAB2-11CE-8C20-00AA0051E5D4}' = s 'Obsolete Font'
- {
- CLSID = s 'Obsolete Font'
- InprocServer32 = s '%MODULE%'
- ProgId = s 'OldFont'
- }
- ForceRemove '{0BE35204-8F91-11CE-9DE3-00AA004BB851}' = s 'CLSID_StdPict'
- {
- CLSID = s 'Standard Picture'
- InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' }
- ProgId = s 'StdPicture'
- }
}
NoRemove Interface
{
@@ -104,7 +86,4 @@ HKCR
ProxyStubClsid32 = s '{00020420-0000-0000-C000-000000000046}'
}
}
- ForceRemove StdFont { CLSID = s '{0BE35203-8F91-11CE-9DE3-00AA004BB851}' }
- ForceRemove OldFont { CLSID = s '{46763EE0-CAB2-11CE-8C20-00AA0051E5D4}' }
- ForceRemove StdPicture { CLSID = s '{0BE35204-8F91-11CE-9DE3-00AA004BB851}' }
}
diff --git a/dlls/oleaut32/oleaut32_ocidl.idl b/dlls/oleaut32/oleaut32_ocidl.idl
index dcd3ea4..9f6b7cf 100644
--- a/dlls/oleaut32/oleaut32_ocidl.idl
+++ b/dlls/oleaut32/oleaut32_ocidl.idl
@@ -17,3 +17,27 @@
*/
#include "ocidl.idl"
+
+[
+ helpstring("Standard Font"),
+ progid("StdFont"),
+ threading(both),
+ uuid(0be35203-8f91-11ce-9de3-00aa004bb851)
+]
+coclass StdFont { interface IFont; }
+
+[
+ helpstring("Obsolete Font"),
+ progid("OldFont"),
+ threading(both),
+ uuid(46763ee0-cab2-11ce-8c20-00aa0051e5d4)
+]
+coclass OldFont { interface IFont; }
+
+[
+ helpstring("Standard Picture"),
+ progid("StdPicture"),
+ threading(apartment),
+ uuid(0be35204-8f91-11ce-9de3-00aa004bb851)
+]
+coclass StdPicture { interface IPicture; }
More information about the wine-cvs
mailing list