Commit e8c7c068 authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard

actxprxy: Add the start of actxprxy.dll.

The native version of this DLL contains proxy code for various interfaces, but for the moment only servprov.idl is implemented.
parent b9966054
......@@ -15,6 +15,9 @@ dlls/Makedll.rules
dlls/Makeimplib.rules
dlls/Maketest.rules
dlls/activeds/libactiveds.def
dlls/actxprxy/actxprxy_servprov.h
dlls/actxprxy/actxprxy_servprov_i.c
dlls/actxprxy/actxprxy_servprov_p.c
dlls/advapi32/libadvapi32.def
dlls/advapi32/tests/*.ok
dlls/advapi32/tests/advapi32_crosstest.exe
......
......@@ -159,6 +159,7 @@ ALL_MAKEFILES = \
dlls/Makefile \
dlls/acledit/Makefile \
dlls/activeds/Makefile \
dlls/actxprxy/Makefile \
dlls/advapi32/Makefile \
dlls/advapi32/tests/Makefile \
dlls/advpack/Makefile \
......@@ -540,6 +541,7 @@ Makefile: Makefile.in Make.rules
dlls/Makefile: dlls/Makefile.in Make.rules
dlls/acledit/Makefile: dlls/acledit/Makefile.in dlls/Makedll.rules
dlls/activeds/Makefile: dlls/activeds/Makefile.in dlls/Makedll.rules
dlls/actxprxy/Makefile: dlls/actxprxy/Makefile.in dlls/Makedll.rules
dlls/advapi32/Makefile: dlls/advapi32/Makefile.in dlls/Makedll.rules
dlls/advapi32/tests/Makefile: dlls/advapi32/tests/Makefile.in dlls/Maketest.rules
dlls/advpack/Makefile: dlls/advpack/Makefile.in dlls/Makedll.rules
......
......@@ -20527,6 +20527,8 @@ ac_config_files="$ac_config_files dlls/acledit/Makefile"
ac_config_files="$ac_config_files dlls/activeds/Makefile"
ac_config_files="$ac_config_files dlls/actxprxy/Makefile"
ac_config_files="$ac_config_files dlls/advapi32/Makefile"
ac_config_files="$ac_config_files dlls/advapi32/tests/Makefile"
......@@ -21824,6 +21826,7 @@ do
"dlls/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/Makefile" ;;
"dlls/acledit/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/acledit/Makefile" ;;
"dlls/activeds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/activeds/Makefile" ;;
"dlls/actxprxy/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/actxprxy/Makefile" ;;
"dlls/advapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advapi32/Makefile" ;;
"dlls/advapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advapi32/tests/Makefile" ;;
"dlls/advpack/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advpack/Makefile" ;;
......
......@@ -1580,6 +1580,7 @@ AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([dlls/Makefile])
AC_CONFIG_FILES([dlls/acledit/Makefile])
AC_CONFIG_FILES([dlls/activeds/Makefile])
AC_CONFIG_FILES([dlls/actxprxy/Makefile])
AC_CONFIG_FILES([dlls/advapi32/Makefile])
AC_CONFIG_FILES([dlls/advapi32/tests/Makefile])
AC_CONFIG_FILES([dlls/advpack/Makefile])
......
......@@ -18,6 +18,7 @@ EXTRADIRS = @GLU32FILES@ @OPENGLFILES@ @QUARTZFILES@ @XFILES@
BASEDIRS = \
acledit \
activeds \
actxprxy \
advapi32 \
advpack \
amstream \
......
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = actxprxy.dll
IMPORTS = rpcrt4 kernel32 ntdll
EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_CLSID_IS="{ 0xb8da6310, 0xe19b, 0x11d0, { 0x93, 0x3c, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9 } }"
EXTRA_OBJS = dlldata.o
C_SRCS = \
usrmarshal.c
IDL_I_SRCS = \
actxprxy_servprov.idl
IDL_P_SRCS = \
actxprxy_servprov.idl
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend
3 stdcall -private GetProxyDllInfo(ptr ptr)
@ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject(ptr ptr ptr)
@ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer()
/*
* 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);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment