6 Mar
2010
6 Mar
'10
12:05 p.m.
Author: cwittich
Date: Sat Mar 6 13:05:00 2010
New Revision: 45922
URL: http://svn.reactos.org/svn/reactos?rev=45922&view=rev
Log:
[ACTXPRXY]
partially sync actxprxy to wine 1.1.40
(shlobjidl.idl needs fixing!!!)
Added:
trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl (with props)
trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl (with props)
trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl (with props)
trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl (with props)
trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl (with props)
trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl (with props)
trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl (with props)
trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl (with props)
trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl (with props)
Modified:
trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild
trunk/reactos/dll/win32/actxprxy/usrmarshal.c
Modified: trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] Sat Mar 6 13:05:00
2010
@@ -9,20 +9,29 @@
<include base="actxprxy"
root="intermediate">.</include>
<define name="__WINESRC__" />
<library>wine</library>
- <library>actxprxy_interface</library>
<library>actxprxy_proxy</library>
<library>ntdll</library>
<library>rpcrt4</library>
+ <library>ole32</library>
+ <library>oleaut32</library>
+ <library>uuid</library>
<library>pseh</library>
<file>usrmarshal.c</file>
-</module>
-<module name="actxprxy_interface" type="idlinterface">
- <file>actxprxy_servprov.idl</file>
</module>
<module name="actxprxy_proxy" type="rpcproxy">
<define name="__WINESRC__" />
<define name="REGISTER_PROXY_DLL" />
- <define name="PROXY_CLSID_IS">"{ 0xb8da6310, 0xe19b, 0x11d0, {
0x93, 0x3c, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9 } }"</define>
+ <define name="PROXY_DELEGATION" />
+ <file>actxprxy_activscp.idl</file>
+ <file>actxprxy_comcat.idl</file>
+ <file>actxprxy_docobj.idl</file>
+ <file>actxprxy_hlink.idl</file>
+ <file>actxprxy_htiframe.idl</file>
+ <file>actxprxy_objsafe.idl</file>
+ <file>actxprxy_ocmm.idl</file>
<file>actxprxy_servprov.idl</file>
+ <!-- file>actxprxy_shobjidl.idl</file -->
+ <file>actxprxy_urlhist.idl
+</file>
</module>
</group>
Added: trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl (added)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl [iso-8859-1] Sat Mar 6
13:05:00 2010
@@ -1,0 +1,21 @@
+/*
+ * Copyright 2009 Alexandre Julliard
+ *
+ * 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
+ */
+
+/* just a wrapper for activscp.idl */
+
+#include "activscp.idl"
Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl (added)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl [iso-8859-1] Sat Mar 6 13:05:00
2010
@@ -1,0 +1,21 @@
+/*
+ * Copyright 2009 Alexandre Julliard
+ *
+ * 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
+ */
+
+/* just a wrapper for comcat.idl */
+
+#include "comcat.idl"
Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl (added)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl [iso-8859-1] Sat Mar 6 13:05:00
2010
@@ -1,0 +1,21 @@
+/*
+ * Copyright 2009 Alexandre Julliard
+ *
+ * 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
+ */
+
+/* just a wrapper for docobj.idl */
+
+#include "docobj.idl"
Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl (added)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl [iso-8859-1] Sat Mar 6 13:05:00
2010
@@ -1,0 +1,21 @@
+/*
+ * Copyright 2009 Alexandre Julliard
+ *
+ * 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
+ */
+
+/* just a wrapper for hlink.idl */
+
+#include "hlink.idl"
Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl (added)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl [iso-8859-1] Sat Mar 6
13:05:00 2010
@@ -1,0 +1,21 @@
+/*
+ * Copyright 2009 Alexandre Julliard
+ *
+ * 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
+ */
+
+/* just a wrapper for htiframe.idl */
+
+#include "htiframe.idl"
Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl (added)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl [iso-8859-1] Sat Mar 6 13:05:00
2010
@@ -1,0 +1,21 @@
+/*
+ * Copyright 2009 Alexandre Julliard
+ *
+ * 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
+ */
+
+/* just a wrapper for objsafe.idl */
+
+#include "objsafe.idl"
Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl (added)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl [iso-8859-1] Sat Mar 6 13:05:00
2010
@@ -1,0 +1,21 @@
+/*
+ * Copyright 2009 Alexandre Julliard
+ *
+ * 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
+ */
+
+/* just a wrapper for ocmm.idl */
+
+#include "ocmm.idl"
Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl (added)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl [iso-8859-1] Sat Mar 6
13:05:00 2010
@@ -1,0 +1,21 @@
+/*
+ * Copyright 2009 Alexandre Julliard
+ *
+ * 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
+ */
+
+/* just a wrapper for shobjidl.idl */
+
+#include "shobjidl.idl"
Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl (added)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl [iso-8859-1] Sat Mar 6 13:05:00
2010
@@ -1,0 +1,21 @@
+/*
+ * Copyright 2009 Alexandre Julliard
+ *
+ * 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
+ */
+
+/* just a wrapper for urlhist.idl */
+
+#include "urlhist.idl"
Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/win32/actxprxy/usrmarshal.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/usrmars…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/usrmarshal.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/usrmarshal.c [iso-8859-1] Sat Mar 6 13:05:00 2010
@@ -32,6 +32,8 @@
#include "winerror.h"
#include "objbase.h"
#include "servprov.h"
+#include "comcat.h"
+#include "docobj.h"
#include "wine/debug.h"
@@ -62,3 +64,107 @@
return IServiceProvider_QueryService(This, guidService, riid,
(void **)ppvObject);
}
+
+HRESULT CALLBACK ICatInformation_EnumClassesOfCategories_Proxy(
+ ICatInformation *This,
+ ULONG cImplemented,
+ CATID rgcatidImpl[],
+ ULONG cRequired,
+ CATID rgcatidReq[],
+ IEnumCLSID** ppenumClsid )
+{
+ TRACE("(%p)\n", This);
+ return ICatInformation_RemoteEnumClassesOfCategories_Proxy( This, cImplemented,
rgcatidImpl,
+ cRequired, rgcatidReq,
ppenumClsid );
+}
+
+HRESULT __RPC_STUB ICatInformation_EnumClassesOfCategories_Stub(
+ ICatInformation *This,
+ ULONG cImplemented,
+ CATID rgcatidImpl[],
+ ULONG cRequired,
+ CATID rgcatidReq[],
+ IEnumCLSID** ppenumClsid )
+{
+ TRACE("(%p)\n", This);
+ return ICatInformation_EnumClassesOfCategories( This, cImplemented, rgcatidImpl,
+ cRequired, rgcatidReq, ppenumClsid
);
+}
+
+HRESULT CALLBACK ICatInformation_IsClassOfCategories_Proxy(
+ ICatInformation *This,
+ REFCLSID rclsid,
+ ULONG cImplemented,
+ CATID rgcatidImpl[],
+ ULONG cRequired,
+ CATID rgcatidReq[] )
+{
+ TRACE("(%p)\n", This);
+ return ICatInformation_RemoteIsClassOfCategories_Proxy( This, rclsid, cImplemented,
rgcatidImpl,
+ cRequired, rgcatidReq );
+}
+
+HRESULT __RPC_STUB ICatInformation_IsClassOfCategories_Stub(
+ ICatInformation *This,
+ REFCLSID rclsid,
+ ULONG cImplemented,
+ CATID rgcatidImpl[],
+ ULONG cRequired,
+ CATID rgcatidReq[] )
+{
+ TRACE("(%p)\n", This);
+ return ICatInformation_IsClassOfCategories( This, rclsid, cImplemented, rgcatidImpl,
+ cRequired, rgcatidReq );
+}
+
+HRESULT CALLBACK IPrint_Print_Proxy(
+ IPrint *This,
+ DWORD grfFlags,
+ DVTARGETDEVICE **pptd,
+ PAGESET **ppPageSet,
+ STGMEDIUM *pstgmOptions,
+ IContinueCallback *pcallback,
+ LONG nFirstPage,
+ LONG *pcPagesPrinted,
+ LONG *pnLastPage )
+{
+ TRACE("(%p)\n", This);
+ return IPrint_RemotePrint_Proxy( This, grfFlags, pptd, ppPageSet, (RemSTGMEDIUM
*)pstgmOptions,
+ pcallback, nFirstPage, pcPagesPrinted, pnLastPage
);
+}
+
+HRESULT __RPC_STUB IPrint_Print_Stub(
+ IPrint *This,
+ DWORD grfFlags,
+ DVTARGETDEVICE **pptd,
+ PAGESET **ppPageSet,
+ RemSTGMEDIUM *pstgmOptions,
+ IContinueCallback *pcallback,
+ LONG nFirstPage,
+ LONG *pcPagesPrinted,
+ LONG *pnLastPage )
+{
+ TRACE("(%p)\n", This);
+ return IPrint_Print( This, grfFlags, pptd, ppPageSet, (STGMEDIUM *)pstgmOptions,
+ pcallback, nFirstPage, pcPagesPrinted, pnLastPage );
+}
+
+HRESULT CALLBACK IEnumOleDocumentViews_Next_Proxy(
+ IEnumOleDocumentViews *This,
+ ULONG cViews,
+ IOleDocumentView **rgpView,
+ ULONG *pcFetched )
+{
+ TRACE("(%p)\n", This);
+ return IEnumOleDocumentViews_RemoteNext_Proxy( This, cViews, rgpView, pcFetched );
+}
+
+HRESULT __RPC_STUB IEnumOleDocumentViews_Next_Stub(
+ IEnumOleDocumentViews *This,
+ ULONG cViews,
+ IOleDocumentView **rgpView,
+ ULONG *pcFetched )
+{
+ TRACE("(%p)\n", This);
+ return IEnumOleDocumentViews_Next( This, cViews, rgpView, pcFetched );
+}