December 2008 - Wine-Commits

Hans Leidekker : wuapi: Register interfaces.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 0c9b2c3201df5127ed50d27d2d39fdcfe173f3a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9b2c3201df5127ed50d27d2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 16 16:43:25 2008 +0100 wuapi: Register interfaces. --- dlls/wuapi/Makefile.in | 3 +- dlls/wuapi/regsvr.c | 424 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wuapi/wuapi.spec | 4 +- tools/wine.inf.in | 1 + 4 files changed, 429 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c9b2c3201df5127ed50d…

1 0

Hans Leidekker : wuapi: Add class factory.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 03b0c69abd100b6198c15ff181c544a6456bcb29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b0c69abd100b6198c15ff18… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 16 16:43:11 2008 +0100 wuapi: Add class factory. --- dlls/wuapi/main.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wuapi/wuapi.spec | 4 +- 2 files changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c index 7076024..18a86bc 100644 --- a/dlls/wuapi/main.c +++ b/dlls/wuapi/main.c @@ -18,17 +18,101 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "ole2.h" +#include "wuapi.h" #include "wine/debug.h" +#include "wuapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(wuapi); +typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); + +typedef struct _wucf +{ + const struct IClassFactoryVtbl *vtbl; + fnCreateInstance pfnCreateInstance; +} wucf; + +static inline wucf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return (wucf *)((char *)iface - FIELD_OFFSET( wucf, vtbl )); +} + +static HRESULT WINAPI wucf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI wucf_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI wucf_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI wucf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOuter, + REFIID riid, LPVOID *ppobj ) +{ + wucf *This = impl_from_IClassFactory( iface ); + HRESULT r; + IUnknown *punk; + + TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + if (pOuter) + return CLASS_E_NOAGGREGATION; + + r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk ); + if (FAILED(r)) + return r; + + r = IUnknown_QueryInterface( punk, riid, ppobj ); + if (FAILED(r)) + return r; + + IUnknown_Release( punk ); + return r; +} + +static HRESULT WINAPI wucf_LockServer( IClassFactory *iface, BOOL dolock ) +{ + FIXME("(%p)->(%d)\n", iface, dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl wucf_vtbl = +{ + wucf_QueryInterface, + wucf_AddRef, + wucf_Release, + wucf_CreateInstance, + wucf_LockServer +}; + +static wucf updatecf = { &wucf_vtbl, UpdateSession_create }; + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) { switch(reason) @@ -43,3 +127,22 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) } return TRUE; } + +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) +{ + IClassFactory *cf = NULL; + + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + if (IsEqualGUID( rclsid, &CLSID_UpdateSession )) + cf = (IClassFactory *)&updatecf.vtbl; + + if (!cf) return CLASS_E_CLASSNOTAVAILABLE; + return IClassFactory_QueryInterface( cf, iid, ppv ); +} + +HRESULT WINAPI DllCanUnloadNow( void ) +{ + FIXME("\n"); + return S_FALSE; +} diff --git a/dlls/wuapi/wuapi.spec b/dlls/wuapi/wuapi.spec index c5fc87a..c534b4f 100644 --- a/dlls/wuapi/wuapi.spec +++ b/dlls/wuapi/wuapi.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllRegisterServer @ stub DllUnregisterServer

1 0

Hans Leidekker : wuapi: Add a stub implementation of IUpdateSession.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 5ae3e3cfa2bb0ad4d275b3b2a9d6970026c9f57e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae3e3cfa2bb0ad4d275b3b2a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 16 16:42:58 2008 +0100 wuapi: Add a stub implementation of IUpdateSession. --- dlls/wuapi/Makefile.in | 1 + dlls/wuapi/session.c | 236 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wuapi/wuapi_private.h | 23 +++++ 3 files changed, 260 insertions(+), 0 deletions(-) diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index c3fae00..3de5b6a 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ installer.c \ main.c \ searcher.c \ + session.c \ updates.c @MAKE_DLL_RULES@ diff --git a/dlls/wuapi/session.c b/dlls/wuapi/session.c new file mode 100644 index 0000000..5f163c7 --- /dev/null +++ b/dlls/wuapi/session.c @@ -0,0 +1,236 @@ +/* + * IUpdateSession implementation + * + * Copyright 2008 Hans Leidekker + * + * 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 + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "wuapi.h" + +#include "wine/debug.h" +#include "wuapi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + +typedef struct _update_session +{ + const struct IUpdateSessionVtbl *vtbl; + LONG refs; +} update_session; + +static inline update_session *impl_from_IUpdateSession( IUpdateSession *iface ) +{ + return (update_session *)((char *)iface - FIELD_OFFSET( update_session, vtbl )); +} + +static ULONG WINAPI update_session_AddRef( + IUpdateSession *iface ) +{ + update_session *update_session = impl_from_IUpdateSession( iface ); + return InterlockedIncrement( &update_session->refs ); +} + +static ULONG WINAPI update_session_Release( + IUpdateSession *iface ) +{ + update_session *update_session = impl_from_IUpdateSession( iface ); + LONG refs = InterlockedDecrement( &update_session->refs ); + if (!refs) + { + TRACE("destroying %p\n", update_session); + HeapFree( GetProcessHeap(), 0, update_session ); + } + return refs; +} + +static HRESULT WINAPI update_session_QueryInterface( + IUpdateSession *iface, + REFIID riid, + void **ppvObject ) +{ + update_session *This = impl_from_IUpdateSession( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_IUpdateSession ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IUpdateSession_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI update_session_GetTypeInfoCount( + IUpdateSession *iface, + UINT *pctinfo ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_session_GetTypeInfo( + IUpdateSession *iface, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_session_GetIDsOfNames( + IUpdateSession *iface, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_session_Invoke( + IUpdateSession *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_session_get_ClientApplicationID( + IUpdateSession *This, + BSTR *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_session_put_ClientApplicationID( + IUpdateSession *This, + BSTR value ) +{ + FIXME("%p, %s\n", This, debugstr_w(value)); + return S_OK; +} + +static HRESULT WINAPI update_session_get_ReadOnly( + IUpdateSession *This, + VARIANT_BOOL *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_session_get_WebProxy( + IUpdateSession *This, + IWebProxy **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_session_put_WebProxy( + IUpdateSession *This, + IWebProxy *value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_session_CreateUpdateSearcher( + IUpdateSession *This, + IUpdateSearcher **retval ) +{ + TRACE("%p\n", This); + return UpdateSearcher_create( NULL, (LPVOID *)retval ); +} + +static HRESULT WINAPI update_session_CreateUpdateDownloader( + IUpdateSession *This, + IUpdateDownloader **retval ) +{ + TRACE("%p\n", This); + return UpdateDownloader_create( NULL, (LPVOID *)retval ); +} + +static HRESULT WINAPI update_session_CreateUpdateInstaller( + IUpdateSession *This, + IUpdateInstaller **retval ) +{ + TRACE("%p\n", This); + return UpdateInstaller_create( NULL, (LPVOID *)retval ); +} + +static const struct IUpdateSessionVtbl update_session_vtbl = +{ + update_session_QueryInterface, + update_session_AddRef, + update_session_Release, + update_session_GetTypeInfoCount, + update_session_GetTypeInfo, + update_session_GetIDsOfNames, + update_session_Invoke, + update_session_get_ClientApplicationID, + update_session_put_ClientApplicationID, + update_session_get_ReadOnly, + update_session_get_WebProxy, + update_session_put_WebProxy, + update_session_CreateUpdateSearcher, + update_session_CreateUpdateDownloader, + update_session_CreateUpdateInstaller +}; + +HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + update_session *session; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + session = HeapAlloc( GetProcessHeap(), 0, sizeof(*session) ); + if (!session) return E_OUTOFMEMORY; + + session->vtbl = &update_session_vtbl; + session->refs = 1; + + *ppObj = &session->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} diff --git a/dlls/wuapi/wuapi_private.h b/dlls/wuapi/wuapi_private.h new file mode 100644 index 0000000..9c10daf --- /dev/null +++ b/dlls/wuapi/wuapi_private.h @@ -0,0 +1,23 @@ +/* + * Copyright 2008 Hans Leidekker 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 + */ + +extern HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ); +extern HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ); +extern HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ); +extern HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ); +extern HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj );

1 0

Hans Leidekker : wuapi: Add a stub implementation of IUpdateSearcher.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: e614df5583fce36bca80c891627e107f8e2925f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e614df5583fce36bca80c8916… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 16 16:42:35 2008 +0100 wuapi: Add a stub implementation of IUpdateSearcher. --- dlls/wuapi/Makefile.in | 3 +- dlls/wuapi/searcher.c | 257 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 259 insertions(+), 1 deletions(-) diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index e870d78..72de377 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -9,7 +9,8 @@ IMPORTS = uuid kernel32 C_SRCS = \ downloader.c \ installer.c \ - main.c + main.c \ + searcher.c @MAKE_DLL_RULES@ diff --git a/dlls/wuapi/searcher.c b/dlls/wuapi/searcher.c new file mode 100644 index 0000000..8105681 --- /dev/null +++ b/dlls/wuapi/searcher.c @@ -0,0 +1,257 @@ +/* + * IUpdateSearcher implementation + * + * Copyright 2008 Hans Leidekker + * + * 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 + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "wuapi.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + +typedef struct _update_searcher +{ + const struct IUpdateSearcherVtbl *vtbl; + LONG refs; +} update_searcher; + +static inline update_searcher *impl_from_IUpdateSearcher( IUpdateSearcher *iface ) +{ + return (update_searcher *)((char *)iface - FIELD_OFFSET( update_searcher, vtbl )); +} + +static ULONG WINAPI update_searcher_AddRef( + IUpdateSearcher *iface ) +{ + update_searcher *update_searcher = impl_from_IUpdateSearcher( iface ); + return InterlockedIncrement( &update_searcher->refs ); +} + +static ULONG WINAPI update_searcher_Release( + IUpdateSearcher *iface ) +{ + update_searcher *update_searcher = impl_from_IUpdateSearcher( iface ); + LONG refs = InterlockedDecrement( &update_searcher->refs ); + if (!refs) + { + TRACE("destroying %p\n", update_searcher); + HeapFree( GetProcessHeap(), 0, update_searcher ); + } + return refs; +} + +static HRESULT WINAPI update_searcher_QueryInterface( + IUpdateSearcher *iface, + REFIID riid, + void **ppvObject ) +{ + update_searcher *This = impl_from_IUpdateSearcher( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_IUpdateSearcher ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IUpdateSearcher_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI update_searcher_GetTypeInfoCount( + IUpdateSearcher *iface, + UINT *pctinfo ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_GetTypeInfo( + IUpdateSearcher *iface, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_GetIDsOfNames( + IUpdateSearcher *iface, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_Invoke( + IUpdateSearcher *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_get_CanAutomaticallyUpgradeService( + IUpdateSearcher *This, + VARIANT_BOOL *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_put_CanAutomaticallyUpgradeService( + IUpdateSearcher *This, + VARIANT_BOOL value ) +{ + FIXME("%p, %d\n", This, value); + return S_OK; +} + +static HRESULT WINAPI update_searcher_get_ClientApplicationID( + IUpdateSearcher *This, + BSTR *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_put_ClientApplicationID( + IUpdateSearcher *This, + BSTR value ) +{ + FIXME("%p, %s\n", This, debugstr_w(value)); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_get_IncludePotentiallySupersededUpdates( + IUpdateSearcher *This, + VARIANT_BOOL *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_put_IncludePotentiallySupersededUpdates( + IUpdateSearcher *This, + VARIANT_BOOL value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_get_ServerSelection( + IUpdateSearcher *This, + ServerSelection *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_put_ServerSelection( + IUpdateSearcher *This, + ServerSelection value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_BeginSearch( + IUpdateSearcher *This, + BSTR criteria, + IUnknown *onCompleted, + VARIANT state, + ISearchJob **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_EndSearch( + IUpdateSearcher *This, + ISearchJob *searchJob, + ISearchResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const struct IUpdateSearcherVtbl update_searcher_vtbl = +{ + update_searcher_QueryInterface, + update_searcher_AddRef, + update_searcher_Release, + update_searcher_GetTypeInfoCount, + update_searcher_GetTypeInfo, + update_searcher_GetIDsOfNames, + update_searcher_Invoke, + update_searcher_get_CanAutomaticallyUpgradeService, + update_searcher_put_CanAutomaticallyUpgradeService, + update_searcher_get_ClientApplicationID, + update_searcher_put_ClientApplicationID, + update_searcher_get_IncludePotentiallySupersededUpdates, + update_searcher_put_IncludePotentiallySupersededUpdates, + update_searcher_get_ServerSelection, + update_searcher_put_ServerSelection, + update_searcher_BeginSearch, + update_searcher_EndSearch +}; + +HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + update_searcher *searcher; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + searcher = HeapAlloc( GetProcessHeap(), 0, sizeof(*searcher) ); + if (!searcher) return E_OUTOFMEMORY; + + searcher->vtbl = &update_searcher_vtbl; + searcher->refs = 1; + + *ppObj = &searcher->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +}

1 0

Hans Leidekker : wuapi: Add a stub implementation of IAutomaticUpdates.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: fe32d211d9d9b7e38caa2f4d396dee6030d1232e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe32d211d9d9b7e38caa2f4d3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 16 16:42:49 2008 +0100 wuapi: Add a stub implementation of IAutomaticUpdates. --- dlls/wuapi/Makefile.in | 3 +- dlls/wuapi/updates.c | 221 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 223 insertions(+), 1 deletions(-) diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index 72de377..c3fae00 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -10,7 +10,8 @@ C_SRCS = \ downloader.c \ installer.c \ main.c \ - searcher.c + searcher.c \ + updates.c @MAKE_DLL_RULES@ diff --git a/dlls/wuapi/updates.c b/dlls/wuapi/updates.c new file mode 100644 index 0000000..1bf063b --- /dev/null +++ b/dlls/wuapi/updates.c @@ -0,0 +1,221 @@ +/* + * IAutomaticUpdates implementation + * + * Copyright 2008 Hans Leidekker + * + * 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 + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "wuapi.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + +typedef struct _automatic_updates +{ + const struct IAutomaticUpdatesVtbl *vtbl; + LONG refs; +} automatic_updates; + +static inline automatic_updates *impl_from_IAutomaticUpdates( IAutomaticUpdates *iface ) +{ + return (automatic_updates *)((char*)iface - FIELD_OFFSET( automatic_updates, vtbl )); +} + +static ULONG WINAPI automatic_updates_AddRef( + IAutomaticUpdates *iface ) +{ + automatic_updates *automatic_updates = impl_from_IAutomaticUpdates( iface ); + return InterlockedIncrement( &automatic_updates->refs ); +} + +static ULONG WINAPI automatic_updates_Release( + IAutomaticUpdates *iface ) +{ + automatic_updates *automatic_updates = impl_from_IAutomaticUpdates( iface ); + LONG refs = InterlockedDecrement( &automatic_updates->refs ); + if (!refs) + { + TRACE("destroying %p\n", automatic_updates); + HeapFree( GetProcessHeap(), 0, automatic_updates ); + } + return refs; +} + +static HRESULT WINAPI automatic_updates_QueryInterface( + IAutomaticUpdates *iface, + REFIID riid, + void **ppvObject ) +{ + automatic_updates *This = impl_from_IAutomaticUpdates( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_IAutomaticUpdates ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IAutomaticUpdates_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI automatic_updates_GetTypeInfoCount( + IAutomaticUpdates *iface, + UINT *pctinfo ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI automatic_updates_GetTypeInfo( + IAutomaticUpdates *iface, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI automatic_updates_GetIDsOfNames( + IAutomaticUpdates *iface, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI automatic_updates_Invoke( + IAutomaticUpdates *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI automatic_updates_DetectNow( + IAutomaticUpdates *This ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI automatic_updates_Pause( + IAutomaticUpdates *This ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI automatic_updates_Resume( + IAutomaticUpdates *This ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI automatic_updates_ShowSettingsDialog( + IAutomaticUpdates *This ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI automatic_updates_EnableService( + IAutomaticUpdates *This ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI automatic_updates_get_ServiceEnabled( + IAutomaticUpdates *This, + VARIANT_BOOL *retval ) +{ + FIXME("%p\n", retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI automatic_updates_get_Settings( + IAutomaticUpdates *This, + IAutomaticUpdatesSettings **retval ) +{ + FIXME("%p\n", retval); + return E_NOTIMPL; +} + +static const struct IAutomaticUpdatesVtbl automatic_updates_vtbl = +{ + automatic_updates_QueryInterface, + automatic_updates_AddRef, + automatic_updates_Release, + automatic_updates_GetTypeInfoCount, + automatic_updates_GetTypeInfo, + automatic_updates_GetIDsOfNames, + automatic_updates_Invoke, + automatic_updates_DetectNow, + automatic_updates_Pause, + automatic_updates_Resume, + automatic_updates_ShowSettingsDialog, + automatic_updates_get_Settings, + automatic_updates_get_ServiceEnabled, + automatic_updates_EnableService +}; + +HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + automatic_updates *updates; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + updates = HeapAlloc( GetProcessHeap(), 0, sizeof(*updates) ); + if (!updates) return E_OUTOFMEMORY; + + updates->vtbl = &automatic_updates_vtbl; + updates->refs = 1; + + *ppObj = &updates->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +}

1 0

Hans Leidekker : wuapi: Add a stub implementation of IUpdateInstaller.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 85d44cab29a81a2c6b575b6c1036eba80190f112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d44cab29a81a2c6b575b6c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 16 16:42:22 2008 +0100 wuapi: Add a stub implementation of IUpdateInstaller. --- dlls/wuapi/Makefile.in | 1 + dlls/wuapi/installer.c | 253 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 254 insertions(+), 0 deletions(-) diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index 3735adc..e870d78 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = uuid kernel32 C_SRCS = \ downloader.c \ + installer.c \ main.c @MAKE_DLL_RULES@ diff --git a/dlls/wuapi/installer.c b/dlls/wuapi/installer.c new file mode 100644 index 0000000..1a2c553 --- /dev/null +++ b/dlls/wuapi/installer.c @@ -0,0 +1,253 @@ +/* + * IUpdateInstaller implementation + * + * Copyright 2008 Hans Leidekker + * + * 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 + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "wuapi.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + +typedef struct _update_installer +{ + const struct IUpdateInstallerVtbl *vtbl; + LONG refs; +} update_installer; + +static inline update_installer *impl_from_IUpdateInstaller( IUpdateInstaller *iface ) +{ + return (update_installer *)((char *)iface - FIELD_OFFSET( update_installer, vtbl )); +} + +static ULONG WINAPI update_installer_AddRef( + IUpdateInstaller *iface ) +{ + update_installer *update_installer = impl_from_IUpdateInstaller( iface ); + return InterlockedIncrement( &update_installer->refs ); +} + +static ULONG WINAPI update_installer_Release( + IUpdateInstaller *iface ) +{ + update_installer *update_installer = impl_from_IUpdateInstaller( iface ); + LONG refs = InterlockedDecrement( &update_installer->refs ); + if (!refs) + { + TRACE("destroying %p\n", update_installer); + HeapFree( GetProcessHeap(), 0, update_installer ); + } + return refs; +} + +static HRESULT WINAPI update_installer_QueryInterface( + IUpdateInstaller *iface, + REFIID riid, + void **ppvObject ) +{ + update_installer *This = impl_from_IUpdateInstaller( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_IUpdateInstaller ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IUpdateInstaller_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI update_installer_GetTypeInfoCount( + IUpdateInstaller *iface, + UINT *pctinfo ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_GetTypeInfo( + IUpdateInstaller *iface, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_GetIDsOfNames( + IUpdateInstaller *iface, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_Invoke( + IUpdateInstaller *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_get_ClientApplicationID( + IUpdateInstaller *This, + BSTR *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_put_ClientApplicationID( + IUpdateInstaller *This, + BSTR value ) +{ + FIXME("%p, %s\n", This, debugstr_w(value)); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_get_IsForced( + IUpdateInstaller *This, + VARIANT_BOOL *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_put_IsForced( + IUpdateInstaller *This, + VARIANT_BOOL value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_get_ParentHwnd( + IUpdateInstaller *This, + HWND *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_put_ParentHwnd( + IUpdateInstaller *This, + HWND value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_put_ParentWindow( + IUpdateInstaller *This, + IUnknown *value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_get_ParentWindow( + IUpdateInstaller *This, + IUnknown **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_get_Updates( + IUpdateInstaller *This, + IUpdateCollection **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_put_Updates( + IUpdateInstaller *This, + IUpdateCollection *value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const struct IUpdateInstallerVtbl update_installer_vtbl = +{ + update_installer_QueryInterface, + update_installer_AddRef, + update_installer_Release, + update_installer_GetTypeInfoCount, + update_installer_GetTypeInfo, + update_installer_GetIDsOfNames, + update_installer_Invoke, + update_installer_get_ClientApplicationID, + update_installer_put_ClientApplicationID, + update_installer_get_IsForced, + update_installer_put_IsForced, + update_installer_get_ParentHwnd, + update_installer_put_ParentHwnd, + update_installer_put_ParentWindow, + update_installer_get_ParentWindow, + update_installer_get_Updates, + update_installer_put_Updates, +}; + +HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + update_installer *installer; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + installer = HeapAlloc( GetProcessHeap(), 0, sizeof(*installer) ); + if (!installer) return E_OUTOFMEMORY; + + installer->vtbl = &update_installer_vtbl; + installer->refs = 1; + + *ppObj = &installer->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +}

1 0

Hans Leidekker : wuapi: New dll.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 5b6551a591b2f25d380d751bd4195a9b096cb2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b6551a591b2f25d380d751bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 16 16:41:43 2008 +0100 wuapi: New dll. --- configure | 9 +++++++++ configure.ac | 1 + dlls/wuapi/Makefile.in | 14 ++++++++++++++ dlls/wuapi/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wuapi/wuapi.spec | 4 ++++ 5 files changed, 73 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 475bc08..c7db22c 100755 --- a/configure +++ b/configure @@ -26660,6 +26660,14 @@ dlls/wtsapi32/Makefile: dlls/wtsapi32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wtsapi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/wuapi/Makefile" +test "x$enable_wuapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wuapi" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/wuapi/Makefile: dlls/wuapi/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/wuapi/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/xinput1_1/Makefile" test "x$enable_xinput1_1" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ xinput1_1" @@ -28235,6 +28243,7 @@ do "dlls/ws2_32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ws2_32/tests/Makefile" ;; "dlls/wsock32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wsock32/Makefile" ;; "dlls/wtsapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wtsapi32/Makefile" ;; + "dlls/wuapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wuapi/Makefile" ;; "dlls/xinput1_1/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_1/Makefile" ;; "dlls/xinput1_2/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_2/Makefile" ;; "dlls/xinput1_3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/Makefile" ;; diff --git a/configure.ac b/configure.ac index 4a0048e..b554201 100644 --- a/configure.ac +++ b/configure.ac @@ -2089,6 +2089,7 @@ WINE_CONFIG_MAKEFILE([dlls/ws2_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/ws2_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/wsock32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wuapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_1/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_2/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in new file mode 100644 index 0000000..95592aa --- /dev/null +++ b/dlls/wuapi/Makefile.in @@ -0,0 +1,14 @@ +EXTRADEFS = -DCOM_NO_WINDOWS_H +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = wuapi.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c new file mode 100644 index 0000000..7076024 --- /dev/null +++ b/dlls/wuapi/main.c @@ -0,0 +1,45 @@ +/* + * WUAPI implementation + * + * Copyright 2008 Hans Leidekker + * + * 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 "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/wuapi/wuapi.spec b/dlls/wuapi/wuapi.spec new file mode 100644 index 0000000..c5fc87a --- /dev/null +++ b/dlls/wuapi/wuapi.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Hans Leidekker : wuapi: Add a stub implementation of IUpdateDownloader.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 0d9359c6858fb0e4a2ee88736111f6317c547d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d9359c6858fb0e4a2ee88736… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 16 16:42:13 2008 +0100 wuapi: Add a stub implementation of IUpdateDownloader. --- dlls/wuapi/Makefile.in | 3 +- dlls/wuapi/downloader.c | 267 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 269 insertions(+), 1 deletions(-) diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index 95592aa..3735adc 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -4,9 +4,10 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wuapi.dll -IMPORTS = kernel32 +IMPORTS = uuid kernel32 C_SRCS = \ + downloader.c \ main.c @MAKE_DLL_RULES@ diff --git a/dlls/wuapi/downloader.c b/dlls/wuapi/downloader.c new file mode 100644 index 0000000..7292966 --- /dev/null +++ b/dlls/wuapi/downloader.c @@ -0,0 +1,267 @@ +/* + * IUpdateDownloader implementation + * + * Copyright 2008 Hans Leidekker + * + * 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 + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "initguid.h" +#include "wuapi.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + +typedef struct _update_downloader +{ + const struct IUpdateDownloaderVtbl *vtbl; + LONG refs; +} update_downloader; + +static inline update_downloader *impl_from_IUpdateDownloader( IUpdateDownloader *iface ) +{ + return (update_downloader *)((char *)iface - FIELD_OFFSET( update_downloader, vtbl )); +} + +static ULONG WINAPI update_downloader_AddRef( + IUpdateDownloader *iface ) +{ + update_downloader *update_downloader = impl_from_IUpdateDownloader( iface ); + return InterlockedIncrement( &update_downloader->refs ); +} + +static ULONG WINAPI update_downloader_Release( + IUpdateDownloader *iface ) +{ + update_downloader *update_downloader = impl_from_IUpdateDownloader( iface ); + LONG refs = InterlockedDecrement( &update_downloader->refs ); + if (!refs) + { + TRACE("destroying %p\n", update_downloader); + HeapFree( GetProcessHeap(), 0, update_downloader ); + } + return refs; +} + +static HRESULT WINAPI update_downloader_QueryInterface( + IUpdateDownloader *iface, + REFIID riid, + void **ppvObject ) +{ + update_downloader *This = impl_from_IUpdateDownloader( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_IUpdateDownloader ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IUpdateDownloader_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI update_downloader_GetTypeInfoCount( + IUpdateDownloader *iface, + UINT *pctinfo ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_downloader_GetTypeInfo( + IUpdateDownloader *iface, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_downloader_GetIDsOfNames( + IUpdateDownloader *iface, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_downloader_Invoke( + IUpdateDownloader *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_downloader_get_IsForced( + IUpdateDownloader *This, + VARIANT_BOOL *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_downloader_put_IsForced( + IUpdateDownloader *This, + VARIANT_BOOL value ) +{ + FIXME("%p, %d\n", This, value); + return S_OK; +} + +static HRESULT WINAPI update_downloader_get_ClientApplicationID( + IUpdateDownloader *This, + BSTR *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_downloader_put_ClientApplicationID( + IUpdateDownloader *This, + BSTR value ) +{ + FIXME("%p, %s\n", This, debugstr_w(value)); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_downloader_get_Priority( + IUpdateDownloader *This, + DownloadPriority *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_downloader_put_Priority( + IUpdateDownloader *This, + DownloadPriority value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_downloader_get_Updates( + IUpdateDownloader *This, + IUpdateCollection **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_downloader_put_Updates( + IUpdateDownloader *This, + IUpdateCollection *value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_downloader_BeginDownload( + IUpdateDownloader *This, + IUnknown *onProgressChanged, + IUnknown *onCompleted, + VARIANT state, + IDownloadJob **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_downloader_Download( + IUpdateDownloader *This, + IDownloadResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_downloader_EndDownload( + IUpdateDownloader *This, + IDownloadJob *value, + IDownloadResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const struct IUpdateDownloaderVtbl update_downloader_vtbl = +{ + update_downloader_QueryInterface, + update_downloader_AddRef, + update_downloader_Release, + update_downloader_GetTypeInfoCount, + update_downloader_GetTypeInfo, + update_downloader_GetIDsOfNames, + update_downloader_Invoke, + update_downloader_get_ClientApplicationID, + update_downloader_put_ClientApplicationID, + update_downloader_get_IsForced, + update_downloader_put_IsForced, + update_downloader_get_Priority, + update_downloader_put_Priority, + update_downloader_get_Updates, + update_downloader_put_Updates, + update_downloader_BeginDownload, + update_downloader_Download, + update_downloader_EndDownload +}; + +HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + update_downloader *downloader; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + downloader = HeapAlloc( GetProcessHeap(), 0, sizeof(*downloader) ); + if (!downloader) return E_OUTOFMEMORY; + + downloader->vtbl = &update_downloader_vtbl; + downloader->refs = 1; + + *ppObj = &downloader->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +}

1 0

Hans Leidekker : include: Add IAutomaticUpdates, IUpdateSession, IUpdateSearcher, IUpdateDownloader and IUpdateInstaller interfaces.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 57f82b89a89b8c30f645f2ad5e1ae33b6420f88c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f82b89a89b8c30f645f2ad5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 16 16:42:03 2008 +0100 include: Add IAutomaticUpdates, IUpdateSession, IUpdateSearcher, IUpdateDownloader and IUpdateInstaller interfaces. --- .gitignore | 1 + include/Makefile.in | 1 + include/wuapi.idl | 359 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 361 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index dd81905..ab0eef7 100644 --- a/.gitignore +++ b/.gitignore @@ -202,6 +202,7 @@ include/wine/itss.h include/wine/svcctl.h include/wine/wined3d.h include/wtypes.h +include/wuapi.h include/xmldom.h include/xmldso.h libs/wpp/ppl.yy.c diff --git a/include/Makefile.in b/include/Makefile.in index abb89ab..8f004f2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -75,6 +75,7 @@ PUBLIC_IDL_H_SRCS = \ wine/itss.idl \ wine/svcctl.idl \ wtypes.idl \ + wuapi.idl \ xmldom.idl \ xmldso.idl diff --git a/include/wuapi.idl b/include/wuapi.idl new file mode 100644 index 0000000..27a3d5f --- /dev/null +++ b/include/wuapi.idl @@ -0,0 +1,359 @@ +/* + * Copyright 2008 Hans Leidekker 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 + */ + +cpp_quote("DEFINE_GUID(CLSID_AutomaticUpdates, 0xbfe18e9c,0x6d87,0x4450,0xb3,0x7c,0xe0,0x2f,0x0b,0x37,0x38,0x03);") +cpp_quote("DEFINE_GUID(CLSID_UpdateSession, 0x4cb43d7f,0x7eee,0x4906,0x86,0x98,0x60,0xda,0x1c,0x38,0xf2,0xfe);") + +import "oaidl.idl"; + +interface IAutomaticUpdates; +interface IAutomaticUpdatesSettings; +interface IDownloadJob; +interface IDownloadResult; +interface IInstallationJob; +interface IInstallationResult; +interface ISearchJob; +interface ISearchResult; +interface IUpdateCollection; +interface IUpdateDownloader; +interface IUpdateHistoryEntryCollection; +interface IUpdateInstaller; +interface IUpdateSearcher; +interface IUpdateSession; +interface IWebProxy; + +typedef [public] enum tagDownloadPriority +{ + dpLow = 1, + dpNormal = 2, + dpHigh = 3, +} DownloadPriority; + +typedef [public] enum tagServerSelection +{ + ssDefault = 0, + ssManagedServer = 1, + ssWindowsUpdate = 2, + ssOthers = 3, +} ServerSelection; + +[ + object, + uuid(673425bf-c082-4c7c-bdfd-569464b8e0ce), + oleautomation, + dual, + nonextensible, + pointer_default(unique), + hidden +] +interface IAutomaticUpdates : IDispatch +{ + HRESULT DetectNow(); + HRESULT Pause(); + HRESULT Resume(); + HRESULT ShowSettingsDialog(); + + [propget] + HRESULT Settings( + [out, retval] IAutomaticUpdatesSettings **retval); + + [propget] + HRESULT ServiceEnabled( + [out, retval] VARIANT_BOOL *retval); + + HRESULT EnableService(); +} + +[ + object, + uuid(816858a4-260d-4260-933a-2585f1abc76b), + oleautomation, + dual, + nonextensible, + pointer_default(unique), +] +interface IUpdateSession : IDispatch +{ + [propget] + HRESULT ClientApplicationID( + [out, retval] BSTR *retval); + + [propput] + HRESULT ClientApplicationID( + [in] BSTR value); + + [propget] + HRESULT ReadOnly( + [out, retval] VARIANT_BOOL *retval); + + [propget] + HRESULT WebProxy( + [out, retval] IWebProxy **retval); + + [propput] + HRESULT WebProxy( + [in, unique] IWebProxy *value); + + HRESULT CreateUpdateSearcher( + [out, retval] IUpdateSearcher **retval); + + HRESULT CreateUpdateDownloader( + [out, retval] IUpdateDownloader **retval); + + HRESULT CreateUpdateInstaller( + [out, retval] IUpdateInstaller **retval); +} + +[ + object, + uuid(8f45abf1-f9ae-4b95-a933-f0f66e5056ea), + oleautomation, + dual, + nonextensible, + pointer_default(unique), +] +interface IUpdateSearcher : IDispatch +{ + [propget] + HRESULT CanAutomaticallyUpgradeService( + [out, retval] VARIANT_BOOL *retval); + + [propput] + HRESULT CanAutomaticallyUpgradeService( + [in] VARIANT_BOOL value); + + [propget] + HRESULT ClientApplicationID( + [out, retval] BSTR *retval); + + [propput] + HRESULT ClientApplicationID( + [in] BSTR value); + + [propget] + HRESULT IncludePotentiallySupersededUpdates( + [out, retval] VARIANT_BOOL *retval); + + [propput] + HRESULT IncludePotentiallySupersededUpdates( + [in] VARIANT_BOOL value); + + [propget] + HRESULT ServerSelection( + [out, retval] ServerSelection *retval); + + [propput] + HRESULT ServerSelection( + [in] ServerSelection value); + + HRESULT BeginSearch( + [in] BSTR criteria, + [in] IUnknown *onCompleted, + [in] VARIANT state, + [out, retval] ISearchJob **retval); + + HRESULT EndSearch( + [in] ISearchJob *searchJob, + [out, retval] ISearchResult **retval); + + HRESULT EscapeString( + [in] BSTR unescaped, + [out, retval] BSTR *retval); + + HRESULT QueryHistory( + [in] LONG startIndex, + [in] LONG count, + [out, retval] IUpdateHistoryEntryCollection **retval); + + HRESULT Search( + [in] BSTR criteria, + [out, retval] ISearchResult **retval); + + [propget] + HRESULT Online( + [out, retval] VARIANT_BOOL *retval); + + [propput] + HRESULT Online( + [in] VARIANT_BOOL value); + + HRESULT GetTotalHistoryCount( + [out, retval] LONG *retval); + + [propget] + HRESULT ServiceID( + [out, retval] BSTR *retval); + + [propput] + HRESULT ServiceID( + [in] BSTR value); +} + +[ + object, + uuid(68f1c6f9-7ecc-4666-a464-247fe12496c3), + oleautomation, + dual, + nonextensible, + pointer_default(unique), + hidden +] +interface IUpdateDownloader : IDispatch +{ + [propget] + HRESULT ClientApplicationID( + [out, retval] BSTR *retval); + + [propput] + HRESULT ClientApplicationID( + [in] BSTR value); + + [propget] + HRESULT IsForced( + [out, retval] VARIANT_BOOL *retval); + + [propput] + HRESULT IsForced( + [in] VARIANT_BOOL value); + + [propget] + HRESULT Priority( + [out, retval] DownloadPriority *retval); + + [propput] + HRESULT Priority( + [in] DownloadPriority value); + + [propget] + HRESULT Updates( + [out, retval] IUpdateCollection **retval); + + [propput] + HRESULT Updates( + [in] IUpdateCollection *value); + + HRESULT BeginDownload( + [in] IUnknown *onProgressChanged, + [in] IUnknown *onCompleted, + [in] VARIANT state, + [out, retval] IDownloadJob **retval); + + HRESULT Download( + [out, retval] IDownloadResult **retval); + + HRESULT EndDownload( + [in] IDownloadJob *value, + [out, retval] IDownloadResult **retval); +} + +[ + object, + uuid(7b929c68-ccdc-4226-96b1-8724600b54c2), + oleautomation, + dual, + nonextensible, + pointer_default(unique), +] +interface IUpdateInstaller : IDispatch +{ + [propget] + HRESULT ClientApplicationID( + [out, retval] BSTR *retval); + + [propput] + HRESULT ClientApplicationID( + [in] BSTR value); + + [propget] + HRESULT IsForced( + [out, retval] VARIANT_BOOL *retval); + + [propput] + HRESULT IsForced( + [in] VARIANT_BOOL value); + + [propget, restricted] + HRESULT ParentHwnd( + [out, retval] HWND *retval); + + [propput, restricted] + HRESULT ParentHwnd( + [in, unique] HWND value); + + [propput] + HRESULT ParentWindow( + [in, unique] IUnknown *value); + + [propget] + HRESULT ParentWindow( + [out, retval] IUnknown **retval); + + [propget] + HRESULT Updates( + [out, retval] IUpdateCollection **retval); + + [propput] + HRESULT Updates( + [in] IUpdateCollection *value); + + HRESULT BeginInstall( + [in] IUnknown *onProgressChanged, + [in] IUnknown *onCompleted, + [in] VARIANT state, + [out, retval] IInstallationJob **retval); + + HRESULT BeginUninstall( + [in] IUnknown *onProgressChanged, + [in] IUnknown *onCompleted, + [in] VARIANT state, + [out, retval] IInstallationJob **retval); + + HRESULT EndInstall( + [in] IInstallationJob *value, + [out, retval] IInstallationResult **retval); + + HRESULT EndUninstall( + [in] IInstallationJob *value, + [out, retval] IInstallationResult **retval); + + HRESULT Install( + [out, retval] IInstallationResult **retval); + + HRESULT RunWizard( + [in, defaultvalue("")] BSTR dialogTitle, + [out, retval] IInstallationResult **retval); + + [propget] + HRESULT IsBusy( + [out, retval] VARIANT_BOOL *retval); + + HRESULT Uninstall( + [out, retval] IInstallationResult **retval); + + [propget] + HRESULT AllowSourcePrompts( + [out, retval] VARIANT_BOOL *retval); + + [propput] + HRESULT AllowSourcePrompts( + [in] VARIANT_BOOL value); + + [propget] + HRESULT RebootRequiredBeforeInstallation( + [out, retval] VARIANT_BOOL *retval); +}

1 0

Alexandre Julliard : configure: Get rid of the va_copy checks.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 0f37b55211ec0b44e2ee03b313d62cd7dc675db1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f37b55211ec0b44e2ee03b31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 12:55:58 2008 +0100 configure: Get rid of the va_copy checks. --- configure | 129 --------------------------------------------------- configure.ac | 18 ------- include/config.h.in | 6 -- 3 files changed, 0 insertions(+), 153 deletions(-) diff --git a/configure b/configure index 20d0182..475bc08 100755 --- a/configure +++ b/configure @@ -14990,135 +14990,6 @@ _ACEOF fi -{ $as_echo "$as_me:$LINENO: checking for va_copy" >&5 -$as_echo_n "checking for va_copy... " >&6; } -if test "${ac_cv_c_va_copy+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdarg.h> -int -main () -{ -va_list ap1, ap2; va_copy(ap1,ap2); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_c_va_copy="yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_va_copy="no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_va_copy" >&5 -$as_echo "$ac_cv_c_va_copy" >&6; } -if test "$ac_cv_c_va_copy" = "yes" -then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_VA_COPY 1 -_ACEOF - -fi -{ $as_echo "$as_me:$LINENO: checking for __va_copy" >&5 -$as_echo_n "checking for __va_copy... " >&6; } -if test "${ac_cv_c___va_copy+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdarg.h> -int -main () -{ -va_list ap1, ap2; __va_copy(ap1,ap2); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_c___va_copy="yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c___va_copy="no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c___va_copy" >&5 -$as_echo "$ac_cv_c___va_copy" >&6; } -if test "$ac_cv_c___va_copy" = "yes" -then - -cat >>confdefs.h <<\_ACEOF -#define HAVE___VA_COPY 1 -_ACEOF - -fi - { $as_echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5 $as_echo_n "checking for pthread_rwlock_t... " >&6; } if test "${ac_cv_type_pthread_rwlock_t+set}" = set; then diff --git a/configure.ac b/configure.ac index b74fb19..4a0048e 100644 --- a/configure.ac +++ b/configure.ac @@ -1075,24 +1075,6 @@ then AC_DEFINE(HAVE_PPDEV, 1, [Define if we can use ppdev.h for parallel port access]) fi -dnl **** Check for va_copy **** -AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[va_list ap1, ap2; va_copy(ap1,ap2);]])], - [ac_cv_c_va_copy="yes"],[ac_cv_c_va_copy="no"]) - ) -if test "$ac_cv_c_va_copy" = "yes" -then - AC_DEFINE(HAVE_VA_COPY, 1, [Define if we have va_copy]) -fi -AC_CACHE_CHECK([for __va_copy], ac_cv_c___va_copy, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[va_list ap1, ap2; __va_copy(ap1,ap2);]])], - [ac_cv_c___va_copy="yes"],[ac_cv_c___va_copy="no"]) - ) -if test "$ac_cv_c___va_copy" = "yes" -then - AC_DEFINE(HAVE___VA_COPY, 1, [Define if we have __va_copy]) -fi - dnl **** Check for pthread_rwlock_t **** AC_CHECK_TYPES([pthread_rwlock_t, pthread_rwlockattr_t],,,[#define _GNU_SOURCE #include <pthread.h>]) diff --git a/include/config.h.in b/include/config.h.in index c45765e..330564e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -942,9 +942,6 @@ /* Define to 1 if you have the <valgrind/valgrind.h> header file. */ #undef HAVE_VALGRIND_VALGRIND_H -/* Define if we have va_copy */ -#undef HAVE_VA_COPY - /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF @@ -1038,9 +1035,6 @@ /* Define to 1 if you have the `_vsnprintf' function. */ #undef HAVE__VSNPRINTF -/* Define if we have __va_copy */ -#undef HAVE___VA_COPY - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT

1 0