Rob Shearman : uuid: Add CLSID_InProcFreeMarshaler.

Alexandre Julliard julliard at winehq.org
Thu Mar 6 11:08:37 CST 2008


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

Author: Rob Shearman <rob at codeweavers.com>
Date:   Thu Mar  6 15:02:00 2008 +0000

uuid: Add CLSID_InProcFreeMarshaler.

Remove its initialisation from ole32.

---

 dlls/ole32/compobj_private.h |    1 -
 dlls/uuid/uuid.c             |    1 +
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h
index 34d4cdb..5a954b9 100644
--- a/dlls/ole32/compobj_private.h
+++ b/dlls/ole32/compobj_private.h
@@ -43,7 +43,6 @@ typedef struct apartment APARTMENT;
 
 DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 );
 DEFINE_OLEGUID( CLSID_PSFactoryBuffer, 0x00000320, 0, 0 );
-DEFINE_OLEGUID( CLSID_InProcFreeMarshaler, 0x0000033a, 0, 0 );
 
 /* signal to stub manager that this is a rem unknown object */
 #define MSHLFLAGSP_REMUNKNOWN   0x80000000
diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c
index b00a2a7..3fc97ee 100644
--- a/dlls/uuid/uuid.c
+++ b/dlls/uuid/uuid.c
@@ -102,3 +102,4 @@ DEFINE_GUID(CLSID_ComBinding,             0x00000328,0x0000,0x0000,0xc0,0x00,0x0
 DEFINE_GUID(CLSID_StdEvent,               0x0000032b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
 DEFINE_GUID(CLSID_ManualResetEvent,       0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
 DEFINE_GUID(CLSID_SynchronizeContainer,   0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
+DEFINE_GUID(CLSID_InProcFreeMarshaler,    0x0000033a,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);




More information about the wine-cvs mailing list