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

Zhenbo Li : kernel32/tests: Add one more test for FindFirstFileA.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 767c09f16f1e02912a21fbe3863a24380b08a07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=767c09f16f1e02912a21fbe38… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Dec 31 13:05:41 2013 +0800 kernel32/tests: Add one more test for FindFirstFileA. --- dlls/kernel32/tests/file.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3ac4be8..7101e7b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2430,6 +2430,14 @@ static void test_FindFirstFileA(void) ok ( err == ERROR_PATH_NOT_FOUND, "Bad Error number %d\n", err ); } + /* try FindFirstFileA without trailing backslash */ + SetLastError( 0xdeadbeaf ); + strcpy(buffer2, nonexistent); + handle = FindFirstFileA(buffer2, &data); + err = GetLastError(); + ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should Fail\n", buffer2 ); + ok ( err == ERROR_FILE_NOT_FOUND, "Bad Error number %d\n", err ); + /* try FindFirstFileA on "C:\foo\bar.txt" */ SetLastError( 0xdeadbeaf ); strcpy(buffer2, nonexistent);

1 0

Michael Müller : quartz: Return increasing monitor GUID on VMR7 monitor enumeration.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 6e373aa6956c8bc267c0051cb04f6a34574cca5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e373aa6956c8bc267c0051cb… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Dec 31 03:23:19 2013 +0100 quartz: Return increasing monitor GUID on VMR7 monitor enumeration. --- dlls/quartz/vmr9.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 31f3f8e..53e4942 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1314,7 +1314,14 @@ static BOOL CALLBACK get_available_monitors_proc(HMONITOR hmon, HDC hdc, LPRECT VMRMONITORINFO *info = args->info7++; memset(info, 0, sizeof(*info)); - info->guid.pGUID = NULL; /* FIXME */ + if (args->numdev > 0) + { + info->guid.pGUID = &info->guid.GUID; + info->guid.GUID.Data4[7] = args->numdev; + } + else + info->guid.pGUID = NULL; + CopyRect(&info->rcMonitor, &mi.rcMonitor); info->hMon = hmon; info->dwFlags = mi.dwFlags;

1 0

Nikolay Sivov : scrrun: Implement GetFolder().
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: f76f34ca23990f02ba20e5957609ee0c2335b124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76f34ca23990f02ba20e5957… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 2 21:27:45 2014 +0400 scrrun: Implement GetFolder(). --- dlls/scrrun/filesystem.c | 19 ++++++++++++++++--- dlls/scrrun/tests/filesystem.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 2753ecc..1254532 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1410,11 +1410,24 @@ static HRESULT WINAPI filesys_GetFile(IFileSystem3 *iface, BSTR FilePath, } static HRESULT WINAPI filesys_GetFolder(IFileSystem3 *iface, BSTR FolderPath, - IFolder **ppfolder) + IFolder **folder) { - FIXME("%p %s %p\n", iface, debugstr_w(FolderPath), ppfolder); + DWORD attrs; - return E_NOTIMPL; + TRACE("%p %s %p\n", iface, debugstr_w(FolderPath), folder); + + if(!folder) + return E_POINTER; + + *folder = NULL; + if(!FolderPath) + return E_INVALIDARG; + + attrs = GetFileAttributesW(FolderPath); + if((attrs == INVALID_FILE_ATTRIBUTES) || !(attrs & FILE_ATTRIBUTE_DIRECTORY)) + return CTL_E_PATHNOTFOUND; + + return create_folder(FolderPath, folder); } static HRESULT WINAPI filesys_GetSpecialFolder(IFileSystem3 *iface, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index ba0ff37..a6c5980 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -739,6 +739,42 @@ static void test_BuildPath(void) } } +static void test_GetFolder(void) +{ + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + WCHAR buffW[MAX_PATH]; + IFolder *folder; + HRESULT hr; + BSTR str; + + folder = (void*)0xdeadbeef; + hr = IFileSystem3_GetFolder(fs3, NULL, &folder); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(folder == NULL, "got %p\n", folder); + + hr = IFileSystem3_GetFolder(fs3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + /* something that doesn't exist */ + str = SysAllocString(dummyW); + + hr = IFileSystem3_GetFolder(fs3, str, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + folder = (void*)0xdeadbeef; + hr = IFileSystem3_GetFolder(fs3, str, &folder); + ok(hr == CTL_E_PATHNOTFOUND, "got 0x%08x\n", hr); + ok(folder == NULL, "got %p\n", folder); + SysFreeString(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); + IFolder_Release(folder); +} + START_TEST(filesystem) { HRESULT hr; @@ -763,6 +799,7 @@ START_TEST(filesystem) test_GetFile(); test_CopyFolder(); test_BuildPath(); + test_GetFolder(); IFileSystem3_Release(fs3);

1 0

Piotr Caban : msvcrt: Try to convert C to C++ exception in __CxxFrameHandler.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 0f3c31b1eab7842834242ac13e5eef0e0d5ce5ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3c31b1eab7842834242ac13… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 2 14:37:59 2014 +0100 msvcrt: Try to convert C to C++ exception in __CxxFrameHandler. --- dlls/msvcrt/except_i386.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 8639579..0481282 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -543,9 +543,19 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } else { + thread_data_t *data = msvcrt_get_thread_data(); + exc_type = NULL; TRACE("handling C exception code %x rec %p frame %p trylevel %d descr %p nested_frame %p\n", rec->ExceptionCode, rec, frame, frame->trylevel, descr, nested_frame ); + + if (data->se_translator) { + EXCEPTION_POINTERS except_ptrs; + + except_ptrs.ExceptionRecord = rec; + except_ptrs.ContextRecord = context; + data->se_translator(rec->ExceptionCode, &except_ptrs); + } } call_catch_block( rec, frame, descr, frame->trylevel, exc_type );

1 0

Stefan Dösinger : d3dx9_36: Add explicit casts in type conversion functions.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: aa2baf8c58054a19440a7a8472004a199f85045e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa2baf8c58054a19440a7a847… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 2 15:23:51 2014 +0100 d3dx9_36: Add explicit casts in type conversion functions. --- dlls/d3dx9_36/util.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index c180d71..ea75dfa 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -308,7 +308,7 @@ static INT get_int(D3DXPARAMETER_TYPE type, const void *data) switch (type) { case D3DXPT_FLOAT: - return *(FLOAT *)data; + return (INT)(*(FLOAT *)data); case D3DXPT_INT: case D3DXPT_VOID: @@ -332,10 +332,10 @@ static FLOAT get_float(D3DXPARAMETER_TYPE type, const void *data) return *(FLOAT *)data; case D3DXPT_INT: - return *(INT *)data; + return (FLOAT)(*(INT *)data); case D3DXPT_BOOL: - return get_bool(type, data); + return (FLOAT)get_bool(type, data); default: FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type));

1 0

Zhenbo Li : wineps.drv: Constify a few pointers.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: c3bb460d686ea653acf78a586bdbbbb16cbe506b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3bb460d686ea653acf78a586… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun Dec 29 13:31:33 2013 +0800 wineps.drv: Constify a few pointers. --- dlls/wineps.drv/type1.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index 316bece..58fe11f 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -63,11 +63,11 @@ enum t1_cmds { (DWORD)_x1 ) #ifdef WORDS_BIGENDIAN -static inline WORD get_be_word(const void *p) { return *(WORD*)p; } -static inline DWORD get_be_dword(const void *p) { return *(DWORD*)p; } +static inline WORD get_be_word(const void *p) { return *(const WORD*)p; } +static inline DWORD get_be_dword(const void *p) { return *(const DWORD*)p; } #else -static inline WORD get_be_word(const void *p) { return RtlUshortByteSwap(*(WORD*)p); } -static inline DWORD get_be_dword(const void *p) { return RtlUlongByteSwap(*(DWORD*)p); } +static inline WORD get_be_word(const void *p) { return RtlUshortByteSwap(*(const WORD*)p); } +static inline DWORD get_be_dword(const void *p) { return RtlUlongByteSwap(*(const DWORD*)p); } #endif TYPE1 *T1_download_header(PHYSDEV dev, char *ps_name, RECT *bbox, UINT emsize) @@ -442,8 +442,8 @@ static BOOL append_complex_glyph(HDC hdc, const BYTE *data, glyph_outline *outli } else { - arg1 = *(char*)ptr++; - arg2 = *(char*)ptr++; + arg1 = *(const char*)ptr++; + arg2 = *(const char*)ptr++; } if(flags & WE_HAVE_A_SCALE) {

1 0

Jacek Caban : msrle32: Get rid of ICM_GETQUALITY and ICM_SET_QUALITY that should not be supported .
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: f9be296be40e8a948a1d3821c49a195818e1a28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9be296be40e8a948a1d3821c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:16:31 2014 +0100 msrle32: Get rid of ICM_GETQUALITY and ICM_SET_QUALITY that should not be supported. --- dlls/msrle32/msrle32.c | 45 +++++++---------------------------------- dlls/msrle32/msrle_private.h | 1 - dlls/msrle32/tests/msrle.c | 9 ++++++++ 3 files changed, 17 insertions(+), 38 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 882b5d2..645e323 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -39,7 +39,6 @@ static HINSTANCE MSRLE32_hModule = 0; #define ABS(a) ((a) < 0 ? -(a) : (a)) #define SQR(a) ((a) * (a)) -#define QUALITY_to_DIST(q) (ICQUALITY_HIGH - q) static inline WORD ColorCmp(WORD clr1, WORD clr2) { UINT a = clr1 - clr2; @@ -547,7 +546,7 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, LPBYTE lpOut, BOOL isKey) { LPWORD lpC; - LONG lLine, lInLine, lDist; + LONG lLine, lInLine; LPBYTE lpOutStart = lpOut; /* pre-conditions */ @@ -556,7 +555,6 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, assert(pi->pCurFrame != NULL); lpC = pi->pCurFrame; - lDist = QUALITY_to_DIST(pi->dwQuality); lInLine = DIBWIDTHBYTES(*lpbiIn); lLine = WIDTHBYTES(lpbiOut->biWidth * 16) / 2; @@ -569,7 +567,7 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, x = 0; do { - x = MSRLE32_CompressRLE4Line(pi, NULL, lpC, lpbiIn, lpIn, lDist, x, + x = MSRLE32_CompressRLE4Line(pi, NULL, lpC, lpbiIn, lpIn, 0, x, &lpOut, &lpbiOut->biSizeImage); } while (x < lpbiOut->biWidth); @@ -603,7 +601,7 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (jumpx == -1) jumpx = x; for (count = 0, pos = x; pos < lpbiOut->biWidth; pos++, count++) { - if (ColorCmp(lpP[pos], lpC[pos]) > lDist) + if (ColorCmp(lpP[pos], lpC[pos]) > 0) break; } @@ -663,7 +661,7 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (x < lpbiOut->biWidth) { /* skipped the 'same' things corresponding to previous frame */ - x = MSRLE32_CompressRLE4Line(pi, lpP, lpC, lpbiIn, lpIn, lDist, x, + x = MSRLE32_CompressRLE4Line(pi, lpP, lpC, lpbiIn, lpIn, 0, x, &lpOut, &lpbiOut->biSizeImage); } } while (x < lpbiOut->biWidth); @@ -701,7 +699,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, LPBYTE lpOut, BOOL isKey) { LPWORD lpC; - LONG lDist, lInLine, lLine; + LONG lInLine, lLine; LPBYTE lpOutStart = lpOut; assert(pi != NULL && lpbiOut != NULL); @@ -709,7 +707,6 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, assert(pi->pCurFrame != NULL); lpC = pi->pCurFrame; - lDist = QUALITY_to_DIST(pi->dwQuality); lInLine = DIBWIDTHBYTES(*lpbiIn); lLine = WIDTHBYTES(lpbiOut->biWidth * 16) / 2; @@ -722,7 +719,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, x = 0; do { - x = MSRLE32_CompressRLE8Line(pi, NULL, lpC, lpbiIn, lpIn, lDist, x, + x = MSRLE32_CompressRLE8Line(pi, NULL, lpC, lpbiIn, lpIn, 0, x, &lpOut, &lpbiOut->biSizeImage); assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); } while (x < lpbiOut->biWidth); @@ -757,7 +754,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (jumpx == -1) jumpx = x; for (count = 0, pos = x; pos < lpbiOut->biWidth; pos++, count++) { - if (ColorCmp(lpP[pos], lpC[pos]) > lDist) + if (ColorCmp(lpP[pos], lpC[pos]) > 0) break; } @@ -804,7 +801,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (x < lpbiOut->biWidth) { /* skip the 'same' things corresponding to previous frame */ - x = MSRLE32_CompressRLE8Line(pi, lpP, lpC, lpbiIn, lpIn, lDist, x, + x = MSRLE32_CompressRLE8Line(pi, lpP, lpC, lpbiIn, lpIn, 0, x, &lpOut, &lpbiOut->biSizeImage); assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); } @@ -1144,7 +1141,6 @@ static CodecInfo* Open(LPICOPEN icinfo) pi->fccHandler = icinfo->fccHandler; pi->bCompress = FALSE; - pi->dwQuality = MSRLE32_DEFAULTQUALITY; pi->nPrevFrame = -1; pi->pPrevFrame = pi->pCurFrame = NULL; @@ -1195,21 +1191,6 @@ static LRESULT GetInfo(const CodecInfo *pi, ICINFO *icinfo, DWORD dwSize) return sizeof(ICINFO); } -static LRESULT SetQuality(CodecInfo *pi, LONG lQuality) -{ - /* pre-condition */ - assert(pi != NULL); - - if (lQuality == -1) - lQuality = MSRLE32_DEFAULTQUALITY; - else if (ICQUALITY_LOW > lQuality || lQuality > ICQUALITY_HIGH) - return ICERR_BADPARAM; - - pi->dwQuality = (DWORD)lQuality; - - return ICERR_OK; -} - static LRESULT Configure(const CodecInfo *pi, HWND hWnd) { /* pre-condition */ @@ -1494,8 +1475,6 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) } for (i = 0; i < 3; i++) { - SetQuality(pi, lpic->dwQuality); - lpic->lpbiOutput->biSizeImage = 0; if (lpic->lpbiOutput->biBitCount == 4) @@ -1850,14 +1829,6 @@ LRESULT CALLBACK MSRLE32_DriverProc(DWORD_PTR dwDrvID, HDRVR hDrv, UINT uMsg, return ICERR_OK; } break; - case ICM_GETQUALITY: - if ((LPVOID)lParam1 != NULL) { - *((LPDWORD)lParam1) = pi->dwQuality; - return ICERR_OK; - } - break; - case ICM_SETQUALITY: - return SetQuality(pi, *(LPLONG)lParam1); case ICM_COMPRESS_GET_FORMAT: return CompressGetFormat(pi, (LPCBITMAPINFOHEADER)lParam1, (LPBITMAPINFOHEADER)lParam2); diff --git a/dlls/msrle32/msrle_private.h b/dlls/msrle32/msrle_private.h index 1ff6cbe..d182fef 100644 --- a/dlls/msrle32/msrle_private.h +++ b/dlls/msrle32/msrle_private.h @@ -46,7 +46,6 @@ typedef struct _CodecInfo { FOURCC fccHandler; - DWORD dwQuality; BOOL bCompress; LONG nPrevFrame; diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 819cb34..58dcc41 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -46,6 +46,15 @@ static void test_encode(void) ok(res == ICERR_OK, "ICSendMessage(ICM_GETDEFAULTQUALITY) failed: %ld\n", res); ok(quality == 8500, "quality = %d\n", quality); + quality = 0xdeadbeef; + res = ICSendMessage(hic, ICM_GETQUALITY, (DWORD_PTR)&quality, 0); + ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_GETQUALITY) failed: %ld\n", res); + ok(quality == 0xdeadbeef, "quality = %d\n", quality); + + quality = ICQUALITY_HIGH; + res = ICSendMessage(hic, ICM_SETQUALITY, (DWORD_PTR)&quality, 0); + ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_SETQUALITY) failed: %ld\n", res); + ICClose(hic); }

1 0

Jacek Caban : msrle32: Append EOI instead of replacing EOL.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: cb767f738d636b23290220f5988e3724d619b64b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb767f738d636b23290220f59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:16:49 2014 +0100 msrle32: Append EOI instead of replacing EOL. --- dlls/msrle32/msrle32.c | 10 ++++++---- dlls/msrle32/tests/msrle.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 645e323..d22b412 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -256,7 +256,7 @@ static LONG MSRLE32_GetMaxCompressedSize(LPCBITMAPINFOHEADER lpbi) } size = (2 + a * (2 + ((a + 2) & ~2)) + b * (2 + ((b + 2) & ~2))); - return size * lpbi->biHeight; + return size * lpbi->biHeight + 2; } /* lpP => current pos in previous frame @@ -820,14 +820,16 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, } } - /* add EOL -- will be changed to EOI */ + /* add EOL */ lpbiOut->biSizeImage += 2; *((LPWORD)lpOut) = 0; lpOut += sizeof(WORD); } - /* change EOL to EOI -- end of image */ - lpOut[-1] = 1; + /* add EOI -- end of image */ + lpbiOut->biSizeImage += 2; + *lpOut++ = 0; + *lpOut++ = 1; assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); return ICERR_OK; diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 58dcc41..1b7e680 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -24,13 +24,40 @@ #include "wine/test.h" +static void test_output(const BYTE *output, int out_size, const BYTE *expect, int size) +{ + char buf[512], *ptr; + int i; + + i = out_size == size && !memcmp(output, expect, size); + ok(i, "Unexpected output\n"); + if(i) + return; + + for(i=0, ptr=buf; i<out_size; i++) + ptr += sprintf(ptr, "%x ", output[i]); + trace("Got: %s\n", buf); + for(i=0, ptr=buf; i<size; i++) + ptr += sprintf(ptr, "%x ", expect[i]); + trace("Exp: %s\n", buf); +} + static void test_encode(void) { - DWORD quality; + BITMAPINFOHEADER *output_header; + DWORD output_size, flags, quality; + BYTE buf[64]; ICINFO info; HIC hic; LRESULT res; + struct { BITMAPINFOHEADER header; RGBQUAD map[256]; } + input_header = { {sizeof(BITMAPINFOHEADER), 32, 1, 1, 8, 0, 32*8, 0, 0, 256, 256}, + {{255,0,0}, {0,255,0}, {0,0,255}, {255,255,255}}}; + + static BYTE input1[32] = {1,2,3,3,3,3,2,3,1}; + static const BYTE output1[] = {1,1,1,2,4,3,0,3,2,3,1,0,23,0,0,0,0,1}; + hic = ICOpen(FCC('V','I','D','C'), FCC('m','r','l','e'), ICMODE_COMPRESS); ok(hic != NULL, "ICOpen failed\n"); @@ -55,6 +82,20 @@ static void test_encode(void) res = ICSendMessage(hic, ICM_SETQUALITY, (DWORD_PTR)&quality, 0); ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_SETQUALITY) failed: %ld\n", res); + output_size = ICCompressGetFormatSize(hic, &input_header.header); + ok(output_size == 1064, "output_size = %d\n", output_size); + + output_header = HeapAlloc(GetProcessHeap(), 0, output_size); + ICCompressGetFormat(hic, &input_header.header, output_header); + + flags = 0; + res = ICCompress(hic, ICCOMPRESS_KEYFRAME, output_header, buf, &input_header.header, input1, 0, &flags, 0, 0, 0, NULL, NULL); + ok(res == ICERR_OK, "ICCompress failed: %ld\n", res); + test_output(buf, output_header->biSizeImage, output1, sizeof(output1)); + todo_wine ok(flags == (AVIIF_TWOCC|AVIIF_KEYFRAME), "flags = %x\n", flags); + + HeapFree(GetProcessHeap(), 0, output_header); + ICClose(hic); }

1 0

Jacek Caban : msrle32: Properly set compression output flags.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: d190b0c61efa31a10f1cffe1e1b4933520d32c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d190b0c61efa31a10f1cffe1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:17:11 2014 +0100 msrle32: Properly set compression output flags. --- dlls/msrle32/msrle32.c | 13 ++++++++----- dlls/msrle32/tests/msrle.c | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 50b44b2..aba94a0 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1420,6 +1420,7 @@ static LRESULT CompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) { + BOOL is_key; int i; TRACE("(%p,%p,%u)\n",pi,lpic,dwSize); @@ -1475,15 +1476,15 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) pi->nPrevFrame = lpic->lFrameNum; } + is_key = (lpic->dwFlags & ICCOMPRESS_KEYFRAME) != 0; + for (i = 0; i < 3; i++) { lpic->lpbiOutput->biSizeImage = 0; if (lpic->lpbiOutput->biBitCount == 4) - MSRLE32_CompressRLE4(pi, lpic->lpbiInput, lpic->lpInput, - lpic->lpbiOutput, lpic->lpOutput, (lpic->dwFlags & ICCOMPRESS_KEYFRAME) != 0); + MSRLE32_CompressRLE4(pi, lpic->lpbiInput, lpic->lpInput, lpic->lpbiOutput, lpic->lpOutput, is_key); else - MSRLE32_CompressRLE8(pi, lpic->lpbiInput, lpic->lpInput, - lpic->lpbiOutput, lpic->lpOutput, (lpic->dwFlags & ICCOMPRESS_KEYFRAME) != 0); + MSRLE32_CompressRLE8(pi, lpic->lpbiInput, lpic->lpInput, lpic->lpbiOutput, lpic->lpOutput, is_key); if (lpic->dwFrameSize == 0 || lpic->lpbiOutput->biSizeImage < lpic->dwFrameSize) @@ -1500,7 +1501,7 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) if (lpic->dwFrameSize == 0 || lpic->lpbiOutput->biSizeImage < lpic->dwFrameSize) { WARN("switched to keyframe, was small enough!\n"); - *lpic->lpdwFlags |= ICCOMPRESS_KEYFRAME; + is_key = TRUE; *lpic->lpckid = MAKEAVICKID(cktypeDIBbits, StreamFromFOURCC(*lpic->lpckid)); break; @@ -1522,6 +1523,8 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) pi->nPrevFrame = lpic->lFrameNum; } + /* FIXME: What is AVIIF_TWOCC? */ + *lpic->lpdwFlags |= AVIIF_TWOCC | (is_key ? AVIIF_KEYFRAME : 0); return ICERR_OK; } diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 1b7e680..5ab0b6a 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -92,7 +92,7 @@ static void test_encode(void) res = ICCompress(hic, ICCOMPRESS_KEYFRAME, output_header, buf, &input_header.header, input1, 0, &flags, 0, 0, 0, NULL, NULL); ok(res == ICERR_OK, "ICCompress failed: %ld\n", res); test_output(buf, output_header->biSizeImage, output1, sizeof(output1)); - todo_wine ok(flags == (AVIIF_TWOCC|AVIIF_KEYFRAME), "flags = %x\n", flags); + ok(flags == (AVIIF_TWOCC|AVIIF_KEYFRAME), "flags = %x\n", flags); HeapFree(GetProcessHeap(), 0, output_header);

1 0

Stefan Dösinger : d3dx9_36: Use float math functions.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: f06fc7f85817e502e184871382854f5e286145a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f06fc7f85817e502e18487138… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 2 15:23:49 2014 +0100 d3dx9_36: Use float math functions. --- dlls/d3dx9_36/math.c | 44 ++++++++++++++++++++++---------------------- dlls/d3dx9_36/mesh.c | 18 +++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index b33e062..bcda6cc 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -487,8 +487,8 @@ D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovLH(D3DXMATRIX *pout, FLOAT fovy, FLOA TRACE("pout %p, fovy %f, aspect %f, zn %f, zf %f\n", pout, fovy, aspect, zn, zf); D3DXMatrixIdentity(pout); - pout->u.m[0][0] = 1.0f / (aspect * tan(fovy/2.0f)); - pout->u.m[1][1] = 1.0f / tan(fovy/2.0f); + pout->u.m[0][0] = 1.0f / (aspect * tanf(fovy/2.0f)); + pout->u.m[1][1] = 1.0f / tanf(fovy/2.0f); pout->u.m[2][2] = zf / (zf - zn); pout->u.m[2][3] = 1.0f; pout->u.m[3][2] = (zf * zn) / (zn - zf); @@ -501,8 +501,8 @@ D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovRH(D3DXMATRIX *pout, FLOAT fovy, FLOA TRACE("pout %p, fovy %f, aspect %f, zn %f, zf %f\n", pout, fovy, aspect, zn, zf); D3DXMatrixIdentity(pout); - pout->u.m[0][0] = 1.0f / (aspect * tan(fovy/2.0f)); - pout->u.m[1][1] = 1.0f / tan(fovy/2.0f); + pout->u.m[0][0] = 1.0f / (aspect * tanf(fovy/2.0f)); + pout->u.m[1][1] = 1.0f / tanf(fovy/2.0f); pout->u.m[2][2] = zf / (zn - zf); pout->u.m[2][3] = -1.0f; pout->u.m[3][2] = (zf * zn) / (zn - zf); @@ -647,10 +647,10 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationX(D3DXMATRIX *pout, FLOAT angle) TRACE("pout %p, angle %f\n", pout, angle); D3DXMatrixIdentity(pout); - pout->u.m[1][1] = cos(angle); - pout->u.m[2][2] = cos(angle); - pout->u.m[1][2] = sin(angle); - pout->u.m[2][1] = -sin(angle); + pout->u.m[1][1] = cosf(angle); + pout->u.m[2][2] = cosf(angle); + pout->u.m[1][2] = sinf(angle); + pout->u.m[2][1] = -sinf(angle); return pout; } @@ -659,10 +659,10 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationY(D3DXMATRIX *pout, FLOAT angle) TRACE("pout %p, angle %f\n", pout, angle); D3DXMatrixIdentity(pout); - pout->u.m[0][0] = cos(angle); - pout->u.m[2][2] = cos(angle); - pout->u.m[0][2] = -sin(angle); - pout->u.m[2][0] = sin(angle); + pout->u.m[0][0] = cosf(angle); + pout->u.m[2][2] = cosf(angle); + pout->u.m[0][2] = -sinf(angle); + pout->u.m[2][0] = sinf(angle); return pout; } @@ -704,10 +704,10 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationZ(D3DXMATRIX *pout, FLOAT angle) TRACE("pout %p, angle %f\n", pout, angle); D3DXMatrixIdentity(pout); - pout->u.m[0][0] = cos(angle); - pout->u.m[1][1] = cos(angle); - pout->u.m[0][1] = sin(angle); - pout->u.m[1][0] = -sin(angle); + pout->u.m[0][0] = cosf(angle); + pout->u.m[1][1] = cosf(angle); + pout->u.m[0][1] = sinf(angle); + pout->u.m[1][0] = -sinf(angle); return pout; } @@ -888,15 +888,15 @@ D3DXMATRIX* WINAPI D3DXMatrixTransformation2D(D3DXMATRIX *pout, const D3DXVECTOR trans.z=0.0f; } - rot.w=cos(rotation/2.0f); + rot.w=cosf(rotation/2.0f); rot.x=0.0f; rot.y=0.0f; - rot.z=sin(rotation/2.0f); + rot.z=sinf(rotation/2.0f); - sca_rot.w=cos(scalingrotation/2.0f); + sca_rot.w=cosf(scalingrotation/2.0f); sca_rot.x=0.0f; sca_rot.y=0.0f; - sca_rot.z=sin(scalingrotation/2.0f); + sca_rot.z=sinf(scalingrotation/2.0f); D3DXMatrixTransformation(pout, &sca_center, &sca_rot, &sca, &rot_center, &rot, &trans); @@ -1655,7 +1655,7 @@ void WINAPI D3DXQuaternionToAxisAngle(const D3DXQUATERNION *pq, D3DXVECTOR3 *pax paxis->x = pq->x; paxis->y = pq->y; paxis->z = pq->z; - *pangle = 2.0f * acos(pq->w); + *pangle = 2.0f * acosf(pq->w); } /*_________________D3DXVec2_____________________*/ @@ -2128,7 +2128,7 @@ D3DXVECTOR4* WINAPI D3DXVec4TransformArray(D3DXVECTOR4* out, UINT outstride, con unsigned short float_32_to_16(const float in) { int exp = 0, origexp; - float tmp = fabs(in); + float tmp = fabsf(in); int sign = (copysignf(1, in) < 0); unsigned int mantissa; unsigned short ret; diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 8180d8e..aa20119 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2404,7 +2404,7 @@ BOOL WINAPI D3DXIntersectTri(const D3DXVECTOR3 *p0, const D3DXVECTOR3 *p1, const { *pu = vec.x; *pv = vec.y; - *pdist = fabs( vec.z ); + *pdist = fabsf( vec.z ); return TRUE; } } @@ -4569,8 +4569,8 @@ static BOOL compute_sincos_table(struct sincos_table *sincos_table, float angle_ angle = angle_start; for (i = 0; i < n; i++) { - sincos_table->sin[i] = sin(angle); - sincos_table->cos[i] = cos(angle); + sincos_table->sin[i] = sinf(angle); + sincos_table->cos[i] = cosf(angle); angle += angle_step; } @@ -4660,8 +4660,8 @@ HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, U for (stack = 0; stack < stacks - 1; stack++) { - sin_theta = sin(theta); - cos_theta = cos(theta); + sin_theta = sinf(theta); + cos_theta = cosf(theta); for (slice = 0; slice < slices; slice++) { @@ -5772,9 +5772,9 @@ HRESULT WINAPI D3DXCreateTextW(struct IDirect3DDevice9 *device, HDC hdc, const W face *face_ptr; float max_deviation_sq; const struct cos_table cos_table = { - cos(D3DXToRadian(0.5f)), - cos(D3DXToRadian(45.0f)), - cos(D3DXToRadian(90.0f)), + cosf(D3DXToRadian(0.5f)), + cosf(D3DXToRadian(45.0f)), + cosf(D3DXToRadian(90.0f)), }; int f1, f2; @@ -6154,7 +6154,7 @@ static BOOL weld_float4(void *to, void *from, FLOAT epsilon) FLOAT diff_y = fabsf(v1->y - v2->y); FLOAT diff_z = fabsf(v1->z - v2->z); FLOAT diff_w = fabsf(v1->w - v2->w); - FLOAT max_abs_diff = fmax(diff_x, diff_y); + FLOAT max_abs_diff = max(diff_x, diff_y); max_abs_diff = max(diff_z, max_abs_diff); max_abs_diff = max(diff_w, max_abs_diff);

1 0

Alexandre Julliard : makefiles: Get rid of the MAKE_TEST_RULES variable.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

1 0

Jacek Caban : msrle32: Use the same default quality as native.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 1ed45a7416bd377d854c62b8f62c07ae9490c42d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed45a7416bd377d854c62b8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:16:20 2014 +0100 msrle32: Use the same default quality as native. --- dlls/msrle32/msrle_private.h | 2 +- dlls/msrle32/tests/msrle.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msrle32/msrle_private.h b/dlls/msrle32/msrle_private.h index bf2aed0..1ff6cbe 100644 --- a/dlls/msrle32/msrle_private.h +++ b/dlls/msrle32/msrle_private.h @@ -34,7 +34,7 @@ #define IDS_DESCRIPTION 101 #define IDS_ABOUT 102 -#define MSRLE32_DEFAULTQUALITY (75 * ICQUALITY_HIGH) / 100 +#define MSRLE32_DEFAULTQUALITY (85 * ICQUALITY_HIGH) / 100 #define FOURCC_RLE mmioFOURCC('R','L','E',' ') #define FOURCC_RLE4 mmioFOURCC('R','L','E','4') diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 04cf64f..819cb34 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -20,11 +20,13 @@ #include <windows.h> #include <vfw.h> #include <aviriff.h> +#include <stdio.h> #include "wine/test.h" static void test_encode(void) { + DWORD quality; ICINFO info; HIC hic; LRESULT res; @@ -39,6 +41,11 @@ static void test_encode(void) todo_wine ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); ok(info.dwVersionICM == ICVERSION, "dwVersionICM = %d\n", info.dwVersionICM); + quality = 0xdeadbeef; + res = ICSendMessage(hic, ICM_GETDEFAULTQUALITY, (DWORD_PTR)&quality, 0); + ok(res == ICERR_OK, "ICSendMessage(ICM_GETDEFAULTQUALITY) failed: %ld\n", res); + ok(quality == 8500, "quality = %d\n", quality); + ICClose(hic); }

1 0

Jacek Caban : msrle32: Get rid of no longer needed lDist argument in MSRLE32_CompressRLE8Line.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 331cb13b2f1dbd655c3eb2733ed5db3970e6cf63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331cb13b2f1dbd655c3eb2733… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:17:00 2014 +0100 msrle32: Get rid of no longer needed lDist argument in MSRLE32_CompressRLE8Line. --- dlls/msrle32/msrle32.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index d22b412..50b44b2 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -456,8 +456,7 @@ static INT MSRLE32_CompressRLE4Line(const CodecInfo *pi, const WORD *lpP, static INT MSRLE32_CompressRLE8Line(const CodecInfo *pi, const WORD *lpP, const WORD *lpC, LPCBITMAPINFOHEADER lpbi, - const BYTE *lpIn, LONG lDist, - INT x, LPBYTE *ppOut, + const BYTE *lpIn, INT x, LPBYTE *ppOut, DWORD *lpSizeImage) { LPBYTE lpOut = *ppOut; @@ -471,13 +470,13 @@ static INT MSRLE32_CompressRLE8Line(const CodecInfo *pi, const WORD *lpP, pos = x; clr = lpC[pos++]; for (count = 1; pos < lpbi->biWidth; count++) { - if (ColorCmp(clr, lpC[pos++]) > lDist) + if (ColorCmp(clr, lpC[pos++]) > 0) break; } if (count < 2) { /* add some more pixels for absoluting if possible */ - count += countDiffRLE8(lpP, lpC - 1, lpC, pos-1, lDist, lpbi->biWidth); + count += countDiffRLE8(lpP, lpC - 1, lpC, pos-1, 0, lpbi->biWidth); assert(count > 0); @@ -719,7 +718,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, x = 0; do { - x = MSRLE32_CompressRLE8Line(pi, NULL, lpC, lpbiIn, lpIn, 0, x, + x = MSRLE32_CompressRLE8Line(pi, NULL, lpC, lpbiIn, lpIn, x, &lpOut, &lpbiOut->biSizeImage); assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); } while (x < lpbiOut->biWidth); @@ -801,7 +800,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (x < lpbiOut->biWidth) { /* skip the 'same' things corresponding to previous frame */ - x = MSRLE32_CompressRLE8Line(pi, lpP, lpC, lpbiIn, lpIn, 0, x, + x = MSRLE32_CompressRLE8Line(pi, lpP, lpC, lpbiIn, lpIn, x, &lpOut, &lpbiOut->biSizeImage); assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); }

1 0

Jacek Caban : qcap: Added AVICompressorIn_Receive implementation.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 93722745337761992ca7a5bbf5a4b59aa5e5d826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93722745337761992ca7a5bbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 15:29:01 2014 +0100 qcap: Added AVICompressorIn_Receive implementation. --- dlls/qcap/avico.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 4720ae3..2e44282 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -489,8 +489,87 @@ static const BasePinFuncTable AVICompressorInputBasePinVtbl = { static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample *pSample) { AVICompressor *This = impl_from_BasePin(&base->pin); - FIXME("(%p)->(%p)\n", This, pSample); - return E_NOTIMPL; + VIDEOINFOHEADER *src_videoinfo; + REFERENCE_TIME start, stop; + IMediaSample *out_sample; + AM_MEDIA_TYPE *mt; + IMediaSample2 *sample2; + DWORD comp_flags = 0; + BOOL is_preroll; + BOOL sync_point; + BYTE *ptr, *buf; + DWORD res; + HRESULT hres; + + TRACE("(%p)->(%p)\n", base, pSample); + + if(!This->hic) { + FIXME("Driver not loaded\n"); + return E_UNEXPECTED; + } + + hres = IMediaSample_QueryInterface(pSample, &IID_IMediaSample2, (void**)&sample2); + if(SUCCEEDED(hres)) { + FIXME("Use IMediaSample2\n"); + IMediaSample2_Release(sample2); + } + + is_preroll = IMediaSample_IsPreroll(pSample) == S_OK; + sync_point = IMediaSample_IsSyncPoint(pSample) == S_OK; + + hres = IMediaSample_GetTime(pSample, &start, &stop); + if(FAILED(hres)) { + WARN("GetTime failed: %08x\n", hres); + return hres; + } + + hres = IMediaSample_GetMediaType(pSample, &mt); + if(FAILED(hres)) + return hres; + + hres = IMediaSample_GetPointer(pSample, &ptr); + if(FAILED(hres)) { + WARN("GetPointer failed: %08x\n", hres); + return hres; + } + + hres = BaseOutputPinImpl_GetDeliveryBuffer(This->out, &out_sample, &start, &stop, 0); + if(FAILED(hres)) + return hres; + + hres = IMediaSample_GetPointer(out_sample, &buf); + if(FAILED(hres)) + return hres; + + if((This->driver_flags & VIDCF_TEMPORAL) && !(This->driver_flags & VIDCF_FASTTEMPORALC)) + FIXME("Unsupported temporal compression\n"); + + src_videoinfo = (VIDEOINFOHEADER*)This->in->pin.mtCurrent.pbFormat; + res = ICCompress(This->hic, sync_point ? ICCOMPRESS_KEYFRAME : 0, &This->videoinfo->bmiHeader, buf, + &src_videoinfo->bmiHeader, ptr, 0, &comp_flags, This->frame_cnt, 0, 0, NULL, NULL); + if(res != ICERR_OK) { + WARN("ICCompress failed: %d\n", res); + IMediaSample_Release(out_sample); + return E_FAIL; + } + + IMediaSample_SetActualDataLength(out_sample, This->videoinfo->bmiHeader.biSizeImage); + IMediaSample_SetPreroll(out_sample, is_preroll); + IMediaSample_SetSyncPoint(out_sample, (comp_flags&AVIIF_KEYFRAME) != 0); + IMediaSample_SetDiscontinuity(out_sample, (IMediaSample_IsDiscontinuity(pSample) == S_OK)); + + if (IMediaSample_GetMediaTime(pSample, &start, &stop) == S_OK) + IMediaSample_SetMediaTime(out_sample, &start, &stop); + else + IMediaSample_SetMediaTime(out_sample, NULL, NULL); + + hres = BaseOutputPinImpl_Deliver(This->out, out_sample); + if(FAILED(hres)) + WARN("Deliver failed: %08x\n", hres); + + IMediaSample_Release(out_sample); + This->frame_cnt++; + return hres; } static const BaseInputPinFuncTable AVICompressorBaseInputPinVtbl = {

1 0

Dmitry Timoshkov : winebuild: Write actual (not aligned) sizes in the resource headers.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 8cf8285adda3e6173b1e49396e8b5ddf4cfc735f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf8285adda3e6173b1e49396… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 2 21:57:19 2014 +0900 winebuild: Write actual (not aligned) sizes in the resource headers. --- tools/winebuild/res32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 0c39ec1..d459a5f 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -477,7 +477,7 @@ void output_resources( DLLSPEC *spec ) for (i = 0, res = spec->resources; i < spec->nb_resources; i++, res++) output( "\t.long .L__wine_spec_res_%d-.L__wine_spec_rva_base,%u,0,0\n", - i, (res->data_size + 3) & ~3 ); + i, res->data_size ); /* dump the name strings */ @@ -578,7 +578,7 @@ void output_bin_resources( DLLSPEC *spec, unsigned int start_rva ) for (i = 0, res = spec->resources; i < spec->nb_resources; i++, res++) { put_dword( data_offset + start_rva ); - put_dword( (res->data_size + 3) & ~3 ); + put_dword( res->data_size ); put_dword( 0 ); put_dword( 0 ); data_offset += (res->data_size + 3) & ~3;

1 0