Fixed a few problems caused by the new objidl.idl.

dlls/ole32/bindctx.c

@@ -68,8 +68,8 @@ static ULONG   WINAPI BindCtxImpl_Release(IBindCtx* iface);
 static HRESULT WINAPI BindCtxImpl_RegisterObjectBound(IBindCtx* iface,IUnknown* punk);
 static HRESULT WINAPI BindCtxImpl_RevokeObjectBound(IBindCtx* iface, IUnknown* punk);
 static HRESULT WINAPI BindCtxImpl_ReleaseBoundObjects(IBindCtx* iface);
-static HRESULT WINAPI BindCtxImpl_SetBindOptions(IBindCtx* iface,LPBIND_OPTS2 pbindopts);
-static HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,LPBIND_OPTS2 pbindopts);
+static HRESULT WINAPI BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts);
+static HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts);
 static HRESULT WINAPI BindCtxImpl_GetRunningObjectTable(IBindCtx* iface,IRunningObjectTable** pprot);
 static HRESULT WINAPI BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown* punk);
 static HRESULT WINAPI BindCtxImpl_GetObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown** punk);
@@ -308,7 +308,7 @@ HRESULT WINAPI BindCtxImpl_ReleaseBoundObjects(IBindCtx* iface)
 /******************************************************************************
  *        BindCtx_SetBindOptions
  ******************************************************************************/
-HRESULT WINAPI BindCtxImpl_SetBindOptions(IBindCtx* iface,LPBIND_OPTS2 pbindopts)
+HRESULT WINAPI BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts)
 {
     ICOM_THIS(BindCtxImpl,iface);
 
@@ -329,7 +329,7 @@ HRESULT WINAPI BindCtxImpl_SetBindOptions(IBindCtx* iface,LPBIND_OPTS2 pbindopts
 /******************************************************************************
  *        BindCtx_GetBindOptions
  ******************************************************************************/
-HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,LPBIND_OPTS2 pbindopts)
+HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts)
 {
     ICOM_THIS(BindCtxImpl,iface);
 

dlls/ole32/ftmarshal.c

@@ -26,10 +26,7 @@
 #include <assert.h>
 
 #include "winbase.h"
-
 #include "objbase.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_marshal.h"
 
 #include "wine/debug.h"
 

dlls/ole32/ifs.c

@@ -456,18 +456,16 @@ static int WINAPI IMallocSpy_fnPostDidAlloc(LPMALLOCSPY iface, void* pRequest, B
     return fActual;
 }
 
-static int WINAPI IMallocSpy_fnPreHeapMinimize(LPMALLOCSPY iface)
+static void WINAPI IMallocSpy_fnPreHeapMinimize(LPMALLOCSPY iface)
 {
     ICOM_THIS (_MallocSpy, iface);
     TRACE ("(%p)->()\n", This);
-    return 0;
 }
 
-static int WINAPI IMallocSpy_fnPostHeapMinimize(LPMALLOCSPY iface)
+static void WINAPI IMallocSpy_fnPostHeapMinimize(LPMALLOCSPY iface)
 {
     ICOM_THIS (_MallocSpy, iface);
     TRACE ("(%p)->()\n", This);
-    return 0;
 }
 
 static void MallocSpyDumpLeaks() {

dlls/ole32/marshal.c

@@ -35,12 +35,6 @@
 #include "wownt32.h"
 #include "wtypes.h"
 #include "wine/unicode.h"
-#include "wine/obj_base.h"
-#include "wine/obj_clientserver.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_marshal.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_channel.h"
 #include "wine/winbase16.h"
 #include "compobj_private.h"
 #include "ifs.h"
@@ -49,6 +43,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
+extern const CLSID CLSID_DfMarshal;
+
 /* Marshaling just passes a unique identifier to the remote client,
  * that makes it possible to find the passed interface again.
  *

dlls/ole32/ole16.c

@@ -39,16 +39,9 @@
 #include "wownt32.h"
 #include "wtypes.h"
 #include "wine/unicode.h"
-#include "wine/obj_base.h"
-#include "wine/obj_clientserver.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_marshal.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_channel.h"
 #include "wine/winbase16.h"
 #include "compobj_private.h"
 #include "ifs.h"
-#include "wine/winbase16.h"
 
 #include "wine/debug.h"
 

dlls/ole32/oleproxy.c

@@ -44,9 +44,6 @@
 #include "winerror.h"
 #include "winreg.h"
 #include "wtypes.h"
-#include "wine/obj_base.h"
-#include "wine/obj_marshal.h"
-#include "wine/obj_channel.h"
 
 #include "compobj_private.h"
 
@@ -54,6 +51,9 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
+const CLSID CLSID_DfMarshal       = { 0x0000030b, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} };
+const CLSID CLSID_PSFactoryBuffer = { 0x00000320, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} };
+
 /* From: http://msdn.microsoft.com/library/en-us/com/cmi_m_4lda.asp
  *
  * The first time a client requests a pointer to an interface on a

dlls/ole32/rpc.c

@@ -35,12 +35,6 @@
 #include "wownt32.h"
 #include "wtypes.h"
 #include "wine/unicode.h"
-#include "wine/obj_base.h"
-#include "wine/obj_clientserver.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_marshal.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_channel.h"
 #include "wine/winbase16.h"
 #include "compobj_private.h"
 #include "ifs.h"