diff --git a/configure b/configure index fe2cf48b8d4..35bdf9d1f43 100755 --- a/configure +++ b/configure @@ -16792,12 +16792,12 @@ wine_fn_config_test dlls/apphelp/tests apphelp_test wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po wine_fn_config_dll atl enable_atl clean,implib wine_fn_config_test dlls/atl/tests atl_test -wine_fn_config_dll atl100 enable_atl100 implib +wine_fn_config_dll atl100 enable_atl100 clean,implib wine_fn_config_test dlls/atl100/tests atl100_test -wine_fn_config_dll atl110 enable_atl110 -wine_fn_config_dll atl80 enable_atl80 implib +wine_fn_config_dll atl110 enable_atl110 clean +wine_fn_config_dll atl80 enable_atl80 clean,implib wine_fn_config_test dlls/atl80/tests atl80_test -wine_fn_config_dll atl90 enable_atl90 +wine_fn_config_dll atl90 enable_atl90 clean wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib wine_fn_config_dll avifil32 enable_avifil32 clean,implib,po diff --git a/configure.ac b/configure.ac index ba0c927e101..2f291e37f36 100644 --- a/configure.ac +++ b/configure.ac @@ -2702,12 +2702,12 @@ WINE_CONFIG_TEST(dlls/apphelp/tests) WINE_CONFIG_DLL(appwiz.cpl,,[po]) WINE_CONFIG_DLL(atl,,[clean,implib]) WINE_CONFIG_TEST(dlls/atl/tests) -WINE_CONFIG_DLL(atl100,,[implib]) +WINE_CONFIG_DLL(atl100,,[clean,implib]) WINE_CONFIG_TEST(dlls/atl100/tests) -WINE_CONFIG_DLL(atl110) -WINE_CONFIG_DLL(atl80,,[implib]) +WINE_CONFIG_DLL(atl110,,[clean]) +WINE_CONFIG_DLL(atl80,,[clean,implib]) WINE_CONFIG_TEST(dlls/atl80/tests) -WINE_CONFIG_DLL(atl90) +WINE_CONFIG_DLL(atl90,,[clean]) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) WINE_CONFIG_DLL(avifil32,,[clean,implib,po]) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 4f87b271f22..34ae9b84f74 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -9,4 +9,6 @@ C_SRCS = \ atl_ax.c \ registrar.c -IDL_SRCS = atl_classes.idl +IDL_SRCS = \ + atl_classes.idl \ + atl_lib.idl diff --git a/dlls/atl/atl_lib.idl b/dlls/atl/atl_lib.idl new file mode 100644 index 00000000000..918416c5ee2 --- /dev/null +++ b/dlls/atl/atl_lib.idl @@ -0,0 +1,36 @@ +/* + * Copyright 2014 Jacek Caban 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 + */ + +#pragma makedep regtypelib +#pragma makedep register + +import "atliface.idl"; + +[ + uuid(44ec0535-400f-11d0-9dcd-00a0c90391d3), + version(1.0), + helpstring("ATL 2.0 Type Library") +] +library ATLLib +{ + importlib("stdole2.tlb"); + + interface IDocHostUIHandlerDispatch; + interface IAxWinAmbientDispatch; + interface IAxWinAmbientDispatchEx; +} diff --git a/dlls/atl100/Makefile.in b/dlls/atl100/Makefile.in index 35b37ac01bd..916bd8e748e 100644 --- a/dlls/atl100/Makefile.in +++ b/dlls/atl100/Makefile.in @@ -8,3 +8,5 @@ C_SRCS = \ atl.c \ atl_ax.c \ registrar.c + +IDL_SRCS = atl_lib.idl diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in index ed357f6ad7a..ced0f187994 100644 --- a/dlls/atl110/Makefile.in +++ b/dlls/atl110/Makefile.in @@ -7,3 +7,5 @@ C_SRCS = \ atl.c \ atl_ax.c \ registrar.c + +IDL_SRCS = atl_lib.idl diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index 2ada9257315..4b7bbd73f2c 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -10,4 +10,6 @@ C_SRCS = \ atl_ax.c \ registrar.c +IDL_SRCS = atl_lib.idl + RC_SRCS = atl80.rc diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index a5082bc1f69..5fed63bb93d 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -8,4 +8,6 @@ C_SRCS = \ atl_ax.c \ registrar.c +IDL_SRCS = atl_lib.idl + RC_SRCS = atl90.rc