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

Nikolay Sivov : xmllite/writer: Implement SetOutput() for writer.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 9080329e4e05eea155c08008618810fb88dd75e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9080329e4e05eea155c080086… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 18:25:37 2014 +0400 xmllite/writer: Implement SetOutput() for writer. --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/writer.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6e51d5e..6e3f9cd 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -642,7 +642,7 @@ static void readerinput_release_stream(xmlreaderinput *readerinput) /* Queries already stored interface for IStream/ISequentialStream. Interface supplied on creation will be overwritten */ -static HRESULT readerinput_query_for_stream(xmlreaderinput *readerinput) +static inline HRESULT readerinput_query_for_stream(xmlreaderinput *readerinput) { HRESULT hr; diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 5266049..a58164b 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -39,15 +39,19 @@ typedef struct IXmlWriterOutput IXmlWriterOutput_iface; LONG ref; IUnknown *output; + ISequentialStream *stream; IMalloc *imalloc; xml_encoding encoding; } xmlwriteroutput; +static const struct IUnknownVtbl xmlwriteroutputvtbl; + typedef struct _xmlwriter { IXmlWriter IXmlWriter_iface; LONG ref; IMalloc *imalloc; + xmlwriteroutput *output; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -82,6 +86,26 @@ static inline void writer_free(xmlwriter *writer, void *mem) m_free(writer->imalloc, mem); } +static void writeroutput_release_stream(xmlwriteroutput *writeroutput) +{ + if (writeroutput->stream) { + ISequentialStream_Release(writeroutput->stream); + writeroutput->stream = NULL; + } +} + +static inline HRESULT writeroutput_query_for_stream(xmlwriteroutput *writeroutput) +{ + HRESULT hr; + + writeroutput_release_stream(writeroutput); + hr = IUnknown_QueryInterface(writeroutput->output, &IID_IStream, (void**)&writeroutput->stream); + if (hr != S_OK) + hr = IUnknown_QueryInterface(writeroutput->output, &IID_ISequentialStream, (void**)&writeroutput->stream); + + return hr; +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -116,6 +140,7 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) { IMalloc *imalloc = This->imalloc; + if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); writer_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -124,13 +149,46 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) } /*** IXmlWriter methods ***/ -static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *pOutput) +static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) { xmlwriter *This = impl_from_IXmlWriter(iface); + IXmlWriterOutput *writeroutput; + HRESULT hr; - FIXME("%p %p\n", This, pOutput); + TRACE("(%p)->(%p)\n", This, output); - return E_NOTIMPL; + if (This->output) { + writeroutput_release_stream(This->output); + IUnknown_Release(&This->output->IXmlWriterOutput_iface); + This->output = NULL; + } + + /* just reset current output */ + if (!output) + return S_OK; + + /* now try IXmlWriterOutput, ISequentialStream, IStream */ + hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&writeroutput); + if (hr == S_OK) { + if (writeroutput->lpVtbl == &xmlwriteroutputvtbl) + This->output = impl_from_IXmlWriterOutput(writeroutput); + else { + ERR("got external IXmlWriterOutput implementation: %p, vtbl=%p\n", + writeroutput, writeroutput->lpVtbl); + IUnknown_Release(writeroutput); + return E_FAIL; + + } + } + + if (hr != S_OK || !writeroutput) { + /* create IXmlWriterOutput basing on supplied interface */ + hr = CreateXmlWriterOutputWithEncodingName(output, This->imalloc, NULL, &writeroutput); + if (hr != S_OK) return hr; + This->output = impl_from_IXmlWriterOutput(writeroutput); + } + + return writeroutput_query_for_stream(This->output); } static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR *ppValue) @@ -471,6 +529,7 @@ static ULONG WINAPI xmlwriteroutput_Release(IXmlWriterOutput *iface) { IMalloc *imalloc = This->imalloc; if (This->output) IUnknown_Release(This->output); + if (This->stream) ISequentialStream_Release(This->stream); writeroutput_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -507,6 +566,7 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->ref = 1; writer->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); + writer->output = NULL; *obj = &writer->IXmlWriter_iface; @@ -537,6 +597,7 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, writeroutput->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding, -1); + writeroutput->stream = NULL; IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output);

1 0

Jacek Caban : mshtml: Use debugstr_mshtml_guid in a few more places.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 6ebe1c60e243ac2b70ec19cceebb7d1a6a8f2cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ebe1c60e243ac2b70ec19cce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 13 18:56:30 2014 +0200 mshtml: Use debugstr_mshtml_guid in a few more places. --- dlls/mshtml/htmlstorage.c | 2 +- dlls/mshtml/htmlstylesheet.c | 42 +++++++++++++++++------------------------- dlls/mshtml/htmlwindow.c | 33 +++++++++------------------------ dlls/mshtml/main.c | 12 ++++++++++++ 4 files changed, 39 insertions(+), 50 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 3e169ba..60a2a3a 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -56,7 +56,7 @@ static HRESULT WINAPI HTMLStorage_QueryInterface(IHTMLStorage *iface, REFIID rii return *ppv ? S_OK : E_NOINTERFACE; }else { *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); return E_NOINTERFACE; } diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 4258f79..8f48a07 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -68,17 +68,17 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_QueryInterface(IHTMLStyleShe { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetRulesCollection_iface; }else if(IsEqualGUID(&IID_IHTMLStyleSheetRulesCollection, riid)) { - TRACE("(%p)->(IID_IHTMLStyleSheetRulesCollection %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetRulesCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { *ppv = NULL; - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + FIXME("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); return E_NOINTERFACE; } @@ -222,28 +222,24 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_QueryInterface(IHTMLStyleSheetsC { HTMLStyleSheetsCollection *This = impl_from_IHTMLStyleSheetsCollection(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetsCollection_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetsCollection_iface; }else if(IsEqualGUID(&IID_IHTMLStyleSheetsCollection, riid)) { - TRACE("(%p)->(IID_IHTMLStyleSheetsCollection %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetsCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("unsupported %s\n", debugstr_mshtml_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("unsupported %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLStyleSheetsCollection_AddRef(IHTMLStyleSheetsCollection *iface) @@ -415,28 +411,24 @@ static HRESULT WINAPI HTMLStyleSheet_QueryInterface(IHTMLStyleSheet *iface, REFI { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheet_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheet_iface; }else if(IsEqualGUID(&IID_IHTMLStyleSheet, riid)) { - TRACE("(%p)->(IID_IHTMLStyleSheet %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheet_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("unsupported %s\n", debugstr_mshtml_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("unsupported %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLStyleSheet_AddRef(IHTMLStyleSheet *iface) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a57dfba..1333608 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -141,59 +141,45 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { - TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_IHTMLFramesCollection2, riid)) { - TRACE("(%p)->(IID_IHTMLFramesCollection2 %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IHTMLWindow2, riid)) { - TRACE("(%p)->(IID_IHTMLWindow2 %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IHTMLWindow3, riid)) { - TRACE("(%p)->(IID_IHTMLWindow3 %p)\n", This, ppv); *ppv = &This->IHTMLWindow3_iface; }else if(IsEqualGUID(&IID_IHTMLWindow4, riid)) { - TRACE("(%p)->(IID_IHTMLWindow4 %p)\n", This, ppv); *ppv = &This->IHTMLWindow4_iface; }else if(IsEqualGUID(&IID_IHTMLWindow5, riid)) { - TRACE("(%p)->(IID_IHTMLWindow5 %p)\n", This, ppv); *ppv = &This->IHTMLWindow5_iface; }else if(IsEqualGUID(&IID_IHTMLWindow6, riid)) { - TRACE("(%p)->(IID_IHTMLWindow6 %p)\n", This, ppv); *ppv = &This->IHTMLWindow6_iface; }else if(IsEqualGUID(&IID_IHTMLPrivateWindow, riid)) { - TRACE("(%p)->(IID_IHTMLPrivateWindow %p)\n", This, ppv); *ppv = &This->IHTMLPrivateWindow_iface; }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { - TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = &This->IServiceProvider_iface; }else if(IsEqualGUID(&IID_ITravelLogClient, riid)) { - TRACE("(%p)->(IID_ITravelLogClient %p)\n", This, ppv); *ppv = &This->ITravelLogClient_iface; }else if(IsEqualGUID(&IID_IObjectIdentity, riid)) { - TRACE("(%p)->(IID_IObjectIdentity %p)\n", This, ppv); *ppv = &This->IObjectIdentity_iface; }else if(dispex_query_interface(&This->inner_window->dispex, riid, ppv)) { assert(!*ppv); return E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLWindow2_AddRef(IHTMLWindow2 *iface) @@ -2407,8 +2393,7 @@ static HRESULT WINAPI WindowDispEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid UINT i; HRESULT hres; - WARN("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); + WARN("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); for(i=0; i < cNames; i++) { /* We shouldn't use script's IDispatchEx here, so we shouldn't use GetDispID */ @@ -2686,7 +2671,7 @@ static HRESULT WINAPI HTMLWindowSP_QueryService(IServiceProvider *iface, REFGUID return IHTMLWindow2_QueryInterface(&This->IHTMLWindow2_iface, riid, ppv); } - TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_mshtml_guid(guidService), debugstr_mshtml_guid(riid), ppv); if(!This->outer_window->doc_obj) return E_NOINTERFACE; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 5e9d7cb..c34a6d8 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -573,9 +573,11 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLElementCollection); X(IID_IHTMLEventObj); X(IID_IHTMLFiltersCollection); + X(IID_IHTMLFramesCollection2); X(IID_IHTMLImageElementFactory); X(IID_IHTMLLocation); X(IID_IHTMLOptionElementFactory); + X(IID_IHTMLPrivateWindow); X(IID_IHTMLRect); X(IID_IHTMLScreen); X(IID_IHTMLStorage); @@ -585,9 +587,18 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLStyle4); X(IID_IHTMLStyle5); X(IID_IHTMLStyle6); + X(IID_IHTMLStyleSheet); + X(IID_IHTMLStyleSheetRulesCollection); + X(IID_IHTMLStyleSheetsCollection); + X(IID_IHTMLWindow2); + X(IID_IHTMLWindow3); + X(IID_IHTMLWindow4); + X(IID_IHTMLWindow5); + X(IID_IHTMLWindow6); X(IID_IHtmlLoadOptions); X(IID_IInternetHostSecurityManager); X(IID_IMonikerProp); + X(IID_IObjectIdentity); X(IID_IObjectSafety); X(IID_IObjectWithSite); X(IID_IOleContainer); @@ -613,6 +624,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IServiceProvider); X(IID_ISupportErrorInfo); X(IID_ITargetContainer); + X(IID_ITravelLogClient); X(IID_IUnknown); X(IID_IViewObject); X(IID_IViewObject2);

1 0

Alex Henrie : gdi32/tests: Add MS Shell Dlg tests.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 0fb88f8d01fd69e3d026fba069a66aa05413d48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb88f8d01fd69e3d026fba06… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 11 22:05:12 2014 -0600 gdi32/tests: Add MS Shell Dlg tests. --- dlls/gdi32/tests/font.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 255771a..0e75088 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4681,6 +4681,7 @@ static void test_EnumFonts(void) int ret; LOGFONTA lf; HDC hdc; + struct enum_fullname_data efnd; if (!is_truetype_font_installed("Arial")) { @@ -4741,6 +4742,28 @@ static void test_EnumFonts(void) ret = EnumFontFamiliesA(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); ok(ret, "font Arial Italic Bold should not be enumerated\n"); + /* MS Shell Dlg and MS Shell Dlg 2 must exist */ + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + + memset(&efnd, 0, sizeof(efnd)); + strcpy(lf.lfFaceName, "MS Shell Dlg"); + ret = EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(ret, "font MS Shell Dlg is not enumerated\n"); + ret = strcmp((char*)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg"); + todo_wine ok(!ret, "expected MS Shell Dlg got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((char*)efnd.elf[0].elfFullName, "MS Shell Dlg"); + ok(ret, "did not expect MS Shell Dlg\n"); + + memset(&efnd, 0, sizeof(efnd)); + strcpy(lf.lfFaceName, "MS Shell Dlg 2"); + ret = EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(ret, "font MS Shell Dlg 2 is not enumerated\n"); + ret = strcmp((char*)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg 2"); + todo_wine ok(!ret, "expected MS Shell Dlg 2 got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((char*)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); + ok(ret, "did not expect MS Shell Dlg 2\n"); + DeleteDC(hdc); }

1 0

Henri Verbeet : d2d1: Add the ID2D1RoundedRectangleGeometry interface.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: fa764fbf1f0866abca799bf00cdece6b63006782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa764fbf1f0866abca799bf00… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 13 09:41:09 2014 +0200 d2d1: Add the ID2D1RoundedRectangleGeometry interface. --- include/d2d1.idl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index bf29404..2e84614 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -142,6 +142,13 @@ typedef struct D2D1_TRIANGLE D2D1_POINT_2F point3; } D2D1_TRIANGLE; +typedef struct D2D1_ROUNDED_RECT +{ + D2D1_RECT_F rect; + float radiusX; + float radiusY; +} D2D1_ROUNDED_RECT; + interface ID2D1Factory; [ @@ -306,5 +313,17 @@ interface ID2D1RectangleGeometry : ID2D1Geometry ); } +[ + local, + object, + uuid(2cd906a3-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1RoundedRectangleGeometry : ID2D1Geometry +{ + void GetRoundedRect( + [out] D2D1_ROUNDED_RECT *rect + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1EllipseGeometry interface.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 9807bdd7d22c370ada44c650ed7b86a457a684ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9807bdd7d22c370ada44c650e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 13 09:41:10 2014 +0200 d2d1: Add the ID2D1EllipseGeometry interface. --- include/d2d1.idl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 2e84614..4860cf5 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -149,6 +149,13 @@ typedef struct D2D1_ROUNDED_RECT float radiusY; } D2D1_ROUNDED_RECT; +typedef struct D2D1_ELLIPSE +{ + D2D1_POINT_2F point; + float radiusX; + float radiusY; +} D2D1_ELLIPSE; + interface ID2D1Factory; [ @@ -325,5 +332,17 @@ interface ID2D1RoundedRectangleGeometry : ID2D1Geometry ); } +[ + local, + object, + uuid(2cd906a4-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1EllipseGeometry : ID2D1Geometry +{ + void GetEllipse( + [out] D2D1_ELLIPSE *ellipse + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Vincent Povirk : ole32: STGM_NOSNAPSHOT implies deny write.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: b3e26be0cb80daf582e8c57fb58bf6851b089e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e26be0cb80daf582e8c57fb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 9 14:51:07 2014 -0500 ole32: STGM_NOSNAPSHOT implies deny write. --- dlls/ole32/storage32.c | 10 ++++++++++ dlls/ole32/storage32.h | 9 ++++++--- dlls/ole32/tests/storage32.c | 4 ++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 56d3229..786924b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2908,6 +2908,13 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) ULARGE_INTEGER cb; DWORD share_mode = STGM_SHARE_MODE(openFlags); + if (openFlags & STGM_NOSNAPSHOT) + { + /* STGM_NOSNAPSHOT implies deny write */ + if (share_mode == STGM_SHARE_DENY_READ) share_mode = STGM_SHARE_EXCLUSIVE; + else if (share_mode != STGM_SHARE_EXCLUSIVE) share_mode = STGM_SHARE_DENY_WRITE; + } + /* Wrap all other locking inside a single lock so we can check ranges safely */ offset.QuadPart = RANGELOCK_CHECKLOCKS; cb.QuadPart = 1; @@ -2954,6 +2961,9 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) if (SUCCEEDED(hr) && (share_mode == STGM_SHARE_DENY_WRITE || share_mode == STGM_SHARE_EXCLUSIVE)) hr = StorageImpl_LockOne(This, RANGELOCK_DENY_WRITE_FIRST, RANGELOCK_DENY_WRITE_LAST); + if (SUCCEEDED(hr) && (openFlags & STGM_NOSNAPSHOT) == STGM_NOSNAPSHOT) + hr = StorageImpl_LockOne(This, RANGELOCK_NOSNAPSHOT_FIRST, RANGELOCK_NOSNAPSHOT_LAST); + offset.QuadPart = RANGELOCK_CHECKLOCKS; cb.QuadPart = 1; ILockBytes_UnlockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE); diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 0b8bcc8..c6fe8b2 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -508,7 +508,8 @@ StgStreamImpl* StgStreamImpl_Construct( * In particular, ends of ranges may be wrong. 0x0 through 0x57: Unknown. Causes read-only exclusive opens to fail. - 0x58 through 0x7f: Priority mode. + 0x58 through 0x6b: Priority mode. + 0x6c through 0x7f: No snapshot mode. 0x80: Commit lock. 0x81 through 0x91: Priority mode, again. Not sure why it uses two regions. 0x92: Lock-checking lock. Held while opening so ranges can be tested without @@ -524,7 +525,9 @@ StgStreamImpl* StgStreamImpl_Construct( #define RANGELOCK_UNK1_FIRST 0x7fffff00 #define RANGELOCK_UNK1_LAST 0x7fffff57 #define RANGELOCK_PRIORITY1_FIRST 0x7fffff58 -#define RANGELOCK_PRIORITY1_LAST 0x7fffff7f +#define RANGELOCK_PRIORITY1_LAST 0x7fffff6b +#define RANGELOCK_NOSNAPSHOT_FIRST 0x7fffff6c +#define RANGELOCK_NOSNAPSHOT_LAST 0x7fffff7f #define RANGELOCK_COMMIT 0x7fffff80 #define RANGELOCK_PRIORITY2_FIRST 0x7fffff81 #define RANGELOCK_PRIORITY2_LAST 0x7fffff91 @@ -539,7 +542,7 @@ StgStreamImpl* StgStreamImpl_Construct( #define RANGELOCK_DENY_WRITE_LAST 0x7fffffe2 #define RANGELOCK_UNK2_FIRST 0x7fffffe3 #define RANGELOCK_UNK2_LAST 0x7fffffff -#define RANGELOCK_TRANSACTION_FIRST RANGELOCK_PRIORITY1_FIRST +#define RANGELOCK_TRANSACTION_FIRST RANGELOCK_COMMIT #define RANGELOCK_TRANSACTION_LAST RANGELOCK_CHECKLOCKS #define RANGELOCK_FIRST RANGELOCK_UNK1_FIRST #define RANGELOCK_LAST RANGELOCK_UNK2_LAST diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 5db9120..74b6def 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3156,6 +3156,7 @@ struct lock_test static const int priority_locked_bytes[] = { 0x58, 0x81, 0x93, -1 }; static const int rwex_locked_bytes[] = { 0x93, 0xa7, 0xbb, 0xcf, -1 }; static const int rw_locked_bytes[] = { 0x93, 0xa7, -1 }; +static const int nosn_locked_bytes[] = { 0x6c, 0x93, 0xa7, 0xcf, -1 }; static const int rwdw_locked_bytes[] = { 0x93, 0xa7, 0xcf, -1 }; static const int wodw_locked_bytes[] = { 0xa7, 0xcf, -1 }; static const int tr_locked_bytes[] = { 0x93, -1 }; @@ -3164,6 +3165,7 @@ static const int roex_locked_bytes[] = { 0x93, 0xbb, 0xcf, -1 }; static const int rwex_fail_ranges[] = { 0x93,0xe3, -1 }; static const int rw_fail_ranges[] = { 0xbb,0xe3, -1 }; +static const int rwdw_fail_ranges[] = { 0xa7,0xe3, -1 }; static const int dw_fail_ranges[] = { 0xa7,0xcf, -1 }; static const int tr_fail_ranges[] = { 0xbb,0xcf, -1 }; static const int pr_fail_ranges[] = { 0x80,0x81, 0xbb,0xcf, -1 }; @@ -3179,6 +3181,8 @@ static const struct lock_test lock_tests[] = { { STGM_SHARE_EXCLUSIVE|STGM_READWRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, FALSE }, { STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, FALSE }, { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_fail_ranges, FALSE }, + { STGM_READWRITE|STGM_TRANSACTED|STGM_NOSNAPSHOT, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, nosn_locked_bytes, rwdw_fail_ranges, FALSE }, + { STGM_READWRITE|STGM_TRANSACTED|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, rwdw_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, TRUE }, { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE },

1 0

Frédéric Delanoy : user32/tests: Constify some arrays.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: b242d9cee36b8c8186c92d0bf86c067fc56b19c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b242d9cee36b8c8186c92d0bf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat May 10 19:01:06 2014 +0200 user32/tests: Constify some arrays. --- dlls/user32/tests/cursoricon.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index a7c3ca4..9540f3d 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -955,14 +955,14 @@ static void test_CreateIcon(void) /* Shamelessly ripped from dlls/oleaut32/tests/olepicture.c */ /* 1x1 pixel gif */ -static unsigned char gifimage[35] = { +static const unsigned char gifimage[35] = { 0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x00,0xff,0xff,0xff, 0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, 0x01,0x00,0x3b }; /* 1x1 pixel jpg */ -static unsigned char jpgimage[285] = { +static const unsigned char jpgimage[285] = { 0xff,0xd8,0xff,0xe0,0x00,0x10,0x4a,0x46,0x49,0x46,0x00,0x01,0x01,0x01,0x01,0x2c, 0x01,0x2c,0x00,0x00,0xff,0xdb,0x00,0x43,0x00,0x05,0x03,0x04,0x04,0x04,0x03,0x05, 0x04,0x04,0x04,0x05,0x05,0x05,0x06,0x07,0x0c,0x08,0x07,0x07,0x07,0x07,0x0f,0x0b, @@ -984,7 +984,7 @@ static unsigned char jpgimage[285] = { }; /* 1x1 pixel png */ -static unsigned char pngimage[285] = { +static const unsigned char pngimage[285] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53, 0xde,0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b, @@ -1005,14 +1005,14 @@ static unsigned char bmpimage[70] = { }; /* 1x1 pixel bmp using BITMAPCOREHEADER */ -static unsigned char bmpcoreimage[38] = { +static const unsigned char bmpcoreimage[38] = { 0x42,0x4d,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x22,0x00,0x00,0x00,0x0c,0x00, 0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xff,0xff,0xff,0x00,0x55,0x55, 0x55,0x00,0x00,0x00,0x00,0x00 }; /* 2x2 pixel gif */ -static unsigned char gif4pixel[42] = { +static const unsigned char gif4pixel[42] = { 0x47,0x49,0x46,0x38,0x37,0x61,0x02,0x00,0x02,0x00,0xa1,0x00,0x00,0x00,0x00,0x00, 0x39,0x62,0xfc,0xff,0x1a,0xe5,0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x02,0x00, 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b @@ -1059,7 +1059,7 @@ static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) ok(color_match(pixel, 0x00ffffff), "%s: Pixel is 0x%08x\n", test_desc, pixel); } -static void test_LoadImageFile(const char * test_desc, unsigned char * image_data, +static void test_LoadImageFile(const char * test_desc, const unsigned char * image_data, unsigned int image_size, const char * ext, BOOL expect_success) { HANDLE handle;

1 0

Alistair Leslie-Hughes : dxguid: Include dplobby8.h.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: 123c670f8e6201dcadaf6e6d4cafb5730c4c40c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123c670f8e6201dcadaf6e6d4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 10 20:55:49 2014 +1000 dxguid: Include dplobby8.h. --- dlls/dxguid/dxguid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dxguid/dxguid.c b/dlls/dxguid/dxguid.c index f923d9c..77d4194 100644 --- a/dlls/dxguid/dxguid.c +++ b/dlls/dxguid/dxguid.c @@ -40,6 +40,7 @@ #include "dplay.h" #include "dplay8.h" #include "dplobby.h" +#include "dplobby8.h" #include "dinput.h" #include "ddrawi.h" #include "dxdiag.h"

1 0

Akihiro Sagawa : taskmgr: Show whether the process is running under WOW64.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: 776849987d34a8c77fef97b07cbb79091c0d5e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=776849987d34a8c77fef97b07… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 11 23:54:29 2014 +0900 taskmgr: Show whether the process is running under WOW64. --- programs/taskmgr/perfdata.c | 8 ++++++++ programs/taskmgr/perfdata.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 110fe5a..aa19914 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -33,6 +33,7 @@ static PROCNTQSI pNtQuerySystemInformation = NULL; static PROCGGR pGetGuiResources = NULL; static PROCGPIC pGetProcessIoCounters = NULL; +static PROCISW64 pIsWow64Process = NULL; static CRITICAL_SECTION PerfDataCriticalSection; static PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ static PPERFDATA pPerfData = NULL; /* Most recent copy of perf data */ @@ -60,6 +61,7 @@ BOOL PerfDataInitialize(void) pNtQuerySystemInformation = (PROCNTQSI)GetProcAddress(GetModuleHandleW(wszNtdll), "NtQuerySystemInformation"); pGetGuiResources = (PROCGGR)GetProcAddress(GetModuleHandleW(wszUser32), "GetGuiResources"); pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandleW(wszKernel32), "GetProcessIoCounters"); + pIsWow64Process = (PROCISW64)GetProcAddress(GetModuleHandleW(wszKernel32), "IsWow64Process"); InitializeCriticalSection(&PerfDataCriticalSection); @@ -296,6 +298,8 @@ void PerfDataRefresh(void) } if (pGetProcessIoCounters) pGetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); + if (pIsWow64Process) + pIsWow64Process(hProcess, &pPerfData[Idx].Wow64Process); CloseHandle(hProcess); } pPerfData[Idx].UserTime.QuadPart = pSPI->UserTime.QuadPart; @@ -331,12 +335,16 @@ ULONG PerfDataGetProcessorSystemUsage(void) BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, int nMaxCount) { + static const WCHAR proc32W[] = {' ','*','3','2',0}; BOOL bSuccessful; EnterCriticalSection(&PerfDataCriticalSection); if (Index < ProcessCount) { wcsncpy(lpImageName, pPerfData[Index].ImageName, nMaxCount); + if (pPerfData[Index].Wow64Process && + nMaxCount - lstrlenW(lpImageName) > 4 /* =lstrlenW(proc32W) */) + lstrcatW(lpImageName, proc32W); bSuccessful = TRUE; } else { bSuccessful = FALSE; diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index be6b819..d6a1602 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -47,6 +47,7 @@ typedef struct _PERFDATA TIME UserTime; TIME KernelTime; + BOOL Wow64Process; } PERFDATA, *PPERFDATA; /* SystemPageFileInformation (18) */ @@ -68,6 +69,7 @@ struct _SYSTEM_PAGEFILE_INFORMATION typedef LONG (WINAPI *PROCNTQSI)(UINT,PVOID,ULONG,PULONG); typedef DWORD (WINAPI *PROCGGR)(HANDLE,DWORD); typedef BOOL (WINAPI *PROCGPIC)(HANDLE,PIO_COUNTERS); +typedef BOOL (WINAPI *PROCISW64)(HANDLE,PBOOL); BOOL PerfDataInitialize(void); void PerfDataRefresh(void);

1 0

Nikolay Sivov : setupapi: Make default context structure layout compatible.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: dcab5fe61bed87b291901ceff686894a64871d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcab5fe61bed87b291901ceff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 12 01:59:33 2014 +0400 setupapi: Make default context structure layout compatible. --- dlls/setupapi/queue.c | 13 ++++++++---- dlls/setupapi/tests/misc.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 1855e99..d57f8e1 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -39,9 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* context structure for the default queue callback */ struct default_callback_context { - HWND owner; - HWND progress; - UINT message; + DWORD magic; + HWND owner; + DWORD unk1[4]; + DWORD_PTR unk2[7]; + HWND progress; + UINT message; + DWORD_PTR unk3[5]; }; struct file_op @@ -1482,8 +1486,9 @@ PVOID WINAPI SetupInitDefaultQueueCallbackEx( HWND owner, HWND progress, UINT ms { struct default_callback_context *context; - if ((context = HeapAlloc( GetProcessHeap(), 0, sizeof(*context) ))) + if ((context = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*context) ))) { + context->magic = 0x43515053; /* "SPQC" */ context->owner = owner; context->progress = progress; context->message = msg; diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index db74fcb..cfe888b 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -731,6 +731,51 @@ static void test_SetupUninstallOEMInf(void) } } +struct default_callback_context +{ + DWORD magic; + HWND owner; + DWORD unk1[4]; + DWORD_PTR unk2[7]; + HWND progress; + UINT message; + DWORD_PTR unk3[5]; +}; + +static void test_defaultcallback(void) +{ + struct default_callback_context *ctxt; + static const DWORD magic = 0x43515053; /* "SPQC" */ + HWND owner, progress; + + owner = (HWND)0x123; + progress = (HWND)0x456; + ctxt = SetupInitDefaultQueueCallbackEx(owner, progress, WM_USER, 0, NULL); + ok(ctxt != NULL, "got %p\n", ctxt); + + ok(ctxt->magic == magic || broken(ctxt->magic != magic) /* win2000 */, "got magic 0x%08x\n", ctxt->magic); + if (ctxt->magic == magic) + { + ok(ctxt->owner == owner, "got %p, expected %p\n", ctxt->owner, owner); + ok(ctxt->progress == progress, "got %p, expected %p\n", ctxt->progress, progress); + ok(ctxt->message == WM_USER, "got %d, expected %d\n", ctxt->message, WM_USER); + SetupTermDefaultQueueCallback(ctxt); + } + else + { + win_skip("Skipping tests on old systems.\n"); + SetupTermDefaultQueueCallback(ctxt); + return; + } + + ctxt = SetupInitDefaultQueueCallback(owner); + ok(ctxt->magic == magic, "got magic 0x%08x\n", ctxt->magic); + ok(ctxt->owner == owner, "got %p, expected %p\n", ctxt->owner, owner); + ok(ctxt->progress == NULL, "got %p, expected %p\n", ctxt->progress, progress); + ok(ctxt->message == 0, "got %d\n", ctxt->message); + SetupTermDefaultQueueCallback(ctxt); +} + START_TEST(misc) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -760,4 +805,6 @@ START_TEST(misc) test_SetupUninstallOEMInf(); else win_skip("SetupUninstallOEMInfA is not available\n"); + + test_defaultcallback(); }

1 0