Module: wine Branch: master Commit: df31247ede0f0fb99971b21193e81cb159cd9d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df31247ede0f0fb99971b21193...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Aug 1 14:27:00 2011 +0200
oleaut32: Specify the PSFactoryBuffer class in the idl files.
---
dlls/oleaut32/Makefile.in | 3 +-- dlls/oleaut32/oleaut.c | 1 + dlls/oleaut32/oleaut32_oaidl.idl | 6 ++++++ dlls/oleaut32/oleaut32_ocidl.idl | 6 ++++++ 4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index de61a25..ca64fc9 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -3,8 +3,7 @@ IMPORTLIB = oleaut32 IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 urlmon windowscodecs EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H \ - -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL \ - -DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}" + -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer
C_SRCS = \ connpt.c \ diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 2a3257f..1fe6dcf 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -35,6 +35,7 @@ #include "oleauto.h" #include "initguid.h" #include "typelib.h" +#include "oleaut32_oaidl.h"
#include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/oleaut32/oleaut32_oaidl.idl b/dlls/oleaut32/oleaut32_oaidl.idl index 320e7ec..3574d08 100644 --- a/dlls/oleaut32/oleaut32_oaidl.idl +++ b/dlls/oleaut32/oleaut32_oaidl.idl @@ -23,3 +23,9 @@ cpp_quote("#if 0 /* oleaut32_oaidl.idl hack */") #include "oaidl.idl" cpp_quote("#endif /* oleaut32_oaidl.idl hack */") + +[ + threading(both), + uuid(b196b286-bab4-101a-b69c-00aa00341d07) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/oleaut32/oleaut32_ocidl.idl b/dlls/oleaut32/oleaut32_ocidl.idl index 9f6b7cf..514e5d9 100644 --- a/dlls/oleaut32/oleaut32_ocidl.idl +++ b/dlls/oleaut32/oleaut32_ocidl.idl @@ -19,6 +19,12 @@ #include "ocidl.idl"
[ + threading(both), + uuid(b196b286-bab4-101a-b69c-00aa00341d07) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } + +[ helpstring("Standard Font"), progid("StdFont"), threading(both),