January 2014 - Wine-Commits

Nikolay Sivov : scrrun: Use DISPID_VALUE instead of 0 in private idl.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: c84189609da41c584fc395ced8213b81ce50ba7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84189609da41c584fc395ced… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 3 14:26:01 2014 +0400 scrrun: Use DISPID_VALUE instead of 0 in private idl. --- dlls/scrrun/scrrun.idl | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/scrrun/scrrun.idl b/dlls/scrrun/scrrun.idl index 98bd8b9..73948b5 100644 --- a/dlls/scrrun/scrrun.idl +++ b/dlls/scrrun/scrrun.idl @@ -116,13 +116,13 @@ library Scripting ] interface IDictionary : IDispatch { - [id(00000000), propputref] + [id(DISPID_VALUE), propputref] HRESULT Item([in] VARIANT* Key, [in] VARIANT* pRetItem); - [id(00000000), propput] + [id(DISPID_VALUE), propput] HRESULT Item([in] VARIANT* Key, [in] VARIANT* pRetItem); - [id(00000000), propget] + [id(DISPID_VALUE), propget] HRESULT Item([in] VARIANT* Key, [out, retval] VARIANT* pRetItem); [id(0x00000001)] @@ -263,7 +263,7 @@ library Scripting oleautomation ] interface IDriveCollection : IDispatch { - [id(00000000)] + [id(DISPID_VALUE)] HRESULT Item([in] VARIANT Key, [out, retval] IDrive** ppdrive); [id(DISPID_NEWENUM), propget, restricted, hidden] @@ -283,7 +283,7 @@ library Scripting ] interface IDrive : IDispatch { - [id(00000000), propget] + [id(DISPID_VALUE), propget] HRESULT Path([out, retval] BSTR* pbstrPath); [id(0x00002710), propget] @@ -333,7 +333,7 @@ library Scripting ] interface IFolder : IDispatch { - [id(00000000), propget] + [id(DISPID_VALUE), propget] HRESULT Path([out, retval] BSTR* pbstrPath); [id(0x000003e8), propget] @@ -411,7 +411,7 @@ library Scripting [id(0x00000002)] HRESULT Add([in] BSTR Name, [out, retval] IFolder** ppfolder); - [id(00000000), propget] + [id(DISPID_VALUE), propget] HRESULT Item([in] VARIANT Key, [out, retval] IFolder** ppfolder); [id(DISPID_NEWENUM), propget, restricted, hidden] @@ -431,7 +431,7 @@ library Scripting ] interface IFileCollection : IDispatch { - [id(00000000), propget] + [id(DISPID_VALUE), propget] HRESULT Item([in] VARIANT Key, [out, retval] IFile** ppfile); [id(DISPID_NEWENUM), propget, restricted, hidden] @@ -451,7 +451,7 @@ library Scripting ] interface IFile : IDispatch { - [id(00000000), propget] + [id(DISPID_VALUE), propget] HRESULT Path([out, retval] BSTR* pbstrPath); [id(0x000003e8), propget] @@ -582,7 +582,7 @@ library Scripting ] interface IScriptEncoder : IDispatch { - [id(00000000)] + [id(DISPID_VALUE)] HRESULT EncodeScriptFile([in] BSTR szExt, [in] BSTR bstrStreamIn, [in] long cFlags, [in] BSTR bstrDefaultLang, [out, retval] BSTR* pbstrStreamOut); }

1 0

Nikolay Sivov : scrrun: Implement IEnumVARIANT stub for folder collection.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 47e1ac9f98ddc158bb69ae8c6594dc598af9e99d URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e1ac9f98ddc158bb69ae8c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 3 16:35:07 2014 +0400 scrrun: Implement IEnumVARIANT stub for folder collection. --- dlls/scrrun/filesystem.c | 132 +++++++++++++++++++++++++++++++++++++++- dlls/scrrun/tests/filesystem.c | 53 ++++++++++++++++- 2 files changed, 182 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index c96ae6d..5459b7e 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -36,6 +36,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrrun); +struct enumdata { + union + { + struct + { + IFolderCollection *coll; + } foldercoll; + } u; +}; + +struct enumvariant { + IEnumVARIANT IEnumVARIANT_iface; + LONG ref; + + struct enumdata data; +}; + struct foldercollection { IFolderCollection IFolderCollection_iface; LONG ref; @@ -87,6 +104,11 @@ static inline struct foldercollection *impl_from_IFolderCollection(IFolderCollec return CONTAINING_RECORD(iface, struct foldercollection, IFolderCollection_iface); } +static inline struct enumvariant *impl_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, struct enumvariant, IEnumVARIANT_iface); +} + static inline HRESULT create_error(DWORD err) { switch(err) { @@ -348,6 +370,107 @@ static HRESULT create_textstream(IOMode mode, ITextStream **ret) return S_OK; } +static HRESULT WINAPI enumvariant_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **obj) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualIID( riid, &IID_IEnumVARIANT ) || + IsEqualIID( riid, &IID_IUnknown )) + { + *obj = iface; + IEnumVARIANT_AddRef(iface); + } + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI enumvariant_AddRef(IEnumVARIANT *iface) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI foldercoll_enumvariant_Release(IEnumVARIANT *iface) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + IFolderCollection_Release(This->data.u.foldercoll.coll); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI foldercoll_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 foldercoll_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 foldercoll_enumvariant_Reset(IEnumVARIANT *iface) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI foldercoll_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 foldercollenumvariantvtbl = { + enumvariant_QueryInterface, + enumvariant_AddRef, + foldercoll_enumvariant_Release, + foldercoll_enumvariant_Next, + foldercoll_enumvariant_Skip, + foldercoll_enumvariant_Reset, + foldercoll_enumvariant_Clone +}; + +static HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnknown **newenum) +{ + struct enumvariant *This; + + *newenum = NULL; + + This = heap_alloc(sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->IEnumVARIANT_iface.lpVtbl = &foldercollenumvariantvtbl; + This->ref = 1; + This->data.u.foldercoll.coll = &collection->IFolderCollection_iface; + IFolderCollection_AddRef(This->data.u.foldercoll.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); @@ -468,8 +591,13 @@ static HRESULT WINAPI foldercoll_get_Item(IFolderCollection *iface, VARIANT key, static HRESULT WINAPI foldercoll_get__NewEnum(IFolderCollection *iface, IUnknown **newenum) { struct foldercollection *This = impl_from_IFolderCollection(iface); - FIXME("(%p)->(%p): stub\n", This, newenum); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, newenum); + + if(!newenum) + return E_POINTER; + + return create_foldercoll_enum(This, newenum); } static HRESULT WINAPI foldercoll_get_Count(IFolderCollection *iface, LONG *count) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 23cbd2c..b373df4 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -33,6 +33,15 @@ static IFileSystem3 *fs3; +static inline ULONG get_refcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + +#define GET_REFCOUNT(iface) \ + get_refcount((IUnknown*)iface) + static void test_interfaces(void) { static const WCHAR nonexistent_dirW[] = { @@ -781,7 +790,9 @@ static void test_FolderCollection(void) static const WCHAR bW[] = {'\\','b',0}; IFolderCollection *folders; WCHAR buffW[MAX_PATH], pathW[MAX_PATH], path2W[MAX_PATH]; - LONG count, count2; + IEnumVARIANT *enumvar, *clone; + LONG count, count2, ref, ref2; + IUnknown *unk, *unk2; IFolder *folder; HRESULT hr; BSTR str; @@ -818,6 +829,46 @@ static void test_FolderCollection(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(count2 > count, "got %d, %d\n", count, count2); + hr = IFolderCollection_get__NewEnum(folders, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IFolderCollection_QueryInterface(folders, &IID_IEnumVARIANT, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + /* NewEnum creates new instance each time it's called */ + ref = GET_REFCOUNT(folders); + + unk = NULL; + hr = IFolderCollection_get__NewEnum(folders, &unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ref2 = GET_REFCOUNT(folders); + ok(ref2 == ref + 1, "got %d, %d\n", ref2, ref); + + unk2 = NULL; + hr = IFolderCollection_get__NewEnum(folders, &unk2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(unk != unk2, "got %p, %p\n", unk2, unk); + IUnknown_Release(unk2); + + /* now get IEnumVARIANT */ + ref = GET_REFCOUNT(folders); + hr = IUnknown_QueryInterface(unk, &IID_IEnumVARIANT, (void**)&enumvar); + ok(hr == S_OK, "got 0x%08x\n", hr); + ref2 = GET_REFCOUNT(folders); + ok(ref2 == ref, "got %d, %d\n", ref2, ref); + + /* clone enumerator */ + hr = IEnumVARIANT_Clone(enumvar, &clone); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) { + ok(clone != enumvar, "got %p, %p\n", enumvar, clone); + IEnumVARIANT_Release(clone); +} + IEnumVARIANT_Release(enumvar); + IUnknown_Release(unk); + RemoveDirectoryW(pathW); RemoveDirectoryW(path2W);

1 0

Nikolay Sivov : scrrun: Implement Reset() for folder collection.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 3cc34a5bf88f9ba059efa52d0f47f0a1274cccfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc34a5bf88f9ba059efa52d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 3 16:35:31 2014 +0400 scrrun: Implement Reset() for folder collection. --- dlls/scrrun/filesystem.c | 21 +++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 4 ++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 5459b7e..fa53950 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -42,6 +42,8 @@ struct enumdata { struct { IFolderCollection *coll; + HANDLE find; + BSTR path; } foldercoll; } u; }; @@ -408,6 +410,8 @@ static ULONG WINAPI foldercoll_enumvariant_Release(IEnumVARIANT *iface) if (!ref) { IFolderCollection_Release(This->data.u.foldercoll.coll); + SysFreeString(This->data.u.foldercoll.path); + FindClose(This->data.u.foldercoll.find); heap_free(This); } @@ -431,8 +435,13 @@ static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG cel static HRESULT WINAPI foldercoll_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.foldercoll.find); + This->data.u.foldercoll.find = NULL; + + return S_OK; } static HRESULT WINAPI foldercoll_enumvariant_Clone(IEnumVARIANT *iface, IEnumVARIANT **pclone) @@ -463,6 +472,14 @@ static HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnkn This->IEnumVARIANT_iface.lpVtbl = &foldercollenumvariantvtbl; This->ref = 1; + This->data.u.foldercoll.find = NULL; + This->data.u.foldercoll.path = SysAllocString(collection->path); + if (!This->data.u.foldercoll.path) + { + heap_free(This); + return E_OUTOFMEMORY; + } + This->data.u.foldercoll.coll = &collection->IFolderCollection_iface; IFolderCollection_AddRef(This->data.u.foldercoll.coll); diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index b373df4..be5131c 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -866,6 +866,10 @@ if (hr == S_OK) { ok(clone != enumvar, "got %p, %p\n", enumvar, clone); IEnumVARIANT_Release(clone); } + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "got 0x%08x\n", hr); + IEnumVARIANT_Release(enumvar); IUnknown_Release(unk);

1 0

Martin Storsjo : ntdll: Improve handling of THUMB_MOV32 relocations.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 48ae8f307007117f68ef1d40e5f3e4816e9e1802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ae8f307007117f68ef1d40e… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Jan 2 23:24:57 2014 +0200 ntdll: Improve handling of THUMB_MOV32 relocations. --- dlls/ntdll/loader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e0907e7..e25ba1f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2230,19 +2230,19 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count DWORD inst = *(INT_PTR *)((char *)page + offset); DWORD imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); + DWORD hi_delta; if ((inst & 0x8000fbf0) != 0x0000f240) ERR("wrong Thumb2 instruction %08x, expected MOVW\n", inst); imm16 += LOWORD(delta); - if (imm16 > 0xffff) - ERR("resulting immediate value won't fit: %08x\n", imm16); + hi_delta = HIWORD(delta) + HIWORD(imm16); *(INT_PTR *)((char *)page + offset) = (inst & 0x8f00fbf0) + ((imm16 >> 1) & 0x0400) + ((imm16 >> 12) & 0x000f) + ((imm16 << 20) & 0x70000000) + ((imm16 << 16) & 0xff0000); - if (delta > 0xffff) + if (hi_delta != 0) { inst = *(INT_PTR *)((char *)page + offset + 4); imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + @@ -2251,7 +2251,7 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count if ((inst & 0x8000fbf0) != 0x0000f2c0) ERR("wrong Thumb2 instruction %08x, expected MOVT\n", inst); - imm16 += HIWORD(delta); + imm16 += hi_delta; if (imm16 > 0xffff) ERR("resulting immediate value won't fit: %08x\n", imm16); *(INT_PTR *)((char *)page + offset + 4) = (inst & 0x8f00fbf0) +

1 0

Nikolay Sivov : scrrun: Added IFolderCollection stub.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 2a3f1560bb403d387a67ef99aae6e2e56b2e476b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a3f1560bb403d387a67ef99a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 3 16:33:43 2014 +0400 scrrun: Added IFolderCollection stub. --- dlls/scrrun/filesystem.c | 178 +++++++++++++++++++++++++++++++++++++++- dlls/scrrun/scrrun.c | 1 + dlls/scrrun/scrrun_private.h | 1 + dlls/scrrun/tests/filesystem.c | 25 ++++++ 4 files changed, 203 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 1254532..1d2beda 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -36,6 +36,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrrun); +struct foldercollection { + IFolderCollection IFolderCollection_iface; + LONG ref; +}; + struct folder { IFolder IFolder_iface; LONG ref; @@ -76,6 +81,11 @@ static inline struct textstream *impl_from_ITextStream(ITextStream *iface) return CONTAINING_RECORD(iface, struct textstream, ITextStream_iface); } +static inline struct foldercollection *impl_from_IFolderCollection(IFolderCollection *iface) +{ + return CONTAINING_RECORD(iface, struct foldercollection, IFolderCollection_iface); +} + static inline HRESULT create_error(DWORD err) { switch(err) { @@ -337,6 +347,165 @@ static HRESULT create_textstream(IOMode mode, ITextStream **ret) return S_OK; } +static HRESULT WINAPI foldercoll_QueryInterface(IFolderCollection *iface, REFIID riid, void **obj) +{ + struct foldercollection *This = impl_from_IFolderCollection(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualIID( riid, &IID_IFolderCollection ) || + IsEqualIID( riid, &IID_IDispatch ) || + IsEqualIID( riid, &IID_IUnknown )) + { + *obj = iface; + IFolderCollection_AddRef(iface); + } + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI foldercoll_AddRef(IFolderCollection *iface) +{ + struct foldercollection *This = impl_from_IFolderCollection(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI foldercoll_Release(IFolderCollection *iface) +{ + struct foldercollection *This = impl_from_IFolderCollection(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI foldercoll_GetTypeInfoCount(IFolderCollection *iface, UINT *pctinfo) +{ + struct foldercollection *This = impl_from_IFolderCollection(iface); + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI foldercoll_GetTypeInfo(IFolderCollection *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + struct foldercollection *This = impl_from_IFolderCollection(iface); + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo(IFolderCollection_tid, ppTInfo); +} + +static HRESULT WINAPI foldercoll_GetIDsOfNames(IFolderCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + struct foldercollection *This = impl_from_IFolderCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IFolderCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI foldercoll_Invoke(IFolderCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + struct foldercollection *This = impl_from_IFolderCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IFolderCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI foldercoll_Add(IFolderCollection *iface, BSTR name, IFolder **folder) +{ + struct foldercollection *This = impl_from_IFolderCollection(iface); + FIXME("(%p)->(%s %p): stub\n", This, debugstr_w(name), folder); + return E_NOTIMPL; +} + +static HRESULT WINAPI foldercoll_get_Item(IFolderCollection *iface, VARIANT key, IFolder **folder) +{ + struct foldercollection *This = impl_from_IFolderCollection(iface); + FIXME("(%p)->(%p): stub\n", This, folder); + return E_NOTIMPL; +} + +static HRESULT WINAPI foldercoll_get__NewEnum(IFolderCollection *iface, IUnknown **newenum) +{ + struct foldercollection *This = impl_from_IFolderCollection(iface); + FIXME("(%p)->(%p): stub\n", This, newenum); + return E_NOTIMPL; +} + +static HRESULT WINAPI foldercoll_get_Count(IFolderCollection *iface, LONG *count) +{ + struct foldercollection *This = impl_from_IFolderCollection(iface); + FIXME("(%p)->(%p): stub\n", This, count); + return E_NOTIMPL; +} + +static const IFolderCollectionVtbl foldercollvtbl = { + foldercoll_QueryInterface, + foldercoll_AddRef, + foldercoll_Release, + foldercoll_GetTypeInfoCount, + foldercoll_GetTypeInfo, + foldercoll_GetIDsOfNames, + foldercoll_Invoke, + foldercoll_Add, + foldercoll_get_Item, + foldercoll_get__NewEnum, + foldercoll_get_Count +}; + +static HRESULT create_foldercoll(IFolderCollection **folders) +{ + struct foldercollection *This; + + *folders = NULL; + + This = heap_alloc(sizeof(struct foldercollection)); + if (!This) return E_OUTOFMEMORY; + + This->IFolderCollection_iface.lpVtbl = &foldercollvtbl; + This->ref = 1; + + *folders = &This->IFolderCollection_iface; + + return S_OK; +} + static HRESULT WINAPI folder_QueryInterface(IFolder *iface, REFIID riid, void **obj) { struct folder *This = impl_from_IFolder(iface); @@ -568,8 +737,13 @@ static HRESULT WINAPI folder_get_Size(IFolder *iface, VARIANT *size) static HRESULT WINAPI folder_get_SubFolders(IFolder *iface, IFolderCollection **folders) { struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%p): stub\n", This, folders); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, folders); + + if(!folders) + return E_POINTER; + + return create_foldercoll(folders); } static HRESULT WINAPI folder_get_Files(IFolder *iface, IFileCollection **files) diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 3739e30..761e2d6 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -105,6 +105,7 @@ static REFIID tid_ids[] = { &IID_IDictionary, &IID_IFileSystem3, &IID_IFolder, + &IID_IFolderCollection, &IID_ITextStream, &IID_IFile }; diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index aa24dde..2c6aba5 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -27,6 +27,7 @@ typedef enum tid_t IDictionary_tid, IFileSystem3_tid, IFolder_tid, + IFolderCollection_tid, ITextStream_tid, IFile_tid, LAST_tid diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index a6c5980..b5d2e1f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -775,6 +775,30 @@ static void test_GetFolder(void) IFolder_Release(folder); } +static void test_FolderCollection(void) +{ + IFolderCollection *folders; + WCHAR buffW[MAX_PATH]; + IFolder *folder; + HRESULT hr; + BSTR str; + + GetWindowsDirectoryW(buffW, MAX_PATH); + str = SysAllocString(buffW); + hr = IFileSystem3_GetFolder(fs3, str, &folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + hr = IFolder_get_SubFolders(folder, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IFolder_get_SubFolders(folder, &folders); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IFolderCollection_Release(folders); + IFolder_Release(folder); +} + START_TEST(filesystem) { HRESULT hr; @@ -800,6 +824,7 @@ START_TEST(filesystem) test_CopyFolder(); test_BuildPath(); test_GetFolder(); + test_FolderCollection(); IFileSystem3_Release(fs3);

1 0

Nikolay Sivov : scrrun: Implement Count() property for folder collection.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 51f5ab19990b453efdb5013e576984039b306b51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f5ab19990b453efdb5013e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 3 16:34:44 2014 +0400 scrrun: Implement Count() property for folder collection. --- dlls/scrrun/filesystem.c | 42 ++++++++++++++++++++++++++++++++++++--- dlls/scrrun/tests/filesystem.c | 30 ++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 949173a..c96ae6d 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -39,6 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrrun); struct foldercollection { IFolderCollection IFolderCollection_iface; LONG ref; + BSTR path; }; struct folder { @@ -383,7 +384,10 @@ static ULONG WINAPI foldercoll_Release(IFolderCollection *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + SysFreeString(This->path); heap_free(This); + } return ref; } @@ -471,8 +475,32 @@ static HRESULT WINAPI foldercoll_get__NewEnum(IFolderCollection *iface, IUnknown static HRESULT WINAPI foldercoll_get_Count(IFolderCollection *iface, LONG *count) { struct foldercollection *This = impl_from_IFolderCollection(iface); - FIXME("(%p)->(%p): stub\n", This, count); - return E_NOTIMPL; + static const WCHAR allW[] = {'\\','*',0}; + WIN32_FIND_DATAW data; + WCHAR pathW[MAX_PATH]; + HANDLE handle; + + TRACE("(%p)->(%p)\n", This, count); + + if(!count) + return E_POINTER; + + *count = 0; + + strcpyW(pathW, This->path); + strcatW(pathW, allW); + handle = FindFirstFileW(pathW, &data); + if (handle == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + do + { + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + *count += 1; + } while (FindNextFileW(handle, &data)); + FindClose(handle); + + return S_OK; } static const IFolderCollectionVtbl foldercollvtbl = { @@ -489,7 +517,7 @@ static const IFolderCollectionVtbl foldercollvtbl = { foldercoll_get_Count }; -static HRESULT create_foldercoll(IFolderCollection **folders) +static HRESULT create_foldercoll(BSTR path, IFolderCollection **folders) { struct foldercollection *This; @@ -500,6 +528,12 @@ static HRESULT create_foldercoll(IFolderCollection **folders) This->IFolderCollection_iface.lpVtbl = &foldercollvtbl; This->ref = 1; + This->path = SysAllocString(path); + if (!This->path) + { + heap_free(This); + return E_OUTOFMEMORY; + } *folders = &This->IFolderCollection_iface; @@ -744,7 +778,7 @@ static HRESULT WINAPI folder_get_SubFolders(IFolder *iface, IFolderCollection ** if(!folders) return E_POINTER; - return create_foldercoll(folders); + return create_foldercoll(This->path, folders); } static HRESULT WINAPI folder_get_Files(IFolder *iface, IFileCollection **files) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index b5d2e1f..23cbd2c 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -777,13 +777,17 @@ static void test_GetFolder(void) static void test_FolderCollection(void) { + static const WCHAR aW[] = {'\\','a',0}; + static const WCHAR bW[] = {'\\','b',0}; IFolderCollection *folders; - WCHAR buffW[MAX_PATH]; + WCHAR buffW[MAX_PATH], pathW[MAX_PATH], path2W[MAX_PATH]; + LONG count, count2; IFolder *folder; HRESULT hr; BSTR str; - GetWindowsDirectoryW(buffW, MAX_PATH); + GetTempPathW(MAX_PATH, buffW); + str = SysAllocString(buffW); hr = IFileSystem3_GetFolder(fs3, str, &folder); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -792,9 +796,31 @@ static void test_FolderCollection(void) hr = IFolder_get_SubFolders(folder, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); + lstrcpyW(pathW, buffW); + lstrcatW(pathW, aW); + CreateDirectoryW(pathW, NULL); + hr = IFolder_get_SubFolders(folder, &folders); ok(hr == S_OK, "got 0x%08x\n", hr); + count = 0; + hr = IFolderCollection_get_Count(folders, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count > 0, "got %d\n", count); + + lstrcpyW(path2W, buffW); + lstrcatW(path2W, bW); + CreateDirectoryW(path2W, NULL); + + /* every time property is requested it scans directory */ + count2 = 0; + hr = IFolderCollection_get_Count(folders, &count2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count2 > count, "got %d, %d\n", count, count2); + + RemoveDirectoryW(pathW); + RemoveDirectoryW(path2W); + IFolderCollection_Release(folders); IFolder_Release(folder); }

1 0

Frédéric Delanoy : winedump: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 201e49d4aa66cbc907841d8c6b94f9a40daf7984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=201e49d4aa66cbc907841d8c6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 3 01:57:01 2014 +0100 winedump: Use BOOL type where appropriate. --- tools/winedump/main.c | 2 +- tools/winedump/search.c | 8 ++++---- tools/winedump/winedump.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index 9b076e1..ca2047b 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -447,7 +447,7 @@ int main (int argc, char *argv[]) int result = symbol_demangle (&symbol); if (result) - result = symbol_search (&symbol); + result = !symbol_search (&symbol); if (!result && symbol.function_name) /* Clean up the prototype */ diff --git a/tools/winedump/search.c b/tools/winedump/search.c index 7b3a98f..08aa8e1 100644 --- a/tools/winedump/search.c +++ b/tools/winedump/search.c @@ -36,7 +36,7 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg); * Call Patrik Stridvall's 'function_grep.pl' script to retrieve a * function prototype from include file(s) */ -int symbol_search (parsed_symbol *sym) +BOOL symbol_search (parsed_symbol *sym) { static const size_t MAX_RESULT_LEN = 1024; FILE *grep; @@ -47,7 +47,7 @@ int symbol_search (parsed_symbol *sym) assert (sym && sym->symbol); if (!symbol_is_valid_c (sym)) - return - 1; + return FALSE; if (!grep_buff) grep_buff = malloc (MAX_RESULT_LEN); @@ -137,7 +137,7 @@ int symbol_search (parsed_symbol *sym) { pclose (f_grep); pclose (grep); - return 0; /* OK */ + return TRUE; /* OK */ } if (VERBOSE) puts ("Failed, trying next"); @@ -152,7 +152,7 @@ int symbol_search (parsed_symbol *sym) attempt++; } - return -1; /* Not found */ + return FALSE; /* Not found */ } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index ea7fc87..754a7d2 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -166,7 +166,7 @@ void symbol_init(parsed_symbol* symbol, const char* name); int symbol_demangle (parsed_symbol *symbol); -int symbol_search (parsed_symbol *symbol); +BOOL symbol_search (parsed_symbol *symbol); void symbol_clear(parsed_symbol *sym);

1 0

Nikolay Sivov : scrrun: Fix IFolder::QueryInterface() to respond to IDispatch query.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 0802e301ffcdc261eeb5be3b8dd89c7295a36dce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0802e301ffcdc261eeb5be3b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 3 16:34:24 2014 +0400 scrrun: Fix IFolder::QueryInterface() to respond to IDispatch query. --- dlls/scrrun/filesystem.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 1d2beda..949173a 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -514,8 +514,9 @@ static HRESULT WINAPI folder_QueryInterface(IFolder *iface, REFIID riid, void ** *obj = NULL; - if (IsEqualGUID( riid, &IID_IFolder ) || - IsEqualGUID( riid, &IID_IUnknown)) + if (IsEqualIID( riid, &IID_IFolder ) || + IsEqualIID( riid, &IID_IDispatch ) || + IsEqualIID( riid, &IID_IUnknown)) { *obj = iface; IFolder_AddRef(iface);

1 0

Stefan Dösinger : d3dx9_36: Floatify some constants.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 6bc4ebd51691e03d36c4b3a32389f9e1b3c3636c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc4ebd51691e03d36c4b3a32… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 2 15:23:50 2014 +0100 d3dx9_36: Floatify some constants. --- dlls/d3dx9_36/math.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index bcda6cc..a5dbee1 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -162,7 +162,7 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation2D(D3DXMATRIX *out, FLOAT scal s = sinf(rotation / 2.0f); tmp1 = 1.0f - 2.0f * s * s; - tmp2 = 2.0 * s * cosf(rotation / 2.0f); + tmp2 = 2.0f * s * cosf(rotation / 2.0f); D3DXMatrixIdentity(out); out->u.m[0][0] = scaling * tmp1; @@ -2423,7 +2423,7 @@ FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, const D3DXVECTOR3 *dir out[31] = sqrtf(165.0f / D3DX_PI) / 16.0f * dir->x * (14.0f * dirzz - 21.0f * dirzzzz - 1.0f); out[32] = sqrtf(1155.0f / D3DX_PI) / 8.0f * dir->z * (dirxx - diryy) * (3.0f * dirzz - 1.0f); out[33] = sqrtf(770.0f / D3DX_PI) / 32.0f * dir->x * (dirxx - 3.0f * diryy) * (1.0f - 9.0f * dirzz); - out[34] = 3.0f / 16.0f * sqrtf(385.0f / D3DX_PI) * dir->z * (dirxxxx - 6.0 * dirxyxy + diryyyy); + out[34] = 3.0f / 16.0f * sqrtf(385.0f / D3DX_PI) * dir->z * (dirxxxx - 6.0f * dirxyxy + diryyyy); out[35] = -3.0f/ 32.0f * sqrtf(154.0f / D3DX_PI) * dir->x * (dirxxxx - 10.0f * dirxyxy + 5.0f * diryyyy); return out; @@ -2629,8 +2629,8 @@ FLOAT * WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b) t = a[4] * b[5] + a[5] * b[4]; out[7] += 0.15607834f * t; - ta = 0.28209479f * a[0] + 0.09011186 * a[6] - 0.15607835f * a[8]; - tb = 0.28209479f * b[0] + 0.09011186 * b[6] - 0.15607835f * b[8]; + ta = 0.28209479f * a[0] + 0.09011186f * a[6] - 0.15607835f * a[8]; + tb = 0.28209479f * b[0] + 0.09011186f * b[6] - 0.15607835f * b[8]; out[5] += ta * b[5] + tb * a[5]; t = a[5] * b[5]; out[0] += 0.28209479f * t; @@ -2644,8 +2644,8 @@ FLOAT * WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b) out[0] += 0.28209480f * t; out[6] += 0.18022376f * t; - ta = 0.28209479f * a[0] + 0.09011186 * a[6] + 0.15607835f * a[8]; - tb = 0.28209479f * b[0] + 0.09011186 * b[6] + 0.15607835f * b[8]; + ta = 0.28209479f * a[0] + 0.09011186f * a[6] + 0.15607835f * a[8]; + tb = 0.28209479f * b[0] + 0.09011186f * b[6] + 0.15607835f * b[8]; out[7] += ta * b[7] + tb * a[7]; t = a[7] * b[7]; out[0] += 0.28209479f * t; @@ -2988,7 +2988,7 @@ static void rotate_X(FLOAT *out, UINT order, FLOAT a, FLOAT *in) out[25] = a * 0.7015607357f * in[30] - a * 0.6846531630f * in[32] + a * 0.1976423711f * in[34]; out[26] = -0.5f * in[26] + 0.8660253882f * in[28]; - out[27] = a * 0.5229125023f * in[30] + a * 0.3061861992f * in[32] - a * 0.7954951525 * in[34]; + out[27] = a * 0.5229125023f * in[30] + a * 0.3061861992f * in[32] - a * 0.7954951525f * in[34]; out[28] = 0.8660253882f * in[26] + 0.5f * in[28]; out[29] = a * 0.4841229022f * in[30] + a * 0.6614378691f * in[32] + a * 0.5728219748f * in[34]; out[30] = -a * 0.7015607357f * in[25] - a * 0.5229125023f * in[27] - a * 0.4841229022f * in[29];

1 0

Stefan Dösinger : d3dx9_36/tests: Use NAN.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 95317c33a969cb41c6dc5ecc68c0a8712662dc23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95317c33a969cb41c6dc5ecc6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 2 15:23:53 2014 +0100 d3dx9_36/tests: Use NAN. --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 3a876e5..21c3b41 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4800,7 +4800,7 @@ static void test_create_skin_info(void) exp_vertices[0] = 0; exp_vertices[1] = 0x87654321; exp_weights[0] = 0.5; - exp_weights[1] = 0.0f / 0.0f; /* NAN */ + exp_weights[1] = NAN; num_influences = 2; hr = skininfo->lpVtbl->SetBoneInfluence(skininfo, 1, num_influences, vertices, weights);

1 0