March 2014 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3: Fix return values for some methods needed by SAX reader.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 3cce31b1324513c7f2d6c9d4ba5fe9e5ca7cf834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cce31b1324513c7f2d6c9d4b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 5 10:40:20 2014 +0400 msxml3: Fix return values for some methods needed by SAX reader. --- dlls/msxml3/mxwriter.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index d38e837..a0c2a2b 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1155,8 +1155,8 @@ static HRESULT WINAPI SAXContentHandler_startPrefixMapping( int nuri) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)->(%s %s)\n", This, debugstr_wn(prefix, nprefix), debugstr_wn(uri, nuri)); - return E_NOTIMPL; + TRACE("(%p)->(%s %s)\n", This, debugstr_wn(prefix, nprefix), debugstr_wn(uri, nuri)); + return S_OK; } static HRESULT WINAPI SAXContentHandler_endPrefixMapping( @@ -1165,8 +1165,8 @@ static HRESULT WINAPI SAXContentHandler_endPrefixMapping( int nprefix) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_wn(prefix, nprefix)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_wn(prefix, nprefix)); + return S_OK; } static HRESULT WINAPI SAXContentHandler_startElement( @@ -2007,8 +2007,8 @@ static HRESULT WINAPI VBSAXContentHandler_Invoke(IVBSAXContentHandler *iface, DI static HRESULT WINAPI VBSAXContentHandler_putref_documentLocator(IVBSAXContentHandler *iface, IVBSAXLocator *locator) { mxwriter *This = impl_from_IVBSAXContentHandler( iface ); - FIXME("(%p)->(%p): stub\n", This, locator); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, locator); + return S_OK; } static HRESULT WINAPI VBSAXContentHandler_startDocument(IVBSAXContentHandler *iface)

1 0

Nikolay Sivov : msxml3: Fix IVBSAXAttributes handling of retval BSTRs.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 969f060e5827d61ede4434ff2f8c10359c83d7bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=969f060e5827d61ede4434ff2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 5 10:40:37 2014 +0400 msxml3: Fix IVBSAXAttributes handling of retval BSTRs. --- dlls/msxml3/msxml_private.h | 12 ++++ dlls/msxml3/mxwriter.c | 136 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 134 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 5d2010f..d7014b6 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -457,6 +457,18 @@ static inline HRESULT return_bstr(const WCHAR *value, BSTR *p) return S_OK; } +static inline HRESULT return_bstrn(const WCHAR *value, int len, BSTR *p) +{ + if(value) { + *p = SysAllocStringLen(value, len); + if(!*p) + return E_OUTOFMEMORY; + }else + *p = NULL; + + return S_OK; +} + static inline HRESULT return_null_node(IXMLDOMNode **p) { if(!p) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index a0c2a2b..6fc3631 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -3155,25 +3155,61 @@ static HRESULT WINAPI VBSAXAttributes_get_length(IVBSAXAttributes* iface, int *l static HRESULT WINAPI VBSAXAttributes_getURI(IVBSAXAttributes* iface, int index, BSTR *uri) { mxattributes *This = impl_from_IVBSAXAttributes( iface ); + const WCHAR *uriW; + HRESULT hr; int len; - return ISAXAttributes_getURI(&This->ISAXAttributes_iface, index, (const WCHAR**)uri, &len); + TRACE("(%p)->(%d %p)\n", This, index, uri); + + if (!uri) + return E_POINTER; + + *uri = NULL; + hr = ISAXAttributes_getURI(&This->ISAXAttributes_iface, index, &uriW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(uriW, len, uri); } static HRESULT WINAPI VBSAXAttributes_getLocalName(IVBSAXAttributes* iface, int index, BSTR *name) { mxattributes *This = impl_from_IVBSAXAttributes( iface ); + const WCHAR *nameW; + HRESULT hr; int len; - return ISAXAttributes_getLocalName(&This->ISAXAttributes_iface, index, (const WCHAR**)name, &len); + TRACE("(%p)->(%d %p)\n", This, index, name); + + if (!name) + return E_POINTER; + + *name = NULL; + hr = ISAXAttributes_getLocalName(&This->ISAXAttributes_iface, index, &nameW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(nameW, len, name); } static HRESULT WINAPI VBSAXAttributes_getQName(IVBSAXAttributes* iface, int index, BSTR *qname) { mxattributes *This = impl_from_IVBSAXAttributes( iface ); + const WCHAR *qnameW; + HRESULT hr; int len; - return ISAXAttributes_getQName(&This->ISAXAttributes_iface, index, (const WCHAR**)qname, &len); + TRACE("(%p)->(%d %p)\n", This, index, qname); + + if (!qname) + return E_POINTER; + + *qname = NULL; + hr = ISAXAttributes_getQName(&This->ISAXAttributes_iface, index, &qnameW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(qnameW, len, qname); } static HRESULT WINAPI VBSAXAttributes_getIndexFromName(IVBSAXAttributes* iface, BSTR uri, BSTR name, int *index) @@ -3190,58 +3226,130 @@ static HRESULT WINAPI VBSAXAttributes_getIndexFromQName(IVBSAXAttributes* iface, SysStringLen(qname), index); } -static HRESULT WINAPI VBSAXAttributes_getType(IVBSAXAttributes* iface, int index,BSTR *type) +static HRESULT WINAPI VBSAXAttributes_getType(IVBSAXAttributes* iface, int index, BSTR *type) { mxattributes *This = impl_from_IVBSAXAttributes( iface ); + const WCHAR *typeW; + HRESULT hr; int len; - return ISAXAttributes_getType(&This->ISAXAttributes_iface, index, (const WCHAR**)type, &len); + TRACE("(%p)->(%d %p)\n", This, index, type); + + if (!type) + return E_POINTER; + + *type = NULL; + hr = ISAXAttributes_getType(&This->ISAXAttributes_iface, index, &typeW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(typeW, len, type); } static HRESULT WINAPI VBSAXAttributes_getTypeFromName(IVBSAXAttributes* iface, BSTR uri, BSTR name, BSTR *type) { mxattributes *This = impl_from_IVBSAXAttributes( iface ); + const WCHAR *typeW; + HRESULT hr; int len; - return ISAXAttributes_getTypeFromName(&This->ISAXAttributes_iface, uri, SysStringLen(uri), - name, SysStringLen(name), (const WCHAR**)type, &len); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(uri), debugstr_w(name), type); + + if (!type) + return E_POINTER; + + *type = NULL; + hr = ISAXAttributes_getTypeFromName(&This->ISAXAttributes_iface, uri, SysStringLen(uri), + name, SysStringLen(name), &typeW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(typeW, len, type); } static HRESULT WINAPI VBSAXAttributes_getTypeFromQName(IVBSAXAttributes* iface, BSTR qname, BSTR *type) { mxattributes *This = impl_from_IVBSAXAttributes( iface ); + const WCHAR *typeW; + HRESULT hr; int len; - return ISAXAttributes_getTypeFromQName(&This->ISAXAttributes_iface, qname, SysStringLen(qname), - (const WCHAR**)type, &len); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(qname), type); + + if (!type) + return E_POINTER; + + *type = NULL; + hr = ISAXAttributes_getTypeFromQName(&This->ISAXAttributes_iface, qname, SysStringLen(qname), + &typeW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(typeW, len, type); } static HRESULT WINAPI VBSAXAttributes_getValue(IVBSAXAttributes* iface, int index, BSTR *value) { mxattributes *This = impl_from_IVBSAXAttributes( iface ); + const WCHAR *valueW; + HRESULT hr; int len; - return ISAXAttributes_getValue(&This->ISAXAttributes_iface, index, (const WCHAR**)value, &len); + TRACE("(%p)->(%d %p)\n", This, index, value); + + if (!value) + return E_POINTER; + + *value = NULL; + hr = ISAXAttributes_getValue(&This->ISAXAttributes_iface, index, &valueW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(valueW, len, value); } static HRESULT WINAPI VBSAXAttributes_getValueFromName(IVBSAXAttributes* iface, BSTR uri, BSTR name, BSTR *value) { mxattributes *This = impl_from_IVBSAXAttributes( iface ); + const WCHAR *valueW; + HRESULT hr; int len; - return ISAXAttributes_getValueFromName(&This->ISAXAttributes_iface, uri, SysStringLen(uri), - name, SysStringLen(name), (const WCHAR**)value, &len); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(uri), debugstr_w(name), value); + + if (!value) + return E_POINTER; + + *value = NULL; + hr = ISAXAttributes_getValueFromName(&This->ISAXAttributes_iface, uri, SysStringLen(uri), + name, SysStringLen(name), &valueW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(valueW, len, value); } static HRESULT WINAPI VBSAXAttributes_getValueFromQName(IVBSAXAttributes* iface, BSTR qname, BSTR *value) { mxattributes *This = impl_from_IVBSAXAttributes( iface ); + const WCHAR *valueW; + HRESULT hr; int len; - return ISAXAttributes_getValueFromQName(&This->ISAXAttributes_iface, qname, SysStringLen(qname), - (const WCHAR**)value, &len); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(qname), value); + + if (!value) + return E_POINTER; + + *value = NULL; + hr = ISAXAttributes_getValueFromQName(&This->ISAXAttributes_iface, qname, SysStringLen(qname), + &valueW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(valueW, len, value); } static const struct IVBSAXAttributesVtbl VBSAXAttributesVtbl =

1 0

Nikolay Sivov : msxml3: Fix retval BSTR handling for IVBSAXXMLReader.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 7ca1ac736580db5c70e2deda275c38203b8cc927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca1ac736580db5c70e2deda2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 5 10:40:53 2014 +0400 msxml3: Fix retval BSTR handling for IVBSAXXMLReader. --- dlls/msxml3/saxreader.c | 181 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 146 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index df92997..b59ce48 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -705,7 +705,6 @@ static void update_position(saxlocator *This, BOOL fix_column) } /*** IVBSAXAttributes interface ***/ -/*** IUnknown methods ***/ static HRESULT WINAPI ivbsaxattributes_QueryInterface( IVBSAXAttributes* iface, REFIID riid, @@ -719,16 +718,15 @@ static HRESULT WINAPI ivbsaxattributes_QueryInterface( static ULONG WINAPI ivbsaxattributes_AddRef(IVBSAXAttributes* iface) { saxlocator *This = impl_from_IVBSAXAttributes(iface); - return ISAXLocator_AddRef(&This->ISAXLocator_iface); + return IVBSAXLocator_AddRef(&This->IVBSAXLocator_iface); } static ULONG WINAPI ivbsaxattributes_Release(IVBSAXAttributes* iface) { saxlocator *This = impl_from_IVBSAXAttributes(iface); - return ISAXLocator_Release(&This->ISAXLocator_iface); + return IVBSAXLocator_Release(&This->IVBSAXLocator_iface); } -/*** IDispatch methods ***/ static HRESULT WINAPI ivbsaxattributes_GetTypeInfoCount( IVBSAXAttributes *iface, UINT* pctinfo ) { saxlocator *This = impl_from_IVBSAXAttributes( iface ); @@ -745,13 +743,10 @@ static HRESULT WINAPI ivbsaxattributes_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { saxlocator *This = impl_from_IVBSAXAttributes( iface ); - HRESULT hr; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - hr = get_typeinfo(IVBSAXAttributes_tid, ppTInfo); - - return hr; + return get_typeinfo(IVBSAXAttributes_tid, ppTInfo); } static HRESULT WINAPI ivbsaxattributes_GetIDsOfNames( @@ -825,20 +820,45 @@ static HRESULT WINAPI ivbsaxattributes_getURI( int nIndex, BSTR *uri) { - int len; saxlocator *This = impl_from_IVBSAXAttributes( iface ); - return ISAXAttributes_getURI(&This->ISAXAttributes_iface, nIndex, (const WCHAR**)uri, &len); + const WCHAR *uriW; + HRESULT hr; + int len; + + TRACE("(%p)->(%d %p)\n", This, nIndex, uri); + + if (!uri) + return E_POINTER; + + *uri = NULL; + hr = ISAXAttributes_getURI(&This->ISAXAttributes_iface, nIndex, &uriW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(uriW, len, uri); } static HRESULT WINAPI ivbsaxattributes_getLocalName( IVBSAXAttributes* iface, int nIndex, - BSTR *localName) + BSTR *name) { - int len; saxlocator *This = impl_from_IVBSAXAttributes( iface ); - return ISAXAttributes_getLocalName(&This->ISAXAttributes_iface, nIndex, - (const WCHAR**)localName, &len); + const WCHAR *nameW; + HRESULT hr; + int len; + + TRACE("(%p)->(%d %p)\n", This, nIndex, name); + + if (!name) + return E_POINTER; + + *name = NULL; + hr = ISAXAttributes_getLocalName(&This->ISAXAttributes_iface, nIndex, &nameW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(nameW, len, name); } static HRESULT WINAPI ivbsaxattributes_getQName( @@ -846,9 +866,22 @@ static HRESULT WINAPI ivbsaxattributes_getQName( int nIndex, BSTR *QName) { - int len; saxlocator *This = impl_from_IVBSAXAttributes( iface ); - return ISAXAttributes_getQName(&This->ISAXAttributes_iface, nIndex, (const WCHAR**)QName, &len); + const WCHAR *nameW; + HRESULT hr; + int len; + + TRACE("(%p)->(%d %p)\n", This, nIndex, QName); + + if (!QName) + return E_POINTER; + + *QName = NULL; + hr = ISAXAttributes_getQName(&This->ISAXAttributes_iface, nIndex, &nameW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(nameW, len, QName); } static HRESULT WINAPI ivbsaxattributes_getIndexFromName( @@ -877,9 +910,22 @@ static HRESULT WINAPI ivbsaxattributes_getType( int nIndex, BSTR *type) { - int len; saxlocator *This = impl_from_IVBSAXAttributes( iface ); - return ISAXAttributes_getType(&This->ISAXAttributes_iface, nIndex, (const WCHAR**)type, &len); + const WCHAR *typeW; + HRESULT hr; + int len; + + TRACE("(%p)->(%d %p)\n", This, nIndex, type); + + if (!type) + return E_POINTER; + + *type = NULL; + hr = ISAXAttributes_getType(&This->ISAXAttributes_iface, nIndex, &typeW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(typeW, len, type); } static HRESULT WINAPI ivbsaxattributes_getTypeFromName( @@ -888,10 +934,23 @@ static HRESULT WINAPI ivbsaxattributes_getTypeFromName( BSTR localName, BSTR *type) { - int len; saxlocator *This = impl_from_IVBSAXAttributes( iface ); - return ISAXAttributes_getTypeFromName(&This->ISAXAttributes_iface, uri, SysStringLen(uri), - localName, SysStringLen(localName), (const WCHAR**)type, &len); + const WCHAR *typeW; + HRESULT hr; + int len; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(uri), debugstr_w(localName), type); + + if (!type) + return E_POINTER; + + *type = NULL; + hr = ISAXAttributes_getTypeFromName(&This->ISAXAttributes_iface, uri, SysStringLen(uri), + localName, SysStringLen(localName), &typeW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(typeW, len, type); } static HRESULT WINAPI ivbsaxattributes_getTypeFromQName( @@ -899,10 +958,23 @@ static HRESULT WINAPI ivbsaxattributes_getTypeFromQName( BSTR QName, BSTR *type) { - int len; saxlocator *This = impl_from_IVBSAXAttributes( iface ); - return ISAXAttributes_getTypeFromQName(&This->ISAXAttributes_iface, QName, SysStringLen(QName), - (const WCHAR**)type, &len); + const WCHAR *typeW; + HRESULT hr; + int len; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(QName), type); + + if (!type) + return E_POINTER; + + *type = NULL; + hr = ISAXAttributes_getTypeFromQName(&This->ISAXAttributes_iface, QName, SysStringLen(QName), + &typeW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(typeW, len, type); } static HRESULT WINAPI ivbsaxattributes_getValue( @@ -910,9 +982,22 @@ static HRESULT WINAPI ivbsaxattributes_getValue( int nIndex, BSTR *value) { - int len; saxlocator *This = impl_from_IVBSAXAttributes( iface ); - return ISAXAttributes_getValue(&This->ISAXAttributes_iface, nIndex, (const WCHAR**)value, &len); + const WCHAR *valueW; + HRESULT hr; + int len; + + TRACE("(%p)->(%d %p)\n", This, nIndex, value); + + if (!value) + return E_POINTER; + + *value = NULL; + hr = ISAXAttributes_getValue(&This->ISAXAttributes_iface, nIndex, &valueW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(valueW, len, value); } static HRESULT WINAPI ivbsaxattributes_getValueFromName( @@ -921,10 +1006,23 @@ static HRESULT WINAPI ivbsaxattributes_getValueFromName( BSTR localName, BSTR *value) { - int len; saxlocator *This = impl_from_IVBSAXAttributes( iface ); - return ISAXAttributes_getValueFromName(&This->ISAXAttributes_iface, uri, SysStringLen(uri), - localName, SysStringLen(localName), (const WCHAR**)value, &len); + const WCHAR *valueW; + HRESULT hr; + int len; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(uri), debugstr_w(localName), value); + + if (!value) + return E_POINTER; + + *value = NULL; + hr = ISAXAttributes_getValueFromName(&This->ISAXAttributes_iface, uri, SysStringLen(uri), + localName, SysStringLen(localName), &valueW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(valueW, len, value); } static HRESULT WINAPI ivbsaxattributes_getValueFromQName( @@ -932,10 +1030,23 @@ static HRESULT WINAPI ivbsaxattributes_getValueFromQName( BSTR QName, BSTR *value) { - int len; saxlocator *This = impl_from_IVBSAXAttributes( iface ); - return ISAXAttributes_getValueFromQName(&This->ISAXAttributes_iface, QName, - SysStringLen(QName), (const WCHAR**)value, &len); + const WCHAR *valueW; + HRESULT hr; + int len; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(QName), value); + + if (!value) + return E_POINTER; + + *value = NULL; + hr = ISAXAttributes_getValueFromQName(&This->ISAXAttributes_iface, QName, + SysStringLen(QName), &valueW, &len); + if (FAILED(hr)) + return hr; + + return return_bstrn(valueW, len, value); } static const struct IVBSAXAttributesVtbl ivbsaxattributes_vtbl = @@ -3045,19 +3156,19 @@ static const struct IVBSAXXMLReaderVtbl VBSAXXMLReaderVtbl = static HRESULT WINAPI isaxxmlreader_QueryInterface(ISAXXMLReader* iface, REFIID riid, void **ppvObject) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return saxxmlreader_QueryInterface(&This->IVBSAXXMLReader_iface, riid, ppvObject); + return IVBSAXXMLReader_QueryInterface(&This->IVBSAXXMLReader_iface, riid, ppvObject); } static ULONG WINAPI isaxxmlreader_AddRef(ISAXXMLReader* iface) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return saxxmlreader_AddRef(&This->IVBSAXXMLReader_iface); + return IVBSAXXMLReader_AddRef(&This->IVBSAXXMLReader_iface); } static ULONG WINAPI isaxxmlreader_Release(ISAXXMLReader* iface) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return saxxmlreader_Release(&This->IVBSAXXMLReader_iface); + return IVBSAXXMLReader_Release(&This->IVBSAXXMLReader_iface); } /*** ISAXXMLReader methods ***/

1 0

Nikolay Sivov : msxml3: Fix BSTR retval handling for IVBSAXLocator.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 17d1c0fbc7e8423d71f1a4e47899e13f393d2759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d1c0fbc7e8423d71f1a4e47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 5 10:41:11 2014 +0400 msxml3: Fix BSTR retval handling for IVBSAXLocator. --- dlls/msxml3/saxreader.c | 56 ++++++++++++++++++++++++++--------------- dlls/msxml3/tests/saxreader.c | 10 ++++++++ 2 files changed, 46 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b59ce48..3ba1c0c 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2080,14 +2080,13 @@ static ULONG WINAPI ivbsaxlocator_AddRef(IVBSAXLocator* iface) { saxlocator *This = impl_from_IVBSAXLocator( iface ); TRACE("%p\n", This ); - return InterlockedIncrement( &This->ref ); + return ISAXLocator_AddRef(&This->ISAXLocator_iface); } -static ULONG WINAPI ivbsaxlocator_Release( - IVBSAXLocator* iface) +static ULONG WINAPI ivbsaxlocator_Release(IVBSAXLocator* iface) { saxlocator *This = impl_from_IVBSAXLocator( iface ); - return ISAXLocator_Release((ISAXLocator*)&This->IVBSAXLocator_iface); + return ISAXLocator_Release(&This->ISAXLocator_iface); } /*** IDispatch methods ***/ @@ -2107,13 +2106,10 @@ static HRESULT WINAPI ivbsaxlocator_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { saxlocator *This = impl_from_IVBSAXLocator( iface ); - HRESULT hr; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - hr = get_typeinfo(IVBSAXLocator_tid, ppTInfo); - - return hr; + return get_typeinfo(IVBSAXLocator_tid, ppTInfo); } static HRESULT WINAPI ivbsaxlocator_GetIDsOfNames( @@ -2179,7 +2175,7 @@ static HRESULT WINAPI ivbsaxlocator_get_columnNumber( int *pnColumn) { saxlocator *This = impl_from_IVBSAXLocator( iface ); - return ISAXLocator_getColumnNumber((ISAXLocator*)&This->IVBSAXLocator_iface, pnColumn); + return ISAXLocator_getColumnNumber(&This->ISAXLocator_iface, pnColumn); } static HRESULT WINAPI ivbsaxlocator_get_lineNumber( @@ -2187,25 +2183,45 @@ static HRESULT WINAPI ivbsaxlocator_get_lineNumber( int *pnLine) { saxlocator *This = impl_from_IVBSAXLocator( iface ); - return ISAXLocator_getLineNumber((ISAXLocator*)&This->IVBSAXLocator_iface, pnLine); + return ISAXLocator_getLineNumber(&This->ISAXLocator_iface, pnLine); } -static HRESULT WINAPI ivbsaxlocator_get_publicId( - IVBSAXLocator* iface, - BSTR* publicId) +static HRESULT WINAPI ivbsaxlocator_get_publicId(IVBSAXLocator* iface, BSTR *ret) { saxlocator *This = impl_from_IVBSAXLocator( iface ); - return ISAXLocator_getPublicId((ISAXLocator*)&This->IVBSAXLocator_iface, - (const WCHAR**)publicId); + const WCHAR *publicidW; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, ret); + + if (!ret) + return E_POINTER; + + *ret = NULL; + hr = ISAXLocator_getPublicId(&This->ISAXLocator_iface, &publicidW); + if (FAILED(hr)) + return hr; + + return return_bstr(publicidW, ret); } -static HRESULT WINAPI ivbsaxlocator_get_systemId( - IVBSAXLocator* iface, - BSTR* systemId) +static HRESULT WINAPI ivbsaxlocator_get_systemId(IVBSAXLocator* iface, BSTR *ret) { saxlocator *This = impl_from_IVBSAXLocator( iface ); - return ISAXLocator_getSystemId((ISAXLocator*)&This->IVBSAXLocator_iface, - (const WCHAR**)systemId); + const WCHAR *systemidW; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, ret); + + if (!ret) + return E_POINTER; + + *ret = NULL; + hr = ISAXLocator_getSystemId(&This->ISAXLocator_iface, &systemidW); + if (FAILED(hr)) + return hr; + + return return_bstr(systemidW, ret); } static const struct IVBSAXLocatorVtbl VBSAXLocatorVtbl = diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ae003ee..5891b55 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1092,6 +1092,7 @@ static HRESULT WINAPI contentHandler_putDocumentLocator( ISAXLocator *pLocator) { struct call_entry call; + IUnknown *unk; HRESULT hr; locator = pLocator; @@ -1100,6 +1101,9 @@ static HRESULT WINAPI contentHandler_putDocumentLocator( call.id = CH_PUTDOCUMENTLOCATOR; add_call(sequences, CONTENT_HANDLER_INDEX, &call); + hr = ISAXLocator_QueryInterface(pLocator, &IID_IVBSAXLocator, (void**)&unk); + EXPECT_HR(hr, E_NOINTERFACE); + if (msxml_version >= 6) { ISAXAttributes *attr, *attr1; IMXAttributes *mxattr; @@ -1113,6 +1117,12 @@ static HRESULT WINAPI contentHandler_putDocumentLocator( EXPECT_REF(pLocator, 3); ok(attr == attr1, "got %p, %p\n", attr, attr1); + hr = ISAXAttributes_QueryInterface(attr, &IID_IVBSAXAttributes, (void**)&unk); + EXPECT_HR(hr, E_NOINTERFACE); + + hr = ISAXLocator_QueryInterface(pLocator, &IID_IVBSAXAttributes, (void**)&unk); + EXPECT_HR(hr, E_NOINTERFACE); + hr = ISAXAttributes_QueryInterface(attr, &IID_IMXAttributes, (void**)&mxattr); EXPECT_HR(hr, E_NOINTERFACE);

1 0

Henri Verbeet : ddraw: Clear DDSD_LPSURFACE after surface creation.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 74b4b821ab1759d8f8c938cf6a44247601c6a7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b4b821ab1759d8f8c938cf6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 5 10:46:35 2014 +0100 ddraw: Clear DDSD_LPSURFACE after surface creation. --- dlls/ddraw/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4a1b112..bf49e15 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6080,6 +6080,8 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s ERR("Failed to set surface memory, hr %#x.\n", hr); return hr; } + + desc->dwFlags &= ~DDSD_LPSURFACE; } wined3d_surface_incref(wined3d_surface);

1 0

Henri Verbeet : ddraw: Disallow user memory surfaces before version 4.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 76ab86ee7f1e17bbe0fe8fbca3e7b2afa3418b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ab86ee7f1e17bbe0fe8fbca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 5 10:46:36 2014 +0100 ddraw: Disallow user memory surfaces before version 4. --- dlls/ddraw/surface.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index bf49e15..13aa813 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5821,6 +5821,13 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDCAPS; } + if (version < 4) + { + WARN("User memory surfaces not supported before version 4.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDPARAMS; + } + if (!(desc->dwFlags & DDSD_PITCH)) { WARN("User memory surfaces should explicitly specify the pitch.\n");

1 0

Henri Verbeet : ddraw/tests: Add a test for creating surfaces with an explicit pitch.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 75935f9499d33bf1c5a0200257b45d728b025a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75935f9499d33bf1c5a020025… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 5 10:46:37 2014 +0100 ddraw/tests: Add a test for creating surfaces with an explicit pitch. --- dlls/ddraw/tests/ddraw1.c | 99 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 99 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 404 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75935f9499d33bf1c5a02…

1 0

Henri Verbeet : ddraw/tests: Avoid using EnumDevices() to get a supported Z buffer format.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 9ee120f108333ff53bb96ac36131d2d776a02fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee120f108333ff53bb96ac36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 5 10:46:38 2014 +0100 ddraw/tests: Avoid using EnumDevices() to get a supported Z buffer format. --- dlls/ddraw/tests/ddraw1.c | 112 +++++++++++++++++++-------------------------- dlls/ddraw/tests/ddraw2.c | 97 ++++++++++++++++++++------------------- 2 files changed, 96 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ee120f108333ff53bb96…

1 0

Henri Verbeet : wined3d: Recognize VMware SVGA3D.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 720f686874c6c8896eee36cfd89554243a406d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=720f686874c6c8896eee36cfd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 5 10:46:39 2014 +0100 wined3d: Recognize VMware SVGA3D. Unfortunately I was only able to test this by overriding the GL_RENDERER and GL_VENDOR strings returned by the driver. --- dlls/wined3d/directx.c | 58 +++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 11 +++++--- 2 files changed, 49 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a779af7..178b246 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -52,6 +52,7 @@ enum wined3d_display_driver DRIVER_NVIDIA_GEFORCE2MX, DRIVER_NVIDIA_GEFORCEFX, DRIVER_NVIDIA_GEFORCE6, + DRIVER_VMWARE, DRIVER_UNKNOWN }; @@ -1168,6 +1169,9 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_NVIDIA_GEFORCEFX, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 11, 7516}, {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT5X, "nv4_disp.dll", 15, 12, 6658}, {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 15, 12, 6658}, + + /* VMware */ + {DRIVER_VMWARE, DRIVER_MODEL_NT5X, "vm3dum.dll", 14, 1, 1134}, }; struct gpu_description @@ -1296,6 +1300,10 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7700, "AMD Radeon HD 7700 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7800, "AMD Radeon HD 7800 Series", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7900, "AMD Radeon HD 7900 Series", DRIVER_AMD_R600, 2048}, + + /* VMware */ + {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, + /* Intel cards */ {HW_VENDOR_INTEL, CARD_INTEL_830M, "Intel(R) 82830M Graphics Controller", DRIVER_INTEL_GMA800, 32 }, {HW_VENDOR_INTEL, CARD_INTEL_855GM, "Intel(R) 82852/82855 GM/GME Graphics Controller", DRIVER_INTEL_GMA800, 32 }, @@ -1616,6 +1624,9 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s || strstr(gl_vendor_string, "Intel Inc.")) return HW_VENDOR_INTEL; + if (strstr(gl_renderer, "SVGA3D")) + return HW_VENDOR_VMWARE; + if (strstr(gl_vendor_string, "Mesa") || strstr(gl_vendor_string, "Brian Paul") || strstr(gl_vendor_string, "Tungsten Graphics, Inc") @@ -2238,29 +2249,41 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i return PCI_DEVICE_NONE; } +static enum wined3d_pci_device select_card_vmware(const struct wined3d_gl_info *gl_info, const char *gl_renderer) +{ + if (strstr(gl_renderer, "SVGA3D")) + return CARD_VMWARE_SVGA3D; + + return PCI_DEVICE_NONE; +} + static const struct gl_vendor_selection { enum wined3d_gl_vendor gl_vendor; const char *description; /* Description of the card selector i.e. Apple OS/X Intel */ enum wined3d_pci_device (*select_card)(const struct wined3d_gl_info *gl_info, const char *gl_renderer); } +amd_gl_vendor_table[] = +{ + {GL_VENDOR_APPLE, "Apple OSX AMD/ATI binary driver", select_card_amd_binary}, + {GL_VENDOR_FGLRX, "AMD/ATI binary driver", select_card_amd_binary}, + {GL_VENDOR_MESA, "Mesa AMD/ATI driver", select_card_amd_mesa}, +}, nvidia_gl_vendor_table[] = { - {GL_VENDOR_NVIDIA, "Nvidia binary driver", select_card_nvidia_binary}, - {GL_VENDOR_APPLE, "Apple OSX NVidia binary driver", select_card_nvidia_binary}, - {GL_VENDOR_MESA, "Mesa Nouveau driver", select_card_nvidia_mesa}, + {GL_VENDOR_APPLE, "Apple OSX NVidia binary driver", select_card_nvidia_binary}, + {GL_VENDOR_MESA, "Mesa Nouveau driver", select_card_nvidia_mesa}, + {GL_VENDOR_NVIDIA, "Nvidia binary driver", select_card_nvidia_binary}, }, -amd_gl_vendor_table[] = +vmware_gl_vendor_table[] = { - {GL_VENDOR_APPLE, "Apple OSX AMD/ATI binary driver", select_card_amd_binary}, - {GL_VENDOR_FGLRX, "AMD/ATI binary driver", select_card_amd_binary}, - {GL_VENDOR_MESA, "Mesa AMD/ATI driver", select_card_amd_mesa}, + {GL_VENDOR_MESA, "VMware driver", select_card_vmware}, }, intel_gl_vendor_table[] = { - {GL_VENDOR_APPLE, "Apple OSX Intel binary driver", select_card_intel}, - {GL_VENDOR_INTEL, "Mesa Intel driver", select_card_intel}, - {GL_VENDOR_MESA, "Mesa Intel driver", select_card_intel}, + {GL_VENDOR_APPLE, "Apple OSX Intel binary driver", select_card_intel}, + {GL_VENDOR_INTEL, "Mesa Intel driver", select_card_intel}, + {GL_VENDOR_MESA, "Mesa Intel driver", select_card_intel}, }; static enum wined3d_pci_device select_card_fallback_nvidia(const struct wined3d_gl_info *gl_info) @@ -2333,14 +2356,17 @@ static const struct } card_vendor_table[] = { - {HW_VENDOR_NVIDIA, "Nvidia", nvidia_gl_vendor_table, - sizeof(nvidia_gl_vendor_table) / sizeof(nvidia_gl_vendor_table[0]), + {HW_VENDOR_AMD, "AMD", amd_gl_vendor_table, + sizeof(amd_gl_vendor_table) / sizeof(*amd_gl_vendor_table), + select_card_fallback_amd}, + {HW_VENDOR_NVIDIA, "Nvidia", nvidia_gl_vendor_table, + sizeof(nvidia_gl_vendor_table) / sizeof(*nvidia_gl_vendor_table), select_card_fallback_nvidia}, - {HW_VENDOR_AMD, "AMD", amd_gl_vendor_table, - sizeof(amd_gl_vendor_table) / sizeof(amd_gl_vendor_table[0]), + {HW_VENDOR_VMWARE, "VMware", vmware_gl_vendor_table, + sizeof(vmware_gl_vendor_table) / sizeof(*vmware_gl_vendor_table), select_card_fallback_amd}, - {HW_VENDOR_INTEL, "Intel", intel_gl_vendor_table, - sizeof(intel_gl_vendor_table) / sizeof(intel_gl_vendor_table[0]), + {HW_VENDOR_INTEL, "Intel", intel_gl_vendor_table, + sizeof(intel_gl_vendor_table) / sizeof(*intel_gl_vendor_table), select_card_fallback_intel}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ceb6f1..60088e8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1350,10 +1350,11 @@ struct wined3d_pixel_format enum wined3d_pci_vendor { - HW_VENDOR_SOFTWARE = 0x0000, - HW_VENDOR_AMD = 0x1002, - HW_VENDOR_NVIDIA = 0x10de, - HW_VENDOR_INTEL = 0x8086, + HW_VENDOR_SOFTWARE = 0x0000, + HW_VENDOR_AMD = 0x1002, + HW_VENDOR_NVIDIA = 0x10de, + HW_VENDOR_VMWARE = 0x15ad, + HW_VENDOR_INTEL = 0x8086, }; enum wined3d_pci_device @@ -1475,6 +1476,8 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0, CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, + CARD_VMWARE_SVGA3D = 0x0405, + CARD_INTEL_830M = 0x3577, CARD_INTEL_855GM = 0x3582, CARD_INTEL_845G = 0x2562,

1 0

Francois Gouget : msi/tests: Avoid source test failures when running in an account with insufficient privileges.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 65bacd4b696db63a57986b4310d27ad8e9cecc27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bacd4b696db63a57986b431… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 5 11:07:13 2014 +0100 msi/tests: Avoid source test failures when running in an account with insufficient privileges. --- dlls/msi/tests/source.c | 48 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index b429c10..9fddd90 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -1014,19 +1014,24 @@ machine_tests: r = pMsiSourceListAddSourceExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT | MSISOURCETYPE_URL, "C:\\source", 0); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + if (r == ERROR_ACCESS_DENIED) + skip("MsiSourceListAddSourceEx (insufficient privileges)\n"); + else + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - res = RegOpenKeyExA(prodkey, "SourceList\\URL", 0, access, &url); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegOpenKeyExA(prodkey, "SourceList\\URL", 0, access, &url); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - size = MAX_PATH; - res = RegQueryValueExA(url, "1", NULL, NULL, (LPBYTE)value, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(!lstrcmpA(value, "C:\\source/"), "Expected 'C:\\source/', got %s\n", value); - ok(size == 11, "Expected 11, got %d\n", size); + size = MAX_PATH; + res = RegQueryValueExA(url, "1", NULL, NULL, (LPBYTE)value, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(!lstrcmpA(value, "C:\\source/"), "Expected 'C:\\source/', got %s\n", value); + ok(size == 11, "Expected 11, got %d\n", size); - RegCloseKey(url); - RegCloseKey(prodkey); + RegCloseKey(url); + RegCloseKey(prodkey); + } LocalFree(usersid); } @@ -2050,6 +2055,11 @@ machine_tests: r = pMsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATHA, "path"); + if (r == ERROR_ACCESS_DENIED) + { + skip("MsiSourceListSetInfo (insufficient privileges)\n"); + goto done; + } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* Media key is created by MsiSourceListSetInfo */ @@ -2063,10 +2073,11 @@ machine_tests: INSTALLPROPERTY_MEDIAPACKAGEPATHA, "path"); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - RegDeleteValueA(media, "MediaPackage"); delete_key(media, "", access); RegCloseKey(media); + +done: delete_key(source, "", access); RegCloseKey(source); delete_key(prodkey, "", access); @@ -2361,6 +2372,11 @@ machine_tests: r = pMsiSourceListAddMediaDiskA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT, 1, "label", "prompt"); + if (r == ERROR_ACCESS_DENIED) + { + skip("MsiSourceListAddMediaDisk (insufficient privileges)\n"); + goto done; + } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* Media subkey is created by MsiSourceListAddMediaDisk */ @@ -2375,10 +2391,11 @@ machine_tests: MSICODE_PRODUCT, 1, "label", "prompt"); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - RegDeleteValueA(media, "1"); delete_key(media, "", access); RegCloseKey(media); + +done: delete_key(source, "", access); RegCloseKey(source); delete_key(prodkey, "", access); @@ -3452,6 +3469,11 @@ machine_tests: /* Net key is created */ res = RegOpenKeyExA(source, "Net", 0, access, &net); + if (res == ERROR_ACCESS_DENIED) + { + skip("MsiSourceListAddSource (insufficient privileges)\n"); + goto done; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_REG_STR(net, "1", "source\\"); @@ -3467,6 +3489,8 @@ machine_tests: RegDeleteValueA(net, "1"); delete_key(net, "", access); RegCloseKey(net); + +done: delete_key(source, "", access); RegCloseKey(source); delete_key(prodkey, "", access);

1 0