wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Christian Costa : amstream: Free all used resources when releasing MultiMediaStream object.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: abc6d186ead35d2cad28c5a2a69183c6ed4f3a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc6d186ead35d2cad28c5a2a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:55:04 2012 +0100 amstream: Free all used resources when releasing MultiMediaStream object. --- dlls/amstream/amstream.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index a731d5e..c771f77 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -106,11 +106,20 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; TRACE("(%p/%p)\n", iface, This); if (!ref) + { + for(i = 0; i < This->nbStreams; i++) + IMediaStream_Release(This->pStreams[i]); + if (This->ipin) + IPin_Release(This->ipin); + if (This->pFilterGraph) + IGraphBuilder_Release(This->pFilterGraph); HeapFree(GetProcessHeap(), 0, This); + } return ref; }

1 0

Christian Costa : amstream: Add source filter to the filtergraph before loading the file.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 14e228c699e6a06792b97f27af2c9d4eda1057ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e228c699e6a06792b97f27a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:54:56 2012 +0100 amstream: Add source filter to the filtergraph before loading the file. --- dlls/amstream/amstream.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 82dcd24..a731d5e 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -316,6 +316,10 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac if(ret != S_OK) return ret; + ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter); + if (FAILED(ret)) + goto end; + ret = IFileSourceFilter_Load(SourceFilter, pszFileName, NULL); if(ret != S_OK) { @@ -337,23 +341,18 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac } ret = IEnumPins_Next(EnumPins, 1, &ipin, NULL); - if(ret == S_OK) + if (ret == S_OK) { ret = IPin_QueryDirection(ipin, &pin_direction); IEnumPins_Release(EnumPins); - if(ret == S_OK && pin_direction == PINDIR_OUTPUT) + if (ret == S_OK && pin_direction == PINDIR_OUTPUT) This->ipin = ipin; - else - goto end; } else { IEnumPins_Release(EnumPins); - goto end; } - ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter); - end: IBaseFilter_Release(BaseFilter); IFileSourceFilter_Release(SourceFilter);

1 0

Christian Costa : amstream: Remove duplicate GraphBuilder member.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: b15c4113c0ad887cf7a85ddd405dda5ba4e130e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15c4113c0ad887cf7a85ddd4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:54:48 2012 +0100 amstream: Remove duplicate GraphBuilder member. --- dlls/amstream/amstream.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 72ace4a..82dcd24 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -36,7 +36,6 @@ typedef struct { LONG ref; IGraphBuilder* pFilterGraph; IPin* ipin; - IGraphBuilder* GraphBuilder; ULONG nbStreams; IMediaStream** pStreams; STREAM_TYPE StreamType; @@ -313,10 +312,6 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac return ret; } - ret = IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)&This->GraphBuilder); - if (ret != S_OK) - goto end; - ret = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IFileSourceFilter, (void**)&SourceFilter); if(ret != S_OK) return ret; @@ -357,7 +352,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac goto end; } - ret = IGraphBuilder_AddSourceFilter(This->GraphBuilder, pszFileName, pszFileName, &BaseFilter); + ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter); end: IBaseFilter_Release(BaseFilter); @@ -383,7 +378,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface, if(dwFlags != AMMSF_NOCLOCK) return E_INVALIDARG; - return IGraphBuilder_Render(This->GraphBuilder, This->ipin); + return IGraphBuilder_Render(This->pFilterGraph, This->ipin); } static const IAMMultiMediaStreamVtbl AM_Vtbl =

1 0

Christian Costa : amstream: Initialize MultiMediastream before creating the source filter.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 8b5f6bf3f40aa3df05f5d5749b8945c8f2844803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b5f6bf3f40aa3df05f5d5749… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:54:39 2012 +0100 amstream: Initialize MultiMediastream before creating the source filter. --- dlls/amstream/amstream.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index bebe6e8..72ace4a 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -305,6 +305,18 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac TRACE("(%p/%p)->(%s,%x)\n", This, iface, debugstr_w(pszFileName), dwFlags); + /* If Initialize was not called before, we do it here */ + if (!This->pFilterGraph) + { + ret = IAMMultiMediaStream_Initialize(iface, STREAMTYPE_READ, 0, NULL); + if (FAILED(ret)) + return ret; + } + + ret = IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)&This->GraphBuilder); + if (ret != S_OK) + goto end; + ret = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IFileSourceFilter, (void**)&SourceFilter); if(ret != S_OK) return ret; @@ -345,20 +357,6 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac goto end; } - /* If Initialize was not called before, we do it here */ - if (!This->pFilterGraph) - { - ret = IAMMultiMediaStream_Initialize(iface, STREAMTYPE_READ, 0, NULL); - if (FAILED(ret)) - goto end; - } - - ret = IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)&This->GraphBuilder); - if(ret != S_OK) - { - goto end; - } - ret = IGraphBuilder_AddSourceFilter(This->GraphBuilder, pszFileName, pszFileName, &BaseFilter); end:

1 0

Hans Leidekker : sxs: Add a stub implementation of IAssemblyName.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 21e5c4c4172f03c0e982d5c62bd2ddfef63f5fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e5c4c4172f03c0e982d5c62… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 14 09:44:12 2012 +0100 sxs: Add a stub implementation of IAssemblyName. --- dlls/sxs/Makefile.in | 1 + dlls/sxs/name.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/sxs/sxs.spec | 2 +- include/winsxs.idl | 1 + 4 files changed, 223 insertions(+), 1 deletions(-) diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in index 180f91c..b9832db 100644 --- a/dlls/sxs/Makefile.in +++ b/dlls/sxs/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = oleaut32 ole32 C_SRCS = \ cache.c \ + name.c \ sxs.c @MAKE_DLL_RULES@ diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c new file mode 100644 index 0000000..1adeebd --- /dev/null +++ b/dlls/sxs/name.c @@ -0,0 +1,220 @@ +/* + * IAssemblyName implementation + * + * Copyright 2012 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "winsxs.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sxs); + +struct name +{ + IAssemblyName IAssemblyName_iface; + LONG refs; +}; + +static inline struct name *impl_from_IAssemblyName( IAssemblyName *iface ) +{ + return CONTAINING_RECORD( iface, struct name, IAssemblyName_iface ); +} + +static HRESULT WINAPI name_QueryInterface( + IAssemblyName *iface, + REFIID riid, + void **obj ) +{ + struct name *name = impl_from_IAssemblyName( iface ); + + TRACE("%p, %s, %p\n", name, debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualIID( riid, &IID_IUnknown ) || + IsEqualIID( riid, &IID_IAssemblyName )) + { + IUnknown_AddRef( iface ); + *obj = name; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI name_AddRef( + IAssemblyName *iface ) +{ + struct name *name = impl_from_IAssemblyName( iface ); + return InterlockedIncrement( &name->refs ); +} + +static ULONG WINAPI name_Release( IAssemblyName *iface ) +{ + struct name *name = impl_from_IAssemblyName( iface ); + ULONG refs = InterlockedDecrement( &name->refs ); + + if (!refs) + { + TRACE("destroying %p\n", name); + HeapFree( GetProcessHeap(), 0, name ); + } + return refs; +} + +static HRESULT WINAPI name_SetProperty( + IAssemblyName *iface, + DWORD id, + LPVOID property, + DWORD size ) +{ + FIXME("%p, %d, %p, %d\n", iface, id, property, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_GetProperty( + IAssemblyName *iface, + DWORD id, + LPVOID buffer, + LPDWORD buflen ) +{ + FIXME("%p, %d, %p, %p\n", iface, id, buffer, buflen); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_Finalize( + IAssemblyName *iface ) +{ + FIXME("%p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_GetDisplayName( + IAssemblyName *iface, + LPOLESTR buffer, + LPDWORD buflen, + DWORD flags ) +{ + FIXME("%p, %p, %p, 0x%08x\n", iface, buffer, buflen, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_Reserved( + IAssemblyName *iface, + REFIID riid, + IUnknown *pUnkReserved1, + IUnknown *pUnkReserved2, + LPCOLESTR szReserved, + LONGLONG llReserved, + LPVOID pvReserved, + DWORD cbReserved, + LPVOID *ppReserved ) +{ + FIXME("%p, %s, %p, %p, %s, %x%08x, %p, %d, %p\n", iface, + debugstr_guid(riid), pUnkReserved1, pUnkReserved2, + debugstr_w(szReserved), (DWORD)(llReserved >> 32), (DWORD)llReserved, + pvReserved, cbReserved, ppReserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_GetName( + IAssemblyName *iface, + LPDWORD buflen, + WCHAR *buffer ) +{ + FIXME("%p, %p, %p\n", iface, buflen, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_GetVersion( + IAssemblyName *iface, + LPDWORD hi, + LPDWORD low ) +{ + FIXME("%p, %p, %p\n", iface, hi, low); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_IsEqual( + IAssemblyName *name1, + IAssemblyName *name2, + DWORD flags ) +{ + FIXME("%p, %p, 0x%08x\n", name1, name2, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_Clone( + IAssemblyName *iface, + IAssemblyName **name ) +{ + FIXME("%p, %p\n", iface, name); + return E_NOTIMPL; +} + +static const IAssemblyNameVtbl name_vtbl = +{ + name_QueryInterface, + name_AddRef, + name_Release, + name_SetProperty, + name_GetProperty, + name_Finalize, + name_GetDisplayName, + name_Reserved, + name_GetName, + name_GetVersion, + name_IsEqual, + name_Clone +}; + +/****************************************************************** + * CreateAssemblyNameObject (SXS.@) + */ +HRESULT WINAPI CreateAssemblyNameObject( + LPASSEMBLYNAME *obj, + LPCWSTR assembly, + DWORD flags, + LPVOID reserved ) +{ + struct name *name; + + TRACE("%p, %s, 0x%08x, %p\n", obj, debugstr_w(assembly), flags, reserved); + + if (!obj) return E_INVALIDARG; + + *obj = NULL; + if (!assembly || !assembly[0] || flags != CANOF_PARSE_DISPLAY_NAME) + return E_INVALIDARG; + + if (!(name = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*name) ))) + return E_OUTOFMEMORY; + + name->IAssemblyName_iface.lpVtbl = &name_vtbl; + name->refs = 1; + + *obj = &name->IAssemblyName_iface; + return S_OK; +} diff --git a/dlls/sxs/sxs.spec b/dlls/sxs/sxs.spec index e199bb1..2a27313 100644 --- a/dlls/sxs/sxs.spec +++ b/dlls/sxs/sxs.spec @@ -1,2 +1,2 @@ @ stdcall CreateAssemblyCache(ptr long) -@ stub CreateAssemblyNameObject +@ stdcall CreateAssemblyNameObject(ptr wstr long ptr) diff --git a/include/winsxs.idl b/include/winsxs.idl index b425b2f..775c69a 100644 --- a/include/winsxs.idl +++ b/include/winsxs.idl @@ -195,3 +195,4 @@ typedef [public] enum } CREATE_ASM_NAME_OBJ_FLAGS; cpp_quote("HRESULT WINAPI CreateAssemblyCache(IAssemblyCache**,DWORD);") +cpp_quote("HRESULT WINAPI CreateAssemblyNameObject(LPASSEMBLYNAME *,LPCWSTR,DWORD,LPVOID);")

1 0

Hans Leidekker : include: Add the IAssemblyName interface.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: cc3d2101305253fa51d1be485e18a8bdab4447c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc3d2101305253fa51d1be485… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 14 09:43:56 2012 +0100 include: Add the IAssemblyName interface. --- include/winsxs.idl | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/include/winsxs.idl b/include/winsxs.idl index 202b91f..b425b2f 100644 --- a/include/winsxs.idl +++ b/include/winsxs.idl @@ -21,6 +21,7 @@ import "oleidl.idl"; interface IAssemblyCache; interface IAssemblyCacheItem; +interface IAssemblyName; typedef struct _FUSION_INSTALL_REFERENCE_ { @@ -99,4 +100,98 @@ interface IAssemblyCacheItem : IUnknown HRESULT AbortItem(); } +[ + object, + uuid(cd193bc0-b4bc-11D2-9833-00c04fc31d2e), + pointer_default(unique), + local +] +interface IAssemblyName : IUnknown +{ + typedef [public] enum + { + ASM_NAME_PUBLIC_KEY, + ASM_NAME_PUBLIC_KEY_TOKEN, + ASM_NAME_HASH_VALUE, + ASM_NAME_NAME, + ASM_NAME_MAJOR_VERSION, + ASM_NAME_MINOR_VERSION, + ASM_NAME_BUILD_NUMBER, + ASM_NAME_REVISION_NUMBER, + ASM_NAME_CULTURE, + ASM_NAME_PROCESSOR_ID_ARRAY, + ASM_NAME_OSINFO_ARRAY, + ASM_NAME_HASH_ALGID, + ASM_NAME_ALIAS, + ASM_NAME_CODEBASE_URL, + ASM_NAME_CODEBASE_LASTMOD, + ASM_NAME_NULL_PUBLIC_KEY, + ASM_NAME_NULL_PUBLIC_KEY_TOKEN, + ASM_NAME_CUSTOM, + ASM_NAME_NULL_CUSTOM, + ASM_NAME_MVID, + ASM_NAME_MAX_PARAMS + } ASM_NAME; + + typedef [public] enum + { + ASM_DISPLAYF_VERSION = 0x1, + ASM_DISPLAYF_CULTURE = 0x2, + ASM_DISPLAYF_PUBLIC_KEY_TOKEN = 0x4, + ASM_DISPLAYF_PUBLIC_KEY = 0x8, + ASM_DISPLAYF_CUSTOM = 0x10, + ASM_DISPLAYF_PROCESSORARCHITECTURE = 0x20, + ASM_DISPLAYF_LANGUAGEID = 0x40 + } ASM_DISPLAY_FLAGS; + + HRESULT SetProperty( + [in] DWORD id, + [in] LPVOID property, + [in] DWORD size); + + HRESULT GetProperty( + [in] DWORD id, + [out] LPVOID buffer, + [in][out] LPDWORD buflen); + + HRESULT Finalize(); + + HRESULT GetDisplayName( + [out] LPWSTR buffer, + [in][out] LPDWORD buflen, + [in] DWORD flags); + + HRESULT Reserved( + [in] REFIID riid, + [in] IUnknown *pUnkReserved1, + [in] IUnknown *pUnkReserved2, + [in] LPCOLESTR szReserved, + [in] LONGLONG llReserved, + [in] LPVOID pvReserved, + [in] DWORD cbReserved, + [out] LPVOID *ppReserved); + + HRESULT GetName( + [in][out] LPDWORD buflen, + [out] LPWSTR buffer); + + HRESULT GetVersion( + [out] LPDWORD hi, + [out] LPDWORD low); + + HRESULT IsEqual( + [in] IAssemblyName *name, + [in] DWORD flags); + + HRESULT Clone( + [out] IAssemblyName **name); +} + +typedef [unique] IAssemblyName *LPASSEMBLYNAME; +typedef [public] enum +{ + CANOF_PARSE_DISPLAY_NAME = 0x1, + CANOF_SET_DEFAULT_VALUES = 0x2 +} CREATE_ASM_NAME_OBJ_FLAGS; + cpp_quote("HRESULT WINAPI CreateAssemblyCache(IAssemblyCache**,DWORD);")

1 0

Nikolay Sivov : msxml3: Implement getIndexFromQName() for MXAttributes.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: c685b92b3d36835c436c4c86dae707c4cca8fe0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c685b92b3d36835c436c4c86d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 14 12:18:55 2012 +0300 msxml3: Implement getIndexFromQName() for MXAttributes. --- dlls/msxml3/mxwriter.c | 25 +++++++++++++++++++++---- dlls/msxml3/tests/saxreader.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 86c0da0..3bb4c7a 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1786,12 +1786,29 @@ static HRESULT WINAPI SAXAttributes_getIndexFromName(ISAXAttributes *iface, cons return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getIndexFromQName(ISAXAttributes *iface, const WCHAR * pQName, - int nQNameLength, int * index) +static HRESULT WINAPI SAXAttributes_getIndexFromQName(ISAXAttributes *iface, const WCHAR *qname, + int len, int *index) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%s:%d %p): stub\n", This, debugstr_wn(pQName, nQNameLength), nQNameLength, index); - return E_NOTIMPL; + int i; + + TRACE("(%p)->(%s:%d %p)\n", This, debugstr_wn(qname, len), len, index); + + if (!index && (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3)) + return E_POINTER; + + if (!qname || !index || !len) return E_INVALIDARG; + + for (i = 0; i < This->length; i++) + { + if (len != SysStringLen(This->attr[i].qname)) continue; + if (strncmpW(qname, This->attr[i].qname, len)) continue; + + *index = i; + return S_OK; + } + + return E_INVALIDARG; } static HRESULT WINAPI SAXAttributes_getType(ISAXAttributes *iface, int index, const WCHAR **type, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ccd690a..e9cfda8 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3299,8 +3299,8 @@ static void test_mxattr_addAttribute(void) ISAXAttributes *saxattr; IMXAttributes *mxattr; const WCHAR *value; + int len, index; HRESULT hr; - int len; if (!is_clsid_supported(table->clsid, mxattributes_support_data)) { @@ -3405,6 +3405,38 @@ static void test_mxattr_addAttribute(void) ok(*value == 0, "%d: got type value %s\n", i, wine_dbgstr_w(value)); ok(len == 0, "%d: got wrong type value length %d\n", i, len); } + + hr = ISAXAttributes_getIndexFromQName(saxattr, NULL, 0, NULL); + if (IsEqualGUID(table->clsid, &CLSID_SAXAttributes) || + IsEqualGUID(table->clsid, &CLSID_SAXAttributes30)) + { + EXPECT_HR(hr, E_POINTER); + } + else + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getIndexFromQName(saxattr, NULL, 0, &index); + EXPECT_HR(hr, E_INVALIDARG); + + index = -1; + hr = ISAXAttributes_getIndexFromQName(saxattr, _bstr_("nonexistent"), 11, &index); + EXPECT_HR(hr, E_INVALIDARG); + ok(index == -1, "%d: got wrong index %d\n", i, index); + + index = -1; + hr = ISAXAttributes_getIndexFromQName(saxattr, _bstr_(table->qname), 0, &index); + EXPECT_HR(hr, E_INVALIDARG); + ok(index == -1, "%d: got wrong index %d\n", i, index); + + index = -1; + hr = ISAXAttributes_getIndexFromQName(saxattr, _bstr_(table->qname), strlen(table->qname), &index); + EXPECT_HR(hr, S_OK); + ok(index == 0, "%d: got wrong index %d\n", i, index); + + index = -1; + hr = ISAXAttributes_getIndexFromQName(saxattr, _bstr_(table->qname), strlen(table->qname)-1, &index); + EXPECT_HR(hr, E_INVALIDARG); + ok(index == -1, "%d: got wrong index %d\n", i, index); } len = -1;

1 0

Nikolay Sivov : msxml3: Implement getType() for MXAttributes.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 69bc0966458d0e22b7f3aed4ae3cc549f4a8da18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bc0966458d0e22b7f3aed4a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 14 11:44:34 2012 +0300 msxml3: Implement getType() for MXAttributes. --- dlls/msxml3/mxwriter.c | 20 +++++++++++++++----- dlls/msxml3/tests/saxreader.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index b28bd19..86c0da0 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1612,7 +1612,7 @@ static HRESULT WINAPI MXAttributes_addAttribute(IMXAttributes *iface, attr->qname = SysAllocString(QName); attr->local = SysAllocString(localName); attr->uri = SysAllocString(uri); - attr->type = SysAllocString(type); + attr->type = SysAllocString(type ? type : emptyW); attr->value = SysAllocString(value); This->length++; @@ -1794,12 +1794,22 @@ static HRESULT WINAPI SAXAttributes_getIndexFromQName(ISAXAttributes *iface, con return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getType(ISAXAttributes *iface, int nIndex, const WCHAR ** pType, - int * pTypeLength) +static HRESULT WINAPI SAXAttributes_getType(ISAXAttributes *iface, int index, const WCHAR **type, + int *len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%d %p %p): stub\n", This, nIndex, pType, pTypeLength); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p %p)\n", This, index, type, len); + + if (index >= This->length) return E_INVALIDARG; + + if ((!type || !len) && (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3)) + return E_POINTER; + + *type = This->attr[index].type; + *len = SysStringLen(This->attr[index].type); + + return S_OK; } static HRESULT WINAPI SAXAttributes_getTypeFromName(ISAXAttributes *iface, const WCHAR * pUri, int nUri, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 95c7787..ccd690a 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3341,6 +3341,18 @@ static void test_mxattr_addAttribute(void) hr = ISAXAttributes_getValue(saxattr, 0, NULL, NULL); EXPECT_HR(hr, E_INVALIDARG); + hr = ISAXAttributes_getType(saxattr, 0, &value, &len); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getType(saxattr, 0, NULL, &len); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getType(saxattr, 0, &value, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getType(saxattr, 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + hr = IMXAttributes_addAttribute(mxattr, _bstr_(table->uri), _bstr_(table->local), _bstr_(table->qname), _bstr_(table->type), _bstr_(table->value)); ok(hr == table->hr, "%d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); @@ -3359,6 +3371,15 @@ static void test_mxattr_addAttribute(void) hr = ISAXAttributes_getValue(saxattr, 0, NULL, NULL); EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getType(saxattr, 0, NULL, &len); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getType(saxattr, 0, &value, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getType(saxattr, 0, NULL, NULL); + EXPECT_HR(hr, E_POINTER); } len = -1; @@ -3367,6 +3388,23 @@ static void test_mxattr_addAttribute(void) ok(!lstrcmpW(_bstr_(table->value), value), "%d: got %s, expected %s\n", i, wine_dbgstr_w(value), table->value); ok(lstrlenW(value) == len, "%d: got wrong value length %d\n", i, len); + + len = -1; + value = (void*)0xdeadbeef; + hr = ISAXAttributes_getType(saxattr, 0, &value, &len); + EXPECT_HR(hr, S_OK); + + if (table->type) + { + ok(!lstrcmpW(_bstr_(table->type), value), "%d: got %s, expected %s\n", i, wine_dbgstr_w(value), + table->type); + ok(lstrlenW(value) == len, "%d: got wrong type value length %d\n", i, len); + } + else + { + ok(*value == 0, "%d: got type value %s\n", i, wine_dbgstr_w(value)); + ok(len == 0, "%d: got wrong type value length %d\n", i, len); + } } len = -1;

1 0

Nikolay Sivov : msxml3: Implement getValue() for MXAttributes.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 4cddf045fc6e7b7c4aaaf39db2d3b91a7e7004ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cddf045fc6e7b7c4aaaf39db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 14 09:21:05 2012 +0300 msxml3: Implement getValue() for MXAttributes. --- dlls/msxml3/mxwriter.c | 18 ++++++++++++++---- dlls/msxml3/tests/saxreader.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index f749eb5..b28bd19 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1819,12 +1819,22 @@ static HRESULT WINAPI SAXAttributes_getTypeFromQName(ISAXAttributes *iface, cons return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getValue(ISAXAttributes *iface, int nIndex, const WCHAR ** pValue, - int * nValue) +static HRESULT WINAPI SAXAttributes_getValue(ISAXAttributes *iface, int index, const WCHAR **value, + int *len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%d %p %p): stub\n", This, nIndex, pValue, nValue); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p %p)\n", This, index, value, len); + + if (index >= This->length) return E_INVALIDARG; + + if ((!value || !len) && (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3)) + return E_POINTER; + + *value = This->attr[index].value; + *len = SysStringLen(This->attr[index].value); + + return S_OK; } static HRESULT WINAPI SAXAttributes_getValueFromName(ISAXAttributes *iface, const WCHAR * pUri, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 8b0a3c4..95c7787 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3298,6 +3298,7 @@ static void test_mxattr_addAttribute(void) { ISAXAttributes *saxattr; IMXAttributes *mxattr; + const WCHAR *value; HRESULT hr; int len; @@ -3328,10 +3329,46 @@ static void test_mxattr_addAttribute(void) EXPECT_HR(hr, S_OK); ok(len == 0, "got %d\n", len); + hr = ISAXAttributes_getValue(saxattr, 0, &value, &len); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValue(saxattr, 0, NULL, &len); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValue(saxattr, 0, &value, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValue(saxattr, 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + hr = IMXAttributes_addAttribute(mxattr, _bstr_(table->uri), _bstr_(table->local), _bstr_(table->qname), _bstr_(table->type), _bstr_(table->value)); ok(hr == table->hr, "%d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); + if (hr == S_OK) + { + /* SAXAttributes40 and SAXAttributes60 both crash on this test */ + if (IsEqualGUID(table->clsid, &CLSID_SAXAttributes) || + IsEqualGUID(table->clsid, &CLSID_SAXAttributes30)) + { + hr = ISAXAttributes_getValue(saxattr, 0, NULL, &len); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValue(saxattr, 0, &value, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValue(saxattr, 0, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + } + + len = -1; + hr = ISAXAttributes_getValue(saxattr, 0, &value, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(_bstr_(table->value), value), "%d: got %s, expected %s\n", i, wine_dbgstr_w(value), + table->value); + ok(lstrlenW(value) == len, "%d: got wrong value length %d\n", i, len); + } + len = -1; hr = ISAXAttributes_getLength(saxattr, &len); EXPECT_HR(hr, S_OK);

1 0

Nicolas Le Cam : msvcp90/tests: Don't redefine __thiscall.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 99db789eda402ab3665b2f66b09de720ef102e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99db789eda402ab3665b2f66b… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Mar 1 22:18:33 2012 +0100 msvcp90/tests: Don't redefine __thiscall. --- dlls/msvcp90/tests/misc.c | 1 + dlls/msvcp90/tests/string.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 688f344..e7f88c5 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -60,6 +60,7 @@ static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); static MSVCP__Ctypevec (__cdecl *p__Getctype)(void); +#undef __thiscall #ifdef __i386__ #define __thiscall __stdcall #else diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 6857dee..8bc5f18 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -52,6 +52,7 @@ static void* (__cdecl *p_set_invalid_parameter_handler)(void*); static basic_string_char* (__cdecl *p_basic_string_char_concatenate)(basic_string_char*, const basic_string_char*, const basic_string_char*); static basic_string_char* (__cdecl *p_basic_string_char_concatenate_cstr)(basic_string_char*, const basic_string_char*, const char*); +#undef __thiscall #ifdef __i386__ #define __thiscall __stdcall #else

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
71
Older →

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 March 2012