[ros-diffs] [cwittich] 39487: add actxprxy from wine 1.14

Author: cwittich
Date: Sun Feb  8 09:26:59 2009
New Revision: 39487

URL: http://svn.reactos.org/svn/reactos?rev=39487&view=rev
Log:
add actxprxy from wine 1.14

Added:
    trunk/reactos/dll/win32/actxprxy/   (with props)
    trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild   (with props)
    trunk/reactos/dll/win32/actxprxy/actxprxy.spec   (with props)
    trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl   (with props)
    trunk/reactos/dll/win32/actxprxy/usrmarshal.c   (with props)
Modified:
    trunk/reactos/baseaddress.rbuild
    trunk/reactos/boot/bootdata/packages/reactos.dff
    trunk/reactos/dll/win32/win32.rbuild

Modified: trunk/reactos/baseaddress.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=394…
==============================================================================
--- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original)
+++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sun Feb  8 09:26:59 2009
@@ -95,6 +95,7 @@
   <property name="BASEADDRESS_ACLUI" value="0x71550000" />
   <property name="BASEADDRESS_DHCPCSVC" value="0x71650000" />
   <property name="BASEADDRESS_SHDOCVW" value="0x71700000" />
+  <property name="BASEADDRESS_ACTXPRXY" value="0x71800000" />
   <property name="BASEADDRESS_MSWSOCK" value="0x71a30000" />
   <property name="BASEADDRESS_WSOCK32" value="0x71ab0000" />
   <property name="BASEADDRESS_ACLEDIT" value="0x71b70000" />

Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Feb  8 09:26:59
2009
@@ -240,6 +240,7 @@
 dll\win32\activeds\activeds.dll                     1
 dll\win32\advapi32\advapi32.dll                     1
 dll\win32\advpack\advpack.dll                       1
+dll\win32\actxprxy\actxprxy.dll                     1
 dll\win32\atl\atl.dll                               1
 dll\win32\authz\authz.dll                           1
 dll\win32\avifil32\avifil32.dll                     1

Propchange: trunk/reactos/dll/win32/actxprxy/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sun Feb  8 09:26:59 2009
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)

Propchange: trunk/reactos/dll/win32/actxprxy/
------------------------------------------------------------------------------
    bugtraq:message = See issue #%BUGID% for more details.

Propchange: trunk/reactos/dll/win32/actxprxy/
------------------------------------------------------------------------------
    bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: trunk/reactos/dll/win32/actxprxy/
------------------------------------------------------------------------------
    tsvn:logminsize = 10

Added: 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 (added)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] Sun Feb  8 09:26:59
2009
@@ -1,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
+<module name="actxprxy" type="win32dll"
baseaddress="${BASEADDRESS_ACTXPRXY}" installbase="system32"
entrypoint="0" installname="actxprxy.dll"
allowwarnings="true">
+	<autoregister infsection="OleControlDlls"
type="DllRegisterServer" />
+	<importlibrary definition="actxprxy.spec" />
+	<include base="actxprxy">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<include base="actxprxy"
root="intermediate">.</include>
+	<define name="__WINESRC__" />
+	<library>wine</library>
+	<library>actxprxy_interface</library>
+	<library>actxprxy_proxy</library>
+	<library>kernel32</library>
+	<library>ntdll</library>
+	<library>rpcrt4</library>
+	<library>pseh</library>
+	<file>usrmarshal.c</file>
+	<compilerflag>-fno-unit-at-a-time</compilerflag>
+</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>
+	<file>actxprxy_servprov.idl</file>
+</module>
+</group>

Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/actxprxy/actxprxy.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy.spec (added)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy.spec [iso-8859-1] Sun Feb  8 09:26:59 2009
@@ -1,0 +1,5 @@
+3 stdcall -private GetProxyDllInfo(ptr ptr)
+@ stdcall -private DllCanUnloadNow()
+@ stdcall -private DllGetClassObject(ptr ptr ptr)
+@ stdcall -private DllRegisterServer()
+@ stdcall -private DllUnregisterServer()

Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl (added)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl [iso-8859-1] Sun Feb  8
09:26:59 2009
@@ -1,0 +1,1 @@
+#include "servprov.idl"

Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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 (added)
+++ trunk/reactos/dll/win32/actxprxy/usrmarshal.c [iso-8859-1] Sun Feb  8 09:26:59 2009
@@ -1,0 +1,64 @@
+/*
+ * Miscellaneous Marshaling Routines
+ *
+ * Copyright 2006 Robert Shearman (for CodeWeavers)
+ *
+ * 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
+ */
+
+#include <stdarg.h>
+#include <string.h>
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winerror.h"
+#include "objbase.h"
+#include "servprov.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(actxprxy);
+
+HRESULT CALLBACK IServiceProvider_QueryService_Proxy(
+    IServiceProvider* This,
+    REFGUID guidService,
+    REFIID riid,
+    void** ppvObject)
+{
+    TRACE("(%p, %s, %s, %p)\n", This, debugstr_guid(guidService),
+        debugstr_guid(riid), ppvObject);
+
+    return IServiceProvider_RemoteQueryService_Proxy(This, guidService, riid,
+        (IUnknown **)ppvObject);
+}
+
+HRESULT __RPC_STUB IServiceProvider_QueryService_Stub(
+    IServiceProvider* This,
+    REFGUID guidService,
+    REFIID riid,
+    IUnknown** ppvObject)
+{
+    TRACE("(%p, %s, %s, %p)\n", This, debugstr_guid(guidService),
+        debugstr_guid(riid), ppvObject);
+
+    return IServiceProvider_QueryService(This, guidService, riid,
+        (void **)ppvObject);
+}

Propchange: trunk/reactos/dll/win32/actxprxy/usrmarshal.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/win32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev…
==============================================================================
--- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sun Feb  8 09:26:59 2009
@@ -16,6 +16,9 @@
 <directory name="advpack">
 	<xi:include href="advpack/advpack.rbuild" />
 </directory>
+<directory name="actxprxy">
+	<xi:include href="actxprxy/actxprxy.rbuild" />
+</directory>
 <directory name="atl">
 	<xi:include href="atl/atl.rbuild" />
 </directory>