wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Andrew Nguyen : winhttp: Fix misleading OpenSSL version number check.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: ccc2f5abae6a57e62580b22dfa90739a351b6555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc2f5abae6a57e62580b22df… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 25 00:09:41 2010 -0500 winhttp: Fix misleading OpenSSL version number check. --- dlls/winhttp/net.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 7826fbb..d4aa31f 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -92,7 +92,7 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; static void *libssl_handle; static void *libcrypto_handle; -#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER> 0x1000000) +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER > 0x10000000) static const SSL_METHOD *method; #else static SSL_METHOD *method;

1 0

Andrew Nguyen : wininet: Fix const qualifier warning when compiling with OpenSSL 1.0.0.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: b20e1110881ca7542ac8be3a44389c56914a6ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20e1110881ca7542ac8be3a4… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Oct 24 23:42:02 2010 -0500 wininet: Fix const qualifier warning when compiling with OpenSSL 1.0.0. --- dlls/wininet/netconnection.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 16b534b..a93aa11 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -875,7 +875,11 @@ LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection) { #ifdef SONAME_LIBSSL +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090707f) + const SSL_CIPHER *cipher; +#else SSL_CIPHER *cipher; +#endif int bits = 0; if (!connection->useSSL)

1 0

Andrew Nguyen : winhttp: Fix const qualifier warning for OpenSSL 1.0.0.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 0c7bd62df214dfd0564f5e6e0767f19e7d4f6bb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7bd62df214dfd0564f5e6e0… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Oct 24 23:41:36 2010 -0500 winhttp: Fix const qualifier warning for OpenSSL 1.0.0. --- dlls/winhttp/net.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 6727707..7826fbb 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -1073,7 +1073,11 @@ const void *netconn_get_certificate( netconn_t *conn ) int netconn_get_cipher_strength( netconn_t *conn ) { #ifdef SONAME_LIBSSL +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090707f) + const SSL_CIPHER *cipher; +#else SSL_CIPHER *cipher; +#endif int bits = 0; if (!conn->secure) return 0;

1 0

Ričardas Barkauskas : wlanapi: Stub WlanOpenHandle.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 7ee3f2d2055867961fbdb1a8dac8bb22b4aab5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee3f2d2055867961fbdb1a8d… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Fri Oct 22 16:24:33 2010 +0300 wlanapi: Stub WlanOpenHandle. --- dlls/wlanapi/main.c | 7 +++++++ dlls/wlanapi/wlanapi.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 97ffd79..7db6fab 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -26,6 +26,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wlanapi); +DWORD WINAPI WlanOpenHandle(DWORD clientVersion, PVOID reserved, + PDWORD negotiatedVersion, PHANDLE clientHandle) +{ + FIXME("(%d, %p, %p, %p) stub\n",clientVersion, reserved, negotiatedVersion, clientHandle); + return ERROR_CALL_NOT_IMPLEMENTED; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index 670c41f..79f9e43 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -15,7 +15,7 @@ @ stub WlanGetProfileList @ stub WlanGetSecuritySettings @ stub WlanIhvControl -@ stub WlanOpenHandle +@ stdcall WlanOpenHandle(long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter @ stub WlanQueryInterface @ stub WlanReasonCodeToString

1 0

Nikolay Sivov : msxml3: Use proper naming and types for IObject* interfaces .
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 21fddfe2358eaeb8b55a008206ecb11d3d872540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21fddfe2358eaeb8b55a00820… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 17:47:30 2010 +0400 msxml3: Use proper naming and types for IObject* interfaces. --- dlls/msxml3/domdoc.c | 80 +++++++++++++++++++++++-------------------------- 1 files changed, 38 insertions(+), 42 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a465e75..2da243b 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2986,30 +2986,27 @@ void ConnectionPoint_Init(ConnectionPoint *cp, struct domdoc *doc, REFIID riid) cp->container = (IConnectionPointContainer*)&doc->lpVtblConnectionPointContainer; } -/* xmldoc implementation of IObjectWithSite */ +/* domdoc implementation of IObjectWithSite */ static HRESULT WINAPI -xmldoc_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) +domdoc_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) { domdoc *This = impl_from_IObjectWithSite(iface); - return IXMLDocument_QueryInterface( (IXMLDocument *)This, riid, ppvObject ); + return IXMLDOMDocument3_QueryInterface( (IXMLDOMDocument3 *)This, riid, ppvObject ); } -static ULONG WINAPI -xmldoc_ObjectWithSite_AddRef( IObjectWithSite* iface ) +static ULONG WINAPI domdoc_ObjectWithSite_AddRef( IObjectWithSite* iface ) { domdoc *This = impl_from_IObjectWithSite(iface); - return IXMLDocument_AddRef((IXMLDocument *)This); + return IXMLDOMDocument3_AddRef((IXMLDOMDocument3 *)This); } -static ULONG WINAPI -xmldoc_ObjectWithSite_Release( IObjectWithSite* iface ) +static ULONG WINAPI domdoc_ObjectWithSite_Release( IObjectWithSite* iface ) { domdoc *This = impl_from_IObjectWithSite(iface); - return IXMLDocument_Release((IXMLDocument *)This); + return IXMLDOMDocument3_Release((IXMLDOMDocument3 *)This); } -static HRESULT WINAPI -xmldoc_GetSite( IObjectWithSite *iface, REFIID iid, void ** ppvSite ) +static HRESULT WINAPI domdoc_ObjectWithSite_GetSite( IObjectWithSite *iface, REFIID iid, void **ppvSite ) { domdoc *This = impl_from_IObjectWithSite(iface); @@ -3021,8 +3018,7 @@ xmldoc_GetSite( IObjectWithSite *iface, REFIID iid, void ** ppvSite ) return IUnknown_QueryInterface( This->site, iid, ppvSite ); } -static HRESULT WINAPI -xmldoc_SetSite( IObjectWithSite *iface, IUnknown *punk ) +static HRESULT WINAPI domdoc_ObjectWithSite_SetSite( IObjectWithSite *iface, IUnknown *punk ) { domdoc *This = impl_from_IObjectWithSite(iface); @@ -3051,71 +3047,71 @@ xmldoc_SetSite( IObjectWithSite *iface, IUnknown *punk ) static const IObjectWithSiteVtbl domdocObjectSite = { - xmldoc_ObjectWithSite_QueryInterface, - xmldoc_ObjectWithSite_AddRef, - xmldoc_ObjectWithSite_Release, - xmldoc_SetSite, - xmldoc_GetSite, + domdoc_ObjectWithSite_QueryInterface, + domdoc_ObjectWithSite_AddRef, + domdoc_ObjectWithSite_Release, + domdoc_ObjectWithSite_SetSite, + domdoc_ObjectWithSite_GetSite }; -static HRESULT WINAPI xmldoc_Safety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) +static HRESULT WINAPI domdoc_Safety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) { domdoc *This = impl_from_IObjectSafety(iface); - return IXMLDocument_QueryInterface( (IXMLDocument *)This, riid, ppv ); + return IXMLDOMDocument3_QueryInterface( (IXMLDOMDocument3 *)This, riid, ppv ); } -static ULONG WINAPI xmldoc_Safety_AddRef(IObjectSafety *iface) +static ULONG WINAPI domdoc_Safety_AddRef(IObjectSafety *iface) { domdoc *This = impl_from_IObjectSafety(iface); - return IXMLDocument_AddRef((IXMLDocument *)This); + return IXMLDOMDocument3_AddRef((IXMLDOMDocument3 *)This); } -static ULONG WINAPI xmldoc_Safety_Release(IObjectSafety *iface) +static ULONG WINAPI domdoc_Safety_Release(IObjectSafety *iface) { domdoc *This = impl_from_IObjectSafety(iface); - return IXMLDocument_Release((IXMLDocument *)This); + return IXMLDOMDocument3_Release((IXMLDOMDocument3 *)This); } #define SAFETY_SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_SECURITY_MANAGER) -static HRESULT WINAPI xmldoc_Safety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, - DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) +static HRESULT WINAPI domdoc_Safety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD *supported, DWORD *enabled) { domdoc *This = impl_from_IObjectSafety(iface); - TRACE("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), pdwSupportedOptions, pdwEnabledOptions); + TRACE("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), supported, enabled); - if(!pdwSupportedOptions || !pdwEnabledOptions) - return E_POINTER; + if(!supported || !enabled) return E_POINTER; - *pdwSupportedOptions = SAFETY_SUPPORTED_OPTIONS; - *pdwEnabledOptions = This->safeopt; + *supported = SAFETY_SUPPORTED_OPTIONS; + *enabled = This->safeopt; return S_OK; } -static HRESULT WINAPI xmldoc_Safety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, - DWORD dwOptionSetMask, DWORD dwEnabledOptions) +static HRESULT WINAPI domdoc_Safety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD mask, DWORD enabled) { domdoc *This = impl_from_IObjectSafety(iface); - TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), mask, enabled); - if ((dwOptionSetMask & ~SAFETY_SUPPORTED_OPTIONS) != 0) + if ((mask & ~SAFETY_SUPPORTED_OPTIONS) != 0) return E_FAIL; - This->safeopt = dwEnabledOptions & dwOptionSetMask & SAFETY_SUPPORTED_OPTIONS; + This->safeopt = enabled & mask & SAFETY_SUPPORTED_OPTIONS; return S_OK; } +#undef SAFETY_SUPPORTED_OPTIONS + static const IObjectSafetyVtbl domdocObjectSafetyVtbl = { - xmldoc_Safety_QueryInterface, - xmldoc_Safety_AddRef, - xmldoc_Safety_Release, - xmldoc_Safety_GetInterfaceSafetyOptions, - xmldoc_Safety_SetInterfaceSafetyOptions + domdoc_Safety_QueryInterface, + domdoc_Safety_AddRef, + domdoc_Safety_Release, + domdoc_Safety_GetInterfaceSafetyOptions, + domdoc_Safety_SetInterfaceSafetyOptions }; - static const tid_t domdoc_iface_tids[] = { IXMLDOMNode_tid, IXMLDOMDocument_tid,

1 0

Nikolay Sivov : msxml3: Add ::Unadvise().
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: b9956f75a9d1f8ed3fb985afd444951c83404423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9956f75a9d1f8ed3fb985afd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 17:40:06 2010 +0400 msxml3: Add ::Unadvise(). --- dlls/msxml3/domdoc.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 1e09a09..a465e75 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -91,6 +91,14 @@ struct ConnectionPoint ConnectionPoint *next; IConnectionPointContainer *container; domdoc *doc; + + union + { + IUnknown *unk; + IDispatch *disp; + IPropertyNotifySink *propnotif; + } *sinks; + DWORD sinks_size; }; struct domdoc @@ -2929,11 +2937,19 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * return E_NOTIMPL; } -static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) +static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD cookie) { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%d): stub\n", This, dwCookie); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, cookie); + + if (cookie == 0 || cookie > This->sinks_size || !This->sinks[cookie-1].unk) + return CONNECT_E_NOCONNECTION; + + IUnknown_Release(This->sinks[cookie-1].unk); + This->sinks[cookie-1].unk = NULL; + + return S_OK; } static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, @@ -2961,7 +2977,8 @@ void ConnectionPoint_Init(ConnectionPoint *cp, struct domdoc *doc, REFIID riid) cp->lpVtblConnectionPoint = &ConnectionPointVtbl; cp->doc = doc; cp->iid = riid; - cp->next = NULL; + cp->sinks = NULL; + cp->sinks_size = 0; cp->next = doc->cp_list; doc->cp_list = cp;

1 0

Nikolay Sivov : msxml3: Add ::GetConnectionPointContainer().
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: fe3ff2ea9f6b94965a5253b75986336932f53956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3ff2ea9f6b94965a5253b75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 17:33:42 2010 +0400 msxml3: Add ::GetConnectionPointContainer(). --- dlls/msxml3/domdoc.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c634938..1e09a09 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2908,11 +2908,17 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *i } static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface, - IConnectionPointContainer **ppCPC) + IConnectionPointContainer **container) { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p): stub\n", This, ppCPC); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, container); + + if (!container) return E_POINTER; + + *container = This->container; + IConnectionPointContainer_AddRef(*container); + return S_OK; } static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *pUnkSink,

1 0

Nikolay Sivov : msxml3: Add ::GetConnectionInterface().
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: eb23a4df25590dabb80775cddd6b638fc6693890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb23a4df25590dabb80775cdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 17:31:52 2010 +0400 msxml3: Add ::GetConnectionInterface(). --- dlls/msxml3/domdoc.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index fc939a5..c634938 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2895,11 +2895,16 @@ static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) return IConnectionPointContainer_Release(This->container); } -static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID) +static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *iid) { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p): stub\n", This, pIID); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, iid); + + if (!iid) return E_POINTER; + + *iid = *This->iid; + return S_OK; } static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface,

1 0

Nikolay Sivov : msxml3: Add stub IConnectionPoint, return points for supported IIDs.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 2a080e85e4752d5ab70151a9e06d3c7f7ec89d92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a080e85e4752d5ab70151a9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 17:22:35 2010 +0400 msxml3: Add stub IConnectionPoint, return points for supported IIDs. --- dlls/msxml3/domdoc.c | 161 ++++++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 12 +++ 2 files changed, 168 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index be56ecd..fc939a5 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -31,6 +31,7 @@ #include "winuser.h" #include "winnls.h" #include "ole2.h" +#include "olectl.h" #include "msxml6.h" #include "wininet.h" #include "winreg.h" @@ -79,7 +80,20 @@ typedef struct _domdoc_properties { BOOL XPath; } domdoc_properties; -typedef struct _domdoc +typedef struct ConnectionPoint ConnectionPoint; +typedef struct domdoc domdoc; + +struct ConnectionPoint +{ + const IConnectionPointVtbl *lpVtblConnectionPoint; + const IID *iid; + + ConnectionPoint *next; + IConnectionPointContainer *container; + domdoc *doc; +}; + +struct domdoc { xmlnode node; const struct IXMLDOMDocument3Vtbl *lpVtbl; @@ -106,7 +120,18 @@ typedef struct _domdoc /* IObjectSafety */ DWORD safeopt; -} domdoc; + + /* connection list */ + ConnectionPoint *cp_list; + ConnectionPoint cp_domdocevents; + ConnectionPoint cp_propnotif; + ConnectionPoint cp_dispatch; +}; + +static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) +{ + return (ConnectionPoint *)((char*)iface - FIELD_OFFSET(ConnectionPoint, lpVtblConnectionPoint)); +} /* In native windows, the whole lifetime management of XMLDOMNodes is @@ -2797,11 +2822,30 @@ static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionP } static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, - REFIID riid, IConnectionPoint **ppCP) + REFIID riid, IConnectionPoint **cp) { domdoc *This = impl_from_IConnectionPointContainer(iface); - FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), ppCP); - return E_NOTIMPL; + ConnectionPoint *iter; + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), cp); + + *cp = NULL; + + for(iter = This->cp_list; iter; iter = iter->next) + { + if (IsEqualGUID(iter->iid, riid)) + *cp = (IConnectionPoint*)&iter->lpVtblConnectionPoint; + } + + if (*cp) + { + IConnectionPoint_AddRef(*cp); + return S_OK; + } + + FIXME("unsupported riid %s\n", debugstr_guid(riid)); + return CONNECT_E_NOCONNECTION; + } static const struct IConnectionPointContainerVtbl ConnectionPointContainerVtbl = @@ -2813,6 +2857,107 @@ static const struct IConnectionPointContainerVtbl ConnectionPointContainerVtbl = ConnectionPointContainer_FindConnectionPoint }; +/* IConnectionPoint */ +static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, + REFIID riid, void **ppv) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv ); + + *ppv = NULL; + + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IConnectionPoint, riid)) + { + *ppv = iface; + } + + if (*ppv) + { + IConnectionPoint_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + return IConnectionPointContainer_AddRef(This->container); +} + +static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + return IConnectionPointContainer_Release(This->container); +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + FIXME("(%p)->(%p): stub\n", This, pIID); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface, + IConnectionPointContainer **ppCPC) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + FIXME("(%p)->(%p): stub\n", This, ppCPC); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *pUnkSink, + DWORD *pdwCookie) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + FIXME("(%p)->(%p %p): stub\n", This, pUnkSink, pdwCookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + FIXME("(%p)->(%d): stub\n", This, dwCookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, + IEnumConnections **ppEnum) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + FIXME("(%p)->(%p): stub\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IConnectionPointVtbl ConnectionPointVtbl = +{ + ConnectionPoint_QueryInterface, + ConnectionPoint_AddRef, + ConnectionPoint_Release, + ConnectionPoint_GetConnectionInterface, + ConnectionPoint_GetConnectionPointContainer, + ConnectionPoint_Advise, + ConnectionPoint_Unadvise, + ConnectionPoint_EnumConnections +}; + +void ConnectionPoint_Init(ConnectionPoint *cp, struct domdoc *doc, REFIID riid) +{ + cp->lpVtblConnectionPoint = &ConnectionPointVtbl; + cp->doc = doc; + cp->iid = riid; + cp->next = NULL; + + cp->next = doc->cp_list; + doc->cp_list = cp; + + cp->container = (IConnectionPointContainer*)&doc->lpVtblConnectionPointContainer; +} + /* xmldoc implementation of IObjectWithSite */ static HRESULT WINAPI xmldoc_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) @@ -2982,6 +3127,12 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **docu doc->site = NULL; doc->safeopt = 0; doc->bsc = NULL; + doc->cp_list = NULL; + + /* events connection points */ + ConnectionPoint_Init(&doc->cp_dispatch, doc, &IID_IDispatch); + ConnectionPoint_Init(&doc->cp_propnotif, doc, &IID_IPropertyNotifySink); + ConnectionPoint_Init(&doc->cp_domdocevents, doc, &DIID_XMLDOMDocumentEvents); init_xmlnode(&doc->node, (xmlNodePtr)xmldoc, (IXMLDOMNode*)&doc->lpVtbl, &domdoc_dispex); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b7db1bf..8821b25 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7100,6 +7100,7 @@ static void test_selectSingleNode(void) static void test_events(void) { IConnectionPointContainer *conn; + IConnectionPoint *point; IXMLDOMDocument *doc; HRESULT hr; @@ -7108,6 +7109,17 @@ static void test_events(void) hr = IXMLDOMDocument_QueryInterface(doc, &IID_IConnectionPointContainer, (void**)&conn); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IConnectionPointContainer_FindConnectionPoint(conn, &IID_IDispatch, &point); + ok(hr == S_OK, "got 0x%08x\n", hr); + IConnectionPoint_Release(point); + hr = IConnectionPointContainer_FindConnectionPoint(conn, &IID_IPropertyNotifySink, &point); + ok(hr == S_OK, "got 0x%08x\n", hr); + IConnectionPoint_Release(point); + hr = IConnectionPointContainer_FindConnectionPoint(conn, &DIID_XMLDOMDocumentEvents, &point); + ok(hr == S_OK, "got 0x%08x\n", hr); + IConnectionPoint_Release(point); + IConnectionPointContainer_Release(conn); IXMLDOMDocument_Release(doc);

1 0

Nikolay Sivov : msxml3: Add stub connection container support.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 0f2c996092897ad4368741b1932347ccf889d3ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f2c996092897ad4368741b19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 15:55:42 2010 +0400 msxml3: Add stub connection container support. --- dlls/msxml3/domdoc.c | 66 ++++++++++++++++++++++++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 17 +++++++++++ 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a7ea78d..be56ecd 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -82,11 +82,12 @@ typedef struct _domdoc_properties { typedef struct _domdoc { xmlnode node; - const struct IXMLDOMDocument3Vtbl *lpVtbl; - const struct IPersistStreamInitVtbl *lpvtblIPersistStreamInit; - const struct IObjectWithSiteVtbl *lpvtblIObjectWithSite; - const struct IObjectSafetyVtbl *lpvtblIObjectSafety; - const struct ISupportErrorInfoVtbl *lpvtblISupportErrorInfo; + const struct IXMLDOMDocument3Vtbl *lpVtbl; + const struct IPersistStreamInitVtbl *lpvtblIPersistStreamInit; + const struct IObjectWithSiteVtbl *lpvtblIObjectWithSite; + const struct IObjectSafetyVtbl *lpvtblIObjectSafety; + const struct ISupportErrorInfoVtbl *lpvtblISupportErrorInfo; + const struct IConnectionPointContainerVtbl *lpVtblConnectionPointContainer; LONG ref; VARIANT_BOOL async; VARIANT_BOOL validating; @@ -540,6 +541,11 @@ static inline domdoc *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface) return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblISupportErrorInfo)); } +static inline domdoc *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpVtblConnectionPointContainer)); +} + /************************************************************************ * domdoc implementation of IPersistStream. */ @@ -768,6 +774,10 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument3 *iface, REFIID rii { return *ppvObject ? S_OK : E_NOINTERFACE; } + else if (IsEqualGUID( riid, &IID_IConnectionPointContainer )) + { + *ppvObject = &This->lpVtblConnectionPointContainer; + } else if(IsEqualGUID(&IID_IRunnableObject, riid)) { TRACE("IID_IRunnableObject not supported returning NULL\n"); @@ -2758,6 +2768,51 @@ static const struct IXMLDOMDocument3Vtbl domdoc_vtbl = domdoc_importNode }; +/* IConnectionPointContainer */ +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, + REFIID riid, void **ppv) +{ + domdoc *This = impl_from_IConnectionPointContainer(iface); + return IXMLDOMDocument3_QueryInterface((IXMLDOMDocument3*)This, riid, ppv); +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + domdoc *This = impl_from_IConnectionPointContainer(iface); + return IXMLDOMDocument3_AddRef((IXMLDOMDocument3*)This); +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + domdoc *This = impl_from_IConnectionPointContainer(iface); + return IXMLDOMDocument3_Release((IXMLDOMDocument3*)This); +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **ppEnum) +{ + domdoc *This = impl_from_IConnectionPointContainer(iface); + FIXME("(%p)->(%p): stub\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **ppCP) +{ + domdoc *This = impl_from_IConnectionPointContainer(iface); + FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), ppCP); + return E_NOTIMPL; +} + +static const struct IConnectionPointContainerVtbl ConnectionPointContainerVtbl = +{ + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + /* xmldoc implementation of IObjectWithSite */ static HRESULT WINAPI xmldoc_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) @@ -2914,6 +2969,7 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **docu doc->lpvtblIObjectWithSite = &domdocObjectSite; doc->lpvtblIObjectSafety = &domdocObjectSafetyVtbl; doc->lpvtblISupportErrorInfo = &support_error_vtbl; + doc->lpVtblConnectionPointContainer = &ConnectionPointContainerVtbl; doc->ref = 1; doc->async = VARIANT_TRUE; doc->validating = 0; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d7d94e6..b7db1bf 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7097,6 +7097,22 @@ static void test_selectSingleNode(void) free_bstrs(); } +static void test_events(void) +{ + IConnectionPointContainer *conn; + IXMLDOMDocument *doc; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IConnectionPointContainer, (void**)&conn); + ok(hr == S_OK, "got 0x%08x\n", hr); + IConnectionPointContainer_Release(conn); + + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -7157,6 +7173,7 @@ START_TEST(domdoc) test_get_prefix(); test_default_properties(); test_selectSingleNode(); + test_events(); CoUninitialize(); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2010