Module: wine Branch: master Commit: 9a5141b32590fcdec8a4b96d8822ea4b25072392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5141b32590fcdec8a4b96d88...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Aug 1 14:26:36 2011 +0200
msdaps: Specify the PSFactoryBuffer class in the idl files.
---
.gitignore | 2 -- dlls/msdaps/Makefile.in | 6 +----- dlls/msdaps/main.c | 1 + dlls/msdaps/msdaps.idl | 6 ++++++ dlls/msdaps/row_server.idl | 7 +++++++ 5 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore index ed67e11..8a77f70 100644 --- a/.gitignore +++ b/.gitignore @@ -67,10 +67,8 @@ dlls/libkernel.def dlls/libwinspool.def dlls/libxinput.def dlls/msdaps/msdaps.h -dlls/msdaps/msdaps_i.c dlls/msdaps/msdaps_p.c dlls/msdaps/row_server.h -dlls/msdaps/row_server_i.c dlls/msdaps/row_server_p.c dlls/mshtml.tlb/mshtml_tlb.tlb dlls/mshtml/nsiface.h diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index 01b0b72..3f3d619 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -1,6 +1,6 @@ MODULE = msdaps.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 -EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID_IS="{ 0x06210e88, 0x01f5, 0x11d1, { 0xb5, 0x12, 0x00, 0x80, 0xc7, 0x81, 0xc3, 0x84 } }" -DENTRY_PREFIX=msdaps_ +EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_ EXTRAIDLFLAGS = --win32-align=2
EXTRA_OBJS = dlldata.o @@ -10,10 +10,6 @@ C_SRCS = \ row_server.c \ usrmarshal.c
-IDL_I_SRCS = \ - msdaps.idl \ - row_server.idl - IDL_P_SRCS = \ msdaps.idl \ row_server.idl diff --git a/dlls/msdaps/main.c b/dlls/msdaps/main.c index b673b58..14c6c01 100644 --- a/dlls/msdaps/main.c +++ b/dlls/msdaps/main.c @@ -29,6 +29,7 @@ #include "wingdi.h" #include "winuser.h" #include "winerror.h" +#include "initguid.h" #include "objbase.h" #include "oleauto.h" #define DBINITCONSTANTS diff --git a/dlls/msdaps/msdaps.idl b/dlls/msdaps/msdaps.idl index c0a8e11..dbbe75c 100644 --- a/dlls/msdaps/msdaps.idl +++ b/dlls/msdaps/msdaps.idl @@ -1 +1,7 @@ #include "oledb.idl" + +[ + threading(both), + uuid(06210e88-01f5-11d1-b512-0080c781c384) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/msdaps/row_server.idl b/dlls/msdaps/row_server.idl index 6fb49b0..afe9463 100644 --- a/dlls/msdaps/row_server.idl +++ b/dlls/msdaps/row_server.idl @@ -20,6 +20,13 @@
import "oledb.idl";
+ +[ + threading(both), + uuid(06210e88-01f5-11d1-b512-0080c781c384) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } + [ object, uuid(38248178-cf6d-11de-abe5-000c2916d865),