January 2014 - Wine-commits

Dmitry Timoshkov : wmiutils: Remove unused IUnknown *outer parameter from object constructors.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: f8a18f9c904fa6f5c2f44edc7028856f5033a449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a18f9c904fa6f5c2f44edc7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 30 18:21:40 2013 +0900 wmiutils: Remove unused IUnknown *outer parameter from object constructors. --- dlls/wmiutils/main.c | 7 ++----- dlls/wmiutils/path.c | 10 +++++----- dlls/wmiutils/statuscode.c | 4 ++-- dlls/wmiutils/wmiutils_private.h | 4 ++-- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/wmiutils/main.c b/dlls/wmiutils/main.c index c088a68..89fd26b 100644 --- a/dlls/wmiutils/main.c +++ b/dlls/wmiutils/main.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); static HINSTANCE instance; -typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); +typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); typedef struct { @@ -87,14 +87,11 @@ static HRESULT WINAPI wmiutils_cf_CreateInstance( IClassFactory *iface, LPUNKNOW if (pOuter) return CLASS_E_NOAGGREGATION; - r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk ); + r = This->pfnCreateInstance( (LPVOID *)&punk ); if (FAILED(r)) return r; r = IUnknown_QueryInterface( punk, riid, ppobj ); - if (FAILED(r)) - return r; - IUnknown_Release( punk ); return r; } diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 046f424..647724f 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -276,11 +276,11 @@ static const struct IWbemPathKeyListVtbl keylist_vtbl = keylist_GetText }; -static HRESULT WbemPathKeyList_create( IUnknown *pUnkOuter, IWbemPath *parent, LPVOID *ppObj ) +static HRESULT WbemPathKeyList_create( IWbemPath *parent, LPVOID *ppObj ) { struct keylist *keylist; - TRACE("%p, %p\n", pUnkOuter, ppObj); + TRACE("%p\n", ppObj); if (!(keylist = heap_alloc( sizeof(*keylist) ))) return E_OUTOFMEMORY; @@ -1178,7 +1178,7 @@ static HRESULT WINAPI path_GetKeyList( LeaveCriticalSection( &path->cs ); return WBEM_E_INVALID_PARAMETER; } - hr = WbemPathKeyList_create( NULL, iface, (void **)pOut ); + hr = WbemPathKeyList_create( iface, (void **)pOut ); LeaveCriticalSection( &path->cs ); return hr; @@ -1269,11 +1269,11 @@ static const struct IWbemPathVtbl path_vtbl = path_IsSameClassName }; -HRESULT WbemPath_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT WbemPath_create( LPVOID *ppObj ) { struct path *path; - TRACE("%p, %p\n", pUnkOuter, ppObj); + TRACE("%p\n", ppObj); if (!(path = heap_alloc( sizeof(*path) ))) return E_OUTOFMEMORY; diff --git a/dlls/wmiutils/statuscode.c b/dlls/wmiutils/statuscode.c index 0718c17..719f3af 100644 --- a/dlls/wmiutils/statuscode.c +++ b/dlls/wmiutils/statuscode.c @@ -132,11 +132,11 @@ static const struct IWbemStatusCodeTextVtbl status_code_vtbl = status_code_GetFacilityCodeText }; -HRESULT WbemStatusCodeText_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT WbemStatusCodeText_create( LPVOID *ppObj ) { status_code *sc; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); if (!(sc = heap_alloc( sizeof(*sc) ))) return E_OUTOFMEMORY; diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index fbd6ab5..2b76f71 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -18,8 +18,8 @@ #include "wine/unicode.h" -HRESULT WbemPath_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemPath_create(LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemStatusCodeText_create(LPVOID *) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc( size_t len )

1 0

Piotr Caban : msvcp110: Share the source code with msvcp90.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 50e3f110d00f698ab17cd90064a2e7e538c855b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e3f110d00f698ab17cd9006… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 7 15:20:57 2014 +0100 msvcp110: Share the source code with msvcp90. --- dlls/msvcp110/Makefile.in | 15 +- dlls/msvcp110/msvcp110.c | 37 - dlls/msvcp110/msvcp110.spec | 5832 +++++++++++++++++++++---------------------- dlls/msvcp90/locale.c | 15 +- 4 files changed, 2944 insertions(+), 2955 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50e3f110d00f698ab17cd…

1 0

Piotr Caban : msvcr110: Add __libm_sse2_sqrt_precise implementation.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 07566faaca053d7b2c9915e9a2bd20fdf51ba81f URL: http://source.winehq.org/git/wine.git/?a=commit;h=07566faaca053d7b2c9915e9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 7 15:47:34 2014 +0100 msvcr110: Add __libm_sse2_sqrt_precise implementation. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcrt/math.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ba588f9..9b3ebe8 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1394,7 +1394,7 @@ @ cdecl -arch=i386 _libm_sse2_log_precise() msvcrt.__libm_sse2_log @ cdecl -arch=i386 _libm_sse2_pow_precise() msvcrt.__libm_sse2_pow @ cdecl -arch=i386 _libm_sse2_sin_precise() msvcrt.__libm_sse2_sin -@ stub -arch=i386 _libm_sse2_sqrt_precise +@ cdecl -arch=i386 _libm_sse2_sqrt_precise() msvcrt.__libm_sse2_sqrt_precise @ cdecl -arch=i386 _libm_sse2_tan_precise() msvcrt.__libm_sse2_tan @ cdecl _loaddll(str) msvcrt._loaddll @ cdecl -arch=x86_64 _local_unwind(ptr ptr) msvcrt._local_unwind diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6bcc2b7..6af8776 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2185,4 +2185,13 @@ void __cdecl __libm_sse2_tanf(void) __asm__ __volatile__( "movd %0,%%xmm0" : : "g" (f) ); } +/* __libm_sse2_sqrt_precise */ +void __cdecl __libm_sse2_sqrt_precise(void) +{ + double d; + __asm__ __volatile__( "movd %%xmm0,%0" : "=m" (d) ); + d = sqrt( d ); + __asm__ __volatile__( "movd %0,%%xmm0" : : "m" (d) ); +} + #endif /* __i386__ */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e482784..fa458a4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1538,3 +1538,4 @@ @ cdecl _fstat32(long ptr) @ cdecl _fstat64i32(long ptr) @ cdecl _is_exception_typeof(ptr ptr) +@ cdecl -arch=i386 __libm_sse2_sqrt_precise()

1 0

Piotr Caban : msvcr110: Add __crtTerminateProcess implementation.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 460991a8e993336177e43996e773970decd3b1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=460991a8e993336177e43996e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 7 16:14:17 2014 +0100 msvcr110: Add __crtTerminateProcess implementation. --- dlls/msvcr110/msvcr110.c | 8 ++++++++ dlls/msvcr110/msvcr110.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr110/msvcr110.c b/dlls/msvcr110/msvcr110.c index 04a0dc2..51fce29 100644 --- a/dlls/msvcr110/msvcr110.c +++ b/dlls/msvcr110/msvcr110.c @@ -62,3 +62,11 @@ int CDECL MSVCR110__crtGetShowWindowMode(void) TRACE("window=%d\n", si.wShowWindow); return si.wShowWindow; } + +/********************************************************************* + * __crtTerminateProcess (MSVCR110.@) + */ +int CDECL MSVCR110__crtTerminateProcess(UINT exit_code) +{ + return TerminateProcess(GetCurrentProcess(), exit_code); +} diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9b3ebe8..19e1769 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -929,7 +929,7 @@ @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub -arch=i386,win64 __crtSetThreadStackGuarantee @ cdecl __crtSetUnhandledExceptionFilter(ptr) MSVCR110__crtSetUnhandledExceptionFilter -@ stub -arch=i386,win64 __crtTerminateProcess +@ cdecl -arch=i386,win64 __crtTerminateProcess(long) MSVCR110__crtTerminateProcess @ stub -arch=i386,win64 __crtUnhandledException @ cdecl __daylight() msvcrt.__daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit

1 0

Frédéric Delanoy : wbemprox/tests: Use BOOL type where appropriate.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: aa0eceb554a35e7d53ffe4e0c8acd6a580246750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa0eceb554a35e7d53ffe4e0c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 7 00:14:36 2014 +0100 wbemprox/tests: Use BOOL type where appropriate. --- dlls/wbemprox/tests/services.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index 7f8a7a2..b36748e 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -115,7 +115,7 @@ static void test_IWbemLocator(void) { const WCHAR *path; HRESULT result; - int todo; + BOOL todo; HRESULT result_broken; } test[] = @@ -124,10 +124,10 @@ static void test_IWbemLocator(void) { path1W, WBEM_E_INVALID_NAMESPACE }, { path2W, WBEM_E_INVALID_NAMESPACE }, { path3W, WBEM_E_INVALID_NAMESPACE }, - { path4W, WBEM_E_INVALID_NAMESPACE, 0, WBEM_E_INVALID_PARAMETER }, + { path4W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, { path5W, WBEM_E_INVALID_NAMESPACE }, - { path6W, 0x800706ba, 1 }, - { path7W, 0x800706ba, 1 }, + { path6W, 0x800706ba, TRUE }, + { path7W, 0x800706ba, TRUE }, { path8W, WBEM_E_INVALID_NAMESPACE }, { path9W, S_OK }, { path10W, WBEM_E_INVALID_PARAMETER },

1 0

Frédéric Delanoy : wmiutils/tests: Use BOOL type where appropriate.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 50629d7ca9e31589f2ad726a7fd7f29cea848a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50629d7ca9e31589f2ad726a7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 7 00:14:37 2014 +0100 wmiutils/tests: Use BOOL type where appropriate. --- dlls/wmiutils/tests/path.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index ffc3d46..56bebb3 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -94,7 +94,7 @@ static void test_IWbemPath_SetText(void) const WCHAR *path; ULONG mode; HRESULT ret; - int todo; + BOOL todo; } test[] = { { path1, 0, WBEM_E_INVALID_PARAMETER }, @@ -113,15 +113,15 @@ static void test_IWbemPath_SetText(void) { path7, WBEMPATH_CREATE_ACCEPT_RELATIVE, S_OK }, { path7, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, S_OK }, { path7, WBEMPATH_CREATE_ACCEPT_ALL, S_OK }, - { path7, WBEMPATH_TREAT_SINGLE_IDENT_AS_NS, WBEM_E_INVALID_PARAMETER, 1 }, + { path7, WBEMPATH_TREAT_SINGLE_IDENT_AS_NS, WBEM_E_INVALID_PARAMETER, TRUE }, { path7, WBEMPATH_TREAT_SINGLE_IDENT_AS_NS + 1, S_OK }, { path8, WBEMPATH_CREATE_ACCEPT_RELATIVE, S_OK }, - { path8, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, WBEM_E_INVALID_PARAMETER, 1 }, + { path8, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, WBEM_E_INVALID_PARAMETER, TRUE }, { path8, WBEMPATH_CREATE_ACCEPT_ALL, S_OK }, - { path8, WBEMPATH_TREAT_SINGLE_IDENT_AS_NS, WBEM_E_INVALID_PARAMETER, 1 }, + { path8, WBEMPATH_TREAT_SINGLE_IDENT_AS_NS, WBEM_E_INVALID_PARAMETER, TRUE }, { path8, WBEMPATH_TREAT_SINGLE_IDENT_AS_NS + 1, S_OK }, { path9, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, S_OK }, - { path10, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, WBEM_E_INVALID_PARAMETER, 1 }, + { path10, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, WBEM_E_INVALID_PARAMETER, TRUE }, { path11, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, S_OK }, { path15, WBEMPATH_CREATE_ACCEPT_ALL, S_OK } };

1 0

Frédéric Delanoy : xmllite/tests: Use BOOL type where appropriate.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: e5b689b71e73b7774438df1786e23aff80262055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b689b71e73b7774438df178… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 7 00:14:38 2014 +0100 xmllite/tests: Use BOOL type where appropriate. --- dlls/xmllite/tests/reader.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 658bb10..0888a7e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -89,11 +89,11 @@ static IStream *create_stream_on_data(const char *data, int size) } static void ok_pos_(IXmlReader *reader, int line, int pos, int line_broken, - int pos_broken, int todo, int _line_) + int pos_broken, BOOL todo, int _line_) { UINT l, p; HRESULT hr; - int broken_state; + BOOL broken_state; hr = IXmlReader_GetLineNumber(reader, &l); ok_(__FILE__, _line_)(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -101,7 +101,7 @@ static void ok_pos_(IXmlReader *reader, int line, int pos, int line_broken, ok_(__FILE__, _line_)(hr == S_OK, "Expected S_OK, got %08x\n", hr); if (line_broken == -1 && pos_broken == -1) - broken_state = 0; + broken_state = FALSE; else broken_state = broken((line_broken == -1 ? line : line_broken) == l && (pos_broken == -1 ? pos : pos_broken) == p); @@ -151,7 +151,7 @@ static const IID *empty_seq[] = { static input_iids_t input_iids; -static void ok_iids_(const input_iids_t *iids, const IID **expected, const IID **exp_broken, int todo, int line) +static void ok_iids_(const input_iids_t *iids, const IID **expected, const IID **exp_broken, BOOL todo, int line) { int i = 0, size = 0; @@ -242,18 +242,18 @@ static const char *type_to_str(XmlNodeType type) } static void test_read_state_(IXmlReader *reader, XmlReadState expected, - XmlReadState exp_broken, int todo, int line) + XmlReadState exp_broken, BOOL todo, int line) { XmlReadState state; HRESULT hr; - int broken_state; + BOOL broken_state; state = -1; /* invalid value */ hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, (LONG_PTR*)&state); ok_(__FILE__, line)(hr == S_OK, "Expected S_OK, got %08x\n", hr); if (exp_broken == -1) - broken_state = 0; + broken_state = FALSE; else broken_state = broken(exp_broken == state); @@ -642,7 +642,7 @@ static void test_reader_state(void) ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); /* attempt to read on closed reader */ - test_read_state(reader, XmlReadState_Closed, -1, 0); + test_read_state(reader, XmlReadState_Closed, -1, FALSE); if (0) { /* newer versions crash here, probably cause no input was set */ @@ -699,7 +699,7 @@ static void test_read_xmldeclaration(void) "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); /* new version 1.2.x and 1.3.x properly update position for <?xml ?> */ ok_pos(reader, 1, 3, -1, 55, TRUE); - test_read_state(reader, XmlReadState_Interactive, -1, 0); + test_read_state(reader, XmlReadState_Interactive, -1, FALSE); hr = IXmlReader_GetValue(reader, &val, NULL); ok(hr == S_OK, "got %08x\n", hr); @@ -770,7 +770,7 @@ struct test_entry { const char *value; HRESULT hr; HRESULT hr_broken; /* this is set to older version results */ - int todo : 1; + BOOL todo; }; static struct test_entry comment_tests[] = { @@ -1338,8 +1338,8 @@ static void test_readvaluechunk(void) static struct test_entry cdata_tests[] = { { "<a><![CDATA[ ]]data ]]></a>", "", " ]]data ", S_OK }, { "<a><![CDATA[<![CDATA[ data ]]]]></a>", "", "<![CDATA[ data ]]", S_OK }, - { "<a><![CDATA[\n \r\n \n\n ]]></a>", "", "\n \n \n\n ", S_OK, S_OK, 1 }, - { "<a><![CDATA[\r \r\r\n \n\n ]]></a>", "", "\n \n\n \n\n ", S_OK, S_OK, 1 }, + { "<a><![CDATA[\n \r\n \n\n ]]></a>", "", "\n \n \n\n ", S_OK, S_OK, TRUE }, + { "<a><![CDATA[\r \r\r\n \n\n ]]></a>", "", "\n \n\n \n\n ", S_OK, S_OK, TRUE }, { "<a><![CDATA[\r\r \n\r \r \n\n ]]></a>", "", "\n\n \n\n \n \n\n ", S_OK }, { NULL } };

1 0

Nikolay Sivov : scrrun: Added stub NewEnum support for IFileCollection.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 0920a3296ee68d07276d83b0db1f4865af102102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0920a3296ee68d07276d83b0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 03:24:41 2014 +0400 scrrun: Added stub NewEnum support for IFileCollection. --- dlls/scrrun/filesystem.c | 87 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index c61020d..94d894f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -47,6 +47,10 @@ struct enumdata { HANDLE find; BSTR path; } foldercoll; + struct + { + IFileCollection *coll; + } filecoll; } u; }; @@ -592,6 +596,80 @@ static HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnkn return S_OK; } +static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + IFileCollection_Release(This->data.u.filecoll.coll); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p)->(%d %p %p): stub\n", This, celt, var, fetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p)->(%d): stub\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI filecoll_enumvariant_Reset(IEnumVARIANT *iface) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI filecoll_enumvariant_Clone(IEnumVARIANT *iface, IEnumVARIANT **pclone) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p)->(%p): stub\n", This, pclone); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl filecollenumvariantvtbl = { + enumvariant_QueryInterface, + enumvariant_AddRef, + filecoll_enumvariant_Release, + filecoll_enumvariant_Next, + filecoll_enumvariant_Skip, + filecoll_enumvariant_Reset, + filecoll_enumvariant_Clone +}; + +static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown **newenum) +{ + struct enumvariant *This; + + *newenum = NULL; + + This = heap_alloc(sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->IEnumVARIANT_iface.lpVtbl = &filecollenumvariantvtbl; + This->ref = 1; + + This->data.u.filecoll.coll = &collection->IFileCollection_iface; + IFileCollection_AddRef(This->data.u.filecoll.coll); + + *newenum = (IUnknown*)&This->IEnumVARIANT_iface; + + return S_OK; +} + static HRESULT WINAPI foldercoll_QueryInterface(IFolderCollection *iface, REFIID riid, void **obj) { struct foldercollection *This = impl_from_IFolderCollection(iface); @@ -899,8 +977,13 @@ static HRESULT WINAPI filecoll_get_Item(IFileCollection *iface, VARIANT Key, IFi static HRESULT WINAPI filecoll_get__NewEnum(IFileCollection *iface, IUnknown **ppenum) { struct filecollection *This = impl_from_IFileCollection(iface); - FIXME("(%p)->(%p)\n", This, ppenum); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppenum); + + if(!ppenum) + return E_POINTER; + + return create_filecoll_enum(This, ppenum); } static HRESULT WINAPI filecoll_get_Count(IFileCollection *iface, LONG *count)

1 0

Nikolay Sivov : scrrun: Implement Next() for file collection.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 308f1144ac6ffd64d08d2a72ce6b4090617d9082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=308f1144ac6ffd64d08d2a72c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 03:25:02 2014 +0400 scrrun: Implement Next() for file collection. --- dlls/scrrun/filesystem.c | 99 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 94d894f..eb75a1f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -50,6 +50,8 @@ struct enumdata { struct { IFileCollection *coll; + HANDLE find; + BSTR path; } filecoll; } u; }; @@ -70,6 +72,7 @@ struct foldercollection { struct filecollection { IFileCollection IFileCollection_iface; LONG ref; + BSTR path; }; struct folder { @@ -142,6 +145,7 @@ static inline HRESULT create_error(DWORD err) } static HRESULT create_folder(const WCHAR*, IFolder**); +static HRESULT create_file(BSTR, IFile**); static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) { @@ -153,6 +157,11 @@ static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) strcmpW(data->cFileName, dotW); } +static inline BOOL is_file_data(const WIN32_FIND_DATAW *data) +{ + return !(data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); +} + static BSTR get_full_path(BSTR path, const WIN32_FIND_DATAW *data) { int len = SysStringLen(path); @@ -606,6 +615,7 @@ static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface) if (!ref) { IFileCollection_Release(This->data.u.filecoll.coll); + SysFreeString(This->data.u.filecoll.path); heap_free(This); } @@ -615,8 +625,74 @@ static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface) static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%d %p %p): stub\n", This, celt, var, fetched); - return E_NOTIMPL; + HANDLE handle = This->data.u.filecoll.find; + WIN32_FIND_DATAW data; + ULONG count = 0; + + TRACE("(%p)->(%d %p %p)\n", This, celt, var, fetched); + + if (fetched) + *fetched = 0; + + if (!handle) + { + static const WCHAR allW[] = {'*',0}; + WCHAR pathW[MAX_PATH]; + BSTR parent = This->data.u.filecoll.path; + int len; + + strcpyW(pathW, parent); + len = SysStringLen(parent); + if (parent[len-1] != '\\') + strcatW(pathW, bsW); + strcatW(pathW, allW); + handle = FindFirstFileW(pathW, &data); + if (handle == INVALID_HANDLE_VALUE) + return S_FALSE; + + while (1) + { + if (is_file_data(&data)) + break; + else + if (!FindNextFileW(handle, &data)) + { + FindClose(handle); + return S_FALSE; + } + } + + This->data.u.filecoll.find = handle; + } + + do + { + if (count >= celt) break; + + if (is_file_data(&data)) + { + IFile *file; + HRESULT hr; + BSTR str; + + str = get_full_path(This->data.u.filecoll.path, &data); + hr = create_file(str, &file); + SysFreeString(str); + if (FAILED(hr)) return hr; + + V_VT(&var[count]) = VT_DISPATCH; + V_DISPATCH(&var[count]) = (IDispatch*)file; + count++; + } + } while (FindNextFileW(handle, &data)); + + if (count < celt) + return S_FALSE; + + if (fetched) + *fetched = count; + + return S_OK; } static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) @@ -661,6 +737,12 @@ static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown This->IEnumVARIANT_iface.lpVtbl = &filecollenumvariantvtbl; This->ref = 1; + This->data.u.filecoll.path = SysAllocString(collection->path); + if (!This->data.u.filecoll.path) + { + heap_free(This); + return E_OUTOFMEMORY; + } This->data.u.filecoll.coll = &collection->IFileCollection_iface; IFileCollection_AddRef(This->data.u.filecoll.coll); @@ -903,7 +985,10 @@ static ULONG WINAPI filecoll_Release(IFileCollection *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + SysFreeString(This->path); heap_free(This); + } return ref; } @@ -1006,7 +1091,7 @@ static const IFileCollectionVtbl filecollectionvtbl = { filecoll_get_Count }; -static HRESULT create_filecoll(IFileCollection **files) +static HRESULT create_filecoll(BSTR path, IFileCollection **files) { struct filecollection *This; @@ -1017,6 +1102,12 @@ static HRESULT create_filecoll(IFileCollection **files) This->IFileCollection_iface.lpVtbl = &filecollectionvtbl; This->ref = 1; + This->path = SysAllocString(path); + if (!This->path) + { + heap_free(This); + return E_OUTOFMEMORY; + } *files = &This->IFileCollection_iface; return S_OK; @@ -1290,7 +1381,7 @@ static HRESULT WINAPI folder_get_Files(IFolder *iface, IFileCollection **files) if(!files) return E_POINTER; - return create_filecoll(files); + return create_filecoll(This->path, files); } static HRESULT WINAPI folder_CreateTextFile(IFolder *iface, BSTR filename, VARIANT_BOOL overwrite,

1 0

Nikolay Sivov : scrrun: Implement Reset() for file collection.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 6dbc8195a0e4ae5fcb9751437e400e6473c0c2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dbc8195a0e4ae5fcb9751437… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 03:25:20 2014 +0400 scrrun: Implement Reset() for file collection. --- dlls/scrrun/filesystem.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index eb75a1f..a2562ef 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -705,8 +705,13 @@ static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) static HRESULT WINAPI filecoll_enumvariant_Reset(IEnumVARIANT *iface) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + FindClose(This->data.u.filecoll.find); + This->data.u.filecoll.find = NULL; + + return S_OK; } static HRESULT WINAPI filecoll_enumvariant_Clone(IEnumVARIANT *iface, IEnumVARIANT **pclone)

1 0