uuid: Add CLSID_InProcFreeMarshaler.

Remove its initialisation from ole32.

uuid: Add CLSID_InProcFreeMarshaler.
630e273d · Rob Shearman · Alexandre Julliard · 38a54118 · 630e273d · 630e273d
Commit 630e273d authored Mar 06, 2008 by Rob Shearman Committed by Alexandre Julliard Mar 06, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

compobj_private.h dlls/ole32/compobj_private.h +0 -1

uuid.c dlls/uuid/uuid.c +1 -0

No files found.
--- 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

--- 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);