ole32: Add a widl-generated proxy file for objidl.idl.

.gitignore

@@ -73,6 +73,8 @@ dlls/ole32/dcom.h
 dlls/ole32/dcom_p.c
 dlls/ole32/irot.h
 dlls/ole32/irot_c.c
+dlls/ole32/ole32_objidl.h
+dlls/ole32/ole32_objidl_p.c
 dlls/ole32/ole32_unknwn.h
 dlls/ole32/ole32_unknwn_p.c
 dlls/oleaut32/oleaut32_oaidl.h

dlls/ole32/Makefile.in

@@ -69,6 +69,7 @@ IDL_C_SRCS = \
 
 IDL_P_SRCS = \
 	dcom.idl \
+	ole32_objidl.idl \
 	ole32_unknwn.idl
 
 @MAKE_DLL_RULES@

dlls/ole32/ole32_objidl.idl

+/*
+ * Copyright 2007 Google (Dan Hipschman)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* The header file generated from this includes rpc.h, which ends up
+   including objidl.h at some point.  This will cause all sorts of errors
+   so the easiest thing to do is just comment out our entire header.  */
+
+cpp_quote("#if 0    /* ole32_objidl.idl hack */")
+#include "objidl.idl"
+cpp_quote("#endif   /* ole32_objidl.idl hack */")

dlls/ole32/oleproxy.c

@@ -50,10 +50,12 @@ static CStdPSFactoryBuffer PSFactoryBuffer;
 CSTDSTUBBUFFERRELEASE(&PSFactoryBuffer)
 
 extern const ExtendedProxyFileInfo dcom_ProxyFileInfo;
+extern const ExtendedProxyFileInfo ole32_objidl_ProxyFileInfo;
 extern const ExtendedProxyFileInfo ole32_unknwn_ProxyFileInfo;
 
 static const ProxyFileInfo *OLE32_ProxyFileList[] = {
   &dcom_ProxyFileInfo,
+  &ole32_objidl_ProxyFileInfo,
   &ole32_unknwn_ProxyFileInfo,
   NULL
 };

dlls/ole32/tests/moniker.c

@@ -571,26 +571,18 @@ static void test_ROT(void)
     /* try with our own moniker that doesn't support IROTData */
     hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE,
         (IUnknown*)&Test_ClassFactory, &MonikerNoROTData, &dwCookie);
-    todo_wine { /* only fails because of lack of IMoniker marshaling */
     ok_ole_success(hr, IRunningObjectTable_Register);
-    }
     ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list);
 
-    todo_wine { /* only fails because of lack of IMoniker marshaling */
     ok_more_than_one_lock();
-    }
 
     expected_method_list = methods_isrunning_no_ROTData;
     hr = IRunningObjectTable_IsRunning(pROT, &MonikerNoROTData);
-    todo_wine { /* only fails because of lack of IMoniker marshaling */
     ok_ole_success(hr, IRunningObjectTable_IsRunning);
-    }
     ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list);
 
     hr = IRunningObjectTable_Revoke(pROT, dwCookie);
-    todo_wine { /* only fails because of lack of IMoniker marshaling */
     ok_ole_success(hr, IRunningObjectTable_Revoke);
-    }
 
     ok_no_locks();
 
@@ -598,26 +590,18 @@ static void test_ROT(void)
     /* try with our own moniker */
     hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE,
         (IUnknown*)&Test_ClassFactory, &Moniker, &dwCookie);
-    todo_wine { /* only fails because of lack of IMoniker marshaling */
     ok_ole_success(hr, IRunningObjectTable_Register);
-    }
     ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list);
 
-    todo_wine { /* only fails because of lack of IMoniker marshaling */
     ok_more_than_one_lock();
-    }
 
     expected_method_list = methods_isrunning;
     hr = IRunningObjectTable_IsRunning(pROT, &Moniker);
-    todo_wine { /* only fails because of lack of IMoniker marshaling */
     ok_ole_success(hr, IRunningObjectTable_IsRunning);
-    }
     ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list);
 
     hr = IRunningObjectTable_Revoke(pROT, dwCookie);
-    todo_wine { /* only fails because of lack of IMoniker marshaling */
     ok_ole_success(hr, IRunningObjectTable_Revoke);
-    }
 
     ok_no_locks();