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

Henri Verbeet : d2d1: Add the ID2D1GeometryGroup interface.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: a7c259fa1a8c4fa91c699e85813f8ba96dc3e4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c259fa1a8c4fa91c699e858… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 13 09:41:11 2014 +0200 d2d1: Add the ID2D1GeometryGroup interface. --- include/d2d1.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 4860cf5..092c1cc 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -344,5 +344,20 @@ interface ID2D1EllipseGeometry : ID2D1Geometry ); } +[ + local, + object, + uuid(2cd906a6-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1GeometryGroup : ID2D1Geometry +{ + D2D1_FILL_MODE GetFillMode(); + UINT32 GetSourceGeometryCount(); + void GetSourceGeometries( + [out, size_is(geometry_count)] ID2D1Geometry **geometry, + [in] UINT32 geometry_count + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Nikolay Sivov : msxml3: Implement empty tagname case of getElementsByTagName() for document.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 82bb4f51c160fe0aabe25765478757481ee5ed81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82bb4f51c160fe0aabe257654… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 12:49:05 2014 +0400 msxml3: Implement empty tagname case of getElementsByTagName() for document. --- dlls/msxml3/domdoc.c | 6 +++++ dlls/msxml3/tests/domdoc.c | 63 ++++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index e981b94..2244172 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1846,12 +1846,18 @@ static HRESULT WINAPI domdoc_createEntityReference( xmlChar* tagName_to_XPath(const BSTR tagName) { xmlChar *query, *tmp; + static const xmlChar everything[] = "/descendant::node()"; static const xmlChar mod_pre[] = "*[local-name()='"; static const xmlChar mod_post[] = "']"; static const xmlChar prefix[] = "descendant::"; const WCHAR *tokBegin, *tokEnd; int len; + /* Special case - empty tagname - means select all nodes, + except document itself. */ + if (!*tagName) + return xmlStrdup(everything); + query = xmlStrdup(prefix); tokBegin = tagName; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b028996..2b877a7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3013,8 +3013,24 @@ static void test_create(void) IXMLDOMDocument_Release( doc ); } +struct queryresult_t { + const char *query; + const char *result; + int len; +}; + +static const struct queryresult_t elementsbytagname[] = { + { "", "P1.D1 E2.D1 E1.E2.D1 T1.E1.E2.D1 E2.E2.D1 T1.E2.E2.D1 E3.E2.D1 E4.E2.D1 E1.E4.E2.D1 T1.E1.E4.E2.D1", 10 }, + { "*", "E2.D1 E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1 E1.E4.E2.D1", 6 }, + { "bs", "E1.E2.D1", 1 }, + { "dl", "", 0 }, + { "str1","", 0 }, + { NULL } +}; + static void test_getElementsByTagName(void) { + const struct queryresult_t *ptr = elementsbytagname; IXMLDOMNodeList *node_list; IXMLDOMDocument *doc; IXMLDOMElement *elem; @@ -3035,17 +3051,21 @@ static void test_getElementsByTagName(void) /* null arguments cases */ r = IXMLDOMDocument_getElementsByTagName(doc, NULL, &node_list); ok( r == E_INVALIDARG, "ret %08x\n", r ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, NULL); + r = IXMLDOMDocument_getElementsByTagName(doc, _bstr_("*"), NULL); ok( r == E_INVALIDARG, "ret %08x\n", r ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list); - ok( r == S_OK, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, &len ); - ok( r == S_OK, "ret %08x\n", r ); - ok( len == 6, "len %d\n", len ); + while (ptr->query) + { + r = IXMLDOMDocument_getElementsByTagName(doc, _bstr_(ptr->query), &node_list); + ok(r == S_OK, "ret %08x\n", r); + r = IXMLDOMNodeList_get_length(node_list, &len); + ok(r == S_OK, "ret %08x\n", r); + ok(len == ptr->len, "%s: got len %d, expected %d\n", ptr->query, len, ptr->len); + expect_list_and_release(node_list, ptr->result); - IXMLDOMNodeList_Release( node_list ); - SysFreeString( str ); + free_bstrs(); + ptr++; + } /* broken query BSTR */ memcpy(&buff[2], szstar, sizeof(szstar)); @@ -3058,33 +3078,6 @@ static void test_getElementsByTagName(void) ok( len == 6, "len %d\n", len ); IXMLDOMNodeList_Release( node_list ); - str = SysAllocString( szbs ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list); - ok( r == S_OK, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, &len ); - ok( r == S_OK, "ret %08x\n", r ); - ok( len == 1, "len %d\n", len ); - IXMLDOMNodeList_Release( node_list ); - SysFreeString( str ); - - str = SysAllocString( szdl ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list); - ok( r == S_OK, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, &len ); - ok( r == S_OK, "ret %08x\n", r ); - ok( len == 0, "len %d\n", len ); - IXMLDOMNodeList_Release( node_list ); - SysFreeString( str ); - - str = SysAllocString( szstr1 ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list); - ok( r == S_OK, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, &len ); - ok( r == S_OK, "ret %08x\n", r ); - ok( len == 0, "len %d\n", len ); - IXMLDOMNodeList_Release( node_list ); - SysFreeString( str ); - /* test for element */ r = IXMLDOMDocument_get_documentElement(doc, &elem); ok( r == S_OK, "ret %08x\n", r );

1 0

Henri Verbeet : d2d1: Add the ID2D1TransformedGeometry interface.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: fb763bf361ecbb0d16510fe4779f11b29448bb94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb763bf361ecbb0d16510fe47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 13 09:41:12 2014 +0200 d2d1: Add the ID2D1TransformedGeometry interface. --- include/d2d1.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 092c1cc..27a617c 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -359,5 +359,20 @@ interface ID2D1GeometryGroup : ID2D1Geometry ); } +[ + local, + object, + uuid(2cd906bb-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1TransformedGeometry : ID2D1Geometry +{ + void GetSourceGeometry( + [out] ID2D1Geometry **geometry + ); + void GetTransform( + [out] D2D1_MATRIX_3X2_F *transform + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Nikolay Sivov : xmllite: Support external IMalloc for writer.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: e58070ab833717daa7d56b5cbd73297b765686f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58070ab833717daa7d56b5cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 17:54:48 2014 +0400 xmllite: Support external IMalloc for writer. --- dlls/xmllite/tests/writer.c | 4 ++-- dlls/xmllite/writer.c | 38 ++++++++++++++++++++++++++++---------- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index f182aeb..b5935c1 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -76,10 +76,10 @@ static void test_writer_create(void) if (0) { pCreateXmlWriter(&IID_IXmlWriter, NULL, NULL); - pCreateXmlWriter(NULL, (LPVOID*)&writer, NULL); + pCreateXmlWriter(NULL, (void**)&writer, NULL); } - hr = pCreateXmlWriter(&IID_IXmlWriter, (LPVOID*)&writer, NULL); + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); IXmlWriter_Release(writer); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index a0e2703..5266049 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -47,6 +47,7 @@ typedef struct _xmlwriter { IXmlWriter IXmlWriter_iface; LONG ref; + IMalloc *imalloc; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -59,7 +60,7 @@ static inline xmlwriteroutput *impl_from_IXmlWriterOutput(IXmlWriterOutput *ifac return CONTAINING_RECORD(iface, xmlwriteroutput, IXmlWriterOutput_iface); } -/* reader input memory allocation functions */ +/* writer output memory allocation functions */ static inline void *writeroutput_alloc(xmlwriteroutput *output, size_t len) { return m_alloc(output->imalloc, len); @@ -70,6 +71,17 @@ static inline void writeroutput_free(xmlwriteroutput *output, void *mem) m_free(output->imalloc, mem); } +/* writer memory allocation functions */ +static inline void *writer_alloc(xmlwriter *writer, size_t len) +{ + return m_alloc(writer->imalloc, len); +} + +static inline void writer_free(xmlwriter *writer, void *mem) +{ + m_free(writer->imalloc, mem); +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -102,8 +114,11 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) TRACE("%p\n", This); ref = InterlockedDecrement(&This->ref); - if (ref == 0) - heap_free(This); + if (ref == 0) { + IMalloc *imalloc = This->imalloc; + writer_free(This, This); + if (imalloc) IMalloc_Release(imalloc); + } return ref; } @@ -470,13 +485,11 @@ static const struct IUnknownVtbl xmlwriteroutputvtbl = xmlwriteroutput_Release }; -HRESULT WINAPI CreateXmlWriter(REFIID riid, void **pObject, IMalloc *pMalloc) +HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) { xmlwriter *writer; - TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), pObject, pMalloc); - - if (pMalloc) FIXME("custom IMalloc not supported yet\n"); + TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); if (!IsEqualGUID(riid, &IID_IXmlWriter)) { @@ -484,15 +497,20 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **pObject, IMalloc *pMalloc) return E_FAIL; } - writer = heap_alloc(sizeof(*writer)); + if (imalloc) + writer = IMalloc_Alloc(imalloc, sizeof(*writer)); + else + writer = heap_alloc(sizeof(*writer)); if(!writer) return E_OUTOFMEMORY; writer->IXmlWriter_iface.lpVtbl = &xmlwriter_vtbl; writer->ref = 1; + writer->imalloc = imalloc; + if (imalloc) IMalloc_AddRef(imalloc); - *pObject = &writer->IXmlWriter_iface; + *obj = &writer->IXmlWriter_iface; - TRACE("returning iface %p\n", *pObject); + TRACE("returning iface %p\n", *obj); return S_OK; }

1 0

Huw Davies : msxml3/tests: Don' t test the variant payload for the VT_EMPTY type.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 9e3d103dcbe76038bcdb708e299639c3446b851f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3d103dcbe76038bcdb708e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 13 09:20:51 2014 +0100 msxml3/tests: Don't test the variant payload for the VT_EMPTY type. --- dlls/msxml3/tests/httpreq.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index b82de03..68de61e 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1457,14 +1457,12 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_get_responseBody(xhr, &varbody); EXPECT_HR(hr, E_PENDING); ok(V_VT(&varbody) == VT_EMPTY, "got type %d\n", V_VT(&varbody)); - ok(V_I2(&varbody) == 1, "got %d\n", V_I2(&varbody)); V_VT(&varbody) = VT_I2; V_I2(&varbody) = 1; hr = IXMLHttpRequest_get_responseStream(xhr, &varbody); EXPECT_HR(hr, E_PENDING); ok(V_VT(&varbody) == VT_EMPTY, "got type %d\n", V_VT(&varbody)); - ok(V_I2(&varbody) == 1, "got %d\n", V_I2(&varbody)); /* send before open */ hr = IXMLHttpRequest_send(xhr, dummy);

1 0

Hans Leidekker : wbemprox: Use a separate index variable to build the safearray in get_properties.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 27b18a395b1c4caa0bdb2ec9e0175cccfbe9bf12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b18a395b1c4caa0bdb2ec9e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 13 13:41:35 2014 +0200 wbemprox: Use a separate index variable to build the safearray in get_properties. --- dlls/wbemprox/query.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index c97b52b..b3a3eb9 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -963,12 +963,12 @@ HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) { SAFEARRAY *sa; BSTR str; - LONG i; - UINT num_props = count_selected_properties( view ); + UINT i, num_props = count_selected_properties( view ); + LONG j; if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, num_props ))) return E_OUTOFMEMORY; - for (i = 0; i < view->table->num_cols; i++) + for (i = 0, j = 0; i < view->table->num_cols; i++) { BOOL is_system; @@ -980,12 +980,13 @@ HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) else if ((flags & WBEM_FLAG_SYSTEM_ONLY) && !is_system) continue; str = SysAllocString( view->table->columns[i].name ); - if (!str || SafeArrayPutElement( sa, &i, str ) != S_OK) + if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) { SysFreeString( str ); SafeArrayDestroy( sa ); return E_OUTOFMEMORY; } + j++; } *props = sa; return S_OK;

1 0

Huw Davies : msxml3/tests: Fix a failing test on win 8.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 8335335c1d4e1974064603573fe2e253135510cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8335335c1d4e1974064603573… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 13 09:20:50 2014 +0100 msxml3/tests: Fix a failing test on win 8. --- dlls/msxml3/tests/schema.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 1145bd5..484be86 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1522,7 +1522,7 @@ static void test_get(void) EXPECT_HR(hr, E_NOTIMPL); hr = IXMLDOMSchemaCollection2_get(cache, _bstr_("uri"), &node); - EXPECT_HR(hr, E_NOTIMPL); + ok(hr == E_NOTIMPL || hr == E_POINTER /* win8 */, "got %08x\n", hr); IXMLDOMSchemaCollection2_Release(cache);

1 0

Hans Leidekker : wmiutils: Always null-terminate the server string in build_server (valgrind).
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 59ca80cb3d957f6a4639a8bacf7d1915ce30c7f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ca80cb3d957f6a4639a8bac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 13 13:42:34 2014 +0200 wmiutils: Always null-terminate the server string in build_server (valgrind). --- dlls/wmiutils/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index b2b4945..7977416 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -582,6 +582,7 @@ static WCHAR *build_server( struct path *path, int *len ) { p[0] = p[1] = '\\'; p[2] = '.'; + p[3] = 0; } return ret; }

1 0

Hans Leidekker : winhttp: Fix a couple of memory leaks (valgrind).
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 6494c50ad7f613430d3ab1eae7bbebe85bed8925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6494c50ad7f613430d3ab1eae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 13 13:43:11 2014 +0200 winhttp: Fix a couple of memory leaks (valgrind). --- dlls/winhttp/net.c | 1 + dlls/winhttp/request.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 7466d36..b751bf0 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -488,6 +488,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) } } + heap_free(read_buf); if(status != SEC_E_OK || res != ERROR_SUCCESS) { WARN("Failed to initialize security context failed: %08x\n", status); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 374051a..54aa616 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2250,6 +2250,8 @@ static BOOL handle_redirect( request_t *request, DWORD status ) request->read_chunked = FALSE; request->read_chunked_eof = FALSE; } + else heap_free( hostname ); + if (!(ret = add_host_header( request, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; if (!(ret = open_connection( request ))) goto end; @@ -2278,7 +2280,6 @@ static BOOL handle_redirect( request_t *request, DWORD status ) ret = TRUE; end: - if (!ret) heap_free( hostname ); heap_free( location ); return ret; }

1 0

Huw Davies : msxml3/tests: Don' t test the values of alignment holes in the variant structure.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 25e5daf87232c041bdb991fea5f4c17f9ca7bb04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e5daf87232c041bdb991fea… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 13 09:20:49 2014 +0100 msxml3/tests: Don't test the values of alignment holes in the variant structure. --- dlls/msxml3/tests/schema.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 658b0d7..1145bd5 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1275,24 +1275,20 @@ static void test_XDR_datatypes(void) while (ptr->query) { IXMLDOMNode* node = NULL; - VARIANT type, testv; + VARIANT type; /* check data types without the schema */ - memset(&testv, -1, sizeof(VARIANT)); - V_VT(&testv) = VT_NULL; - V_BSTR(&testv) = NULL; - hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_(ptr->query), &node); EXPECT_HR(hr, S_OK); ok(node != NULL, "expected node\n"); - memset(&type, -1, sizeof(VARIANT)); V_VT(&type) = VT_EMPTY; + V_BSTR(&type) = (void*)-1; hr = IXMLDOMNode_get_dataType(node, &type); EXPECT_HR(hr, S_FALSE); ok(V_VT(&type) == VT_NULL, "got type %i\n", V_VT(&type)); /* when returning VT_NULL, the pointer is set to NULL */ - ok(!memcmp(&testv, &type, sizeof(VARIANT)), "got %p\n", V_BSTR(&type)); + ok(V_BSTR(&type) == NULL, "got %p\n", V_BSTR(&type)); VariantClear(&type); hr = IXMLDOMNode_get_nodeTypedValue(node, &type);

1 0

Hans Leidekker : wininet: Fix a memory leak (valgrind).
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: e49ebbe953fd968f820999226ff2f714c221bb10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49ebbe953fd968f820999226… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 13 13:42:58 2014 +0200 wininet: Fix a memory leak (valgrind). --- dlls/wininet/netconnection.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index fa07a9b..074229e 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -636,6 +636,8 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode } } + heap_free(read_buf); + if(status != SEC_E_OK || res != ERROR_SUCCESS) { WARN("Failed to establish SSL connection: %08x (%u)\n", status, res); heap_free(connection->ssl_buf);

1 0

Hans Leidekker : fusion: Fix a couple of memory leaks (valgrind).
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 2acd2116d9e4ff01cd9262646082491541f318da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2acd2116d9e4ff01cd9262646… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 13 13:42:45 2014 +0200 fusion: Fix a couple of memory leaks (valgrind). --- dlls/fusion/asmname.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index fa84e53..a17957a 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -709,6 +709,8 @@ done: { HeapFree(GetProcessHeap(), 0, name->displayname); HeapFree(GetProcessHeap(), 0, name->name); + HeapFree(GetProcessHeap(), 0, name->culture); + HeapFree(GetProcessHeap(), 0, name->procarch); } return hr; }

1 0

Hans Leidekker : wbemprox: No longer prefer native.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: e17276b5284d460bd05dcdb8ead360f8abb658c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e17276b5284d460bd05dcdb8e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 13 13:41:58 2014 +0200 wbemprox: No longer prefer native. --- dlls/wbemprox/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index d1b08f1..e6ccd5c 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -118,8 +118,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL);

1 0

Henri Verbeet : d2d1: Add the ID2D1EllipseGeometry interface.
by Alexandre Julliard May 13, 2014

May 13, 2014

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

Henri Verbeet : d2d1: Add the ID2D1RoundedRectangleGeometry interface.
by Alexandre Julliard May 13, 2014

May 13, 2014

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

Stefan Dösinger : wined3d: Remove wined3d_surface_get_palette.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: fc25510fadf96eca3c8a6f40a7ac72232dca1536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc25510fadf96eca3c8a6f40a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 12 15:12:42 2014 +0200 wined3d: Remove wined3d_surface_get_palette. --- dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 14 +++++++------- dlls/wined3d/surface.c | 7 ------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2a5cce3..e184cfd 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1802,7 +1802,7 @@ static BOOL validate_surface_palette(struct ddraw_surface *surface) & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8)) - || wined3d_surface_get_palette(surface->wined3d_surface); + || surface->palette; } static HRESULT d3d_device_set_render_target(struct d3d_device *device, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 349bbda..2efc98c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4982,7 +4982,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu for (;;) { - struct wined3d_palette *wined3d_dst_pal, *wined3d_src_pal; + struct ddraw_palette *dst_pal, *src_pal; DDSURFACEDESC *src_desc, *dst_desc; TRACE("Copying surface %p to surface %p (mipmap level %d).\n", @@ -4992,20 +4992,20 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu dst_surface->surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_ALLOCONLOAD; /* Get the palettes */ - wined3d_dst_pal = wined3d_surface_get_palette(dst_surface->wined3d_surface); - wined3d_src_pal = wined3d_surface_get_palette(src_surface->wined3d_surface); + dst_pal = dst_surface->palette; + src_pal = src_surface->palette; - if (wined3d_src_pal) + if (src_pal) { PALETTEENTRY palent[256]; - if (!wined3d_dst_pal) + if (!dst_pal) { wined3d_mutex_unlock(); return DDERR_NOPALETTEATTACHED; } - wined3d_palette_get_entries(wined3d_src_pal, 0, 0, 256, palent); - wined3d_palette_set_entries(wined3d_dst_pal, 0, 0, 256, palent); + IDirectDrawPalette_GetEntries(&src_pal->IDirectDrawPalette_iface, 0, 0, 256, palent); + IDirectDrawPalette_SetEntries(&dst_pal->IDirectDrawPalette_iface, 0, 0, 256, palent); } /* Copy one surface on the other */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1111df2..b671a0d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2381,13 +2381,6 @@ void CDECL wined3d_surface_set_palette(struct wined3d_surface *surface, struct w surface->surface_ops->surface_realize_palette(surface); } -struct wined3d_palette * CDECL wined3d_surface_get_palette(const struct wined3d_surface *surface) -{ - TRACE("surface %p.\n", surface); - - return surface->palette; -} - DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) { unsigned int alignment; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 99cf6bf..41b3158 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -207,7 +207,6 @@ @ cdecl wined3d_surface_get_blt_status(ptr long) @ cdecl wined3d_surface_get_flip_status(ptr long) @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) -@ cdecl wined3d_surface_get_palette(ptr) @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_surface_get_priority(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 56bedce..db36fbf 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2397,7 +2397,6 @@ struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_re HRESULT __cdecl wined3d_surface_get_blt_status(const struct wined3d_surface *surface, DWORD flags); HRESULT __cdecl wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); -struct wined3d_palette * __cdecl wined3d_surface_get_palette(const struct wined3d_surface *surface); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_priority(const struct wined3d_surface *surface);

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLOptionElementFactory object.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: d06d73c13660a794f97cd80f4fb2ac73c20b9a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d06d73c13660a794f97cd80f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 12 10:23:26 2014 +0200 mshtml: Added IDispatchEx support to HTMLOptionElementFactory object. --- dlls/mshtml/htmloption.c | 36 +++++++++++++++++++++++++----------- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 ++ 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index d64a91d..4738eb5 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -374,6 +374,8 @@ static HRESULT WINAPI HTMLOptionElementFactory_QueryInterface(IHTMLOptionElement *ppv = &This->IHTMLOptionElementFactory_iface; }else if(IsEqualGUID(&IID_IHTMLOptionElementFactory, riid)) { *ppv = &This->IHTMLOptionElementFactory_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; }else { *ppv = NULL; WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); @@ -401,8 +403,10 @@ static ULONG WINAPI HTMLOptionElementFactory_Release(IHTMLOptionElementFactory * TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + release_dispex(&This->dispex); heap_free(This); + } return ref; } @@ -410,16 +414,14 @@ static ULONG WINAPI HTMLOptionElementFactory_Release(IHTMLOptionElementFactory * static HRESULT WINAPI HTMLOptionElementFactory_GetTypeInfoCount(IHTMLOptionElementFactory *iface, UINT *pctinfo) { HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLOptionElementFactory_GetTypeInfo(IHTMLOptionElementFactory *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLOptionElementFactory_GetIDsOfNames(IHTMLOptionElementFactory *iface, REFIID riid, @@ -427,9 +429,7 @@ static HRESULT WINAPI HTMLOptionElementFactory_GetIDsOfNames(IHTMLOptionElementF LCID lcid, DISPID *rgDispId) { HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLOptionElementFactory_Invoke(IHTMLOptionElementFactory *iface, DISPID dispIdMember, @@ -437,9 +437,8 @@ static HRESULT WINAPI HTMLOptionElementFactory_Invoke(IHTMLOptionElementFactory VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory *iface, @@ -505,6 +504,18 @@ static const IHTMLOptionElementFactoryVtbl HTMLOptionElementFactoryVtbl = { HTMLOptionElementFactory_create }; +static const tid_t HTMLOptionElementFactory_iface_tids[] = { + IHTMLOptionElementFactory_tid, + 0 +}; + +static dispex_static_data_t HTMLOptionElementFactory_dispex = { + NULL, + IHTMLOptionElementFactory_tid, + NULL, + HTMLOptionElementFactory_iface_tids +}; + HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow *window, HTMLOptionElementFactory **ret_ptr) { HTMLOptionElementFactory *ret; @@ -517,6 +528,9 @@ HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow *window, HTMLOptionEleme ret->ref = 1; ret->window = window; + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLOptionElementFactory_iface, + &HTMLOptionElementFactory_dispex); + *ret_ptr = ret; return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ccfec4a..068c18e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -167,6 +167,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLObjectElement) \ XIID(IHTMLObjectElement2) \ XIID(IHTMLOptionElement) \ + XIID(IHTMLOptionElementFactory) \ XIID(IHTMLPluginsCollection) \ XIID(IHTMLRect) \ XIID(IHTMLScreen) \ @@ -318,6 +319,7 @@ typedef struct { } global_prop_t; typedef struct { + DispatchEx dispex; IHTMLOptionElementFactory IHTMLOptionElementFactory_iface; LONG ref; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 08c6c29..8af98dd 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1741,6 +1741,8 @@ static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *do IHTMLWindow2_Release(window); ok_(__FILE__,line) (hres == S_OK, "get_Option failed: %08x\n", hres); + test_disp((IUnknown*)factory, &IID_IHTMLOptionElementFactory, "[object]"); + V_VT(&text) = VT_BSTR; V_BSTR(&text) = a2bstr(txt); V_VT(&value) = VT_BSTR;

1 0

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

May 12, 2014

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

Henri Verbeet : d2d1: Add the ID2D1Resource interface.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: eaac54e0ae5b3f11804ffe760e5b7b91910d3fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaac54e0ae5b3f11804ffe760… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 12 09:34:00 2014 +0200 d2d1: Add the ID2D1Resource interface. --- include/d2d1.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index c63ed24..b5f136b 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -78,6 +78,20 @@ typedef struct D2D1_FACTORY_OPTIONS D2D1_DEBUG_LEVEL debugLevel; } D2D1_FACTORY_OPTIONS; +interface ID2D1Factory; + +[ + local, + object, + uuid(2cd90691-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1Resource : IUnknown +{ + void GetFactory( + [out] ID2D1Factory **factory + ); +} + [ local, object,

1 0

Jacek Caban : mshtml: Use debugmsg_mshtml_guid in a few more places.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: b54a9c662ac076b98742280ddd62d7df3210715f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54a9c662ac076b98742280dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 12 10:23:17 2014 +0200 mshtml: Use debugmsg_mshtml_guid in a few more places. --- dlls/mshtml/htmllocation.c | 17 +++++++---------- dlls/mshtml/htmloption.c | 18 +++++++----------- dlls/mshtml/htmlscreen.c | 17 +++++++---------- dlls/mshtml/htmlstorage.c | 17 +++++++---------- dlls/mshtml/htmlstyle.c | 22 +++++++--------------- dlls/mshtml/main.c | 10 ++++++++++ 6 files changed, 45 insertions(+), 56 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 9e4d6d2..0c50609 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -81,25 +81,22 @@ static HRESULT WINAPI HTMLLocation_QueryInterface(IHTMLLocation *iface, REFIID r { HTMLLocation *This = impl_from_IHTMLLocation(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->IHTMLLocation_iface; }else if(IsEqualGUID(&IID_IHTMLLocation, riid)) { - TRACE("(%p)->(IID_IHTMLLocation %p)\n", This, ppv); *ppv = &This->IHTMLLocation_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : 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 HTMLLocation_AddRef(IHTMLLocation *iface) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index a523c59..d64a91d 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -366,26 +366,22 @@ static HRESULT WINAPI HTMLOptionElementFactory_QueryInterface(IHTMLOptionElement { HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(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->IHTMLOptionElementFactory_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLOptionElementFactory_iface; }else if(IsEqualGUID(&IID_IHTMLOptionElementFactory, riid)) { - TRACE("(%p)->(IID_IHTMLOptionElementFactory %p)\n", This, ppv); *ppv = &This->IHTMLOptionElementFactory_iface; + }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 HTMLOptionElementFactory_AddRef(IHTMLOptionElementFactory *iface) diff --git a/dlls/mshtml/htmlscreen.c b/dlls/mshtml/htmlscreen.c index 68091a0..db63688 100644 --- a/dlls/mshtml/htmlscreen.c +++ b/dlls/mshtml/htmlscreen.c @@ -47,25 +47,22 @@ static HRESULT WINAPI HTMLScreen_QueryInterface(IHTMLScreen *iface, REFIID riid, { HTMLScreen *This = impl_from_IHTMLScreen(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->IHTMLScreen_iface; }else if(IsEqualGUID(&IID_IHTMLScreen, riid)) { - TRACE("(%p)->(IID_IHTMLScreen %p)\n", This, ppv); *ppv = &This->IHTMLScreen_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : 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 HTMLScreen_AddRef(IHTMLScreen *iface) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 544ab8a..3e169ba 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -46,25 +46,22 @@ static HRESULT WINAPI HTMLStorage_QueryInterface(IHTMLStorage *iface, REFIID rii { HTMLStorage *This = impl_from_IHTMLStorage(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->IHTMLStorage_iface; }else if(IsEqualGUID(&IID_IHTMLStorage, riid)) { - TRACE("(%p)->(IID_IHTMLStorage %p)\n", This, ppv); *ppv = &This->IHTMLStorage_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_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 HTMLStorage_AddRef(IHTMLStorage *iface) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index d2d2fc8..3ac9727 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -730,40 +730,32 @@ static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, v { HTMLStyle *This = impl_from_IHTMLStyle(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->IHTMLStyle_iface; }else if(IsEqualGUID(&IID_IHTMLStyle, riid)) { - TRACE("(%p)->(IID_IHTMLStyle %p)\n", This, ppv); *ppv = &This->IHTMLStyle_iface; }else if(IsEqualGUID(&IID_IHTMLStyle2, riid)) { - TRACE("(%p)->(IID_IHTMLStyle2 %p)\n", This, ppv); *ppv = &This->IHTMLStyle2_iface; }else if(IsEqualGUID(&IID_IHTMLStyle3, riid)) { - TRACE("(%p)->(IID_IHTMLStyle3 %p)\n", This, ppv); *ppv = &This->IHTMLStyle3_iface; }else if(IsEqualGUID(&IID_IHTMLStyle4, riid)) { - TRACE("(%p)->(IID_IHTMLStyle4 %p)\n", This, ppv); *ppv = &This->IHTMLStyle4_iface; }else if(IsEqualGUID(&IID_IHTMLStyle5, riid)) { - TRACE("(%p)->(IID_IHTMLStyle5 %p)\n", This, ppv); *ppv = &This->IHTMLStyle5_iface; }else if(IsEqualGUID(&IID_IHTMLStyle6, riid)) { - TRACE("(%p)->(IID_IHTMLStyle6 %p)\n", This, ppv); *ppv = &This->IHTMLStyle6_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("unsupported iface %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 HTMLStyle_AddRef(IHTMLStyle *iface) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index feff26e..5e9d7cb 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -574,7 +574,17 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLEventObj); X(IID_IHTMLFiltersCollection); X(IID_IHTMLImageElementFactory); + X(IID_IHTMLLocation); + X(IID_IHTMLOptionElementFactory); X(IID_IHTMLRect); + X(IID_IHTMLScreen); + X(IID_IHTMLStorage); + X(IID_IHTMLStyle); + X(IID_IHTMLStyle2); + X(IID_IHTMLStyle3); + X(IID_IHTMLStyle4); + X(IID_IHTMLStyle5); + X(IID_IHTMLStyle6); X(IID_IHtmlLoadOptions); X(IID_IInternetHostSecurityManager); X(IID_IMonikerProp);

1 0

Vincent Povirk : ole32: STGM_NOSNAPSHOT implies deny write.
by Alexandre Julliard May 12, 2014

May 12, 2014

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

Nikolay Sivov : comctl32/listview: Fix custom draw stage sequence.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: fa3e750e2cfc5fe763c2891f5fa47fec2ded43b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3e750e2cfc5fe763c2891f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 11 00:49:27 2014 +0400 comctl32/listview: Fix custom draw stage sequence. --- dlls/comctl32/listview.c | 321 +++++++++++++++++++++++++--------------- dlls/comctl32/tests/listview.c | 83 +++++++++-- 2 files changed, 269 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa3e750e2cfc5fe763c28…

1 0

Henri Verbeet : d2d1: Add the ID2D1TessellationSink interface.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 7b6ee15bc216086f8a61a7f44d79a2f4c31d8bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b6ee15bc216086f8a61a7f44… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 12 09:34:02 2014 +0200 d2d1: Add the ID2D1TessellationSink interface. --- include/d2d1.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 76cb47f..b208f71 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -107,6 +107,13 @@ typedef struct D2D1_FACTORY_OPTIONS D2D1_DEBUG_LEVEL debugLevel; } D2D1_FACTORY_OPTIONS; +typedef struct D2D1_TRIANGLE +{ + D2D1_POINT_2F point1; + D2D1_POINT_2F point2; + D2D1_POINT_2F point3; +} D2D1_TRIANGLE; + interface ID2D1Factory; [ @@ -158,5 +165,19 @@ interface ID2D1SimplifiedGeometrySink : IUnknown HRESULT Close(); } +[ + local, + object, + uuid(2cd906c1-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1TessellationSink : IUnknown +{ + void AddTriangles( + [in, size_is(count)] const D2D1_TRIANGLE *triangles, + [in] UINT32 count + ); + HRESULT Close(); +} + [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 ID2D1Geometry interface.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 2f72c13c379322ab99cd316eb80ccf9c99ce4152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f72c13c379322ab99cd316eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 12 09:34:03 2014 +0200 d2d1: Add the ID2D1Geometry interface. --- include/d2d1.idl | 115 ++++++++++++++++++++++++++++++++++++++++++++++++ include/d2dbasetypes.h | 18 ++++++++ 2 files changed, 133 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index b208f71..63ca96e 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -20,6 +20,8 @@ import "unknwn.idl"; import "d2dbasetypes.h"; typedef D2D_POINT_2F D2D1_POINT_2F; +typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; +typedef D2D_RECT_F D2D1_RECT_F; typedef enum D2D1_DEBUG_LEVEL { @@ -95,6 +97,32 @@ typedef enum D2D1_DASH_STYLE D2D1_DASH_STYLE_FORCE_DWORD = 0xffffffff, } D2D1_DASH_STYLE; +typedef enum D2D1_GEOMETRY_RELATION +{ + D2D1_GEOMETRY_RELATION_UNKNOWN = 0, + D2D1_GEOMETRY_RELATION_DISJOINT = 1, + D2D1_GEOMETRY_RELATION_IS_CONTAINED = 2, + D2D1_GEOMETRY_RELATION_CONTAINS = 3, + D2D1_GEOMETRY_RELATION_OVERLAP = 4, + D2D1_GEOMETRY_RELATION_FORCE_DWORD = 0xffffffff, +} D2D1_GEOMETRY_RELATION; + +typedef enum D2D1_GEOMETRY_SIMPLIFICATION_OPTION +{ + D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES = 0, + D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES = 1, + D2D1_GEOMETRY_SIMPLIFICATION_OPTION_FORCE_DWORD = 0xffffffff, +} D2D1_GEOMETRY_SIMPLIFICATION_OPTION; + +typedef enum D2D1_COMBINE_MODE +{ + D2D1_COMBINE_MODE_UNION = 0, + D2D1_COMBINE_MODE_INTERSECT = 1, + D2D1_COMBINE_MODE_XOR = 2, + D2D1_COMBINE_MODE_EXCLUDE = 3, + D2D1_COMBINE_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_COMBINE_MODE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -179,5 +207,92 @@ interface ID2D1TessellationSink : IUnknown HRESULT Close(); } +[ + local, + object, + uuid(2cd906a1-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1Geometry : ID2D1Resource +{ + HRESULT GetBounds( + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [out] D2D1_RECT_F *bounds + ); + HRESULT GetWidenedBounds( + [in] float stroke_width, + [in, optional] ID2D1StrokeStyle *stroke_style, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] D2D1_RECT_F *bounds + ); + HRESULT StrokeContainsPoint( + [in] D2D1_POINT_2F point, + [in] float stroke_width, + [in, optional] ID2D1StrokeStyle *stroke_style, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] BOOL *contains + ); + HRESULT FillContainsPoint( + [in] D2D1_POINT_2F point, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] BOOL *contains + ); + HRESULT CompareWithGeometry( + [in] ID2D1Geometry *geometry, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] D2D1_GEOMETRY_RELATION *relation + ); + HRESULT Simplify( + [in] D2D1_GEOMETRY_SIMPLIFICATION_OPTION option, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [in] ID2D1SimplifiedGeometrySink *sink + ); + HRESULT Tessellate( + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [in] ID2D1TessellationSink *sink + ); + HRESULT CombineWithGeometry( + [in] ID2D1Geometry *geometry, + [in] D2D1_COMBINE_MODE combine_mode, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [in] ID2D1SimplifiedGeometrySink *sink + ); + HRESULT Outline( + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [in] ID2D1SimplifiedGeometrySink *sink + ); + HRESULT ComputeArea( + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] float *area + ); + HRESULT ComputeLength( + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] float *length + ); + HRESULT ComputePointAtLength( + [in] float length, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out, optional] D2D1_POINT_2F *point, + [out, optional] D2D1_POINT_2F *tangent + ); + HRESULT Widen( + [in] float stroke_width, + [in, optional] ID2D1StrokeStyle *stroke_style, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [in] ID2D1SimplifiedGeometrySink *sink + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index b306e2b..385e0b3 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -21,3 +21,21 @@ typedef struct D2D_POINT_2F FLOAT x; FLOAT y; } D2D_POINT_2F; + +typedef struct D2D_MATRIX_3X2_F +{ + float _11; + float _12; + float _21; + float _22; + float _31; + float _32; +} D2D_MATRIX_3X2_F; + +typedef struct D2D_RECT_F +{ + float left; + float top; + float right; + float bottom; +} D2D_RECT_F;

1 0

Henri Verbeet : d2d1: Add the ID2D1RectangleGeometry interface.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 3a541f595fca798982029e486c5fcc1dc490b8f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a541f595fca798982029e486… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 12 09:34:04 2014 +0200 d2d1: Add the ID2D1RectangleGeometry interface. --- include/d2d1.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 63ca96e..bf29404 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -294,5 +294,17 @@ interface ID2D1Geometry : ID2D1Resource ); } +[ + local, + object, + uuid(2cd906a2-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1RectangleGeometry : ID2D1Geometry +{ + void GetRect( + [out] D2D1_RECT_F *rect + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0