From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 11 Sep 2009 10:28:31 +0000 (+0200)
Subject: actxprxy: Add proxies for activscp.idl.
X-Git-Tag: wine-1.1.30~367
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=bb9fc3fe5f152a7bd52986c40af48a4d2ef319b0;p=wine%2Feterwine.git

actxprxy: Add proxies for activscp.idl.
---

diff --git a/.gitignore b/.gitignore
index 359f44e1b7..944a896764 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,8 +21,9 @@ dlls/*/tests/testlist.c
 dlls/Makedll.rules
 dlls/Makeimplib.rules
 dlls/Maketest.rules
+dlls/actxprxy/actxprxy_activscp.h
+dlls/actxprxy/actxprxy_activscp_p.c
 dlls/actxprxy/actxprxy_servprov.h
-dlls/actxprxy/actxprxy_servprov_i.c
 dlls/actxprxy/actxprxy_servprov_p.c
 dlls/advapi32/svcctl.h
 dlls/advapi32/svcctl_c.c
diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in
index 005ec0f02e..da142ae190 100644
--- a/dlls/actxprxy/Makefile.in
+++ b/dlls/actxprxy/Makefile.in
@@ -3,18 +3,16 @@ 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 } }"
+IMPORTS   = uuid oleaut32 ole32 rpcrt4 kernel32 ntdll
+EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_DELEGATION
 
 EXTRA_OBJS = dlldata.o
 
 C_SRCS = \
 	usrmarshal.c
 
-IDL_I_SRCS = \
-	actxprxy_servprov.idl
-
 IDL_P_SRCS = \
+	actxprxy_activscp.idl \
 	actxprxy_servprov.idl
 
 @MAKE_DLL_RULES@
diff --git a/dlls/actxprxy/actxprxy_activscp.idl b/dlls/actxprxy/actxprxy_activscp.idl
new file mode 100644
index 0000000000..c056a0ebd1
--- /dev/null
+++ b/dlls/actxprxy/actxprxy_activscp.idl
@@ -0,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"