Module: wine Branch: master Commit: 1d311fd4a459c4d904426913e21e1c5e4abcae0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d311fd4a459c4d904426913e2... Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 15 11:41:39 2017 -0500 dsquery: Register CommonQuery coclass. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/dsquery/Makefile.in | 3 +++ dlls/dsquery/dsquery.idl | 23 +++++++++++++++++++++++ include/cmnquery.idl | 12 +++++++++++- 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 47a41cd..18717e8 100755 --- a/configure +++ b/configure @@ -18307,7 +18307,7 @@ wine_fn_config_dll dpwsockx enable_dpwsockx wine_fn_config_dll drmclien enable_drmclien wine_fn_config_dll dsound enable_dsound clean,implib wine_fn_config_test dlls/dsound/tests dsound_test -wine_fn_config_dll dsquery enable_dsquery +wine_fn_config_dll dsquery enable_dsquery clean wine_fn_config_dll dssenh enable_dssenh wine_fn_config_test dlls/dssenh/tests dssenh_test wine_fn_config_dll dswave enable_dswave clean diff --git a/configure.ac b/configure.ac index cd5a50b..f01162b 100644 --- a/configure.ac +++ b/configure.ac @@ -3097,7 +3097,7 @@ WINE_CONFIG_DLL(dpwsockx) WINE_CONFIG_DLL(drmclien) WINE_CONFIG_DLL(dsound,,[clean,implib]) WINE_CONFIG_TEST(dlls/dsound/tests) -WINE_CONFIG_DLL(dsquery) +WINE_CONFIG_DLL(dsquery,,[clean]) WINE_CONFIG_DLL(dssenh) WINE_CONFIG_TEST(dlls/dssenh/tests) WINE_CONFIG_DLL(dswave,,[clean]) diff --git a/dlls/dsquery/Makefile.in b/dlls/dsquery/Makefile.in index 8fbe92d..611e601 100644 --- a/dlls/dsquery/Makefile.in +++ b/dlls/dsquery/Makefile.in @@ -3,3 +3,6 @@ IMPORTS = uuid C_SRCS = \ main.c + +IDL_SRCS = \ + dsquery.idl diff --git a/dlls/dsquery/dsquery.idl b/dlls/dsquery/dsquery.idl new file mode 100644 index 0000000..22300ed --- /dev/null +++ b/dlls/dsquery/dsquery.idl @@ -0,0 +1,23 @@ +/* + * COM Classes for dsquery + * + * Copyright 2017 Zebediah Figura 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 register + +#include "cmnquery.idl" diff --git a/include/cmnquery.idl b/include/cmnquery.idl index 62411fd..2b89f84 100644 --- a/include/cmnquery.idl +++ b/include/cmnquery.idl @@ -18,6 +18,12 @@ import "oaidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ object, uuid(1a3114b8-a62e-11d0-a6c5-00a0c906af45), @@ -76,4 +82,8 @@ interface ICommonQuery : IUnknown HRESULT OpenQueryWindow([in] HWND parent, [in] LPOPENQUERYWINDOW query_window, [out] IDataObject **data_object); } -cpp_quote("DEFINE_GUID(CLSID_CommonQuery, 0x83bc5ec0, 0x6f2a, 0x11d0, 0xa1,0xc4, 0x00,0xaa,0x00,0xc1,0x6e,0x65);") +[ + threading(apartment), + uuid(83bc5ec0-6f2a-11d0-a1c4-00aa00c16e65) +] +coclass CommonQuery { interface ICommonQuery; }