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

Piotr Caban : msvcrt: Don't crash on NULL struct _tm in asctime.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: c18d52d346898be56239976c1b73007a06d2f38d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c18d52d346898be56239976c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 12 14:34:51 2014 +0200 msvcrt: Don't crash on NULL struct _tm in asctime. --- dlls/msvcrt/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index a6d4691..9c15bf4 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1263,7 +1263,7 @@ static char* asctime_buf(char *buf, const struct MSVCRT_tm *mstm) static const char month[12][4] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - if (mstm->tm_sec<0 || mstm->tm_sec>59 + if (!mstm || mstm->tm_sec<0 || mstm->tm_sec>59 || mstm->tm_min<0 || mstm->tm_min>59 || mstm->tm_hour<0 || mstm->tm_hour>23 || mstm->tm_mon<0 || mstm->tm_mon>11

1 0

Stefan Dösinger : wined3d: Implement DDBLTFX_MIRRORUPDOWN for DXT2.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 46df06aae7e4a0c32c622deae69b8c391ed94012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46df06aae7e4a0c32c622deae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 12 15:12:41 2014 +0200 wined3d: Implement DDBLTFX_MIRRORUPDOWN for DXT2. --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4b40944..1111df2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5369,6 +5369,7 @@ static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data, } return WINED3D_OK; + case WINED3DFMT_DXT2: case WINED3DFMT_DXT3: for (y = 0; y < update_h; y += format->block_height) {

1 0

Alexandre Julliard : include: Add some more media type uuids.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 9a64cf7705709a04c0aadace9ccabea23bdaccad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a64cf7705709a04c0aadace9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 11:38:49 2014 +0200 include: Add some more media type uuids. --- include/Makefile.in | 1 + include/ksuuids.h | 81 ++++++++ include/uuids.h | 573 +++++++++++++++++++++++++++++++++------------------ 3 files changed, 449 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a64cf7705709a04c0aad…

1 0

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

May 12, 2014

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 May 12, 2014

May 12, 2014

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

Jacek Caban : mshtml: Forward IHTMLScreen' s IDispatch methods to IDispatchEx.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 75afeb474098309dba56a6f5d64cc4f188c6effe URL: http://source.winehq.org/git/wine.git/?a=commit;h=75afeb474098309dba56a6f5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 12 10:23:33 2014 +0200 mshtml: Forward IHTMLScreen's IDispatch methods to IDispatchEx. --- dlls/mshtml/htmlscreen.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlscreen.c b/dlls/mshtml/htmlscreen.c index db63688..5e512999 100644 --- a/dlls/mshtml/htmlscreen.c +++ b/dlls/mshtml/htmlscreen.c @@ -93,24 +93,22 @@ static ULONG WINAPI HTMLScreen_Release(IHTMLScreen *iface) static HRESULT WINAPI HTMLScreen_GetTypeInfoCount(IHTMLScreen *iface, UINT *pctinfo) { HTMLScreen *This = impl_from_IHTMLScreen(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLScreen_GetTypeInfo(IHTMLScreen *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLScreen *This = impl_from_IHTMLScreen(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLScreen_GetIDsOfNames(IHTMLScreen *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { HTMLScreen *This = impl_from_IHTMLScreen(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); } static HRESULT WINAPI HTMLScreen_Invoke(IHTMLScreen *iface, DISPID dispIdMember, @@ -118,8 +116,8 @@ static HRESULT WINAPI HTMLScreen_Invoke(IHTMLScreen *iface, DISPID dispIdMember, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLScreen *This = impl_from_IHTMLScreen(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLScreen_get_colorDepth(IHTMLScreen *iface, LONG *p)

1 0

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

May 12, 2014

Module: wine Branch: master Commit: 3a6b53feacb8f0ca0047ef9121749ed14c73e092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a6b53feacb8f0ca0047ef912… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 12 09:34:01 2014 +0200 d2d1: Add the ID2D1StrokeStyle interface. --- include/d2d1.idl | 64 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index b5f136b..76cb47f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -59,13 +59,6 @@ typedef enum D2D1_FIGURE_BEGIN D2D1_FIGURE_BEGIN_FORCE_DWORD = 0xffffffff } D2D1_FIGURE_BEGIN; -typedef struct D2D1_BEZIER_SEGMENT -{ - D2D1_POINT_2F point1; - D2D1_POINT_2F point2; - D2D1_POINT_2F point3; -} D2D1_BEZIER_SEGMENT; - typedef enum D2D1_FIGURE_END { D2D1_FIGURE_END_OPEN = 0, @@ -73,6 +66,42 @@ typedef enum D2D1_FIGURE_END D2D1_FIGURE_END_FORCE_DWORD = 0xffffffff } D2D1_FIGURE_END; +typedef enum D2D1_CAP_STYLE +{ + D2D1_CAP_STYLE_FLAT = 0, + D2D1_CAP_STYLE_SQUARE = 1, + D2D1_CAP_STYLE_ROUND = 2, + D2D1_CAP_STYLE_TRIANGLE = 3, + D2D1_CAP_STYLE_FORCE_DWORD = 0xffffffff, +} D2D1_CAP_STYLE; + +typedef enum D2D1_LINE_JOIN +{ + D2D1_LINE_JOIN_MITER = 0, + D2D1_LINE_JOIN_BEVEL = 1, + D2D1_LINE_JOIN_ROUND = 2, + D2D1_LINE_JOIN_MITER_OR_BEVEL = 3, + D2D1_LINE_JOIN_FORCE_DWORD = 0xffffffff, +} D2D1_LINE_JOIN; + +typedef enum D2D1_DASH_STYLE +{ + D2D1_DASH_STYLE_SOLID = 0, + D2D1_DASH_STYLE_DASH = 1, + D2D1_DASH_STYLE_DOT = 2, + D2D1_DASH_STYLE_DASH_DOT = 3, + D2D1_DASH_STYLE_DASH_DOT_DOT = 4, + D2D1_DASH_STYLE_CUSTOM = 5, + D2D1_DASH_STYLE_FORCE_DWORD = 0xffffffff, +} D2D1_DASH_STYLE; + +typedef struct D2D1_BEZIER_SEGMENT +{ + D2D1_POINT_2F point1; + D2D1_POINT_2F point2; + D2D1_POINT_2F point3; +} D2D1_BEZIER_SEGMENT; + typedef struct D2D1_FACTORY_OPTIONS { D2D1_DEBUG_LEVEL debugLevel; @@ -95,6 +124,27 @@ interface ID2D1Resource : IUnknown [ local, object, + uuid(2cd9069d-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1StrokeStyle : ID2D1Resource +{ + D2D1_CAP_STYLE GetStartCap(); + D2D1_CAP_STYLE GetEndCap(); + D2D1_CAP_STYLE GetDashCap(); + float GetMiterLimit(); + D2D1_LINE_JOIN GetLineJoin(); + float GetDashOffset(); + D2D1_DASH_STYLE GetDashStyle(); + UINT32 GetDashesCount(); + void GetDashes( + [out, size_is(count)] float *dashes, + [in] UINT32 count + ); +} + +[ + local, + object, uuid(2cd9069e-12e2-11dc-9fed-001143a055f9) ] interface ID2D1SimplifiedGeometrySink : IUnknown

1 0

Bruno Jesus : ws2_32: Avoid magic numbers in shutdown() function.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 443edfa1da00f3ddc04699ce18ea9ba0ade9a292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=443edfa1da00f3ddc04699ce1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon May 12 01:21:54 2014 -0300 ws2_32: Avoid magic numbers in shutdown() function. --- dlls/ws2_32/socket.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 519ce85..5499753 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5027,13 +5027,13 @@ int WINAPI WS_shutdown(SOCKET s, int how) switch( how ) { - case 0: /* drop receives */ + case SD_RECEIVE: /* drop receives */ clear_flags |= FD_READ; break; - case 1: /* drop sends */ + case SD_SEND: /* drop sends */ clear_flags |= FD_WRITE; break; - case 2: /* drop all */ + case SD_BOTH: /* drop all */ clear_flags |= FD_READ|FD_WRITE; /*fall through */ default: @@ -7375,7 +7375,7 @@ INT WINAPI WSARecvDisconnect( SOCKET s, LPWSABUF disconnectdata ) { TRACE( "(0x%04lx %p)\n", s, disconnectdata ); - return WS_shutdown( s, 0 ); + return WS_shutdown( s, SD_RECEIVE ); } /***********************************************************************

1 0

Piotr Caban : oleacc: Add Client_accLocation implementation.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 7a0fd9cfe2a79d2fe4d79695029483c4732c4100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0fd9cfe2a79d2fe4d796950… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 12 12:53:39 2014 +0200 oleacc: Add Client_accLocation implementation. --- dlls/oleacc/client.c | 26 ++++++++++++++++++++++++-- dlls/oleacc/tests/main.c | 26 +++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index b2c734a..8a48b36 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -326,9 +326,31 @@ static HRESULT WINAPI Client_accLocation(IAccessible *iface, LONG *pxLeft, LONG *pyTop, LONG *pcxWidth, LONG *pcyHeight, VARIANT varID) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p %p %p %p %s)\n", This, pxLeft, pyTop, + RECT rect; + POINT pt; + + TRACE("(%p)->(%p %p %p %p %s)\n", This, pxLeft, pyTop, pcxWidth, pcyHeight, debugstr_variant(&varID)); - return E_NOTIMPL; + + *pxLeft = *pyTop = *pcxWidth = *pcyHeight = 0; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + + if(!GetClientRect(This->hwnd, &rect)) + return S_OK; + + pt.x = rect.left, + pt.y = rect.top; + MapWindowPoints(This->hwnd, NULL, &pt, 1); + *pxLeft = pt.x; + *pyTop = pt.y; + + pt.x = rect.right; + pt.y = rect.bottom; + MapWindowPoints(This->hwnd, NULL, &pt, 1); + *pcxWidth = pt.x - *pxLeft; + *pcyHeight = pt.y - *pyTop; + return S_OK; } static HRESULT WINAPI Client_accNavigate(IAccessible *iface, diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 3fb23da..4f9ea98 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -319,7 +319,8 @@ static void test_default_client_accessible_object(void) VARIANT vid, v; BSTR str; POINT pt; - LONG l; + RECT rect; + LONG l, left, top, width, height; hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, NULL, NULL); @@ -435,6 +436,22 @@ static void test_default_client_accessible_object(void) ok(disp != NULL, "disp == NULL\n"); IDispatch_Release(disp); + ok(GetClientRect(hwnd, &rect), "GetClientRect failed\n"); + pt.x = rect.left; + pt.y = rect.top; + MapWindowPoints(hwnd, NULL, &pt, 1); + rect.left = pt.x; + rect.top = pt.y; + pt.x = rect.right; + pt.y = rect.bottom; + MapWindowPoints(hwnd, NULL, &pt, 1); + hr = IAccessible_accLocation(acc, &left, &top, &width, &height, vid); + ok(hr == S_OK, "got %x\n", hr); + ok(left == rect.left, "left = %d, expected %d\n", left, rect.left); + ok(top == rect.top, "top = %d, expected %d\n", top, rect.top); + ok(width == pt.x-rect.left, "width = %d, expected %d\n", width, pt.x-rect.left); + ok(height == pt.y-rect.top, "height = %d, expected %d\n", height, pt.y-rect.top); + DestroyWindow(hwnd); hr = IAccessible_get_accChildCount(acc, &l); @@ -467,6 +484,13 @@ static void test_default_client_accessible_object(void) ok(hr == E_FAIL, "got %x\n", hr); ok(disp == NULL, "disp = %p\n", disp); + hr = IAccessible_accLocation(acc, &left, &top, &width, &height, vid); + ok(hr == S_OK, "got %x\n", hr); + ok(left == 0, "left = %d\n", left); + ok(top == 0, "top = %d\n", top); + ok(width == 0, "width = %d\n", width); + ok(height == 0, "height = %d\n", height); + IAccessible_Release(acc); }

1 0

Nikolay Sivov : comctl32/treeview: Added a test for NM_RETURN.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: a709e3f98dc807c2423ce5ea1d39902777f07f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a709e3f98dc807c2423ce5ea1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 12 13:18:36 2014 +0400 comctl32/treeview: Added a test for NM_RETURN. --- dlls/comctl32/tests/treeview.c | 31 +++++++++++++++++++++++++++++++ dlls/comctl32/treeview.c | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index cd619a9..3b70e6c 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -252,6 +252,13 @@ static const struct message parent_cd_seq[] = { { 0 } }; +static const struct message parent_vk_return_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, NM_RETURN }, + { WM_CHANGEUISTATE, sent|optional }, + { 0 } +}; + static HWND hMainWnd; static HTREEITEM hRoot, hChild; @@ -2126,6 +2133,29 @@ static void test_customdraw(void) DestroyWindow(hwnd); } +static void test_WM_KEYDOWN(void) +{ + static const char *rootA = "root"; + TVINSERTSTRUCTA ins; + HTREEITEM hRoot; + HWND hwnd; + + hwnd = create_treeview_control(0); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char*)rootA; + hRoot = TreeView_InsertItemA(hwnd, &ins); + ok(hRoot != NULL, "got %p\n", hRoot); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(hwnd, WM_KEYDOWN, VK_RETURN, 0); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_vk_return_seq, "WM_KEYDOWN/VK_RETURN parent notification", TRUE); + + DestroyWindow(hwnd); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -2200,6 +2230,7 @@ START_TEST(treeview) test_TVM_HITTEST(); test_WM_GETDLGCODE(); test_customdraw(); + test_WM_KEYDOWN(); if (!load_v6_module(&ctx_cookie, &hCtx)) { diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index bb42b21..6dd7e93 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5261,7 +5261,7 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam) case VK_RETURN: TREEVIEW_SendSimpleNotify(infoPtr, NM_RETURN); - break; + break; case VK_HOME: newSelection = infoPtr->root->firstChild;

1 0

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

May 12, 2014

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

André Hentschel : Add WWN369
by Jeremy Newman May 9, 2014

May 9, 2014

Module: website Branch: master Commit: 5388934d8eaf5707ba9fa5f9ef5487cef9fe5a20 URL: http://source.winehq.org/git/website.git/?a=commit;h=5388934d8eaf5707ba9fa5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 9 21:28:40 2014 +0200 Add WWN369 --- news/de/2014050901.xml | 12 + news/en/2014050901.xml | 12 + wwn/en/wn20140509_369.xml | 701 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 725 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=5388934d8eaf5707ba…

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman May 9, 2014

May 9, 2014

Module: website Branch: master Commit: 1d47644aa6bbc8e0593cb50bfae7a1a9f80aa883 URL: http://source.winehq.org/git/website.git/?a=commit;h=1d47644aa6bbc8e0593cb5… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri May 9 14:33:02 2014 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

André Hentschel : Add WWN369
by Jeremy Newman May 9, 2014

May 9, 2014

Module: website Branch: master Commit: 0e82978b680e032346f6cdaa787dc5fd3ec28197 URL: http://source.winehq.org/git/website.git/?a=commit;h=0e82978b680e032346f6cd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 9 21:28:40 2014 +0200 Add WWN369 --- news/de/2014050901.xml | 12 + news/en/2014050901.xml | 12 + wwn/en/wn20140509_369.xml | 701 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 725 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=0e82978b680e032346…

1 0

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

May 9, 2014

Module: wine Branch: master Commit: 018af15b9d7eddf545281ac7091ef01c287b8d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=018af15b9d7eddf545281ac70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 9 13:08:48 2014 +0200 mshtml: Use debugmsg_mshtml_guid in a few more places. --- dlls/mshtml/conpoint.c | 44 ++++++++++++-------------------------------- dlls/mshtml/dispex.c | 4 ++-- dlls/mshtml/ifacewrap.c | 2 +- dlls/mshtml/ipwindow.c | 15 ++++++--------- dlls/mshtml/loadopts.c | 23 ++++++++++------------- dlls/mshtml/main.c | 11 +++++++++++ 6 files changed, 42 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=018af15b9d7eddf545281…

1 0

Piotr Caban : oleacc: Add Client_accHitTest implementation.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: e99dc1acede2cbeb222f4b6458a07c14b64ab2e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99dc1acede2cbeb222f4b645… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 9 13:59:51 2014 +0200 oleacc: Add Client_accHitTest implementation. --- dlls/oleacc/client.c | 22 ++++++++++++++++++-- dlls/oleacc/tests/main.c | 50 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index e768657..d557de9 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -340,8 +340,26 @@ static HRESULT WINAPI Client_accHitTest(IAccessible *iface, LONG xLeft, LONG yTop, VARIANT *pvarID) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%d %d %p)\n", This, xLeft, yTop, pvarID); - return E_NOTIMPL; + HWND child; + POINT pt; + + TRACE("(%p)->(%d %d %p)\n", This, xLeft, yTop, pvarID); + + V_VT(pvarID) = VT_I4; + V_I4(pvarID) = 0; + + pt.x = xLeft; + pt.y = yTop; + if(!IsWindowVisible(This->hwnd) || !ScreenToClient(This->hwnd, &pt)) + return S_OK; + + child = ChildWindowFromPointEx(This->hwnd, pt, CWP_SKIPINVISIBLE); + if(!child || child==This->hwnd) + return S_OK; + + V_VT(pvarID) = VT_DISPATCH; + return AccessibleObjectFromWindow(child, OBJID_WINDOW, + &IID_IDispatch, (void**)&V_DISPATCH(pvarID)); } static HRESULT WINAPI Client_accDoDefaultAction(IAccessible *iface, VARIANT varID) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 186a71b..62fe3f8 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -315,13 +315,14 @@ static void test_default_client_accessible_object(void) HRESULT hr; VARIANT vid, v; BSTR str; + POINT pt; LONG l; hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, - 0, 0, 0, 0, NULL, NULL, NULL, NULL); + 0, 0, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindow failed\n"); - chld = CreateWindowA("static", "message", WS_CHILD, - 0, 0, 0, 0, hwnd, NULL, NULL, NULL); + chld = CreateWindowA("static", "message", WS_CHILD | WS_VISIBLE, + 0, 0, 50, 50, hwnd, NULL, NULL, NULL); ok(chld != NULL, "CreateWindow failed\n"); hr = CreateStdAccessibleObject(NULL, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); @@ -388,6 +389,44 @@ static void test_default_client_accessible_object(void) ok(hr == S_FALSE, "got %x\n", hr); ok(!str, "str != NULL\n"); + pt.x = pt.y = 60; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + + pt.x = pt.y = 25; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + + ShowWindow(hwnd, TRUE); + pt.x = pt.y = 60; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + + pt.x = pt.y = 25; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); + VariantClear(&v); + + ShowWindow(chld, FALSE); + pt.x = pt.y = 25; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + DestroyWindow(hwnd); hr = IAccessible_get_accChildCount(acc, &l); @@ -410,6 +449,11 @@ static void test_default_client_accessible_object(void) ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_I4(&v) == STATE_SYSTEM_INVISIBLE, "V_I4(&v) = %x\n", V_I4(&v)); + hr = IAccessible_accHitTest(acc, 200, 200, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + IAccessible_Release(acc); }

1 0

Piotr Caban : oleacc: Add default window accessible object stub.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 6474f8c1df922d277882ba342414c93078f2aa67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6474f8c1df922d277882ba342… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 9 13:59:47 2014 +0200 oleacc: Add default window accessible object stub. --- dlls/oleacc/Makefile.in | 3 +- dlls/oleacc/main.c | 2 + dlls/oleacc/oleacc_private.h | 1 + dlls/oleacc/window.c | 316 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 321 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6474f8c1df922d277882b…

1 0

Jacek Caban : mshtml: Fixed leaks in IHTMLStyleSheet:: Release and IHTMLStyleSheetsCollection::Release implementations.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 60989ea3328648ac7d04bc08ce292b55105aa5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60989ea3328648ac7d04bc08c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 9 13:29:21 2014 +0200 mshtml: Fixed leaks in IHTMLStyleSheet::Release and IHTMLStyleSheetsCollection::Release implementations. --- dlls/mshtml/htmlstylesheet.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 2abd77f..4258f79 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -264,6 +264,7 @@ static ULONG WINAPI HTMLStyleSheetsCollection_Release(IHTMLStyleSheetsCollection TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + release_dispex(&This->dispex); if(This->nslist) nsIDOMStyleSheetList_Release(This->nslist); heap_free(This); @@ -455,8 +456,12 @@ static ULONG WINAPI HTMLStyleSheet_Release(IHTMLStyleSheet *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + release_dispex(&This->dispex); + if(This->nsstylesheet) + nsIDOMCSSStyleSheet_Release(This->nsstylesheet); heap_free(This); + } return ref; }

1 0

Joachim Priesner : wined3d: Clear active lights when cleaning up a D3D stateblock.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 3cd86c9f62cfb800164068a2cb8a77b65ef6d9bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd86c9f62cfb800164068a2c… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Thu May 8 22:43:46 2014 +0200 wined3d: Clear active lights when cleaning up a D3D stateblock. This prevents dangling pointers as the light structures that the pointers in the state->lights array point to are freed below when cleaning the light maps. --- dlls/wined3d/stateblock.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f991362..e98ee2a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -539,6 +539,11 @@ void state_cleanup(struct wined3d_state *state) if (!(state->flags & WINED3D_STATE_NO_REF)) state_unbind_resources(state); + for (counter = 0; counter < MAX_ACTIVE_LIGHTS; ++counter) + { + state->lights[counter] = NULL; + } + for (counter = 0; counter < LIGHTMAP_SIZE; ++counter) { struct list *e1, *e2;

1 0

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

May 9, 2014

Module: wine Branch: master Commit: 000b78e9436ddb26dc00ee120c1b98150d3776e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=000b78e9436ddb26dc00ee120… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 9 14:05:21 2014 +0200 mshtml: Added IDispatchEx support to HTMLStyleSheetRulesCollection object. --- dlls/mshtml/htmlstylesheet.c | 50 ++++++++++++++++++++++++------------------ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 ++ 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index a1669c1..2abd77f 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -50,6 +50,7 @@ struct HTMLStyleSheetsCollection { }; struct HTMLStyleSheetRulesCollection { + DispatchEx dispex; IHTMLStyleSheetRulesCollection IHTMLStyleSheetRulesCollection_iface; LONG ref; @@ -73,15 +74,16 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_QueryInterface(IHTMLStyleShe }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); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLStyleSheetRulesCollection_AddRef(IHTMLStyleSheetRulesCollection *iface) @@ -102,6 +104,7 @@ static ULONG WINAPI HTMLStyleSheetRulesCollection_Release(IHTMLStyleSheetRulesCo TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + release_dispex(&This->dispex); if(This->nslist) nsIDOMCSSRuleList_Release(This->nslist); heap_free(This); @@ -114,25 +117,22 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_GetTypeInfoCount( IHTMLStyleSheetRulesCollection *iface, UINT *pctinfo) { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLStyleSheetRulesCollection_GetTypeInfo(IHTMLStyleSheetRulesCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(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 HTMLStyleSheetRulesCollection_GetIDsOfNames(IHTMLStyleSheetRulesCollection *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(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 HTMLStyleSheetRulesCollection_Invoke(IHTMLStyleSheetRulesCollection *iface, @@ -140,9 +140,8 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_Invoke(IHTMLStyleSheetRulesC VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(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 HTMLStyleSheetRulesCollection_get_length(IHTMLStyleSheetRulesCollection *iface, @@ -185,6 +184,17 @@ static const IHTMLStyleSheetRulesCollectionVtbl HTMLStyleSheetRulesCollectionVtb HTMLStyleSheetRulesCollection_item }; +static const tid_t HTMLStyleSheetRulesCollection_iface_tids[] = { + IHTMLStyleSheetRulesCollection_tid, + 0 +}; +static dispex_static_data_t HTMLStyleSheetRulesCollection_dispex = { + NULL, + DispHTMLStyleSheetRulesCollection_tid, + NULL, + HTMLStyleSheetRulesCollection_iface_tids +}; + static IHTMLStyleSheetRulesCollection *HTMLStyleSheetRulesCollection_Create(nsIDOMCSSRuleList *nslist) { HTMLStyleSheetRulesCollection *ret; @@ -194,6 +204,8 @@ static IHTMLStyleSheetRulesCollection *HTMLStyleSheetRulesCollection_Create(nsID ret->ref = 1; ret->nslist = nslist; + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLStyleSheetRulesCollection_iface, &HTMLStyleSheetRulesCollection_dispex); + if(nslist) nsIDOMCSSRuleList_AddRef(nslist); @@ -460,7 +472,6 @@ static HRESULT WINAPI HTMLStyleSheet_GetTypeInfo(IHTMLStyleSheet *iface, UINT iT LCID lcid, ITypeInfo **ppTInfo) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } @@ -469,7 +480,6 @@ static HRESULT WINAPI HTMLStyleSheet_GetIDsOfNames(IHTMLStyleSheet *iface, REFII LCID lcid, DISPID *rgDispId) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } @@ -478,8 +488,6 @@ static HRESULT WINAPI HTMLStyleSheet_Invoke(IHTMLStyleSheet *iface, DISPID dispI VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2b59c8a..ccfec4a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -107,6 +107,7 @@ typedef struct event_target_t event_target_t; XDIID(DispHTMLStyle) \ XDIID(DispHTMLStyleElement) \ XDIID(DispHTMLStyleSheet) \ + XDIID(DispHTMLStyleSheetRulesCollection) \ XDIID(DispHTMLStyleSheetsCollection) \ XDIID(DispHTMLTable) \ XDIID(DispHTMLTableCell) \ @@ -180,6 +181,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLStyle6) \ XIID(IHTMLStyleElement) \ XIID(IHTMLStyleSheet) \ + XIID(IHTMLStyleSheetRulesCollection) \ XIID(IHTMLStyleSheetsCollection) \ XIID(IHTMLTable) \ XIID(IHTMLTable2) \ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4378ad3..08c6c29 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6241,6 +6241,8 @@ static void test_stylesheet(IDispatch *disp) hres = IHTMLStyleSheet_get_rules(stylesheet, &col); ok(hres == S_OK, "get_rules failed: %08x\n", hres); ok(col != NULL, "col == NULL\n"); + + test_disp2((IUnknown*)col, &DIID_DispHTMLStyleSheetRulesCollection, &IID_IHTMLStyleSheetRulesCollection, "[object]"); IHTMLStyleSheetRulesCollection_Release(col); href = (void*)0xdeadbeef;

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Client GetSPCaps.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: b01fc1aa6e12b426b3f539c44196c92331bad874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01fc1aa6e12b426b3f539c44… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 7 10:59:46 2014 +1000 dpnet: Implement IDirectPlay8Client GetSPCaps. --- dlls/dpnet/client.c | 20 +++++++++++++++++--- dlls/dpnet/dpnet_private.h | 2 ++ dlls/dpnet/tests/client.c | 25 ++++++++++++++++--------- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 43ffb59..abcc5f7 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -234,9 +234,21 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetSPCaps(IDirectPlay8Client *iface static HRESULT WINAPI IDirectPlay8ClientImpl_GetSPCaps(IDirectPlay8Client *iface, const GUID * const pguidSP, DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + + TRACE("(%p)->(%p,%p,%x)\n", This, pguidSP, pdpspCaps, dwFlags); + + if(!This->msghandler) + return DPNERR_UNINITIALIZED; + + if(pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) + { + return DPNERR_INVALIDPARAM; + } + + *pdpspCaps = This->spcaps; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ClientImpl_GetConnectionInfo(IDirectPlay8Client *iface, @@ -301,6 +313,8 @@ HRESULT DPNET_CreateDirectPlay8Client(IClassFactory *iface, IUnknown *pUnkOuter, client->IDirectPlay8Client_iface.lpVtbl = &DirectPlay8Client_Vtbl; client->ref = 1; + init_dpn_sp_caps(&client->spcaps); + hr = IDirectPlay8ClientImpl_QueryInterface(&client->IDirectPlay8Client_iface, riid, ppv); IDirectPlay8ClientImpl_Release(&client->IDirectPlay8Client_iface); diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 46aa8d5..af81474 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -53,6 +53,8 @@ struct IDirectPlay8ClientImpl PFNDPNMESSAGEHANDLER msghandler; DWORD flags; void *usercontext; + + DPN_SP_CAPS spcaps; }; /* ------------------- */ diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 0df99dd..bf0d26f 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -36,6 +36,7 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, static BOOL test_init_dp(void) { HRESULT hr; + DPN_SP_CAPS caps; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -43,6 +44,12 @@ static BOOL test_init_dp(void) hr = CoCreateInstance(&CLSID_DirectPlay8Client, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Client, (void **)&client); ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + memset(&caps, 0, sizeof(DPN_SP_CAPS)); + caps.dwSize = sizeof(DPN_SP_CAPS); + + hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_UNINITIALIZED, "GetSPCaps failed with %x\n", hr); + hr = IDirectPlay8Client_Initialize(client, NULL, NULL, 0); ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); @@ -160,24 +167,24 @@ static void test_get_sp_caps(void) memset(&caps, 0, sizeof(DPN_SP_CAPS)); hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); - todo_wine ok(hr == DPNERR_INVALIDPARAM, "GetSPCaps unexpectedly returned %x\n", hr); + ok(hr == DPNERR_INVALIDPARAM, "GetSPCaps unexpectedly returned %x\n", hr); caps.dwSize = sizeof(DPN_SP_CAPS); hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); - todo_wine ok((caps.dwFlags & + ok((caps.dwFlags & (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS)) == (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS), "unexpected flags %x\n", caps.dwFlags); - todo_wine ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); - todo_wine ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); - todo_wine ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); - todo_wine ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); - todo_wine ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); - todo_wine ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); - todo_wine ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), + ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); + ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); }

1 0

Alistair Leslie-Hughes : dpnet: Store DPN_SP_CAPS as part of the object.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 329c70d9b8aef9e52313384e369471c612df9067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329c70d9b8aef9e52313384e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 14 15:37:23 2014 +1100 dpnet: Store DPN_SP_CAPS as part of the object. --- dlls/dpnet/dpnet_private.h | 2 ++ dlls/dpnet/peer.c | 34 ++++++++++++++++++++++++---------- dlls/dpnet/tests/peer.c | 7 +++++++ 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 34d2aee..46aa8d5 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -99,6 +99,8 @@ extern HRESULT DPNET_CreateDirectPlay8Address(LPCLASSFACTORY iface, LPUNKNOWN pu extern HRESULT DPNET_CreateDirectPlay8LobbiedApp(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT DPNET_CreateDirectPlay8ThreadPool(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern void init_dpn_sp_caps(DPN_SP_CAPS *dpnspcaps) DECLSPEC_HIDDEN; + /* used for generic dumping (copied from ddraw) */ typedef struct { DWORD val; diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 02b8d99..a07a59a 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -47,6 +47,8 @@ typedef struct IDirectPlay8PeerImpl PFNDPNMESSAGEHANDLER msghandler; DWORD flags; void *usercontext; + + DPN_SP_CAPS spcaps; } IDirectPlay8PeerImpl; static inline IDirectPlay8PeerImpl *impl_from_IDirectPlay8Peer(IDirectPlay8Peer *iface) @@ -416,22 +418,19 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetSPCaps(IDirectPlay8Peer *iface, co static HRESULT WINAPI IDirectPlay8PeerImpl_GetSPCaps(IDirectPlay8Peer *iface, const GUID * const pguidSP, DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags) { - TRACE("(%p)->(%p,%p,%x)\n", iface, pguidSP, pdpspCaps, dwFlags); + IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); + + TRACE("(%p)->(%p,%p,%x)\n", This, pguidSP, pdpspCaps, dwFlags); + + if(!This->msghandler) + return DPNERR_UNINITIALIZED; if(pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) { return DPNERR_INVALIDPARAM; } - pdpspCaps->dwFlags = DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | - DPNSPCAPS_SUPPORTSALLADAPTERS | DPNSPCAPS_SUPPORTSTHREADPOOL; - pdpspCaps->dwNumThreads = 3; - pdpspCaps->dwDefaultEnumCount = 5; - pdpspCaps->dwDefaultEnumRetryInterval = 1500; - pdpspCaps->dwDefaultEnumTimeout = 1500; - pdpspCaps->dwMaxEnumPayloadSize = 983; - pdpspCaps->dwBuffersPerThread = 1; - pdpspCaps->dwSystemBufferSize = 0x10000; + *pdpspCaps = This->spcaps; return DPN_OK; } @@ -501,6 +500,19 @@ static const IDirectPlay8PeerVtbl DirectPlay8Peer_Vtbl = IDirectPlay8PeerImpl_TerminateSession }; +void init_dpn_sp_caps(DPN_SP_CAPS *dpnspcaps) +{ + dpnspcaps->dwFlags = DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | + DPNSPCAPS_SUPPORTSALLADAPTERS | DPNSPCAPS_SUPPORTSTHREADPOOL; + dpnspcaps->dwNumThreads = 3; + dpnspcaps->dwDefaultEnumCount = 5; + dpnspcaps->dwDefaultEnumRetryInterval = 1500; + dpnspcaps->dwDefaultEnumTimeout = 1500; + dpnspcaps->dwMaxEnumPayloadSize = 983; + dpnspcaps->dwBuffersPerThread = 1; + dpnspcaps->dwSystemBufferSize = 0x10000; +}; + HRESULT DPNET_CreateDirectPlay8Peer(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, LPVOID *ppobj) { IDirectPlay8PeerImpl* Client; @@ -522,6 +534,8 @@ HRESULT DPNET_CreateDirectPlay8Peer(IClassFactory *iface, IUnknown *pUnkOuter, R Client->msghandler = NULL; Client->flags = 0; + init_dpn_sp_caps(&Client->spcaps); + ret = IDirectPlay8Peer_QueryInterface(&Client->IDirectPlay8Peer_iface, riid, ppobj); IDirectPlay8Peer_Release(&Client->IDirectPlay8Peer_iface); diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index d1f3504..670b843 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -34,6 +34,7 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, static void test_init_dp(void) { HRESULT hr; + DPN_SP_CAPS caps; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -41,6 +42,12 @@ static void test_init_dp(void) hr = CoCreateInstance(&CLSID_DirectPlay8Peer, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Peer, (void **)&peer); ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + memset(&caps, 0, sizeof(DPN_SP_CAPS)); + caps.dwSize = sizeof(DPN_SP_CAPS); + + hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_UNINITIALIZED, "GetSPCaps failed with %x\n", hr); + hr = IDirectPlay8Peer_Initialize(peer, NULL, NULL, 0); ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr);

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 22acc5cb304d946c7990fccf61ce4a0f77cb1a2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=22acc5cb304d946c7990fccf6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 9 16:06:56 2014 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw7.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b61172c..8c5f6ac 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6688,19 +6688,19 @@ static void test_material(void) ok(!memcmp(&U(material).diffuse, &null_color, sizeof(null_color)), "Got unexpected diffuse color {%.8e, %.8e, %.8e, %.8e}.\n", U1(U(material).diffuse).r, U2(U(material).diffuse).g, - U3(U(material).diffuse).b, U3(U(material).diffuse).a); + U3(U(material).diffuse).b, U4(U(material).diffuse).a); ok(!memcmp(&U1(material).ambient, &null_color, sizeof(null_color)), "Got unexpected ambient color {%.8e, %.8e, %.8e, %.8e}.\n", U1(U1(material).ambient).r, U2(U1(material).ambient).g, - U3(U1(material).ambient).b, U3(U1(material).ambient).a); + U3(U1(material).ambient).b, U4(U1(material).ambient).a); ok(!memcmp(&U2(material).specular, &null_color, sizeof(null_color)), "Got unexpected specular color {%.8e, %.8e, %.8e, %.8e}.\n", U1(U2(material).specular).r, U2(U2(material).specular).g, - U3(U2(material).specular).b, U3(U2(material).specular).a); + U3(U2(material).specular).b, U4(U2(material).specular).a); ok(!memcmp(&U3(material).emissive, &null_color, sizeof(null_color)), "Got unexpected emissive color {%.8e, %.8e, %.8e, %.8e}.\n", U1(U3(material).emissive).r, U2(U3(material).emissive).g, - U3(U3(material).emissive).b, U3(U3(material).emissive).a); + U3(U3(material).emissive).b, U4(U3(material).emissive).a); ok(U4(material).power == 0.0f, "Got unexpected power %.8e.\n", U4(material).power); refcount = IDirect3DDevice7_Release(device);

1 0

Piotr Caban : oleacc: Add Client_get_accParent implementation.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 40bdbda82559062caa335b282883b50ce4f8a7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bdbda82559062caa335b282… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 9 13:59:58 2014 +0200 oleacc: Add Client_get_accParent implementation. --- dlls/oleacc/client.c | 7 +++++-- dlls/oleacc/tests/main.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index d557de9..b2c734a 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -113,8 +113,11 @@ static HRESULT WINAPI Client_Invoke(IAccessible *iface, DISPID dispIdMember, static HRESULT WINAPI Client_get_accParent(IAccessible *iface, IDispatch **ppdispParent) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p)\n", This, ppdispParent); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppdispParent); + + return AccessibleObjectFromWindow(This->hwnd, OBJID_WINDOW, + &IID_IDispatch, (void**)ppdispParent); } static HRESULT WINAPI Client_get_accChildCount(IAccessible *iface, LONG *pcountChildren) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 62fe3f8..3fb23da 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -225,6 +225,8 @@ static LRESULT WINAPI test_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA return E_UNEXPECTED; if(lparam == (DWORD)OBJID_CLIENT) return LresultFromObject(&IID_IUnknown, wparam, &Object); + if(lparam == (DWORD)OBJID_WINDOW) + return 0; ok(0, "unexpected (%ld)\n", lparam); return 0; @@ -311,6 +313,7 @@ static void test_default_client_accessible_object(void) static const WCHAR shortcutW[] = {'A','l','t','+','t',0}; IAccessible *acc; + IDispatch *disp; HWND chld, hwnd; HRESULT hr; VARIANT vid, v; @@ -427,6 +430,11 @@ static void test_default_client_accessible_object(void) ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + hr = IAccessible_get_accParent(acc, &disp); + ok(hr == S_OK, "got %x\n", hr); + ok(disp != NULL, "disp == NULL\n"); + IDispatch_Release(disp); + DestroyWindow(hwnd); hr = IAccessible_get_accChildCount(acc, &l); @@ -454,6 +462,11 @@ static void test_default_client_accessible_object(void) ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + disp = (void*)0xdeadbeef; + hr = IAccessible_get_accParent(acc, &disp); + ok(hr == E_FAIL, "got %x\n", hr); + ok(disp == NULL, "disp = %p\n", disp); + IAccessible_Release(acc); }

1 0

Huw Davies : imagehlp/tests: Don' t assume the certificate chain is originally empty.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 38483f1efe5850131455754e3d08a9ccf06a0065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38483f1efe5850131455754e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 9 11:12:24 2014 +0100 imagehlp/tests: Don't assume the certificate chain is originally empty. --- dlls/imagehlp/tests/integrity.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index eb1eb58..3fa359f 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -135,7 +135,7 @@ static DWORD get_file_size(void) return filesize; } -static void test_add_certificate(const char *cert_data, int len) +static DWORD test_add_certificate(const char *cert_data, int len) { HANDLE hFile; LPWIN_CERTIFICATE cert; @@ -148,7 +148,7 @@ static void test_add_certificate(const char *cert_data, int len) if (hFile == INVALID_HANDLE_VALUE) { skip("Unable to open %s, skipping test\n", test_dll_path); - return; + return ~0; } cert_len = sizeof(WIN_CERTIFICATE) + len; @@ -158,7 +158,7 @@ static void test_add_certificate(const char *cert_data, int len) { skip("Unable to allocate memory, skipping test\n"); CloseHandle(hFile); - return; + return ~0; } cert->dwLength = cert_len; @@ -168,9 +168,11 @@ static void test_add_certificate(const char *cert_data, int len) ret = pImageAddCertificate(hFile, cert, &index); ok(ret, "Unable to add certificate to image, error %x\n", GetLastError()); + trace("added cert index %d\n", index); HeapFree(GetProcessHeap(), 0, cert); CloseHandle(hFile); + return index; } static void test_get_certificate(const char *cert_data, int index) @@ -239,7 +241,7 @@ static void test_remove_certificate(int index) START_TEST(integrity) { - DWORD file_size, file_size_orig; + DWORD file_size, file_size_orig, first, second; hImageHlp = LoadLibraryA("imagehlp.dll"); @@ -272,25 +274,27 @@ START_TEST(integrity) pImageGetCertificateHeader = (void *) GetProcAddress(hImageHlp, "ImageGetCertificateHeader"); pImageRemoveCertificate = (void *) GetProcAddress(hImageHlp, "ImageRemoveCertificate"); - test_add_certificate(test_cert_data, sizeof(test_cert_data)); - test_get_certificate(test_cert_data, 0); - test_remove_certificate(0); + first = test_add_certificate(test_cert_data, sizeof(test_cert_data)); + test_get_certificate(test_cert_data, first); + test_remove_certificate(first); file_size = get_file_size(); ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size); /* Try adding multiple certificates */ - test_add_certificate(test_cert_data, sizeof(test_cert_data)); - test_add_certificate(test_cert_data_2, sizeof(test_cert_data_2)); + first = test_add_certificate(test_cert_data, sizeof(test_cert_data)); + second = test_add_certificate(test_cert_data_2, sizeof(test_cert_data_2)); + ok(second == first + 1, "got %d %d\n", first, second); - test_get_certificate(test_cert_data, 0); - test_get_certificate(test_cert_data_2, 1); + test_get_certificate(test_cert_data, first); + test_get_certificate(test_cert_data_2, second); /* Remove the first one and verify the second certificate is intact */ - test_remove_certificate(0); - test_get_certificate(test_cert_data_2, 0); + test_remove_certificate(first); + second--; + test_get_certificate(test_cert_data_2, second); - test_remove_certificate(0); + test_remove_certificate(second); file_size = get_file_size(); ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size);

1 0

Bruno Jesus : ws2_32: Return the correct error if SO_REUSEADDR is set in bind error.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 843ef11eb8ae7d2a9bf275c2ff5ac81144545580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=843ef11eb8ae7d2a9bf275c2f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 8 21:30:27 2014 -0300 ws2_32: Return the correct error if SO_REUSEADDR is set in bind error. --- dlls/ws2_32/socket.c | 14 ++++++++++++++ dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a8fb9a5..519ce85 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2682,6 +2682,20 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) case EADDRNOTAVAIL: SetLastError(WSAEINVAL); break; + case EADDRINUSE: + { + int optval = 0; + socklen_t optlen = sizeof(optval); + /* Windows >= 2003 will return different results depending on + * SO_REUSEADDR, WSAEACCES may be returned representing that + * the socket hijacking protection prevented the bind */ + if (!getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&optval, &optlen) && optval) + { + SetLastError(WSAEACCES); + break; + } + /* fall through */ + } default: SetLastError(wsaErrno()); break; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1752d35..0bbce27 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1529,7 +1529,6 @@ static void test_so_reuseaddr(void) { trace(">= Win 2003 behavior of SO_REUSEADDR\n"); err = WSAGetLastError(); -todo_wine ok(err==WSAEACCES, "expected 10013, got %d\n", err); closesocket(s1);

1 0

Vincent Povirk : ole32: Use real blocking operations for storage locking when possible.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: cf75c5368be45fc9f208f790e2929e9669170c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf75c5368be45fc9f208f790e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 8 13:56:02 2014 -0500 ole32: Use real blocking operations for storage locking when possible. --- dlls/ole32/filelockbytes.c | 19 +++++++++++++++++++ dlls/ole32/storage32.c | 5 ++++- dlls/ole32/storage32.h | 2 ++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index 1f4ac55..9bd1163 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -356,6 +356,25 @@ static HRESULT WINAPI FileLockBytesImpl_LockRegion(ILockBytes* iface, return STG_E_ACCESSDENIED; } +HRESULT FileLockBytesImpl_LockRegionSync(ILockBytes* iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb) +{ + FileLockBytesImpl* This = impl_from_ILockBytes(iface); + OVERLAPPED ol; + + if (iface->lpVtbl != &FileLockBytesImpl_Vtbl) + return E_NOTIMPL; + + ol.hEvent = 0; + ol.u.s.Offset = libOffset.u.LowPart; + ol.u.s.OffsetHigh = libOffset.u.HighPart; + + if (LockFileEx(This->hfile, LOCKFILE_EXCLUSIVE_LOCK, 0, cb.u.LowPart, cb.u.HighPart, &ol)) + return S_OK; + else + return STG_E_ACCESSDENIED; +} + static HRESULT WINAPI FileLockBytesImpl_UnlockRegion(ILockBytes* iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a71ec41..56d3229 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2831,8 +2831,11 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs { HRESULT hr; - /* potential optimization: if we have an HFILE use LockFileEx in blocking mode directly */ + /* if it's a FileLockBytesImpl use LockFileEx in blocking mode */ + if (SUCCEEDED(FileLockBytesImpl_LockRegionSync(This->lockBytes, offset, cb))) + return S_OK; + /* otherwise we have to fake it based on an async lock */ do { int delay=0; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index d5041d1..0b8bcc8 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -157,6 +157,8 @@ struct DirEntry HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsName, ILockBytes **pLockBytes) DECLSPEC_HIDDEN; +HRESULT FileLockBytesImpl_LockRegionSync(ILockBytes* iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb) DECLSPEC_HIDDEN; + /************************************************************************* * Ole Convert support */

1 0

Vincent Povirk : ole32: Warn in cases where we might corrupt storage files.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 45dd716e4e3115fb41675302d452953d30a32481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45dd716e4e3115fb41675302d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 8 13:34:38 2014 -0500 ole32: Warn in cases where we might corrupt storage files. --- dlls/ole32/storage32.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 7f1affb..a71ec41 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4992,6 +4992,8 @@ static HRESULT WINAPI TransactedSnapshotImpl_Commit( { if ((grfCommitFlags & STGC_ONLYIFCURRENT) && transactionSig != This->lastTransactionSig) hr = STG_E_NOTCURRENT; + else if (transactionSig != This->lastTransactionSig) + ERR("proceeding with unsafe commit\n"); if (SUCCEEDED(hr)) { @@ -5546,6 +5548,12 @@ static HRESULT Storage_Construct( if (openFlags & STGM_TRANSACTED) { + static int fixme; + + if (STGM_SHARE_MODE(openFlags) != STGM_SHARE_DENY_WRITE && + STGM_SHARE_MODE(openFlags) != STGM_SHARE_EXCLUSIVE && !fixme++) + FIXME("transacted storage write sharing not implemented safely\n"); + hr = Storage_ConstructTransacted(&newStorage->base, &newTransactedStorage); if (FAILED(hr)) IStorage_Release(&newStorage->base.IStorage_iface);

1 0

Vincent Povirk : server: Try to get a read lock if we can' t get a write lock.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 473a3a47a7d02694e659760008c1856f305cd82c URL: http://source.winehq.org/git/wine.git/?a=commit;h=473a3a47a7d02694e65976000… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 8 15:03:10 2014 -0500 server: Try to get a read lock if we can't get a write lock. --- server/fd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index fa8874c..7043d04 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1175,8 +1175,12 @@ static int set_unix_lock( struct fd *fd, file_pos_t start, file_pos_t end, int t return 0; case EBADF: /* this can happen if we try to set a write lock on a read-only file */ - /* we just ignore that error */ - if (fl.l_type == F_WRLCK) return 1; + /* try to at least grab a read lock */ + if (fl.l_type == F_WRLCK) + { + type = F_RDLCK; + break; /* retry */ + } set_error( STATUS_ACCESS_DENIED ); return 0; #ifdef EOVERFLOW

1 0

Huw Davies : msxml3/tests: Don' t overwrite a variant which is later used in a QueryInterface call.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: f5aaaf215deb3da10f38279d4f3bd627b9d6d8da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5aaaf215deb3da10f38279d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 9 09:14:46 2014 +0100 msxml3/tests: Don't overwrite a variant which is later used in a QueryInterface call. --- dlls/msxml3/tests/xmldoc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 2478a57..b724f5c 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -656,7 +656,7 @@ static void test_xmlelem_collection(void) WCHAR path[MAX_PATH]; LONG length, type; ULONG num_vars; - VARIANT var, vIndex, vName; + VARIANT var, dummy, vIndex, vName; BSTR url, str; static const CHAR szBankXML[] = "bank.xml"; static const WCHAR szNumber[] = {'N','U','M','B','E','R',0}; @@ -766,14 +766,16 @@ static void test_xmlelem_collection(void) ok(num_vars == 1, "Expected 1, got %d\n", num_vars); /* try advance further, no children left */ - hr = IEnumVARIANT_Next(enumVar, 1, &var, &num_vars); + V_VT(&dummy) = VT_I4; + hr = IEnumVARIANT_Next(enumVar, 1, &dummy, &num_vars); ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); - ok(V_VT(&var) == 0, "Expected 0, got %d\n", V_VT(&var)); + ok(V_VT(&dummy) == VT_EMPTY, "Expected 0, got %d\n", V_VT(&dummy)); ok(num_vars == 0, "Expected 0, got %d\n", num_vars); - hr = IEnumVARIANT_Next(enumVar, 1, &var, NULL); + V_VT(&dummy) = VT_I4; + hr = IEnumVARIANT_Next(enumVar, 1, &dummy, NULL); ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); - ok(V_VT(&var) == 0, "Expected 0, got %d\n", V_VT(&var)); + ok(V_VT(&dummy) == VT_EMPTY, "Expected 0, got %d\n", V_VT(&dummy)); hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IXMLElement, (LPVOID *)&child); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Jacek Caban : kernel32/tests: Added more shared memory tests, exposing MAP_PRIVATE mapping for read only mapping problem.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: ea950ac7cfe5156a96bee762cb3af0b4b0ab5e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea950ac7cfe5156a96bee762c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 8 17:30:46 2014 +0200 kernel32/tests: Added more shared memory tests, exposing MAP_PRIVATE mapping for read only mapping problem. --- dlls/kernel32/tests/virtual.c | 54 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 0d417a6..174d422 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2447,7 +2447,7 @@ todo_wine DeleteFileA(file_name); } -static void test_shared_memory(int is_child) +static void test_shared_memory(BOOL is_child) { HANDLE mapping; LONG *p; @@ -2489,6 +2489,48 @@ static void test_shared_memory(int is_child) CloseHandle(mapping); } +static void test_shared_memory_ro(BOOL is_child) +{ + HANDLE mapping; + LONG *p; + + SetLastError(0xdeadbef); + mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "winetest_virtual.c_ro"); + ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); + if (is_child) + ok(GetLastError() == ERROR_ALREADY_EXISTS, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); + + SetLastError(0xdeadbef); + p = MapViewOfFile(mapping, FILE_MAP_READ | (is_child ? FILE_MAP_WRITE : 0), 0, 0, 4096); + ok(p != NULL, "MapViewOfFile error %d\n", GetLastError()); + + if (is_child) + { + *p = 0xdeadbeef; + } + else + { + char **argv; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { sizeof(si) }; + DWORD ret; + + winetest_get_mainargs(&argv); + sprintf(cmdline, "\"%s\" virtual sharedmemro", argv[0]); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); + winetest_wait_child_process(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + ok(*p == 0xdeadbeef, "*p = %x, expected 0xdeadbeef\n", *p); + } + + UnmapViewOfFile(p); + CloseHandle(mapping); +} + START_TEST(virtual) { int argc; @@ -2504,7 +2546,12 @@ START_TEST(virtual) } if (!strcmp(argv[2], "sharedmem")) { - test_shared_memory(1); + test_shared_memory(TRUE); + return; + } + if (!strcmp(argv[2], "sharedmemro")) + { + test_shared_memory_ro(TRUE); return; } while (1) @@ -2532,7 +2579,8 @@ START_TEST(virtual) pNtMapViewOfSection = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtMapViewOfSection"); pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtUnmapViewOfSection"); - test_shared_memory(0); + test_shared_memory(FALSE); + test_shared_memory_ro(FALSE); test_mapping(); test_CreateFileMapping_protection(); test_VirtualAlloc_protection();

1 0

Mark Harmstone : setupapi: Add CM_Get_DevNode_Registry_Property wrapper around CM_Get_DevNode_Registry_Property_Ex.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: cfb81f2c606c17ff005fce87a2e79e1d27b8224a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb81f2c606c17ff005fce87a… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue May 6 17:12:45 2014 +0100 setupapi: Add CM_Get_DevNode_Registry_Property wrapper around CM_Get_DevNode_Registry_Property_Ex. --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index cac0a13..e38f720 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -56,8 +56,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex -@ stub CM_Get_DevNode_Registry_PropertyA -@ stub CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr long long) setupapi.CM_Get_DevNode_Registry_PropertyA +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExW @ stub CM_Get_DevNode_Status diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 4349055..a8ce41a 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -67,8 +67,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex -@ stub CM_Get_DevNode_Registry_PropertyA -@ stub CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr long long) +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) @ stub CM_Get_DevNode_Status diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index fad9d23..c07278e 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -407,6 +407,24 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExW(DEVINST dev, ULONG prop, P } /*********************************************************************** + * CM_Get_DevNode_Registry_PropertyA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyA(DEVINST dev, ULONG prop, PULONG regdatatype, + PVOID buf, PULONG len, ULONG flags) +{ + return CM_Get_DevNode_Registry_Property_ExA(dev, prop, regdatatype, buf, len, flags, NULL); +} + +/*********************************************************************** + * CM_Get_DevNode_Registry_PropertyW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULONG regdatatype, + PVOID buf, PULONG len, ULONG flags) +{ + return CM_Get_DevNode_Registry_Property_ExW(dev, prop, regdatatype, buf, len, flags, NULL); +} + +/*********************************************************************** * CM_Enumerate_Classes (SETUPAPI.@) */ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags)

1 0

Jacek Caban : ntdll: Always use MAP_SHARED in NtMapViewOfSection.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 4792cf31c5dac3f5216bff8f4fa700acc04ea128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4792cf31c5dac3f5216bff8f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 8 18:22:08 2014 +0200 ntdll: Always use MAP_SHARED in NtMapViewOfSection. --- dlls/ntdll/virtual.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 8d3539a..d9acac6 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -854,11 +854,10 @@ done: * The csVirtual section must be held by caller. */ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start, size_t size, - off_t offset, unsigned int vprot, BOOL removable ) + off_t offset, unsigned int vprot, int flags, BOOL removable ) { void *ptr; int prot = VIRTUAL_GetUnixProt( vprot | VPROT_COMMITTED /* make sure it is accessible */ ); - BOOL shared_write = (vprot & VPROT_WRITE) != 0; assert( start < view->size ); assert( start + size <= view->size ); @@ -871,11 +870,9 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start } /* only try mmap if media is not removable (or if we require write access) */ - if (!removable || shared_write) + if (!removable || (flags & MAP_SHARED)) { - int flags = MAP_FIXED | (shared_write ? MAP_SHARED : MAP_PRIVATE); - - if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) + if (mmap( (char *)view->base + start, size, prot, flags | MAP_FIXED, fd, offset ) != (void *)-1) goto done; if ((errno == EPERM) && (prot & PROT_EXEC)) @@ -885,7 +882,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start /* page-aligned (EINVAL), or because the underlying filesystem */ /* does not support mmap() (ENOEXEC,ENODEV), we do it by hand. */ if ((errno != ENOEXEC) && (errno != EINVAL) && (errno != ENODEV)) return FILE_GetNtStatus(); - if (shared_write) /* we cannot fake shared write mappings */ + if (flags & MAP_SHARED) /* we cannot fake shared mappings */ { if (errno == EINVAL) return STATUS_INVALID_PARAMETER; ERR( "shared writable mmap not supported, broken filesystem?\n" ); @@ -1097,7 +1094,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz if (!st.st_size) goto error; header_size = min( header_size, st.st_size ); if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - !dup_mapping ) != STATUS_SUCCESS) goto error; + MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) goto error; dos = (IMAGE_DOS_HEADER *)ptr; nt = (IMAGE_NT_HEADERS *)(ptr + dos->e_lfanew); header_end = ptr + ROUND_SIZE( 0, header_size ); @@ -1122,7 +1119,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz /* in that case Windows simply maps in the whole file */ if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ, - !dup_mapping ) != STATUS_SUCCESS) goto error; + MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) goto error; /* check that all sections are loaded at the right offset */ if (nt->OptionalHeader.FileAlignment != nt->OptionalHeader.SectionAlignment) goto error; @@ -1176,7 +1173,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz sec->Characteristics ); if (map_file_into_view( view, shared_fd, sec->VirtualAddress, map_size, pos, VPROT_COMMITTED | VPROT_READ | VPROT_WRITE, - FALSE ) != STATUS_SUCCESS) + MAP_SHARED, FALSE ) != STATUS_SUCCESS) { ERR_(module)( "Could not map shared section %.8s\n", sec->Name ); goto error; @@ -1193,7 +1190,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz map_file_into_view( view, shared_fd, base, end - base, pos + (base - sec->VirtualAddress), VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - FALSE ); + MAP_PRIVATE, FALSE ); } pos += map_size; continue; @@ -1215,7 +1212,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz end < file_start || map_file_into_view( view, fd, sec->VirtualAddress, file_size, file_start, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - !dup_mapping ) != STATUS_SUCCESS) + MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) { ERR_(module)( "Could not map section %.8s, file probably truncated\n", sec->Name ); goto error; @@ -2630,7 +2627,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p TRACE("handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart ); - res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, !dup_mapping ); + res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, MAP_SHARED, !dup_mapping ); if (res == STATUS_SUCCESS) { *addr_ptr = view->base;

1 0

Ken Thomases : winemac: Don't bring owned windows to the front when they' re clicked.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 3bca22a6b9d49bbf0255adfc06444227d6228c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bca22a6b9d49bbf0255adfc0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 7 17:09:29 2014 -0500 winemac: Don't bring owned windows to the front when they're clicked. Cocoa will bring an unowned window to the front of its level when it's clicked, but it doesn't do that for owned windows. The old code went out of its way to make owned windows behave like unowned windows in this respect. That was exactly backward. We wish we could control whether windows are raised on a click. We don't have that opportunity for unowned windows, but, by ripping out a bunch of code, we do for owned windows. --- dlls/winemac.drv/cocoa_app.m | 54 ------------------------------------------ 1 file changed, 54 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index ab045b2..e5594d1 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1597,60 +1597,6 @@ int macdrv_err_on; } } } - - if (broughtWindowForward) - { - // Clicking on a child window does not normally reorder it with - // respect to its siblings, but we want it to. We have to do it - // manually. - NSWindow* parent = [window parentWindow]; - NSInteger level = [window level]; - __block BOOL needReorder = FALSE; - NSMutableArray* higherLevelSiblings = [NSMutableArray array]; - - // If the window is already the last child or if it's only below - // children with higher window level, then no need to reorder it. - [[parent childWindows] enumerateObjectsWithOptions:NSEnumerationReverse - usingBlock:^(id obj, NSUInteger idx, BOOL *stop){ - WineWindow* child = obj; - if (child == window) - *stop = TRUE; - else if ([child level] <= level) - { - needReorder = TRUE; - *stop = TRUE; - } - else - [higherLevelSiblings insertObject:child atIndex:0]; - }]; - - if (needReorder) - { - WineWindow* sibling; - - NSDisableScreenUpdates(); - - [parent removeChildWindow:window]; - for (sibling in higherLevelSiblings) - [parent removeChildWindow:sibling]; - - [parent addChildWindow:window ordered:NSWindowAbove]; - for (sibling in higherLevelSiblings) - { - // Setting a window as a child can reset its level to be - // the same as the parent, so save it and restore it. - // The call to -setLevel: puts the window at the front - // of its level but testing shows that that's what Cocoa - // does when you click on any window in an ownership - // hierarchy, anyway. - level = [sibling level]; - [parent addChildWindow:sibling ordered:NSWindowAbove]; - [sibling setLevel:level]; - } - - NSEnableScreenUpdates(); - } - } } if ([windowsBeingDragged count])

1 0

Piotr Caban : msvcp: Fix global_locale leak.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 6fb5155f3037a8a635f9e82c4d862fe2f517507b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb5155f3037a8a635f9e82c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 8 16:44:44 2014 +0200 msvcp: Fix global_locale leak. --- dlls/msvcp60/locale.c | 3 ++- dlls/msvcp90/locale.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 6b95521..2320886 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -8696,8 +8696,9 @@ void free_locale(void) facets_elem *iter, *safe; if(global_locale) { - locale__Locimp_dtor(global_locale); locale_dtor(&classic_locale); + locale__Locimp_dtor(global_locale); + MSVCRT_operator_delete(global_locale); } LIST_FOR_EACH_ENTRY_SAFE(iter, safe, &lazy_facets, facets_elem, entry) { diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 606d6ca..ef06172 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10690,8 +10690,9 @@ void free_locale(void) facets_elem *iter, *safe; if(global_locale) { - locale__Locimp_dtor(global_locale); locale_dtor(&classic_locale); + locale__Locimp_dtor(global_locale); + MSVCRT_operator_delete(global_locale); } LIST_FOR_EACH_ENTRY_SAFE(iter, safe, &lazy_facets, facets_elem, entry) {

1 0

Piotr Caban : msvcp/tests: Force dll cleanup code to get executed ( for valgrind).
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 73a996de013264379c1b68e9512aa127b0b21bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a996de013264379c1b68e95… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 8 16:45:25 2014 +0200 msvcp/tests: Force dll cleanup code to get executed (for valgrind). --- dlls/msvcp100/tests/misc.c | 5 ++++- dlls/msvcp100/tests/string.c | 5 ++++- dlls/msvcp60/tests/ios.c | 5 ++++- dlls/msvcp60/tests/string.c | 5 ++++- dlls/msvcp90/tests/ios.c | 8 ++++++-- dlls/msvcp90/tests/misc.c | 8 ++++++-- dlls/msvcp90/tests/string.c | 8 ++++++-- 7 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c index 554db2e..7775888 100644 --- a/dlls/msvcp100/tests/misc.c +++ b/dlls/msvcp100/tests/misc.c @@ -93,11 +93,12 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcp = LoadLibraryA("msvcp100.dll"); + msvcp = LoadLibraryA("msvcp100.dll"); if(!msvcp) { win_skip("msvcp100.dll not installed\n"); return FALSE; @@ -200,4 +201,6 @@ START_TEST(misc) return; test__Container_base12(); + + FreeLibrary(msvcp); } diff --git a/dlls/msvcp100/tests/string.c b/dlls/msvcp100/tests/string.c index 5fb2003..eb02bc5 100644 --- a/dlls/msvcp100/tests/string.c +++ b/dlls/msvcp100/tests/string.c @@ -83,11 +83,12 @@ static void (__thiscall *_Yarn_char_dtor)(_Yarn_char *this); static const char* (__thiscall *_Yarn_char_c_str)(const _Yarn_char *this); static char (__thiscall *_Yarn_char_empty)(const _Yarn_char *this); +static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcp = LoadLibraryA("msvcp100.dll"); + msvcp = LoadLibraryA("msvcp100.dll"); if(!msvcp) { win_skip("msvcp100.dll not installed\n"); return FALSE; @@ -173,4 +174,6 @@ START_TEST(string) return; test__Yarn_char(); + + FreeLibrary(msvcp); } diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index 2a8b966..cf0fa19 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -565,11 +565,12 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcp = LoadLibraryA("msvcp60.dll"); + msvcp = LoadLibraryA("msvcp60.dll"); if(!msvcp) { win_skip("msvcp60.dll not installed\n"); return FALSE; @@ -1651,4 +1652,6 @@ START_TEST(ios) test_istream_tellg(); test_istream_getline(); test_ostream_print_ushort(); + + FreeLibrary(msvcp); } diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index 6d3ab1a..3ed1480 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -149,11 +149,12 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcp = LoadLibraryA("msvcp60.dll"); + msvcp = LoadLibraryA("msvcp60.dll"); if(!msvcp) { win_skip("msvcp60.dll not installed\n"); return FALSE; @@ -701,4 +702,6 @@ START_TEST(string) test_basic_string_char_replace(); test_basic_string_wchar(); test_basic_string_wchar_swap(); + + FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index dc70c3f..76107b0 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -590,12 +590,13 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcr, msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcr = LoadLibraryA("msvcr90.dll"); - HMODULE msvcp = LoadLibraryA("msvcp90.dll"); + msvcr = LoadLibraryA("msvcr90.dll"); + msvcp = LoadLibraryA("msvcp90.dll"); if(!msvcr || !msvcp) { win_skip("msvcp90.dll or msvcrt90.dll not installed\n"); return FALSE; @@ -1969,4 +1970,7 @@ START_TEST(ios) test_ostream_print_ushort(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); + + FreeLibrary(msvcr); + FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index f294b2a..e94ddcb 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -183,12 +183,13 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcr, msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcr = LoadLibraryA("msvcr90.dll"); - HMODULE msvcp = LoadLibraryA("msvcp90.dll"); + msvcr = LoadLibraryA("msvcr90.dll"); + msvcp = LoadLibraryA("msvcp90.dll"); if(!msvcr || !msvcp) { win_skip("msvcp90.dll or msvcrt90.dll not installed\n"); return FALSE; @@ -863,4 +864,7 @@ START_TEST(misc) test_complex(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); + + FreeLibrary(msvcr); + FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 6cc06ce..f1aa92a 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -170,12 +170,13 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcr, msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcr = LoadLibraryA("msvcr90.dll"); - HMODULE msvcp = LoadLibraryA("msvcp90.dll"); + msvcr = LoadLibraryA("msvcr90.dll"); + msvcp = LoadLibraryA("msvcp90.dll"); if(!msvcr || !msvcp) { win_skip("msvcp90.dll or msvcrt90.dll not installed\n"); return FALSE; @@ -784,4 +785,7 @@ START_TEST(string) test_basic_string_char_find_last_not_of(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); + + FreeLibrary(msvcr); + FreeLibrary(msvcp); }

1 0

Frédéric Delanoy : usp10: Silence a noisy fixme in ScriptPlaceOpenType.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 0ec7907c611fa00cea7cf6de7708d3d0d441443f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec7907c611fa00cea7cf6de7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 8 17:04:42 2014 +0200 usp10: Silence a noisy fixme in ScriptPlaceOpenType. --- dlls/usp10/usp10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ac9c0fd..0493487 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3078,6 +3078,7 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS { HRESULT hr; int i; + static int once = 0; TRACE("(%p, %p, %p, %s, %s, %p, %p, %d, %s, %p, %p, %d, %p, %p, %d, %p %p %p)\n", hdc, psc, psa, @@ -3091,7 +3092,7 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS if (!pGoffset) return E_FAIL; if (cRanges) - FIXME("Ranges not supported yet\n"); + if (!once++) FIXME("Ranges not supported yet\n"); ((ScriptCache *)*psc)->userScript = tagScript; ((ScriptCache *)*psc)->userLang = tagLangSys;

1 0

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

May 8, 2014

Module: wine Branch: master Commit: cac04a675c22c593bd0ad82bdddd5c0a270ee4b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac04a675c22c593bd0ad82bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 8 11:48:32 2014 +0200 mshtml: Use debugmsg_mshtml_guid in a few more places. --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/htmlelem.c | 54 +++++++++++++++-------------------------------- dlls/mshtml/htmlelem2.c | 6 +++--- dlls/mshtml/htmlevent.c | 17 ++++++--------- dlls/mshtml/htmlimg.c | 18 +++++++--------- dlls/mshtml/htmlnode.c | 54 +++++++++++++++++------------------------------ dlls/mshtml/main.c | 16 ++++++++++++++ 7 files changed, 72 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cac04a675c22c593bd0ad…

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Client Initialize.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 0d8f86c66de4fc75793f777967c7df2d9202776b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8f86c66de4fc75793f77796… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 3 15:45:06 2014 +1000 dpnet: Implement IDirectPlay8Client Initialize. --- dlls/dpnet/client.c | 15 ++++++++++++--- dlls/dpnet/dpnet_private.h | 10 +++++++--- dlls/dpnet/tests/client.c | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 9668a68..43ffb59 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -86,9 +86,18 @@ static ULONG WINAPI IDirectPlay8ClientImpl_Release(IDirectPlay8Client *iface) static HRESULT WINAPI IDirectPlay8ClientImpl_Initialize(IDirectPlay8Client *iface, void * const pvUserContext, const PFNDPNMESSAGEHANDLER pfn, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%p,%p,%x): Stub\n", This, pvUserContext, pfn, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + + TRACE("(%p):(%p,%p,%x)\n", This, pvUserContext, pfn, dwFlags); + + if(!pfn) + return DPNERR_INVALIDPARAM; + + This->usercontext = pvUserContext; + This->msghandler = pfn; + This->flags = dwFlags; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ClientImpl_EnumServiceProviders(IDirectPlay8Client *iface, diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 00ea94b..34d2aee 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -46,9 +46,13 @@ typedef struct IDirectPlay8ThreadPoolImpl IDirectPlay8ThreadPoolImpl; */ struct IDirectPlay8ClientImpl { - IDirectPlay8Client IDirectPlay8Client_iface; - LONG ref; - /* IDirectPlay8Client fields */ + IDirectPlay8Client IDirectPlay8Client_iface; + LONG ref; + + /* IDirectPlay8Client fields */ + PFNDPNMESSAGEHANDLER msghandler; + DWORD flags; + void *usercontext; }; /* ------------------- */ diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 890f218..0df99dd 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -44,7 +44,7 @@ static BOOL test_init_dp(void) ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); hr = IDirectPlay8Client_Initialize(client, NULL, NULL, 0); - todo_wine ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); + ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr);

1 0

Zhenbo Li : mshtml: Added IHTMLSelectElement:: remove method implementation.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 15ccfef0804fe1730ded9ab22c30291573bbf61a URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ccfef0804fe1730ded9ab22… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun May 4 18:51:32 2014 +0800 mshtml: Added IHTMLSelectElement::remove method implementation. --- dlls/mshtml/htmlselect.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index aef0bf0..08a374a 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -407,8 +407,14 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem static HRESULT WINAPI HTMLSelectElement_remove(IHTMLSelectElement *iface, LONG index) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%d)\n", This, index); - return E_NOTIMPL; + nsresult nsres; + TRACE("(%p)->(%d)\n", This, index); + nsres = nsIDOMHTMLSelectElement_select_Remove(This->nsselect, index); + if(NS_FAILED(nsres)) { + ERR("Remove failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLSelectElement_put_length(IHTMLSelectElement *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 02e0d00..4378ad3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2559,6 +2559,24 @@ static void _test_select_get_disabled(unsigned line, IHTMLSelectElement *select, _test_elem3_get_disabled(line, (IUnknown*)select, exb); } +static void test_select_remove(IHTMLSelectElement *select) +{ + HRESULT hres; + + hres = IHTMLSelectElement_remove(select, 3); + ok(hres == S_OK, "remove failed: %08x, expected S_OK\n", hres); + test_select_length(select, 2); + + hres = IHTMLSelectElement_remove(select, -1); + todo_wine + ok(hres == E_INVALIDARG, "remove failed: %08x, expected E_INVALIDARG\n", hres); + test_select_length(select, 2); + + hres = IHTMLSelectElement_remove(select, 0); + ok(hres == S_OK, "remove failed:%08x\n", hres); + test_select_length(select, 1); +} + #define test_text_length(u,l) _test_text_length(__LINE__,u,l) static void _test_text_length(unsigned line, IUnknown *unk, LONG l) { @@ -4324,6 +4342,7 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_multiple(select, VARIANT_FALSE); test_select_set_multiple(select, VARIANT_TRUE); + test_select_remove(select); } static void test_form_item(IHTMLElement *elem)

1 0

Shuai Meng : vbscript: Fixed CBool handling.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: b8aecb92b959eaf140a4e752b8caf911db391079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8aecb92b959eaf140a4e752b… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Sat May 3 10:14:26 2014 +0800 vbscript: Fixed CBool handling. --- dlls/vbscript/global.c | 41 ++++++++++---------------------- dlls/vbscript/tests/api.vbs | 55 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 29 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index b89b888..9aeba34 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -114,16 +114,6 @@ static HRESULT return_int(VARIANT *res, int val) return S_OK; } -static HRESULT return_bool(VARIANT *res, int val) -{ - if(res) { - V_VT(res) = VT_BOOL; - V_BOOL(res) = val != 0 ? VARIANT_TRUE : VARIANT_FALSE; - } - - return S_OK; -} - static inline HRESULT return_double(VARIANT *res, double val) { if(res) { @@ -413,30 +403,23 @@ static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - int val; + VARIANT v; + HRESULT hres; + TRACE("%s\n", debugstr_variant(arg)); assert(args_cnt == 1); - switch(V_VT(arg)) { - case VT_I2: - val = V_I2(arg); - break; - case VT_I4: - val = V_I4(arg); - break; - case VT_R4: - val = V_R4(arg) > 0.0 || V_R4(arg) < 0.0; - break; - case VT_R8: - val = V_R8(arg) > 0.0 || V_R8(arg) < 0.0; - break; - default: - ERR("Not a numeric value: %s\n", debugstr_variant(arg)); - return E_FAIL; - } + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_BOOL); + if(FAILED(hres)) + return hres; - return return_bool(res, val); + if(res) + *res = v; + else + VariantClear(&v); + return S_OK; } static HRESULT Global_CByte(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index ee9ebd3..12124b7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -478,4 +478,59 @@ Call ok(getVT(CBool(0)) = "VT_BOOL", "getVT(CBool(0)) = " & getVT(CBool(0))) Call ok(CBool(-5) = true, "CBool(-5) = " & CBool(-5)) Call ok(getVT(CBool(-5)) = "VT_BOOL", "getVT(CBool(-5)) = " & getVT(CBool(-5))) +Sub testCBoolError(strings, error_num) + on error resume next + + Call Err.clear() + Call CBool(strings) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +Class ValClass + Public myval + + Public default Property Get defprop + defprop = myval + End Property +End Class + +Dim MyObject +Set MyObject = New ValClass + +Call ok(CBool(Empty) = False, "CBool(Empty) = " & CBool(Empty)) +Call ok(getVT(CBool(Empty)) = "VT_BOOL", "getVT(CBool(Empty)) = " & getVT(CBool(Empty))) +Call ok(CBool(1) = True, "CBool(1) = " & CBool(1)) +Call ok(getVT(CBool(1)) = "VT_BOOL", "getVT(CBool(1)) = " & getVT(CBool(1))) +Call ok(CBool(0) = False, "CBool(0) = " & CBool(0)) +Call ok(getVT(CBool(0)) = "VT_BOOL", "getVT(CBool(0)) = " & getVT(CBool(0))) +Call ok(CBool(-0.56) = True, "CBool(-0.56) = " & CBool(-0.56)) +Call ok(getVT(CBool(-0.56)) = "VT_BOOL", "getVT(CBool(-0.56)) = " & getVT(CBool(-0.56))) +Call testCBoolError("", 13) +Call ok(CBool("0") = False, "CBool(""0"") = " & CBool("0")) +Call ok(getVT(CBool("0")) = "VT_BOOL", "getVT(CBool(""0"")) = " & getVT(CBool("0"))) +If isEnglishLang Then + Call ok(CBool("0.1") = True, "CBool(""0.1"") = " & CBool("0.1")) + Call ok(getVT(CBool("0.1")) = "VT_BOOL", "getVT(CBool(""0.1"")) = " & getVT(CBool("0.1"))) +End If + Call ok(CBool("true") = True, "CBool(""true"") = " & CBool("true")) +Call ok(getVT(CBool("true")) = "VT_BOOL", "getVT(CBool(""true"")) = " & getVT(CBool("true"))) +Call ok(CBool("false") = False, "CBool(""false"") = " & CBool("false")) +Call ok(getVT(CBool("false")) = "VT_BOOL", "getVT(CBool(""false"")) = " & getVT(CBool("false"))) +Call ok(CBool("TRUE") = True, "CBool(""TRUE"") = " & CBool("TRUE")) +Call ok(getVT(CBool("TRUE")) = "VT_BOOL", "getVT(CBool(""TRUE"")) = " & getVT(CBool("TRUE"))) +Call ok(CBool("FALSE") = False, "CBool(""FALSE"") = " & CBool("FALSE")) +Call ok(getVT(CBool("FALSE")) = "VT_BOOL", "getVT(CBool(""FALSE"")) = " & getVT(CBool("FALSE"))) +Call ok(CBool("#TRUE#") = True, "CBool(""#TRUE#"") = " & CBool("#TRUE#")) +Call ok(getVT(CBool("#TRUE#")) = "VT_BOOL", "getVT(CBool(""#TRUE#"")) = " & getVT(CBool("#TRUE#"))) +Call ok(CBool("#FALSE#") = False, "CBool(""#FALSE#"") = " & CBool("#FALSE#")) +Call ok(getVT(CBool("#FALSE#")) = "VT_BOOL", "getVT(CBool(""#FALSE#"")) = " & getVT(CBool("#FALSE#"))) +Call ok(CBool(MyObject) = False, "CBool(MyObject) = " & CBool(MyObject)) +Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) +MyObject.myval = 1 +Call ok(CBool(MyObject) = True, "CBool(MyObject) = " & CBool(MyObject)) +Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) +MyObject.myval = 0 +Call ok(CBool(MyObject) = False, "CBool(MyObject) = " & CBool(MyObject)) +Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) + Call reportSuccess()

1 0

Alistair Leslie-Hughes : dpnet/tests: Add IDirectPlay8Client tests.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 594c4ea392743b4b81306279997dfa0b2b2e2076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=594c4ea392743b4b813062799… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 3 15:31:13 2014 +1000 dpnet/tests: Add IDirectPlay8Client tests. --- dlls/dpnet/tests/Makefile.in | 1 + dlls/dpnet/tests/client.c | 206 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 207 insertions(+) diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in index 69339dc..f6e45ea 100644 --- a/dlls/dpnet/tests/Makefile.in +++ b/dlls/dpnet/tests/Makefile.in @@ -3,5 +3,6 @@ IMPORTS = dxguid uuid dpnet ole32 C_SRCS = \ address.c \ + client.c \ peer.c \ server.c diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c new file mode 100644 index 0000000..890f218 --- /dev/null +++ b/dlls/dpnet/tests/client.c @@ -0,0 +1,206 @@ +/* + * Copyright 2011 Louis Lenders + * Copyright 2014 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN +#include <stdio.h> + +#include <dplay8.h> +#include "wine/test.h" + + +static IDirectPlay8Client* client = NULL; +static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; + +static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + trace("DirectPlayMessageHandler: 0x%08x\n", message_id); + return S_OK; +} + +static BOOL test_init_dp(void) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok(hr == S_OK, "CoInitialize failed with %x\n", hr); + + hr = CoCreateInstance(&CLSID_DirectPlay8Client, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Client, (void **)&client); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8Client_Initialize(client, NULL, NULL, 0); + todo_wine ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); + + hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); + ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr); + + return client != NULL; +} + +static void test_enum_service_providers(void) +{ + DPN_SERVICE_PROVIDER_INFO *serv_prov_info; + DWORD items, size; + DWORD i; + HRESULT hr; + + size = 0; + items = 0; + + hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, &size, NULL, 0); + todo_wine ok(hr == E_POINTER, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, NULL, &items, 0); + todo_wine ok(hr == E_POINTER, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, &size, &items, 0); + todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(items != 0, "Found unexpectedly no service providers\n"); + + trace("number of items found: %d\n", items); + + for (i=0;i<items;i++) + { + trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + size = 0; + items = 0; + + hr = IDirectPlay8Client_EnumServiceProviders(client, &CLSID_DP8SP_TCPIP, NULL, NULL, &size, &items, 0); + todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Client_EnumServiceProviders(client, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(items != 0, "Found unexpectedly no adapter\n"); + + + for (i=0;i<items;i++) + { + trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); +} + +static void test_enum_hosts(void) +{ + HRESULT hr; + IDirectPlay8Address *host = NULL; + IDirectPlay8Address *local = NULL; + DPN_APPLICATION_DESC appdesc; + DPNHANDLE async = 0; + static const WCHAR localhost[] = {'1','2','7','.','0','.','0','.','1',0}; + + memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC) ); + appdesc.dwSize = sizeof( DPN_APPLICATION_DESC ); + appdesc.guidApplication = appguid; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&local); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(local, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&host); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(host, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(host, DPNA_KEY_HOSTNAME, localhost, sizeof(localhost), + DPNA_DATATYPE_STRING); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + /* Since we are running asynchronously, EnumHosts returns DPNSUCCESS_PENDING. */ + hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); + todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumServiceProviders failed with 0x%08x\n", hr); + todo_wine ok(async, "No Handle returned\n"); + + hr = IDirectPlay8Client_CancelAsyncOperation(client, async, 0); + ok(hr == S_OK, "IDirectPlay8Client_CancelAsyncOperation failed with 0x%08x\n", hr); + + IDirectPlay8Address_Release(local); + IDirectPlay8Address_Release(host); +} + +static void test_get_sp_caps(void) +{ + DPN_SP_CAPS caps; + HRESULT hr; + + memset(&caps, 0, sizeof(DPN_SP_CAPS)); + + hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + todo_wine ok(hr == DPNERR_INVALIDPARAM, "GetSPCaps unexpectedly returned %x\n", hr); + + caps.dwSize = sizeof(DPN_SP_CAPS); + + hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + + todo_wine ok((caps.dwFlags & + (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS)) == + (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS), + "unexpected flags %x\n", caps.dwFlags); + todo_wine ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); + todo_wine ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + todo_wine ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + todo_wine ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + todo_wine ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + todo_wine ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + todo_wine ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), + "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); +} + +static void test_cleanup_dp(void) +{ + HRESULT hr; + + hr = IDirectPlay8Client_Close(client, 0); + ok(hr == S_OK, "IDirectPlay8Client_Close failed with %x\n", hr); + + hr = IDirectPlay8Client_Release(client); + ok(hr == S_OK, "IDirectPlay8Client_Release failed with %x\n", hr); + + CoUninitialize(); +} + +START_TEST(client) +{ + if(!test_init_dp()) + return; + + test_enum_service_providers(); + test_enum_hosts(); + test_get_sp_caps(); + test_cleanup_dp(); +}

1 0

Bruno Jesus : ws2_32: Avoid using WS_ prefix on unix sockaddr struct.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 43241934c616a5b757212241f2b0ca48a0f755f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43241934c616a5b757212241f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed May 7 23:31:57 2014 -0300 ws2_32: Avoid using WS_ prefix on unix sockaddr struct. The address was already converted to unix in these situations, so it's wrong to check against windows #defines. --- dlls/ws2_32/socket.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 630e463..a8fb9a5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2559,7 +2559,7 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) DWORD adap_size; int enable = 1; - if (bind_addr == htonl(WS_INADDR_ANY) || bind_addr == htonl(WS_INADDR_LOOPBACK)) + if (bind_addr == htonl(INADDR_ANY) || bind_addr == htonl(INADDR_LOOPBACK)) return FALSE; /* Not binding to a network adapter, special interface binding unnecessary. */ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &sock_type, &optlen) == -1 || sock_type != SOCK_DGRAM) return FALSE; /* Special interface binding is only necessary for UDP datagrams. */ @@ -2664,10 +2664,10 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) * INADDR_ANY instead*/ WARN("Trying to bind to magic IP address, using " "INADDR_ANY instead.\n"); - in4->sin_addr.s_addr = htonl(WS_INADDR_ANY); + in4->sin_addr.s_addr = htonl(INADDR_ANY); } else if (interface_bind(s, fd, &uaddr.addr)) - in4->sin_addr.s_addr = htonl(WS_INADDR_ANY); + in4->sin_addr.s_addr = htonl(INADDR_ANY); } if (bind(fd, &uaddr.addr, uaddrlen) < 0) { @@ -2725,7 +2725,7 @@ static int do_connect(int fd, const struct WS_sockaddr* name, int namelen) * assuming we really want to connect to localhost */ TRACE("Trying to connect to magic IP address, using " "INADDR_LOOPBACK instead.\n"); - in4->sin_addr.s_addr = htonl(WS_INADDR_LOOPBACK); + in4->sin_addr.s_addr = htonl(INADDR_LOOPBACK); } }

1 0

Piotr Caban : msvcp60: Fix uninitialized variable access in basic_string:: _Tidy.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: ea7baf5304d7c9fa72840999b2da6adc764d5fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7baf5304d7c9fa72840999b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 8 13:43:42 2014 +0200 msvcp60: Fix uninitialized variable access in basic_string::_Tidy. --- dlls/msvcp60/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 01b535d..f1b2b8e 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -164,7 +164,7 @@ void __thiscall basic_string_char__Tidy(basic_string_char *this, MSVCP_bool buil { TRACE("(%p %d)\n", this, built); - if(!this->ptr || !built); + if(!built || !this->ptr); else if(!this->ptr[-1] || (unsigned char)this->ptr[-1]==FROZEN) MSVCP_allocator_char_deallocate(NULL, this->ptr-1, this->res+2); else @@ -1885,7 +1885,7 @@ void __thiscall basic_string_wchar__Tidy(basic_string_wchar *this, MSVCP_bool bu { TRACE("(%p %d)\n", this, built); - if(!this->ptr || !built); + if(!built || !this->ptr); else if(!this->ptr[-1] || (unsigned short)this->ptr[-1]==FROZEN) MSVCP_allocator_wchar_deallocate(NULL, this->ptr-1, this->res+2); else

1 0

Jacek Caban : mshtml: Forward IHTMLImageElementFactory IDispatch functions to IDispatchEx implementation.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: cf2278b2d0cae4684bbc8e5244879a9a88df0322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2278b2d0cae4684bbc8e524… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 8 11:48:43 2014 +0200 mshtml: Forward IHTMLImageElementFactory IDispatch functions to IDispatchEx implementation. --- dlls/mshtml/htmlimg.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index defb08e..212d01e 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -750,16 +750,14 @@ static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfoCount(IHTMLImageElement UINT *pctinfo) { HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfo(IHTMLImageElementFactory *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(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 HTMLImageElementFactory_GetIDsOfNames(IHTMLImageElementFactory *iface, @@ -767,9 +765,7 @@ static HRESULT WINAPI HTMLImageElementFactory_GetIDsOfNames(IHTMLImageElementFac DISPID *rgDispId) { HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(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 HTMLImageElementFactory_Invoke(IHTMLImageElementFactory *iface, @@ -778,9 +774,8 @@ static HRESULT WINAPI HTMLImageElementFactory_Invoke(IHTMLImageElementFactory *i UINT *puArgErr) { HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(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 LONG var_to_size(const VARIANT *v)

1 0

Vincent Povirk : shell32/tests: Use SW_HIDE with ShellExecuteA in tests.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 3ebb9b7b7530a14acec574af127aec5d7a26b053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ebb9b7b7530a14acec574af1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 7 13:55:01 2014 -0500 shell32/tests: Use SW_HIDE with ShellExecuteA in tests. --- dlls/shell32/tests/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index e3169c8..7f07c70 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -118,7 +118,7 @@ static INT_PTR shell_execute(LPCSTR verb, LPCSTR file, LPCSTR parameters, LPCSTR * association it displays the 'Open With' dialog and I could not find * a flag to prevent this. */ - rc=(INT_PTR)ShellExecuteA(NULL, verb, file, parameters, directory, SW_SHOWNORMAL); + rc=(INT_PTR)ShellExecuteA(NULL, verb, file, parameters, directory, SW_HIDE); if (rc > 32) {

1 0

Aric Stewart : user32: Pass WM_IME_CONTROL messages to the IME.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: dfa65a52bbc84b03709fd3d3f7c569b4d9e1642f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa65a52bbc84b03709fd3d3f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 7 10:27:51 2014 -0500 user32: Pass WM_IME_CONTROL messages to the IME. --- dlls/user32/defwnd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index b359c06..bcd6f91 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -831,6 +831,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case WM_IME_ENDCOMPOSITION: case WM_IME_SELECT: case WM_IME_NOTIFY: + case WM_IME_CONTROL: { HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); if (hwndIME) @@ -983,6 +984,7 @@ LRESULT WINAPI DefWindowProcW( case WM_IME_ENDCOMPOSITION: case WM_IME_SELECT: case WM_IME_NOTIFY: + case WM_IME_CONTROL: { HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); if (hwndIME)

1 0

Huw Davies : gdi32: In a Hebrew locale the last char of a symbol font is reported as 0xf896 rather than 0xf0ff.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: c66f0019fff40b4755e217ce555d5147b78d523f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66f0019fff40b4755e217ce5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 7 14:51:11 2014 +0100 gdi32: In a Hebrew locale the last char of a symbol font is reported as 0xf896 rather than 0xf0ff. --- dlls/gdi32/freetype.c | 3 +++ dlls/gdi32/tests/font.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 54241a5..fae9ffe 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7390,6 +7390,9 @@ static BOOL get_outline_text_metrics(GdiFont *font) TM.tmFirstChar = 0; switch(GetACP()) { + case 1255: /* Hebrew */ + TM.tmLastChar = 0xf896; + break; case 1257: /* Baltic */ TM.tmLastChar = 0xf8fd; break; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index fa3b420..255771a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3543,6 +3543,9 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) expect_first_W = 0; switch(GetACP()) { + case 1255: /* Hebrew */ + expect_last_W = 0xf896; + break; case 1257: /* Baltic */ expect_last_W = 0xf8fd; break;

1 0

Stefan Dösinger : gdi32/tests: Test RGBQUAD.rgbReserved in SetDIBColorTable.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: a373c35371016b6fb1129da02f4a5f4da756709b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a373c35371016b6fb1129da02… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 15:16:35 2014 +0200 gdi32/tests: Test RGBQUAD.rgbReserved in SetDIBColorTable. --- dlls/gdi32/tests/bitmap.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 39ca454..2a2dd3a 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -854,6 +854,21 @@ static void test_dibsections(void) i, colors[i].rgbRed, colors[i].rgbGreen, colors[i].rgbBlue, colors[i].rgbReserved); } + rgb[0].rgbRed = 1; + rgb[0].rgbGreen = 2; + rgb[0].rgbBlue = 3; + rgb[0].rgbReserved = 123; + ret = SetDIBColorTable( hdcmem, 0, 1, rgb ); + ok( ret == 1, "SetDIBColorTable returned unexpected result %u\n", ret ); + ok( rgb[0].rgbReserved == 123, "Expected rgbReserved = 123, got %u\n", rgb[0].rgbReserved ); + + ret = GetDIBColorTable( hdcmem, 0, 1, rgb ); + ok( ret == 1, "GetDIBColorTable returned unexpected result %u\n", ret ); + ok( rgb[0].rgbRed == 1, "Expected rgbRed = 1, got %u\n", rgb[0].rgbRed ); + ok( rgb[0].rgbGreen == 2, "Expected rgbGreen = 2, got %u\n", rgb[0].rgbGreen ); + ok( rgb[0].rgbBlue == 3, "Expected rgbBlue = 3, got %u\n", rgb[0].rgbBlue ); + todo_wine ok( rgb[0].rgbReserved == 0, "Expected rgbReserved = 0, got %u\n", rgb[0].rgbReserved ); + SelectObject(hdcmem, oldbm); DeleteObject(hdib); DeleteObject(hpal);

1 0

Huw Davies : advapi32/tests: Fix access rights tests in win 8.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 0451a89ca12690e1d97a69fb1b178f10f74da909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0451a89ca12690e1d97a69fb1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 7 09:42:16 2014 +0100 advapi32/tests: Fix access rights tests in win 8. --- dlls/advapi32/tests/security.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a0574c4..05da0ae 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5073,12 +5073,16 @@ static void test_thread_security(void) { case GENERIC_READ: case GENERIC_EXECUTE: - ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, + ok(access == map[i].mapped || + access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */ || + access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION | THREAD_RESUME) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_WRITE: todo_wine - ok(access == map[i].mapped || access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */, + ok(access == map[i].mapped || + access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */ || + access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION | THREAD_RESUME) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_ALL: @@ -5144,7 +5148,9 @@ static void test_process_access(void) "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_WRITE: - ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */, + ok(access == map[i].mapped || + access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */ || + access == (map[i].mapped | PROCESS_SET_LIMITED_INFORMATION) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_EXECUTE:

1 0

Huw Davies : include: Add a couple of new win 8 access rights.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 76fca0f953505209fd9b2a12f506895ffbfb40a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76fca0f953505209fd9b2a12f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 7 09:42:15 2014 +0100 include: Add a couple of new win 8 access rights. --- include/winnt.h | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 3f33c6b..bae8aed 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4533,31 +4533,33 @@ typedef enum tagSID_NAME_USE { #define TIMER_MODIFY_STATE 0x0002 #define TIMER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3) -#define PROCESS_TERMINATE 0x0001 -#define PROCESS_CREATE_THREAD 0x0002 -#define PROCESS_VM_OPERATION 0x0008 -#define PROCESS_VM_READ 0x0010 -#define PROCESS_VM_WRITE 0x0020 -#define PROCESS_DUP_HANDLE 0x0040 -#define PROCESS_CREATE_PROCESS 0x0080 -#define PROCESS_SET_QUOTA 0x0100 -#define PROCESS_SET_INFORMATION 0x0200 -#define PROCESS_QUERY_INFORMATION 0x0400 -#define PROCESS_SUSPEND_RESUME 0x0800 +#define PROCESS_TERMINATE 0x0001 +#define PROCESS_CREATE_THREAD 0x0002 +#define PROCESS_VM_OPERATION 0x0008 +#define PROCESS_VM_READ 0x0010 +#define PROCESS_VM_WRITE 0x0020 +#define PROCESS_DUP_HANDLE 0x0040 +#define PROCESS_CREATE_PROCESS 0x0080 +#define PROCESS_SET_QUOTA 0x0100 +#define PROCESS_SET_INFORMATION 0x0200 +#define PROCESS_QUERY_INFORMATION 0x0400 +#define PROCESS_SUSPEND_RESUME 0x0800 #define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 +#define PROCESS_SET_LIMITED_INFORMATION 0x2000 #define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xffff) -#define THREAD_TERMINATE 0x0001 -#define THREAD_SUSPEND_RESUME 0x0002 -#define THREAD_GET_CONTEXT 0x0008 -#define THREAD_SET_CONTEXT 0x0010 -#define THREAD_SET_INFORMATION 0x0020 -#define THREAD_QUERY_INFORMATION 0x0040 -#define THREAD_SET_THREAD_TOKEN 0x0080 -#define THREAD_IMPERSONATE 0x0100 -#define THREAD_DIRECT_IMPERSONATION 0x0200 -#define THREAD_SET_LIMITED_INFORMATION 0x0400 -#define THREAD_QUERY_LIMITED_INFORMATION 0x0800 +#define THREAD_TERMINATE 0x0001 +#define THREAD_SUSPEND_RESUME 0x0002 +#define THREAD_GET_CONTEXT 0x0008 +#define THREAD_SET_CONTEXT 0x0010 +#define THREAD_SET_INFORMATION 0x0020 +#define THREAD_QUERY_INFORMATION 0x0040 +#define THREAD_SET_THREAD_TOKEN 0x0080 +#define THREAD_IMPERSONATE 0x0100 +#define THREAD_DIRECT_IMPERSONATION 0x0200 +#define THREAD_SET_LIMITED_INFORMATION 0x0400 +#define THREAD_QUERY_LIMITED_INFORMATION 0x0800 +#define THREAD_RESUME 0x1000 #define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xffff) #define THREAD_BASE_PRIORITY_LOWRT 15

1 0

Qian Hong : include: Added atlcom.h.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: e7aaeae73ba94e51c09c2198a9e680cdbb0339f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7aaeae73ba94e51c09c2198a… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed May 7 15:38:46 2014 +0800 include: Added atlcom.h. --- include/Makefile.in | 1 + include/atlcom.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index cdb7b09..383bef28 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -160,6 +160,7 @@ SRCDIR_INCLUDES = \ asynot.idl \ asysta.idl \ atlbase.h \ + atlcom.h \ atlwin.h \ audevcod.h \ audiosessiontypes.h \ diff --git a/include/atlcom.h b/include/atlcom.h new file mode 100644 index 0000000..c141fbe --- /dev/null +++ b/include/atlcom.h @@ -0,0 +1,50 @@ +/* + * Copyright 2014 Qian Hong for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_ATLCOM_H__ +#define __WINE_ATLCOM_H__ + +#ifndef __WINE_ATLBASE_H__ +# error You must include atlbase.h to use this header +#endif + +typedef struct ATL_PROPMAP_ENTRY +{ + LPCOLESTR szDesc; +#if _ATL_VER < _ATL_VER_100 + DISPID dispid; + const CLSID *pclsidPropPage; + const IID *piidDispatch; +#else + const CLSID *pclsidPropPage; + const IID *piidDispatch; + void *rgclsidAllowed; + DWORD cclsidAllowed; + DISPID dispid; +#endif + DWORD dwOffsetData; + DWORD dwSizeData; + VARTYPE vt; +} ATL_PROPMAP_ENTRY; + +HRESULT WINAPI AtlIPersistStreamInit_Load(IStream*, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistStreamInit_Save(IStream*, BOOL, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistPropertyBag_Load(IPropertyBag*, IErrorLog*, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistPropertyBag_Save(IPropertyBag*, BOOL, BOOL, ATL_PROPMAP_ENTRY*, void*, IUnknown*); + +#endif /* __WINE_ATLCOM_H__ */

1 0

Stefan Dösinger : wined3d: Copy the DIB to sysmem when PIN_SYSMEM is set.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 19f45af19cd0c1162f15d6779506431d1cd99d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f45af19cd0c1162f15d6779… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 15:16:34 2014 +0200 wined3d: Copy the DIB to sysmem when PIN_SYSMEM is set. --- dlls/wined3d/surface.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cd3b5a2..dc8c595 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3234,8 +3234,19 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) surface->resource.map_count--; surface->flags &= ~SFLAG_DCINUSE; - if (surface->map_binding == WINED3D_LOCATION_USER_MEMORY) - surface_load_location(surface, WINED3D_LOCATION_USER_MEMORY); + if (surface->map_binding == WINED3D_LOCATION_USER_MEMORY || (surface->flags & SFLAG_PIN_SYSMEM + && surface->map_binding != WINED3D_LOCATION_DIB)) + { + /* The game Salammbo modifies the surface contents without mapping the surface between + * a GetDC/ReleaseDC operation and flipping the surface. If the DIB remains the active + * copy and is copied to the screen, this update, which draws the mouse pointer, is lost. + * Do not only copy the DIB to the map location, but also make sure the map location is + * copied back to the DIB in the next getdc call. + * + * The same consideration applies to user memory surfaces. */ + surface_load_location(surface, surface->map_binding); + surface_invalidate_location(surface, WINED3D_LOCATION_DIB); + } return WINED3D_OK; }

1 0

Stefan Dösinger : ddraw/tests: Test palette alpha behavior.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 8ca711f4286343fb4e5a8116722771a1334f60e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca711f4286343fb4e5a81167… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 15:16:38 2014 +0200 ddraw/tests: Test palette alpha behavior. What I care about here is that setting peFlags != 0 doesn't cause errors either during ddraw palette creation or DIB section creation. peFlags isn't an alpha channel, but P8 textures abuse it that way, hence the name of the test. It probably has deeper meaning in DDSCL_NORMAL when the X server is running in 8 bit paletteindexed mode, but I don't think we really care about this. --- dlls/ddraw/tests/ddraw1.c | 158 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 166 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 154 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 154 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 632 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ca711f4286343fb4e5a8…

1 0

Stefan Dösinger : ddraw: Alpha palettes can only be attached to textures.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: a227188573dc727dd6d2c53059c1c093a595be05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a227188573dc727dd6d2c5305… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 15:16:37 2014 +0200 ddraw: Alpha palettes can only be attached to textures. --- dlls/ddraw/surface.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d192348..349bbda 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -454,6 +454,13 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD TRACE("iface %p, palette %p.\n", surface, palette); + if (palette_impl && palette_impl->flags & DDPCAPS_ALPHA + && !(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + { + WARN("Alpha palette set on non-texture surface, returning DDERR_INVALIDSURFACETYPE.\n"); + return DDERR_INVALIDSURFACETYPE; + } + if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) return DDERR_INVALIDPIXELFORMAT;

1 0

Piotr Caban : msvcr80: Add __AdjustPointer implementation.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 87bfb306bd591b2a45a9d09a19eb3ab090cc387d URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bfb306bd591b2a45a9d09a1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 7 12:08:06 2014 +0200 msvcr80: Add __AdjustPointer implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 34 ++++++++++++++++++++++++++++++++++ dlls/msvcrt/cpp.c | 5 +++++ 6 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 77ba21d..07d50fc 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -538,7 +538,7 @@ @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ stub __AdjustPointer +@ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1afb3f2..e6576e0 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -869,7 +869,7 @@ @ stub _W_Gettnames @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) -@ stub __AdjustPointer +@ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2aee520..9c7f85b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -172,7 +172,7 @@ @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ stub __AdjustPointer +@ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 766d62e..e86541c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -163,7 +163,7 @@ @ stub _NLG_Return2 @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ stub __AdjustPointer +@ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 1c8da4e..0a81edc 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -120,6 +120,7 @@ static int (__cdecl *p_ferror)(FILE*); static int (__cdecl *p_flsbuf)(int, FILE*); static unsigned long (__cdecl *p_byteswap_ulong)(unsigned long); static void** (__cdecl *p__pxcptinfoptrs)(void); +static void* (__cdecl *p__AdjustPointer)(void*, const void*); /* make sure we use the correct errno */ #undef errno @@ -377,6 +378,7 @@ static BOOL init(void) SET(p_flsbuf, "_flsbuf"); SET(p_byteswap_ulong, "_byteswap_ulong"); SET(p__pxcptinfoptrs, "__pxcptinfoptrs"); + SET(p__AdjustPointer, "__AdjustPointer"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -1419,6 +1421,37 @@ static void test_is_exception_typeof(void) ok(ret == 0, "_is_exception_typeof returned %d\n", ret); } +static void test__AdjustPointer(void) +{ + int off = 0xf0; + void *obj1 = &off; + void *obj2 = (char*)&off - 2; + struct test_data { + void *ptr; + void *ret; + struct { + int this_offset; + int vbase_descr; + int vbase_offset; + } this_ptr_offsets; + } data[] = { + {NULL, NULL, {0, -1, 0}}, + {(void*)0xbeef, (void*)0xbef0, {1, -1, 1}}, + {(void*)0xbeef, (void*)0xbeee, {-1, -1, 0}}, + {&obj1, (char*)&obj1 + off, {0, 0, 0}}, + {(char*)&obj1 - 5, (char*)&obj1 + off, {0, 5, 0}}, + {(char*)&obj1 - 3, (char*)&obj1 + off + 24, {24, 3, 0}}, + {(char*)&obj2 - 17, (char*)&obj2 + off + 4, {4, 17, 2}} + }; + void *ret; + int i; + + for(i=0; i<sizeof(data)/sizeof(data[0]); i++) { + ret = p__AdjustPointer(data[i].ptr, &data[i].this_ptr_offsets); + ok(ret == data[i].ret, "%d) __AdjustPointer returned %p, expected %p\n", i, ret, data[i].ret); + } +} + START_TEST(msvcr90) { if(!init()) @@ -1446,4 +1479,5 @@ START_TEST(msvcr90) test_byteswap(); test_access_s(); test_is_exception_typeof(); + test__AdjustPointer(); } diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 37dc18a..db48dcb 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1431,3 +1431,8 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) return; } #endif + +void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) +{ + return get_this_pointer(off, obj); +}

1 0

Christoph von Wittich : comctl32/treeview: Notify the parent on a return key press.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 4cc503d164ab00b75567d1a206a303c373cbe044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cc503d164ab00b75567d1a20… Author: Christoph von Wittich <Christoph_vW(a)ReactOS.org> Date: Tue May 6 23:27:44 2014 +0200 comctl32/treeview: Notify the parent on a return key press. --- dlls/comctl32/treeview.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index dcc2be4..bb42b21 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5259,6 +5259,10 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam) newSelection = TREEVIEW_GetNextListItem(infoPtr, prevItem); break; + case VK_RETURN: + TREEVIEW_SendSimpleNotify(infoPtr, NM_RETURN); + break; + case VK_HOME: newSelection = infoPtr->root->firstChild; break;

1 0

Qian Hong : atl: Include atlcom.h for ATL_PROPMAP_ENTRY.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 2d80b3ed54891f5f897bf55fd300fa634870a611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d80b3ed54891f5f897bf55fd… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed May 7 15:39:02 2014 +0800 atl: Include atlcom.h for ATL_PROPMAP_ENTRY. --- dlls/atl/atl.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 53c7181..795ca9b 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "atlbase.h" +#include "atlcom.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -249,18 +250,6 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE return rc; } -/* FIXME: should be in a header file */ -typedef struct ATL_PROPMAP_ENTRY -{ - LPCOLESTR szDesc; - DISPID dispid; - const CLSID* pclsidPropPage; - const IID* piidDispatch; - DWORD dwOffsetData; - DWORD dwSizeData; - VARTYPE vt; -} ATL_PROPMAP_ENTRY; - /*********************************************************************** * AtlIPersistStreamInit_Load [atl100.@] */

1 0

Alistair Leslie-Hughes : netcfgx: Fix memory leak (valgrind).
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 2aaef5e48fa0d4881ed4f3fcd18d9a2dd4d8b8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aaef5e48fa0d4881ed4f3fcd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 7 14:02:01 2014 +1000 netcfgx: Fix memory leak (valgrind). --- dlls/netcfgx/tests/netcfgx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index 084f8cd..fda39f5 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -74,6 +74,7 @@ static void create_configuration(void) hr = INetCfgLock_ReleaseWriteLock(netlock); ok(hr == S_OK, "got 0x%08x\n", hr); + INetCfgLock_Release(netlock); INetCfg_Release(config); } }

1 0

Alistair Leslie-Hughes : dplayx: Initial msgtid variable (Valgrind).
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: e95f42fca418dbaa815997de9817b6f1aca98674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95f42fca418dbaa815997de9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 7 12:06:17 2014 +1000 dplayx: Initial msgtid variable (Valgrind). --- dlls/dplayx/dplobby.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 7b0c57a..3a968de 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -2044,6 +2044,7 @@ HRESULT dplobby_create( REFIID riid, void **ppv ) obj->IDirectPlayLobby3_iface.lpVtbl = &dpl3_vt; obj->IDirectPlayLobby3A_iface.lpVtbl = &dpl3A_vt; obj->numIfaces = 1; + obj->msgtid = 0; obj->ref = 0; obj->refA = 0; obj->ref2 = 0;

1 0

Piotr Caban : msvcrt: Fix ioinfo structure size.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 42e800fe796665d914f8ab7f93495e0c1d9602c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e800fe796665d914f8ab7f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 7 09:27:59 2014 +0200 msvcrt: Fix ioinfo structure size. --- dlls/msvcr100/msvcr100.spec | 3 +-- dlls/msvcr110/msvcr110.spec | 3 +-- dlls/msvcr80/msvcr80.spec | 3 +-- dlls/msvcr90/msvcr90.spec | 3 +-- dlls/msvcrt/file.c | 11 +++++++++++ 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 98e9539..77ba21d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -573,7 +573,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -648,7 +648,6 @@ @ cdecl __p__wenviron() MSVCRT___p__wenviron @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index cdca5c3..1afb3f2 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -900,7 +900,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -997,7 +997,6 @@ @ cdecl __p__wenviron() MSVCRT___p__wenviron @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 13ea9f0..2aee520 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -207,7 +207,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -297,7 +297,6 @@ @ cdecl __p__winver() @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 710cb15..766d62e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -198,7 +198,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -281,7 +281,6 @@ @ cdecl __p__wenviron() MSVCRT___p__wenviron @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 957cfaf..77a0fed 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -88,6 +88,17 @@ typedef struct { char lookahead[3]; int exflag; CRITICAL_SECTION crit; +#if _MSVCR_VER >= 80 + char textmode : 7; + char unicode : 1; + char pipech2[2]; + __int64 startpos; + BOOL utf8translations; +#endif +#if _MSVCR_VER >= 90 + char dbcsBuffer; + BOOL dbcsBufferUsed; +#endif } ioinfo; /*********************************************************************

1 0

Erich E. Hoover : hhctrl.ocx: Fix an off by one mistake in searching for the node endpoint.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 74c5e38b7c229fbd427a1dcc63507e687db4f69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c5e38b7c229fbd427a1dcc6… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Mon May 5 23:12:10 2014 -0600 hhctrl.ocx: Fix an off by one mistake in searching for the node endpoint. --- dlls/hhctrl.ocx/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/stream.c b/dlls/hhctrl.ocx/stream.c index 6e831e5..84ed317 100644 --- a/dlls/hhctrl.ocx/stream.c +++ b/dlls/hhctrl.ocx/stream.c @@ -122,7 +122,7 @@ static BOOL find_node_end(stream_t *stream, strbuf_t *buf) if(buf->len == 0) break; p = &buf->buf[b]; - while((p = memchr(p+1, '"', buf->len-(p-buf->buf))) != NULL) + while((p = memchr(p+1, '"', buf->len-(p+1-buf->buf))) != NULL) tag_count++; b = buf->len; if(tag_count % 2 != 0)

1 0

Piotr Caban : msvcp70: Add basic_fstream(const char*, int) constructor implementation.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 6c4b075d1aeb8bdc9ab408580fa58dcb7a25f34b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4b075d1aeb8bdc9ab408580… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 7 10:28:27 2014 +0200 msvcp70: Add basic_fstream(const char*, int) constructor implementation. --- dlls/msvcp70/msvcp70.spec | 10 +++++----- dlls/msvcp90/ios.c | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 8ff6620..4f02785 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -40,15 +40,15 @@ @ cdecl -arch=win64 ??0?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEAU_iobuf@@@Z(ptr ptr) basic_filebuf_wchar_ctor_file @ thiscall -arch=win32 ??0?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)W4_Uninitialized@1@@Z(ptr long) basic_filebuf_wchar_ctor_uninitialized @ cdecl -arch=win64 ??0?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)W4_Uninitialized@1@@Z(ptr long) basic_filebuf_wchar_ctor_uninitialized -@ stub -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_fstream_char_ctor_name_noprot +@ cdecl -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_fstream_char_ctor_name_noprot @ thiscall -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_char_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_char_ctor -@ stub -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_fstream_short_ctor_name_noprot +@ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_fstream_short_ctor_name_noprot @ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_short_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_short_ctor -@ stub -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z +@ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_fstream_wchar_ctor_name_noprot @ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_wchar_ctor @ stub -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z @ stub -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 98d1696..e8d4b06 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -11626,6 +11626,15 @@ basic_fstream_char* __thiscall basic_fstream_char_ctor_name(basic_fstream_char * return this; } +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_char_ctor_name_noprot, 16) +basic_fstream_char* __thiscall basic_fstream_char_ctor_name_noprot(basic_fstream_char *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_fstream_char_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + /* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBGHH@Z */ /* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBGHH@Z */ /* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PB_WHH@Z */ @@ -11881,6 +11890,23 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor_name(basic_fstream_wcha return this; } +/* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_wchar_ctor_name_noprot, 16) +basic_fstream_wchar* __thiscall basic_fstream_wchar_ctor_name_noprot(basic_fstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_fstream_wchar_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + +/* ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_short_ctor_name_noprot, 16) +basic_fstream_wchar* __thiscall basic_fstream_short_ctor_name_noprot(basic_fstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_fstream_short_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + /* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBGHH@Z */ /* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBGHH@Z */ /* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PB_WHH@Z */

1 0

Stefan Dösinger : wined3d: Store RGBQUADs in palettes.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 1558391a110c24e0119dbe4b2a013d26fa808915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1558391a110c24e0119dbe4b2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 18:02:14 2014 +0200 wined3d: Store RGBQUADs in palettes. --- dlls/wined3d/palette.c | 38 +++++++++++++------- dlls/wined3d/surface.c | 77 +++++++++++----------------------------- dlls/wined3d/utils.c | 10 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 52 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1558391a110c24e0119db…

1 0

Bruno Jesus : ws2_32/tests: Test more the behavior of SO_REUSEADDR.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: eda14e611cce9e9c0f72b9a2f84f75885ed3262e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda14e611cce9e9c0f72b9a2f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue May 6 19:36:04 2014 -0300 ws2_32/tests: Test more the behavior of SO_REUSEADDR. --- dlls/ws2_32/tests/sock.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index dcedd99..1752d35 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1468,6 +1468,7 @@ static void test_so_reuseaddr(void) SOCKET s1,s2; unsigned int rc,reuse; int size; + DWORD err; saddr.sin_family = AF_INET; saddr.sin_port = htons(9375); @@ -1496,9 +1497,45 @@ static void test_so_reuseaddr(void) /* On Win2k3 and above, all SO_REUSEADDR seems to do is to allow binding to * a port immediately after closing another socket on that port, so * basically following the BSD socket semantics here. */ - closesocket(s1); rc = bind(s2, (struct sockaddr*)&saddr, sizeof(saddr)); - ok(rc==0, "bind() failed error: %d\n", WSAGetLastError()); + if(rc==0) + { + int s3=socket(AF_INET, SOCK_STREAM, 0), s4; + trace("<= Win XP behavior of SO_REUSEADDR\n"); + + /* If we could bind again in the same port this is Windows version <= XP. + * Lets test if we can really connect to one of them. */ + set_blocking(s1, FALSE); + set_blocking(s2, FALSE); + rc = listen(s1, 1); + ok(!rc, "listen() failed with error: %d\n", WSAGetLastError()); + rc = listen(s2, 1); + ok(!rc, "listen() failed with error: %d\n", WSAGetLastError()); + rc = connect(s3, (struct sockaddr*)&saddr, sizeof(saddr)); + ok(!rc, "connecting to accepting socket failed %d\n", WSAGetLastError()); + + /* the delivery of the connection is random so we need to try on both sockets */ + size = sizeof(saddr); + s4 = accept(s1, (struct sockaddr*)&saddr, &size); + if(s4 == INVALID_SOCKET) + s4 = accept(s2, (struct sockaddr*)&saddr, &size); + ok(s4 != INVALID_SOCKET, "none of the listening sockets could get the connection\n"); + + closesocket(s1); + closesocket(s3); + closesocket(s4); + } + else + { + trace(">= Win 2003 behavior of SO_REUSEADDR\n"); + err = WSAGetLastError(); +todo_wine + ok(err==WSAEACCES, "expected 10013, got %d\n", err); + + closesocket(s1); + rc = bind(s2, (struct sockaddr*)&saddr, sizeof(saddr)); + ok(rc==0, "bind() failed error: %d\n", WSAGetLastError()); + } closesocket(s2); }

1 0

Alex Henrie : gdi32: Simplify family_matches and face_matches.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: d2dce849b50bc8a312696ddf43909606ebdbdc35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2dce849b50bc8a312696ddf4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 6 14:42:41 2014 -0600 gdi32: Simplify family_matches and face_matches. --- dlls/gdi32/freetype.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cece358..54241a5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5709,25 +5709,25 @@ static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEX free_font(font); } -static BOOL family_matches(Family *family, const LOGFONTW *lf) +static BOOL family_matches(Family *family, const WCHAR *face_name) { Face *face; const struct list *face_list; - if (!strcmpiW(lf->lfFaceName, family->FamilyName)) return TRUE; + if (!strcmpiW(face_name, family->FamilyName)) return TRUE; face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) - if (face->FullName && !strcmpiW(lf->lfFaceName, face->FullName)) return TRUE; + if (face->FullName && !strcmpiW(face_name, face->FullName)) return TRUE; return FALSE; } -static BOOL face_matches(const WCHAR *family_name, Face *face, const LOGFONTW *lf) +static BOOL face_matches(const WCHAR *family_name, Face *face, const WCHAR *face_name) { - if (!strcmpiW(lf->lfFaceName, family_name)) return TRUE; + if (!strcmpiW(face_name, family_name)) return TRUE; - return (face->FullName && !strcmpiW(lf->lfFaceName, face->FullName)); + return (face->FullName && !strcmpiW(face_name, face->FullName)); } static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_charset_list *list, @@ -5805,22 +5805,20 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); if(plf->lfFaceName[0]) { - FontSubst *psub; - psub = get_font_subst(&font_subst_list, plf->lfFaceName, plf->lfCharSet); + WCHAR *face_name = plf->lfFaceName; + FontSubst *psub = get_font_subst(&font_subst_list, plf->lfFaceName, plf->lfCharSet); if(psub) { TRACE("substituting %s -> %s\n", debugstr_w(plf->lfFaceName), debugstr_w(psub->to.name)); - lf = *plf; - strcpyW(lf.lfFaceName, psub->to.name); - plf = &lf; + face_name = psub->to.name; } LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { - if (!family_matches(family, plf)) continue; + if (!family_matches(family, face_name)) continue; face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { - if (!face_matches(family->FamilyName, face, plf)) continue; + if (!face_matches(family->FamilyName, face, face_name)) continue; if (!enum_face_charsets(family, face, &enum_charsets, proc, lparam)) return FALSE; } }

1 0

Henri Verbeet : gdi32: Use FIELD_OFFSET to calculate the structure size in GetRegionData().
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 9016d1eda0cec04606fd3996559dabcee6e493b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9016d1eda0cec04606fd39965… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 6 13:06:22 2014 +0200 gdi32: Use FIELD_OFFSET to calculate the structure size in GetRegionData(). --- dlls/gdi32/region.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 2632de5..93aa6a7 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -886,13 +886,13 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata) if(!obj) return 0; size = obj->numRects * sizeof(RECT); - if(count < (size + sizeof(RGNDATAHEADER)) || rgndata == NULL) + if (!rgndata || count < FIELD_OFFSET(RGNDATA, Buffer[size])) { GDI_ReleaseObj( hrgn ); if (rgndata) /* buffer is too small, signal it by return 0 */ return 0; - else /* user requested buffer size with rgndata NULL */ - return size + sizeof(RGNDATAHEADER); + /* user requested buffer size with rgndata NULL */ + return FIELD_OFFSET(RGNDATA, Buffer[size]); } rgndata->rdh.dwSize = sizeof(RGNDATAHEADER); @@ -907,7 +907,7 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata) memcpy( rgndata->Buffer, obj->rects, size ); GDI_ReleaseObj( hrgn ); - return size + sizeof(RGNDATAHEADER); + return FIELD_OFFSET(RGNDATA, Buffer[size]); }

1 0

Piotr Caban : msvcrt: Add __ExceptionPtr* functions implementation.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 868e009e795037e741d5565f2c4c49442de731a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868e009e795037e741d5565f2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 6 16:24:53 2014 +0200 msvcrt: Add __ExceptionPtr* functions implementation. --- dlls/msvcr100/msvcr100.spec | 20 ++-- dlls/msvcr110/msvcr110.spec | 20 ++-- dlls/msvcrt/cpp.c | 220 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 240 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=868e009e795037e741d55…

1 0

Hans Leidekker : wininet: Add support for retrieving the proxy automatic configuration URL on Mac OS X.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 89d40b3de103e1cf785e4606f000f8f85957073e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d40b3de103e1cf785e4606f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:33:18 2014 +0200 wininet: Add support for retrieving the proxy automatic configuration URL on Mac OS X. --- dlls/wininet/Makefile.in | 2 +- dlls/wininet/internet.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index f7b8e89..357b924 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -3,7 +3,7 @@ MODULE = wininet.dll IMPORTLIB = wininet IMPORTS = mpr shlwapi shell32 user32 advapi32 DELAYIMPORTS = secur32 crypt32 cryptui -EXTRALIBS = $(SOCKET_LIBS) $(Z_LIBS) +EXTRALIBS = $(CORESERVICES_LIBS) $(SOCKET_LIBS) $(Z_LIBS) C_SRCS = \ cookie.c \ diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 30e8f60..8ea2803 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -56,6 +56,15 @@ #endif #include <assert.h> +#ifdef HAVE_CORESERVICES_CORESERVICES_H +#define GetCurrentThread MacGetCurrentThread +#define LoadResource MacLoadResource +#include <CoreServices/CoreServices.h> +#undef GetCurrentThread +#undef LoadResource +#undef DPRINTF +#endif + #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -2389,6 +2398,33 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, return res == ERROR_SUCCESS; } +static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) +{ +#ifdef HAVE_CORESERVICES_CORESERVICES_H + CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); + const void *ref; + BOOL ret = FALSE; + + if (!settings) return FALSE; + + if (!(ref = CFDictionaryGetValue( settings, kCFNetworkProxiesProxyAutoConfigURLString ))) + { + CFRelease( settings ); + return FALSE; + } + if (CFStringGetCString( ref, buf, buflen, kCFStringEncodingASCII )) + { + TRACE( "returning %s\n", debugstr_a(buf) ); + ret = TRUE; + } + CFRelease( settings ); + return ret; +#else + FIXME( "no support on this platform\n" ); + return FALSE; +#endif +} + static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL unicode) { /* FIXME: This function currently handles more options than it should. Options requiring @@ -2472,16 +2508,20 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u } case INTERNET_OPTION_PER_CONNECTION_OPTION: { + char url[INTERNET_MAX_URL_LENGTH + 1]; INTERNET_PER_CONN_OPTION_LISTW *con = buffer; INTERNET_PER_CONN_OPTION_LISTA *conA = buffer; DWORD res = ERROR_SUCCESS, i; proxyinfo_t pi; + BOOL have_url; LONG ret; TRACE("Getting global proxy info\n"); if((ret = INTERNET_LoadProxySettings(&pi))) return ret; + have_url = get_proxy_autoconfig_url(url, sizeof(url)); + FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n"); if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) { @@ -2499,6 +2539,9 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u optionW->Value.dwValue = PROXY_TYPE_PROXY; else optionW->Value.dwValue = PROXY_TYPE_DIRECT; + if (have_url) + /* native includes PROXY_TYPE_DIRECT even if PROXY_TYPE_PROXY is set */ + optionW->Value.dwValue |= PROXY_TYPE_DIRECT|PROXY_TYPE_AUTO_PROXY_URL; break; case INTERNET_PER_CONN_PROXY_SERVER: @@ -2516,7 +2559,18 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u break; case INTERNET_PER_CONN_AUTOCONFIG_URL: + if (!have_url) + optionW->Value.pszValue = NULL; + else if (unicode) + optionW->Value.pszValue = heap_strdupAtoW(url); + else + optionA->Value.pszValue = heap_strdupA(url); + break; + case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: + optionW->Value.dwValue = AUTO_PROXY_FLAG_ALWAYS_DETECT; + break; + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME:

1 0

Ken Thomases : winex11: Consolidate duplicate code from glxdrv_wglSetPixelFormat() and X11DRV_wglSetPixelFormatWINE().
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 351fae120690a19530f0c399f0a8956aa877b16d URL: http://source.winehq.org/git/wine.git/?a=commit;h=351fae120690a19530f0c399f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 6 03:44:01 2014 -0500 winex11: Consolidate duplicate code from glxdrv_wglSetPixelFormat() and X11DRV_wglSetPixelFormatWINE(). --- dlls/winex11.drv/opengl.c | 141 ++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 79 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0077ac3..71af3db 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1407,6 +1407,66 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) return TRUE; } + +static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change) +{ + const struct wgl_pixel_format *fmt; + int value; + HWND hwnd = WindowFromDC( hdc ); + + TRACE("(%p,%d)\n", hdc, format); + + if (!hwnd || hwnd == GetDesktopWindow()) + { + WARN( "not a valid window DC %p/%p\n", hdc, hwnd ); + return FALSE; + } + + fmt = get_pixel_format(gdi_display, format, FALSE /* Offscreen */); + if (!fmt) + { + ERR( "Invalid format %d\n", format ); + return FALSE; + } + + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); + if (!(value & GLX_WINDOW_BIT)) + { + WARN( "Pixel format %d is not compatible for window rendering\n", format ); + return FALSE; + } + + if (!allow_change) + { + struct gl_drawable *gl; + if ((gl = get_gl_drawable( hwnd, hdc ))) + { + int prev = pixel_format_index( gl->format ); + release_gl_drawable( gl ); + return prev == format; /* cannot change it if already set */ + } + } + + if (TRACE_ON(wgl)) { + int gl_test = 0; + + gl_test = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_FBCONFIG_ID, &value); + if (gl_test) { + ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); + } else { + TRACE(" FBConfig have :\n"); + TRACE(" - FBCONFIG_ID 0x%x\n", value); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &value); + TRACE(" - VISUAL_ID 0x%x\n", value); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); + TRACE(" - DRAWABLE_TYPE 0x%x\n", value); + } + } + + return set_win_format( hwnd, fmt ); +} + + /*********************************************************************** * sync_gl_drawable */ @@ -1686,57 +1746,7 @@ static int glxdrv_wglGetPixelFormat( HDC hdc ) */ static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd ) { - const struct wgl_pixel_format *fmt; - int value; - struct gl_drawable *gl; - HWND hwnd = WindowFromDC( hdc ); - - TRACE("(%p,%d,%p)\n", hdc, iPixelFormat, ppfd); - - if (!hwnd || hwnd == GetDesktopWindow()) - { - WARN( "not a proper window DC %p/%p\n", hdc, hwnd ); - return FALSE; - } - - /* Check if iPixelFormat is in our list of supported formats to see if it is supported. */ - fmt = get_pixel_format(gdi_display, iPixelFormat, FALSE /* Offscreen */); - if(!fmt) { - ERR("Invalid iPixelFormat: %d\n", iPixelFormat); - return FALSE; - } - - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); - if (!(value & GLX_WINDOW_BIT)) - { - WARN("Pixel format %d is not compatible for window rendering\n", iPixelFormat); - return FALSE; - } - - if ((gl = get_gl_drawable( hwnd, hdc ))) - { - int prev = pixel_format_index( gl->format ); - release_gl_drawable( gl ); - return prev == iPixelFormat; /* cannot change it if already set */ - } - - if (TRACE_ON(wgl)) { - int gl_test = 0; - - gl_test = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_FBCONFIG_ID, &value); - if (gl_test) { - ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); - } else { - TRACE(" FBConfig have :\n"); - TRACE(" - FBCONFIG_ID 0x%x\n", value); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &value); - TRACE(" - VISUAL_ID 0x%x\n", value); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); - TRACE(" - DRAWABLE_TYPE 0x%x\n", value); - } - } - - return set_win_format( hwnd, fmt ); + return set_pixel_format(hdc, iPixelFormat, FALSE); } /*********************************************************************** @@ -3019,34 +3029,7 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) */ static BOOL X11DRV_wglSetPixelFormatWINE(HDC hdc, int format) { - const struct wgl_pixel_format *fmt; - int value; - HWND hwnd; - - TRACE("(%p,%d)\n", hdc, format); - - fmt = get_pixel_format(gdi_display, format, FALSE /* Offscreen */); - if (!fmt) - { - ERR( "Invalid format %d\n", format ); - return FALSE; - } - - hwnd = WindowFromDC( hdc ); - if (!hwnd || hwnd == GetDesktopWindow()) - { - ERR( "not a valid window DC %p\n", hdc ); - return FALSE; - } - - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); - if (!(value & GLX_WINDOW_BIT)) - { - WARN( "Pixel format %d is not compatible for window rendering\n", format ); - return FALSE; - } - - return set_win_format( hwnd, fmt ); + return set_pixel_format(hdc, format, TRUE); } /**

1 0

Huw Davies : usp10/tests: Mark two failing Hebrew strings as broken under win8.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: ee14105afd87256b180b3f225ce90d5f9597cd5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee14105afd87256b180b3f225… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 6 14:59:22 2014 +0100 usp10/tests: Mark two failing Hebrew strings as broken under win8. The strings are tagged as Hebrew, yet the RTL and bidi levels are not correctly set. --- dlls/usp10/tests/usp10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index a7fbc73..dea378a 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -243,12 +243,12 @@ static void test_ScriptItemize( void ) /* Hebrew */ static const WCHAR test6[] = {0x05e9, 0x05dc, 0x05d5, 0x05dd, '.',0}; - static const itemTest t61[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},4,0,0,0,0,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; + static const itemTest t61[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,TRUE,{-1,0,0,0,-1}},{{0,0,0,0,0},4,0,0,0,0,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; static const itemTest t62[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},4,1,1,1,0,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; static const itemTest t63[2] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; static const int b63[2] = {2,2}; static const WCHAR test7[] = {'p','a','r','t',' ','o','n','e',' ',0x05d7, 0x05dc, 0x05e7, ' ', 0x05e9, 0x05ea, 0x05d9, 0x05d9, 0x05dd, ' ','p','a','r','t',' ','t','h','r','e','e', 0}; - static const itemTest t71[4] = {{{0,0,0,0,0},0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},9,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},19,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; + static const itemTest t71[4] = {{{0,0,0,0,0},0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},9,1,1,1,hebr_tag,TRUE,{-1,0,0,0,-1}},{{0,0,0,0,0},19,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; static const itemTest t72[4] = {{{0,0,0,0,0},0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},9,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},18,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; static const itemTest t73[4] = {{{0,0,0,0,0},0,0,0,2,latn_tag,FALSE},{{0,0,0,0,0},8,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},19,0,0,2,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; static const WCHAR test8[] = {0x0633, 0x0644, 0x0627, 0x0645,0};

1 0

Nikolay Sivov : setupapi: Implement a binary compatible string table.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 8802f84c8cc473d5617c134c16973b1cb2c4b53e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8802f84c8cc473d5617c134c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 23:29:53 2014 +0400 setupapi: Implement a binary compatible string table. --- dlls/setupapi/stringtable.c | 781 ++++++++++++++++--------------------- dlls/setupapi/tests/stringtable.c | 152 +++++--- 2 files changed, 426 insertions(+), 507 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8802f84c8cc473d5617c1…

1 0

Damjan Jovanovic : winex11: Fix a WM_DROPFILES memory ownership ambiguity.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: f0a91c0248d8e584e1095dc2308657c6b7a51a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a91c0248d8e584e1095dc23… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 6 03:02:45 2014 +0200 winex11: Fix a WM_DROPFILES memory ownership ambiguity. --- dlls/winex11.drv/xdnd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 5d37495..dbe87e8 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -727,17 +727,20 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) if (found) { - DROPFILES *lpDrop = current->data; + HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, current->size); - if (lpDrop) + if (dropHandle) { + DROPFILES *lpDrop = GlobalLock(dropHandle); lpDrop->pt.x = XDNDxy.x; lpDrop->pt.y = XDNDxy.y; - + memcpy(lpDrop, current->data, current->size); TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); + GlobalUnlock(dropHandle); - PostMessageW(hwnd, WM_DROPFILES, (WPARAM)lpDrop, 0L); + if (!PostMessageW(hwnd, WM_DROPFILES, (WPARAM)dropHandle, 0)) + GlobalFree(dropHandle); } } @@ -761,6 +764,7 @@ static void X11DRV_XDND_FreeDragDropOp(void) LIST_FOR_EACH_ENTRY_SAFE(current, next, &xdndData, XDNDDATA, entry) { list_remove(&current->entry); + HeapFree(GetProcessHeap(), 0, current->data); HeapFree(GetProcessHeap(), 0, current); }

1 0

Huw Davies : wintrust/tests: Fix failing test on win8.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: a27a1214a2fba12069671bffd9854164737a7d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27a1214a2fba12069671bffd… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 6 16:29:36 2014 +0100 wintrust/tests: Fix failing test on win8. --- dlls/wintrust/tests/crypt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 4d9061b..55f9ece 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -551,7 +551,9 @@ static void test_CryptCATAdminAddRemoveCatalog(void) hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 1); error = GetLastError(); ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", GetLastError()); + ok(error == ERROR_INVALID_PARAMETER || + error == ERROR_BAD_FORMAT, /* win 8 */ + "got %u\n", GetLastError()); SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, NULL, 0);

1 0

Piotr Caban : msvcr80: Update exceptions RTTI data to reflect it' s part of std namespace.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 1be46548421aab77c7a9262081459ddc28fe5a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be46548421aab77c7a926208… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 6 16:24:49 2014 +0200 msvcr80: Update exceptions RTTI data to reflect it's part of std namespace. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/cpp.c | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 72cf6f3..0cc8fcb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -226,7 +226,7 @@ @ extern ??_7__non_rtti_object(a)std@@6B@ MSVCRT___non_rtti_object_vtable @ extern ??_7bad_cast(a)std@@6B@ MSVCRT_bad_cast_vtable @ extern ??_7bad_typeid(a)std@@6B@ MSVCRT_bad_typeid_vtable -@ extern ??_7exception@@6B@ MSVCRT_exception_vtable +@ extern ??_7exception@@6B@ MSVCRT_exception_old_vtable @ extern ??_7exception(a)std@@6B@ MSVCRT_exception_vtable @ stub -arch=win32 ??_F?$_SpinWait@$00(a)details@Concurrency@@QAEXXZ @ stub -arch=win64 ??_F?$_SpinWait@$00(a)details@Concurrency@@QEAAXXZ diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ef70cf1..13ea9f0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -54,7 +54,7 @@ @ extern ??_7__non_rtti_object(a)std@@6B@ MSVCRT___non_rtti_object_vtable @ extern ??_7bad_cast(a)std@@6B@ MSVCRT_bad_cast_vtable @ extern ??_7bad_typeid(a)std@@6B@ MSVCRT_bad_typeid_vtable -@ extern ??_7exception@@6B@ MSVCRT_exception_vtable +@ extern ??_7exception@@6B@ MSVCRT_exception_old_vtable @ extern ??_7exception(a)std@@6B@ MSVCRT_exception_vtable @ thiscall -arch=i386 ??_Fbad_cast(a)std@@QAEXXZ(ptr) MSVCRT_bad_cast_default_ctor @ cdecl -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ(ptr) MSVCRT_bad_cast_default_ctor diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 161d224..710cb15 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -54,7 +54,7 @@ @ extern ??_7__non_rtti_object(a)std@@6B@ MSVCRT___non_rtti_object_vtable @ extern ??_7bad_cast(a)std@@6B@ MSVCRT_bad_cast_vtable @ extern ??_7bad_typeid(a)std@@6B@ MSVCRT_bad_typeid_vtable -@ extern ??_7exception@@6B@ MSVCRT_exception_vtable +@ extern ??_7exception@@6B@ MSVCRT_exception_old_vtable @ extern ??_7exception(a)std@@6B@ MSVCRT_exception_vtable @ thiscall -arch=i386 ??_Fbad_cast(a)std@@QAEXXZ(ptr) MSVCRT_bad_cast_default_ctor @ cdecl -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ(ptr) MSVCRT_bad_cast_default_ctor diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index e392208..50c2681 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -658,6 +658,11 @@ __ASM_VTABLE(type_info, __ASM_VTABLE(exception, VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) VTABLE_ADD_FUNC(MSVCRT_what_exception)); +#if _MSVCR_VER >= 80 +__ASM_VTABLE(exception_old, + VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) + VTABLE_ADD_FUNC(MSVCRT_what_exception)); +#endif __ASM_VTABLE(bad_typeid, VTABLE_ADD_FUNC(MSVCRT_bad_typeid_vector_dtor) VTABLE_ADD_FUNC(MSVCRT_what_exception)); @@ -673,10 +678,18 @@ __ASM_VTABLE(__non_rtti_object, #endif DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) +#if _MSVCR_VER >= 80 +DEFINE_RTTI_DATA0( exception, 0, ".?AVexception(a)std@@" ) +DEFINE_RTTI_DATA0( exception_old, 0, ".?AVexception@@" ) +DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid(a)std@@" ) +DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast(a)std@@" ) +DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object(a)std@@" ) +#else DEFINE_RTTI_DATA0( exception, 0, ".?AVexception@@" ) DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid@@" ) DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast@@" ) DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@@" ) +#endif DEFINE_EXCEPTION_TYPE_INFO( exception, 0, NULL, NULL ) DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ) @@ -688,6 +701,9 @@ void msvcrt_init_exception(void *base) #ifdef __x86_64__ init_type_info_rtti(base); init_exception_rtti(base); +#if _MSVCR_VER >= 80 + init_exception_old_rtti(base); +#endif init_bad_typeid_rtti(base); init_bad_cast_rtti(base); init___non_rtti_object_rtti(base);

1 0

Nikolay Sivov : oleaut32/tests: Fixed a couple of string leaks (Valgrind).
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 29eace89e9d6379a4ca33a8ea5d121ab7ccec99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=29eace89e9d6379a4ca33a8ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 6 11:57:48 2014 +0400 oleaut32/tests: Fixed a couple of string leaks (Valgrind). --- dlls/oleaut32/tests/olefont.c | 2 ++ dlls/oleaut32/tests/vartest.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index ded1838..4f421e4 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -412,10 +412,12 @@ static void test_font_events_disp(void) IConnectionPoint_Release(pCP); fonteventsdisp_invoke_called = 0; + fonteventsdisp_invoke_arg0 = NULL; hr = IFont_put_Bold(pFont, TRUE); EXPECT_HR(hr, S_OK); ok(fonteventsdisp_invoke_called == 1, "IFontEventDisp::Invoke wasn't called once\n"); + SysFreeString(fonteventsdisp_invoke_arg0); hr = IFont_QueryInterface(pFont, &IID_IFontDisp, (void **)&pFontDisp); EXPECT_HR(hr, S_OK); diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index bfbc0b2..d139b42 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5611,6 +5611,7 @@ static void test_VarCat(void) VARTYPE leftvt, rightvt, resultvt; HRESULT hres; HRESULT expected_error_num; + int cmp; CHECKPTR(VarCat); @@ -5952,7 +5953,11 @@ static void test_VarCat(void) V_BSTR(&right) = SysAllocStringLen(NULL,0); hres = pVarCat(&left, &right, &result); ok(hres == S_OK, "VarCat failed: %08x\n", hres); - if(!strcmp_wa(V_BSTR(&result), "True")) { + VariantClear(&right); + + cmp = strcmp_wa(V_BSTR(&result), "True"); + VariantClear(&result); + if(!cmp) { V_VT(&right) = VT_BOOL; V_BOOL(&right) = 100; hres = pVarCat(&left, &right, &result);

1 0

Vijay Kiran Kamuju : usp10: Show fixme once in ScriptShapeOpenType.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 8b50762b18fce7de81133b7ef82f12431b47ac01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b50762b18fce7de81133b7ef… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon May 5 18:55:37 2014 +0000 usp10: Show fixme once in ScriptShapeOpenType. --- dlls/usp10/usp10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ae164d2..ac9c0fd 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2848,6 +2848,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, unsigned int g; BOOL rtl; int cluster; + static int once = 0; TRACE("(%p, %p, %p, %s, %s, %p, %p, %d, %s, %d, %d, %p, %p, %p, %p, %p )\n", hdc, psc, psa, @@ -2862,7 +2863,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; if (cRanges) - FIXME("Ranges not supported yet\n"); + if(!once++) FIXME("Ranges not supported yet\n"); rtl = (psa && !psa->fLogicalOrder && psa->fRTL);

1 0

Nikolay Sivov : ntdll/tests: Fix some string leaks (Valgrind).
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 0563c78cb63b8e021fdba2b9049c6875b784ff0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0563c78cb63b8e021fdba2b90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 6 11:58:03 2014 +0400 ntdll/tests: Fix some string leaks (Valgrind). --- dlls/ntdll/tests/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 6406930..d70ed6b 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -267,6 +267,7 @@ static void create_file_test(void) FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); ok(status == STATUS_OBJECT_NAME_INVALID, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + pRtlFreeUnicodeString(&nameW); pRtlDosPathNameToNtPathName_U(pipeInvalidNameW, &nameW, NULL, NULL); attr.ObjectName = &nameW; @@ -281,6 +282,7 @@ static void create_file_test(void) FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); ok(status == STATUS_OBJECT_NAME_INVALID, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + pRtlFreeUnicodeString(&nameW); } static void open_file_test(void) @@ -1966,6 +1968,7 @@ static void test_NtCreateFile(void) } } + pRtlFreeUnicodeString( &nameW ); SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); DeleteFileW( path ); }

1 0

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

May 6, 2014

Module: wine Branch: master Commit: e759105cdd14d7db09881520dc601adf057a959d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e759105cdd14d7db09881520d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 6 10:41:19 2014 +0200 mshtml: Use debugstr_mshtml_guid in a few more places. --- dlls/mshtml/htmlattr.c | 6 +++--- dlls/mshtml/htmlcurstyle.c | 20 +++++++------------- dlls/mshtml/htmlelemcol.c | 23 +++++++++-------------- dlls/mshtml/main.c | 23 +++++++++++++++-------- 4 files changed, 34 insertions(+), 38 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 1b01662..420a275 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -43,16 +43,16 @@ static HRESULT WINAPI HTMLDOMAttribute_QueryInterface(IHTMLDOMAttribute *iface, { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(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->IHTMLDOMAttribute_iface; }else if(IsEqualGUID(&IID_IHTMLDOMAttribute, riid)) { - TRACE("(%p)->(IID_IHTMLDOMAttribute %p)\n", This, ppv); *ppv = &This->IHTMLDOMAttribute_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + WARN("%s not supported\n", debugstr_mshtml_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 71d57a1..ca5d60f 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -69,34 +69,28 @@ static HRESULT WINAPI HTMLCurrentStyle_QueryInterface(IHTMLCurrentStyle *iface, { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(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->IHTMLCurrentStyle_iface; }else if(IsEqualGUID(&IID_IHTMLCurrentStyle, riid)) { - TRACE("(%p)->(IID_IHTMLCurrentStyle %p)\n", This, ppv); *ppv = &This->IHTMLCurrentStyle_iface; }else if(IsEqualGUID(&IID_IHTMLCurrentStyle2, riid)) { - TRACE("(%p)->(IID_IHTMLCurrentStyle2 %p)\n", This, ppv); *ppv = &This->IHTMLCurrentStyle2_iface; }else if(IsEqualGUID(&IID_IHTMLCurrentStyle3, riid)) { - TRACE("(%p)->(IID_IHTMLCurrentStyle3 %p)\n", This, ppv); *ppv = &This->IHTMLCurrentStyle3_iface; }else if(IsEqualGUID(&IID_IHTMLCurrentStyle4, riid)) { - TRACE("(%p)->(IID_IHTMLCurrentStyle4 %p)\n", This, ppv); *ppv = &This->IHTMLCurrentStyle4_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 HTMLCurrentStyle_AddRef(IHTMLCurrentStyle *iface) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 5819d44..cb7bad1 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -104,14 +104,14 @@ static HRESULT WINAPI HTMLElementCollectionEnum_QueryInterface(IEnumVARIANT *ifa { HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IEnumVARIANT_iface; }else if(IsEqualGUID(riid, &IID_IEnumVARIANT)) { - TRACE("(%p)->(IID_IEnumVARIANT %p)\n", This, ppv); *ppv = &This->IEnumVARIANT_iface; }else { - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + FIXME("Unsupported iface %s\n", debugstr_mshtml_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -217,25 +217,20 @@ static HRESULT WINAPI HTMLElementCollection_QueryInterface(IHTMLElementCollectio { HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - *ppv = NULL; - if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLElementCollection_iface; }else if(IsEqualGUID(&IID_IHTMLElementCollection, riid)) { - TRACE("(%p)->(IID_IHTMLElementCollection %p)\n", This, ppv); *ppv = &This->IHTMLElementCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + FIXME("Unsupported iface %s\n", debugstr_mshtml_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IHTMLElementCollection_AddRef(&This->IHTMLElementCollection_iface); - return S_OK; - } - - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + IHTMLElementCollection_AddRef(&This->IHTMLElementCollection_iface); + return S_OK; } static ULONG WINAPI HTMLElementCollection_AddRef(IHTMLElementCollection *iface) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 1f90686..0bdc145 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -204,7 +204,7 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFGUID return S_OK; } - WARN("not supported iid %s\n", debugstr_guid(riid)); + WARN("not supported iid %s\n", debugstr_mshtml_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } @@ -277,25 +277,25 @@ static HRESULT ClassFactory_Create(REFIID riid, void **ppv, CreateInstanceFunc f HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { if(IsEqualGUID(&CLSID_HTMLDocument, rclsid)) { - TRACE("(CLSID_HTMLDocument %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_HTMLDocument %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ClassFactory_Create(riid, ppv, HTMLDocument_Create); }else if(IsEqualGUID(&CLSID_AboutProtocol, rclsid)) { - TRACE("(CLSID_AboutProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_AboutProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_JSProtocol, rclsid)) { - TRACE("(CLSID_JSProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_JSProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_MailtoProtocol, rclsid)) { - TRACE("(CLSID_MailtoProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_MailtoProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_ResProtocol, rclsid)) { - TRACE("(CLSID_ResProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_ResProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_SysimageProtocol, rclsid)) { - TRACE("(CLSID_SysimageProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_SysimageProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_HTMLLoadOptions, rclsid)) { - TRACE("(CLSID_HTMLLoadOptions %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_HTMLLoadOptions %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ClassFactory_Create(riid, ppv, HTMLLoadOptions_Create); } @@ -540,7 +540,12 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_ICustomDoc); X(IID_IDispatch); X(IID_IDispatchEx); + X(IID_IEnumVARIANT); X(IID_IHlinkTarget); + X(IID_IHTMLCurrentStyle); + X(IID_IHTMLCurrentStyle2); + X(IID_IHTMLCurrentStyle3); + X(IID_IHTMLCurrentStyle4); X(IID_IHTMLDocument); X(IID_IHTMLDocument2); X(IID_IHTMLDocument3); @@ -548,6 +553,8 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLDocument5); X(IID_IHTMLDocument6); X(IID_IHTMLDocument7); + X(IID_IHTMLDOMAttribute); + X(IID_IHTMLElementCollection); X(IID_IInternetHostSecurityManager); X(IID_IMonikerProp); X(IID_IObjectSafety);

1 0

Hans Leidekker : wininet: Use a semicolon to delimit registered proxy servers.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 282b9c7bb7c5939a5ed55d70680f1e18b9cd165c URL: http://source.winehq.org/git/wine.git/?a=commit;h=282b9c7bb7c5939a5ed55d706… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:31:35 2014 +0200 wininet: Use a semicolon to delimit registered proxy servers. --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a37606a..08bdd7c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -585,7 +585,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) p += lstrlenW( szHttp ); lstrcpyW( szProxy, p ); } - p = strchrW( szProxy, ' ' ); + p = strchrW( szProxy, ';' ); if (p) *p = 0; lpwpi->proxy = szProxy;

1 0

Hans Leidekker : wininet: Fix a couple of memory leaks.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 9946e8a87ed3a49a5c54e9f3f7e817dbb3bfc4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9946e8a87ed3a49a5c54e9f3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:31:53 2014 +0200 wininet: Fix a couple of memory leaks. --- dlls/wininet/internet.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 08bdd7c..7f325a5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -538,6 +538,8 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) LPCSTR envproxy; LONG ret; + memset( lpwpi, 0, sizeof(*lpwpi) ); + EnterCriticalSection( &WININET_cs ); if (global_proxy) { @@ -548,7 +550,10 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) LeaveCriticalSection( &WININET_cs ); if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key ))) + { + FreeProxyInfo( lpwpi ); return ret; + } len = sizeof(DWORD); if (RegQueryValueExW( key, szProxyEnable, NULL, &type, (BYTE *)&lpwpi->proxyEnabled, &len ) || type != REG_DWORD) @@ -556,6 +561,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) lpwpi->proxyEnabled = 0; if((ret = RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE *)&lpwpi->proxyEnabled, sizeof(DWORD) ))) { + FreeProxyInfo( lpwpi ); RegCloseKey( key ); return ret; } @@ -563,8 +569,6 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if (!(envproxy = getenv( "http_proxy" )) || lpwpi->proxyEnabled) { - TRACE("Proxy is enabled.\n"); - /* figure out how much memory the proxy setting takes */ if (!RegQueryValueExW( key, szProxyServer, NULL, &type, NULL, &len ) && len && (type == REG_SZ)) { @@ -574,6 +578,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if (!(szProxy = heap_alloc(len))) { RegCloseKey( key ); + FreeProxyInfo( lpwpi ); return ERROR_OUTOFMEMORY; } RegQueryValueExW( key, szProxyServer, NULL, &type, (BYTE*)szProxy, &len ); @@ -588,14 +593,18 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) p = strchrW( szProxy, ';' ); if (p) *p = 0; + FreeProxyInfo( lpwpi ); lpwpi->proxy = szProxy; + lpwpi->proxyBypass = NULL; - TRACE("http proxy = %s\n", debugstr_w(lpwpi->proxy)); + TRACE("http proxy (from registry) = %s\n", debugstr_w(lpwpi->proxy)); } else { TRACE("No proxy server settings in registry.\n"); + FreeProxyInfo( lpwpi ); lpwpi->proxy = NULL; + lpwpi->proxyBypass = NULL; } } else if (envproxy) @@ -604,18 +613,23 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); if (!(envproxyW = heap_alloc(len * sizeof(WCHAR)))) + { + RegCloseKey( key ); return ERROR_OUTOFMEMORY; + } MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); + FreeProxyInfo( lpwpi ); lpwpi->proxyEnabled = 1; lpwpi->proxy = envproxyW; TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); } - lpwpi->proxyBypass = NULL; if (lpwpi->proxyEnabled) { + TRACE("Proxy is enabled.\n"); + if (!(envproxy = getenv( "no_proxy" ))) { /* figure out how much memory the proxy setting takes */ @@ -630,24 +644,32 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } RegQueryValueExW( key, szProxyOverride, NULL, &type, (BYTE*)szProxy, &len ); + heap_free( lpwpi->proxyBypass ); lpwpi->proxyBypass = szProxy; - TRACE("http proxy bypass = %s\n", debugstr_w(lpwpi->proxyBypass)); + TRACE("http proxy bypass (from registry) = %s\n", debugstr_w(lpwpi->proxyBypass)); } else { + heap_free( lpwpi->proxyBypass ); + lpwpi->proxyBypass = NULL; + TRACE("No proxy bypass server settings in registry.\n"); } } - else if (envproxy) + else { WCHAR *envproxyW; len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); if (!(envproxyW = heap_alloc(len * sizeof(WCHAR)))) + { + RegCloseKey( key ); return ERROR_OUTOFMEMORY; + } MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); + heap_free( lpwpi->proxyBypass ); lpwpi->proxyBypass = envproxyW; TRACE("http proxy bypass (from environment) = %s\n", debugstr_w(lpwpi->proxyBypass)); @@ -655,7 +677,6 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } RegCloseKey( key ); - return ERROR_SUCCESS; } @@ -2890,7 +2911,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, unsigned int i; proxyinfo_t pi; - INTERNET_LoadProxySettings(&pi); + if (INTERNET_LoadProxySettings(&pi)) return FALSE; for (i = 0; i < con->dwOptionCount; i++) { INTERNET_PER_CONN_OPTIONW *option = con->pOptions + i;

1 0

Hans Leidekker : wininet: Only parse proxy URLs taken from the environment.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 4036475dc6d2c134f20b49cb34a1c8714bbb6ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4036475dc6d2c134f20b49cb3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:32:26 2014 +0200 wininet: Only parse proxy URLs taken from the environment. Proxy server strings stored in the registry use a different format. --- dlls/wininet/internet.c | 118 ++++++++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 47 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 7f325a5..30e8f60 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -105,6 +105,8 @@ typedef struct DWORD proxyEnabled; LPWSTR proxy; LPWSTR proxyBypass; + LPWSTR proxyUsername; + LPWSTR proxyPassword; } proxyinfo_t; static ULONG max_conns = 2, max_1_0_conns = 4; @@ -504,6 +506,8 @@ static void FreeProxyInfo( proxyinfo_t *lpwpi ) { heap_free(lpwpi->proxy); heap_free(lpwpi->proxyBypass); + heap_free(lpwpi->proxyUsername); + heap_free(lpwpi->proxyPassword); } static proxyinfo_t *global_proxy; @@ -519,6 +523,50 @@ static void free_global_proxy( void ) LeaveCriticalSection( &WININET_cs ); } +static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) +{ + static const WCHAR fmt[] = {'%','s',':','%','u',0}; + WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH] = {}; + WCHAR username[INTERNET_MAX_USER_NAME_LENGTH] = {}; + WCHAR password[INTERNET_MAX_PASSWORD_LENGTH] = {}; + URL_COMPONENTSW uc; + + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.lpszHostName = hostname; + uc.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; + uc.lpszUserName = username; + uc.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; + uc.lpszPassword = password; + uc.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; + + if (!InternetCrackUrlW( url, 0, 0, &uc )) return FALSE; + if (!hostname[0]) + { + if (!(info->proxy = heap_strdupW( url ))) return FALSE; + info->proxyUsername = NULL; + info->proxyPassword = NULL; + return TRUE; + } + if (!(info->proxy = heap_alloc( (strlenW(hostname) + 12) * sizeof(WCHAR) ))) return FALSE; + sprintfW( info->proxy, fmt, hostname, uc.nPort ); + + if (!username[0]) info->proxyUsername = NULL; + else if (!(info->proxyUsername = heap_strdupW( username ))) + { + heap_free( info->proxy ); + return FALSE; + } + if (!password[0]) info->proxyPassword = NULL; + else if (!(info->proxyPassword = heap_strdupW( password ))) + { + heap_free( info->proxyUsername ); + heap_free( info->proxy ); + return FALSE; + } + return TRUE; +} + /*********************************************************************** * INTERNET_LoadProxySettings * @@ -620,10 +668,20 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); FreeProxyInfo( lpwpi ); - lpwpi->proxyEnabled = 1; - lpwpi->proxy = envproxyW; - - TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); + if (parse_proxy_url( lpwpi, envproxyW )) + { + TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); + lpwpi->proxyEnabled = 1; + lpwpi->proxyBypass = NULL; + } + else + { + WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxyW)); + lpwpi->proxyEnabled = 0; + lpwpi->proxy = NULL; + lpwpi->proxyBypass = NULL; + } + heap_free( envproxyW ); } if (lpwpi->proxyEnabled) @@ -675,6 +733,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) TRACE("http proxy bypass (from environment) = %s\n", debugstr_w(lpwpi->proxyBypass)); } } + else TRACE("Proxy is disabled.\n"); RegCloseKey( key ); return ERROR_SUCCESS; @@ -685,56 +744,21 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) */ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) { - proxyinfo_t wpi = {0}; + proxyinfo_t wpi; if (INTERNET_LoadProxySettings( &wpi )) return FALSE; if (wpi.proxyEnabled) { - WCHAR proxyurl[INTERNET_MAX_URL_LENGTH]; - WCHAR username[INTERNET_MAX_USER_NAME_LENGTH]; - WCHAR password[INTERNET_MAX_PASSWORD_LENGTH]; - WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH]; - URL_COMPONENTSW UrlComponents; - - UrlComponents.dwStructSize = sizeof UrlComponents; - UrlComponents.dwSchemeLength = 0; - UrlComponents.lpszHostName = hostname; - UrlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; - UrlComponents.lpszUserName = username; - UrlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; - UrlComponents.lpszPassword = password; - UrlComponents.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; - UrlComponents.dwUrlPathLength = 0; - UrlComponents.dwExtraInfoLength = 0; - - if(InternetCrackUrlW(wpi.proxy, 0, 0, &UrlComponents)) - { - static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 }; - - if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) - UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; - sprintfW(proxyurl, szFormat, hostname, UrlComponents.nPort); + TRACE("http proxy = %s bypass = %s\n", debugstr_w(lpwai->proxy), debugstr_w(lpwai->proxyBypass)); - lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; - lpwai->proxy = heap_strdupW(proxyurl); - lpwai->proxyBypass = heap_strdupW(wpi.proxyBypass); - if (UrlComponents.dwUserNameLength) - { - lpwai->proxyUsername = heap_strdupW(UrlComponents.lpszUserName); - lpwai->proxyPassword = heap_strdupW(UrlComponents.lpszPassword); - } - - TRACE("http proxy = %s bypass = %s\n", debugstr_w(lpwai->proxy), debugstr_w(lpwai->proxyBypass)); - FreeProxyInfo(&wpi); - return TRUE; - } - else - { - TRACE("Failed to parse proxy: %s\n", debugstr_w(wpi.proxy)); - lpwai->proxy = NULL; - } + lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; + lpwai->proxy = wpi.proxy; + lpwai->proxyBypass = wpi.proxyBypass; + lpwai->proxyUsername = wpi.proxyUsername; + lpwai->proxyPassword = wpi.proxyPassword; + return TRUE; } lpwai->accessType = INTERNET_OPEN_TYPE_DIRECT;

1 0

Hans Leidekker : wininet: Handle secure proxy connections inside the main loop.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 5b56624a1bc6d4ff7768f15700ef3ef00c073d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b56624a1bc6d4ff7768f1570… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:32:53 2014 +0200 wininet: Handle secure proxy connections inside the main loop. This adds support for authenticated secure proxy connections. --- dlls/wininet/http.c | 145 +++++++++++++++++++++++---------------------------- 1 file changed, 66 insertions(+), 79 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 07b4787..97becd4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4176,43 +4176,6 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) return str; } -static DWORD HTTP_SecureProxyConnect(http_request_t *request) -{ - server_t *server = request->server; - LPWSTR requestString; - INT len; - INT cnt; - INT responseLen; - char *ascii_req; - DWORD res; - - static const WCHAR connectW[] = {'C','O','N','N','E','C','T',0}; - - TRACE("\n"); - - requestString = build_request_header( request, connectW, server->host_port, g_szHttp1_1, TRUE ); - - len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, - NULL, 0, NULL, NULL ); - len--; /* the nul terminator isn't needed */ - ascii_req = heap_alloc(len); - WideCharToMultiByte( CP_ACP, 0, requestString, -1, ascii_req, len, NULL, NULL ); - heap_free( requestString ); - - TRACE("full request -> %s\n", debugstr_an( ascii_req, len ) ); - - NETCON_set_timeout( request->netconn, TRUE, request->send_timeout ); - res = NETCON_send( request->netconn, ascii_req, len, 0, &cnt ); - heap_free( ascii_req ); - if (res != ERROR_SUCCESS) - return res; - - if (HTTP_GetResponseHeaders( request, &responseLen ) || !responseLen) - return ERROR_HTTP_INVALID_HEADER; - - return ERROR_SUCCESS; -} - static void HTTP_InsertCookies(http_request_t *request) { DWORD cookie_size, size, cnt = 0; @@ -4837,29 +4800,24 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) INTERNET_STATUS_CONNECTED_TO_SERVER, request->server->addr_str, strlen(request->server->addr_str)+1); - if(is_https) { - /* Note: we differ from Microsoft's WinINet here. they seem to have - * a bug that causes no status callbacks to be sent when starting - * a tunnel to a proxy server using the CONNECT verb. i believe our - * behaviour to be more correct and to not cause any incompatibilities - * because using a secure connection through a proxy server is a rare - * case that would be hard for anyone to depend on */ - if(request->proxy) - res = HTTP_SecureProxyConnect(request); - if(res == ERROR_SUCCESS) - res = NETCON_secure_connect(request->netconn, request->server); - } - - if(res != ERROR_SUCCESS) { - http_release_netconn(request, FALSE); - return res; - } - *reusing = FALSE; TRACE("Created connection to %s: %p\n", debugstr_w(request->server->name), netconn); return ERROR_SUCCESS; } +static char *build_ascii_request( const WCHAR *str, void *data, DWORD data_len, DWORD *out_len ) +{ + int len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); + char *ret; + + if (!(ret = heap_alloc( len + data_len ))) return NULL; + WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); + if (data_len) memcpy( ret + len - 1, data, data_len ); + *out_len = len + data_len - 1; + ret[*out_len] = 0; + return ret; +} + /*********************************************************************** * HTTP_HttpSendRequestW (internal) * @@ -4874,13 +4832,11 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength, DWORD dwContentLength, BOOL bEndRequest) { - INT cnt; - BOOL redirected = FALSE; - LPWSTR requestString = NULL; - INT responseLen; - BOOL loop_next; static const WCHAR szContentLength[] = { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0 }; + BOOL redirected = FALSE, secure_proxy_connect = FALSE, loop_next; + LPWSTR requestString = NULL; + INT responseLen, cnt; WCHAR contentLengthStr[sizeof szContentLength/2 /* includes \r\n */ + 20 /* int */ ]; DWORD res; @@ -4929,7 +4885,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, do { - DWORD len; + DWORD len, data_len = dwOptionalLength; BOOL reusing_connection; char *ascii_req; @@ -4957,7 +4913,31 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (!(request->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES)) HTTP_InsertCookies(request); - if (request->proxy) + res = open_http_connection(request, &reusing_connection); + if (res != ERROR_SUCCESS) + break; + + if (!reusing_connection && (request->hdr.dwFlags & INTERNET_FLAG_SECURE)) + { + if (request->proxy) secure_proxy_connect = TRUE; + else + { + res = NETCON_secure_connect(request->netconn, request->server); + if (res != ERROR_SUCCESS) + { + WARN("failed to upgrade to secure connection\n"); + http_release_netconn(request, FALSE); + break; + } + } + } + if (secure_proxy_connect) + { + static const WCHAR connectW[] = {'C','O','N','N','E','C','T',0}; + const WCHAR *target = request->server->host_port; + requestString = build_request_header(request, connectW, target, g_szHttp1_1, TRUE); + } + else if (request->proxy && !(request->hdr.dwFlags & INTERNET_FLAG_SECURE)) { WCHAR *url = build_proxy_path_url(request); requestString = build_request_header(request, request->verb, url, request->version, TRUE); @@ -4966,25 +4946,13 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, else requestString = build_request_header(request, request->verb, request->path, request->version, TRUE); - TRACE("Request header -> %s\n", debugstr_w(requestString) ); - res = open_http_connection(request, &reusing_connection); - if (res != ERROR_SUCCESS) - break; - /* send the request as ASCII, tack on the optional data */ - if (!lpOptional || redirected) - dwOptionalLength = 0; - len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, - NULL, 0, NULL, NULL ); - ascii_req = heap_alloc(len + dwOptionalLength); - WideCharToMultiByte( CP_ACP, 0, requestString, -1, - ascii_req, len, NULL, NULL ); - if( lpOptional ) - memcpy( &ascii_req[len-1], lpOptional, dwOptionalLength ); - len = (len + dwOptionalLength - 1); - ascii_req[len] = 0; + if (!lpOptional || redirected || secure_proxy_connect) + data_len = 0; + + ascii_req = build_ascii_request( requestString, lpOptional, data_len, &len ); TRACE("full request -> %s\n", debugstr_a(ascii_req) ); INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, @@ -5002,7 +4970,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, continue; } - request->bytesWritten = dwOptionalLength; + request->bytesWritten = data_len; INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REQUEST_SENT, @@ -5139,6 +5107,25 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, } } } + if (secure_proxy_connect && request->status_code == HTTP_STATUS_OK) + { + int index; + + res = NETCON_secure_connect(request->netconn, request->server); + if (res != ERROR_SUCCESS) + { + WARN("failed to upgrade to secure proxy connection\n"); + http_release_netconn( request, FALSE ); + break; + } + index = HTTP_GetCustomHeaderIndex(request, szProxy_Authorization, 0, TRUE); + if (index != -1) HTTP_DeleteCustomHeader(request, index); + destroy_authinfo(request->proxyAuthInfo); + request->proxyAuthInfo = NULL; + + secure_proxy_connect = FALSE; + loop_next = TRUE; + } } else res = ERROR_SUCCESS;

1 0

Nikolay Sivov : msxml3: Fix some string leaks (Valgrind).
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 9e576e1089a376c3fdc793e5ec1aeec390bd5530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e576e1089a376c3fdc793e5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 6 11:47:46 2014 +0400 msxml3: Fix some string leaks (Valgrind). --- dlls/msxml3/element.c | 1 + dlls/msxml3/tests/domdoc.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4fe53a8..0de9c34 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1287,6 +1287,7 @@ static HRESULT WINAPI domelem_setAttribute( { int cmp = xmlStrEqual(ns->href, xml_value); heap_free(xml_value); + heap_free(xml_name); return cmp ? S_OK : E_INVALIDARG; } } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8d8c7c0..19b2951 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1940,6 +1940,7 @@ static void test_domnode( void ) ok( r == E_FAIL, "getAttribute ret %08x\n", r ); ok( V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); VariantClear(&var); + SysFreeString(str); str = SysAllocString( szdl ); V_VT(&var) = VT_I4; @@ -8121,6 +8122,7 @@ static void test_put_nodeTypedValue(void) EXPECT_HR(hr, S_OK); ok(!lstrcmpW(str, _bstr_("ABCD")), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); + SysFreeString(str); array = SafeArrayCreateVector(VT_UI1, 0, 7); hr = SafeArrayAccessData(array, (void*)&ptr); @@ -8160,6 +8162,7 @@ static void test_put_nodeTypedValue(void) ok(!lstrcmpW(str, _bstr_("ZEdWemRBPQ==")), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); SafeArrayDestroyData(array); + SysFreeString(str); /* bin.hex */ V_VT(&value) = VT_BSTR; @@ -8208,6 +8211,7 @@ static void test_put_nodeTypedValue(void) ok(!lstrcmpW(str, _bstr_("000102030405060708090a0b0c0d0e0f")), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); SafeArrayDestroyData(array); + SysFreeString(str); IXMLDOMElement_Release(elem); IXMLDOMDocument_Release(doc); @@ -9509,6 +9513,7 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, _bstr_("c")), "got node name %s\n", wine_dbgstr_w(name)); IXMLDOMNode_Release(node); + SysFreeString(name); V_VT(&v) = VT_I2; hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); @@ -9530,6 +9535,7 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, _bstr_("d")), "got node name %s\n", wine_dbgstr_w(name)); IXMLDOMNode_Release(node); + SysFreeString(name); IXMLDOMSelection_Release(selection); IXMLDOMNodeList_Release(list); @@ -11784,6 +11790,7 @@ static void test_create_attribute(void) ok(hr == S_FALSE, "%d: got 0x%08x\n", i, hr); ok(str == NULL, "%d: got prefix %s\n", i, wine_dbgstr_w(str)); } + SysFreeString(str); str = NULL; hr = IXMLDOMNode_get_namespaceURI(node, &str);

1 0

Francois Gouget : testbot/VMs: Make sure the VM status has been set to ' reverting' before starting RevertVM.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: tools Branch: master Commit: 8fee9165bb6b1026e8eaf3913098d9942e482cea URL: http://source.winehq.org/git/tools.git/?a=commit;h=8fee9165bb6b1026e8eaf391… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 11:56:10 2014 +0200 testbot/VMs: Make sure the VM status has been set to 'reverting' before starting RevertVM. --- testbot/lib/WineTestBot/VMs.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index be95bcc..3c7f3fa 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -1,5 +1,5 @@ # Copyright 2009 Ge van Geldorp -# Copyright 2012 Francois Gouget +# Copyright 2012-2014 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -533,7 +533,8 @@ sub RunRevert my $self = shift; $self->Status("reverting"); - $self->Save(); + my ($ErrProperty, $ErrMessage) = $self->Save(); + return $ErrMessage if (defined $ErrMessage); $self->GetBackEnd()->PrepareForFork(); my $Pid = fork;

1 0

Francois Gouget : testbot/lib: Pass the Step object to Task::Run() so it does not have to look it up.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: tools Branch: master Commit: 25d01cd2b4496290c5fc0b257e72efc04d2734f3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=25d01cd2b4496290c5fc0b25… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 12:41:31 2014 +0200 testbot/lib: Pass the Step object to Task::Run() so it does not have to look it up. --- testbot/lib/WineTestBot/Jobs.pm | 4 ++-- testbot/lib/WineTestBot/Tasks.pm | 16 ++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 8e36a32..b042bea 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -1,5 +1,5 @@ # Copyright 2009 Ge van Geldorp -# Copyright 2012 Francois Gouget +# Copyright 2012-2014 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -511,7 +511,7 @@ sub ScheduleOnHost($$$) my ($ErrProperty, $ErrMessage) = $VM->Save(); return $ErrMessage if (defined $ErrMessage); - $ErrMessage = $Task->Run($Job->Id, $Step->No); + $ErrMessage = $Task->Run($Step); return $ErrMessage if (defined $ErrMessage); $Job->UpdateStatus(); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 28e0727..fd848f2 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -1,5 +1,5 @@ # Copyright 2009 Ge van Geldorp -# Copyright 2012 Francois Gouget +# Copyright 2012-2014 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -72,16 +72,13 @@ Where $Type corresponds to the Task's type. =back =cut -sub Run +sub Run($$) { - my $self = shift; - my ($JobId, $StepNo) = @_; + my ($self, $Step) = @_; $self->Status("running"); $self->Save(); - my $Job = WineTestBot::Jobs::CreateJobs()->GetItem($JobId); - my $Step = $Job->Steps->GetItem($StepNo); my $RunScript; if ($Step->Type eq "build") { @@ -95,8 +92,6 @@ sub Run { $RunScript = "RunTask.pl"; } - $Step = undef; - $Job = undef; $self->GetBackEnd()->PrepareForFork(); my $Pid = fork; @@ -107,7 +102,8 @@ sub Run elsif (!$Pid) { # Capture Perl errors in the task's generic error log - my $TaskDir = "$DataDir/jobs/$JobId/$StepNo/" . $self->No; + my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; + my $TaskDir = "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; mkdir $TaskDir; unlink "$TaskDir/err"; # truncate the log since this is a new run if (open(STDERR, ">>", "$TaskDir/err")) @@ -123,7 +119,7 @@ sub Run } $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; - exec("$BinDir/${ProjectName}$RunScript", $JobId, $StepNo, $self->No) or + exec("$BinDir/${ProjectName}$RunScript", $JobId, $StepNo, $TaskNo) or require WineTestBot::Log; WineTestBot::Log::LogMsg("Unable to exec ${ProjectName}$RunScript: $!\n"); exit(1);

1 0

Francois Gouget : testbot/lib: Make Collections try harder to return existing Item objects to avoid inconsistencies.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: tools Branch: master Commit: c1658af0dac543ad77c327eecb7216b8cadc0fdc URL: http://source.winehq.org/git/tools.git/?a=commit;h=c1658af0dac543ad77c327ee… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 12:40:27 2014 +0200 testbot/lib: Make Collections try harder to return existing Item objects to avoid inconsistencies. Assume we have the following code: 1: my $Jobs = CreateJobs(); 2: my $VM1 = $Jobs->GetItem(100)->Steps->GetItem(1)->Tasks->GetItem(1)->VM; 3: my $VM2 = $Jobs->GetItem(101)->Steps->GetItem(1)->Tasks->GetItem(1)->VM; 4: my $VM2b = $Jobs->GetItem(101)->Steps->GetItem(1)->Tasks->GetItem(1)->VM; 5: print $VM1->Name, " is ", $VM1->Status, "\n"; # Prints 'buildvm is idle' 6: print $VM2->Name, " is ", $VM2->Status, "\n"; # Prints 'buildvm is idle' 7: $VM1->Status('running'); 8: $VM1->Save(); 9: print $VM1->Name, " is ", $VM1->Status, "\n"; # Prints 'buildvm is running' 10: print $VM2->Name, " is ", $VM2->Status, "\n"; # Prints 'buildvm is idle' !!! 11: print $VM2b->Name, " is ", $VM2b->Status, "\n"; # Prints 'buildvm is running' The problem is that although $VM1, $VM2 and $VM2b refer to the same VM (buildvm), they are all separate objects. Then $VM2->Status gets loaded from the database for the print statement on line 6, and is then never refreshed; hence the out-of-date value printed on line 10. In contrast $VM2b->Status is loaded from database for the print statement on line 11 and thus shows the up-to-date value that was saved on line 8. This is very confusing. This patch associates a scope to each Collection and ensures that there is no duplicate Item objects within that scope. Further, any object created from a Collection inherits its scope. So in the example above, because all objects can ultimately be traced back to the $Jobs collection, $VM1, $VM2 and $VM2b all point to the same object which avoids any inconsistency. It's also possible to ensure that two Collections share the same scope by passing the reference collection as a parameter. For instance, in the above sample code, CreateVMs($Jobs)->GetItem('buildvm') will return $VM1. As before, creating a new Collection normally, CreateVMs() for instance, ensures gets a new, empty, scope and thus reload the objects from the database. This ensures the new objects will reflect changes made to the database by other processes. This is also why having a global persistent cache would not work. --- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/ObjectModel/Collection.pm | 199 +++++++++++++++++++++++---- testbot/lib/ObjectModel/DBIBackEnd.pm | 10 +- testbot/lib/ObjectModel/Item.pm | 27 +++- testbot/lib/WineTestBot/Branches.pm | 6 +- testbot/lib/WineTestBot/CGI/Sessions.pm | 5 +- testbot/lib/WineTestBot/Jobs.pm | 6 +- testbot/lib/WineTestBot/Patches.pm | 5 +- testbot/lib/WineTestBot/PendingPatchSets.pm | 5 +- testbot/lib/WineTestBot/PendingPatches.pm | 6 +- testbot/lib/WineTestBot/Roles.pm | 5 +- testbot/lib/WineTestBot/Steps.pm | 7 +- testbot/lib/WineTestBot/StepsTasks.pm | 6 +- testbot/lib/WineTestBot/Tasks.pm | 7 +- testbot/lib/WineTestBot/UserRoles.pm | 7 +- testbot/lib/WineTestBot/Users.pm | 6 +- testbot/lib/WineTestBot/VMs.pm | 6 +- testbot/web/JobDetails.pl | 2 +- 18 files changed, 250 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=c1658af0dac543ad77c3…

1 0

Francois Gouget : testbot/lib: Set the VM status to running in Task::Run() .
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: tools Branch: master Commit: cfde7ca87f7a2608b2c13939d9d41a52799ac751 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cfde7ca87f7a2608b2c13939… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 12:43:14 2014 +0200 testbot/lib: Set the VM status to running in Task::Run(). It's Task::Run() that starts the WineRun* processes, so it should be its responsibility to update the VM status. --- testbot/lib/WineTestBot/Jobs.pm | 5 +---- testbot/lib/WineTestBot/Tasks.pm | 8 ++++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b042bea..4532d4e 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -507,11 +507,8 @@ sub ScheduleOnHost($$$) { $IdleVMs{$VMKey} = 0; $IdleCount--; - $VM->Status("running"); - my ($ErrProperty, $ErrMessage) = $VM->Save(); - return $ErrMessage if (defined $ErrMessage); - $ErrMessage = $Task->Run($Step); + my $ErrMessage = $Task->Run($Step); return $ErrMessage if (defined $ErrMessage); $Job->UpdateStatus(); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index fd848f2..dd22749 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -79,6 +79,11 @@ sub Run($$) $self->Status("running"); $self->Save(); + my $VM = $self->VM; + $VM->Status("running"); + my ($ErrProperty, $ErrMessage) = $VM->Save(); + return $ErrMessage if (defined $ErrMessage); + my $RunScript; if ($Step->Type eq "build") { @@ -131,8 +136,7 @@ sub Run($$) # ChildPid should be ignored anyway if Status is not 'running'. $self->ChildPid($Pid); $self->Started(time); - my ($ErrProperty, $ErrMessage) = $self->Save(); - + ($ErrProperty, $ErrMessage) = $self->Save(); return $ErrMessage; }

1 0

Francois Gouget : testbot/lib: Make sure we have a consistent view of the VMs Status, no matter which Task we get the corresponding object from.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: tools Branch: master Commit: ad5dc5add5223edefd45ab693d238be5208b1c74 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ad5dc5add5223edefd45ab69… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 12:40:49 2014 +0200 testbot/lib: Make sure we have a consistent view of the VMs Status, no matter which Task we get the corresponding object from. This ensures we don't schedule two tasks on the same VM when there is more than one VM host. Specifically, in the single VM host scenario the scheduler actions go like this: Schedule Jobs on Host1 Load Job1 from database Load Step1 from database Load Task1 from database Load VM1 (e.g. buildvm) from database VM1 is idle -> start Task1 VM1->Status = running Save VM1 to the database Load Job2 from database Load Step2 from database Load Task2 from database Load VM2 (e.g. the same buildvm) from database -> VM2->Status is up to date VM2->Status is running -> nothing to do All done But in the two (or more) VM hosts scenario the first pass is when all the objects are being loaded from database, while the second one just reuses the already created Collections and Items. So in some cases scheduling goes like this: Schedule Jobs on Host1 Load Job1 from database Load Step1 from database Load Task1 from database Load VM1 (e.g. buildvm) from database VM1 is not on Host1 so continue Load Job2 from database Load Step2 from database Load Task2 from database Load VM2 (e.g. the same buildvm) from database VM2 is not on Host1 so continue Schedule Jobs on Host2 Job1 is already in memory Step1 is already in memory Task1 is already in memory VM1 is already in memory VM1 is idle -> start Task1 VM1->Status = running Save VM1 to the database Job2 is already in memory Step2 is already in memory Task2 is already in memory VM2 is already in memory -> VM2->Status has not been updated so VM2->Status is still idle -> start Task2 -> Bug!!! At this point we have two tasks trying to run on a single VM. When the first one completes the VM gets powered off, leaving the second one hanging. With this patch VM1 and VM2 are the same object, and thus we always have VM1->Status == VM2->Status which fixes this issue. --- testbot/lib/WineTestBot/Jobs.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 1bf9de6..8e36a32 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -429,11 +429,12 @@ $MaxVMsWhenIdle VMs (or $MaxActiveVMs if not set) for future jobs. =back =cut -sub ScheduleOnHost($$) +sub ScheduleOnHost($$$) { - my ($SortedJobs, $Hypervisors) = @_; + my ($ScopeObject, $SortedJobs, $Hypervisors) = @_; - my $HostVMs = CreateVMs(); + + my $HostVMs = CreateVMs($ScopeObject); $HostVMs->FilterEnabledRole(); $HostVMs->FilterHypervisors($Hypervisors); @@ -674,7 +675,7 @@ sub ScheduleJobs() # we should check if there are VMs to revert my %Hosts; - my $VMs = CreateVMs(); + my $VMs = CreateVMs($Jobs); $VMs->FilterEnabledRole(); foreach my $VM (@{$VMs->GetItems()}) { @@ -686,7 +687,7 @@ sub ScheduleJobs() foreach my $Host (keys %Hosts) { my @HostHypervisors = keys %{$Hosts{$Host}}; - my $HostErrMessage = ScheduleOnHost(\@SortedJobs, \@HostHypervisors); + my $HostErrMessage = ScheduleOnHost($Jobs, \@SortedJobs, \@HostHypervisors); push @ErrMessages, $HostErrMessage if (defined $HostErrMessage); } return @ErrMessages ? join("\n", @ErrMessages) : undef;

1 0

Nikolay Sivov : oledb32/tests: Simplify IMalloc handling.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 51a4fce54d9807043534ccf139c694c8800b13b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a4fce54d9807043534ccf13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:34:27 2014 +0400 oledb32/tests: Simplify IMalloc handling. --- dlls/oledb32/tests/Makefile.in | 2 +- dlls/oledb32/tests/database.c | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in index df71d64..1a4e07e 100644 --- a/dlls/oledb32/tests/Makefile.in +++ b/dlls/oledb32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = oledb32.dll -IMPORTS = uuid shell32 oleaut32 ole32 user32 gdi32 advapi32 +IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 C_SRCS = \ convert.c \ diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index b7020ab..a46725c 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -29,7 +29,6 @@ #include "ole2.h" #include "msdadc.h" #include "msdasc.h" -#include "shlobj.h" #include "msdaguid.h" #include "initguid.h" #include "oledberr.h" @@ -56,14 +55,6 @@ static void test_GetDataSource(WCHAR *initstring) if(SUCCEEDED(hr)) { IDBProperties *props = NULL; - IMalloc *ppM = NULL; - - hr = SHGetMalloc(&ppM); - if (FAILED(hr)) - { - ok(0, "Couldn't get IMalloc object.\n"); - goto end; - } hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); ok(hr == S_OK, "got %08x\n", hr); @@ -84,15 +75,12 @@ static void test_GetDataSource(WCHAR *initstring) pInfoset->rgPropertyInfos[i].vtType); } - IMalloc_Free(ppM, ary); + CoTaskMemFree(ary); } IDBProperties_Release(props); } - IMalloc_Release(ppM); - -end: IDBInitialize_Release(dbinit); }

1 0

Nikolay Sivov : msxml3/tests: Null-terminate a string before A-> W conversion (Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 1742449ad8497d100d34f534b30ef6ecafa56d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1742449ad8497d100d34f534b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:33:18 2014 +0400 msxml3/tests: Null-terminate a string before A->W conversion (Valgrind). --- dlls/msxml3/tests/saxreader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 1032b8c..646984f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3297,8 +3297,9 @@ static void test_mxwriter_flush(void) ok(pos2.QuadPart == 0, "expected stream beginning\n"); len = 2048; - buff = HeapAlloc(GetProcessHeap(), 0, len); + buff = HeapAlloc(GetProcessHeap(), 0, len+1); memset(buff, 'A', len); + buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len); EXPECT_HR(hr, S_OK); @@ -3344,6 +3345,7 @@ todo_wine ok(pos2.QuadPart == 0, "expected stream beginning\n"); memset(buff, 'A', len); + buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len - 8); EXPECT_HR(hr, S_OK); @@ -3368,6 +3370,7 @@ todo_wine EXPECT_HR(hr, S_OK); memset(buff, 'A', len); + buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len); EXPECT_HR(hr, S_OK);

1 0

Victor Martinez Calvo : ieframe: Compare against the correct IID in ShellUIHelper.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 9e828995c9e6f85a0411918eaf45b0f41362784c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e828995c9e6f85a0411918ea… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Fri May 2 19:20:05 2014 +0200 ieframe: Compare against the correct IID in ShellUIHelper. --- dlls/ieframe/shelluihelper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/shelluihelper.c b/dlls/ieframe/shelluihelper.c index 867505b..9dca681 100644 --- a/dlls/ieframe/shelluihelper.c +++ b/dlls/ieframe/shelluihelper.c @@ -45,7 +45,7 @@ static HRESULT WINAPI ShellUIHelper2_QueryInterface(IShellUIHelper2 *iface, REFI }else if(IsEqualGUID(&IID_IShellUIHelper, riid)) { TRACE("(%p)->(IID_IShellUIHelper %p)\n", This, ppv); *ppv = &This->IShellUIHelper2_iface; - }else if(IsEqualGUID(&IID_IShellUIHelper, riid)) { + }else if(IsEqualGUID(&IID_IShellUIHelper2, riid)) { TRACE("(%p)->(IID_IShellUIHelper2 %p)\n", This, ppv); *ppv = &This->IShellUIHelper2_iface; }else {

1 0

Piotr Caban : oleacc: Add GetProcessHandleFromHwnd implementation.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: d8467aee7472d07158258138aa5144557833cf29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8467aee7472d07158258138a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 3 14:27:35 2014 +0200 oleacc: Add GetProcessHandleFromHwnd implementation. --- dlls/oleacc/main.c | 12 ++++++++++++ dlls/oleacc/oleacc.spec | 1 + dlls/oleacc/tests/main.c | 27 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 2777a38..a80d6b4 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -332,6 +332,18 @@ void WINAPI GetOleaccVersionInfo(DWORD* pVersion, DWORD* pBuild) *pBuild = MAKELONG(0,0); } +HANDLE WINAPI GetProcessHandleFromHwnd(HWND hwnd) +{ + DWORD proc_id; + + TRACE("%p\n", hwnd); + + if(!GetWindowThreadProcessId(hwnd, &proc_id)) + return NULL; + return OpenProcess(PROCESS_DUP_HANDLE | PROCESS_VM_OPERATION | + PROCESS_VM_READ | PROCESS_VM_WRITE | SYNCHRONIZE, TRUE, proc_id); +} + UINT WINAPI GetRoleTextW(DWORD role, LPWSTR lpRole, UINT rolemax) { INT ret; diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 6851454..dc92172 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -9,6 +9,7 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stdcall GetOleaccVersionInfo(ptr ptr) +@ stdcall GetProcessHandleFromHwnd(ptr) @ stdcall GetRoleTextA(long ptr long) @ stdcall GetRoleTextW(long ptr long) @ stub GetStateTextA diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 0162d72..186a71b 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -279,6 +279,32 @@ static void test_AccessibleObjectFromWindow(void) DestroyWindow(hwnd); } +static void test_GetProcessHandleFromHwnd(void) +{ + HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); + HANDLE proc; + HWND hwnd; + + pGetProcessHandleFromHwnd = (void*)GetProcAddress( + GetModuleHandleA("oleacc.dll"), "GetProcessHandleFromHwnd"); + if(!pGetProcessHandleFromHwnd) { + win_skip("GetProcessHandleFromHwnd not available\n"); + return; + } + + proc = pGetProcessHandleFromHwnd(NULL); + ok(!proc, "proc = %p\n", proc); + + hwnd = CreateWindowA("static", "", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + + proc = pGetProcessHandleFromHwnd(hwnd); + ok(proc != NULL, "proc == NULL\n"); + CloseHandle(proc); + + DestroyWindow(hwnd); +} + static void test_default_client_accessible_object(void) { static const WCHAR testW[] = {'t','e','s','t',' ','t',' ','&','j','u','n','k',0}; @@ -417,6 +443,7 @@ START_TEST(main) test_getroletext(); test_LresultFromObject(argv[0]); test_AccessibleObjectFromWindow(); + test_GetProcessHandleFromHwnd(); test_default_client_accessible_object(); unregister_window_class();

1 0

Zhenbo Li : mshtml: Removed invalid nsAString_InitDepend from HTMLTableRow_put_bgColor and fixed error handling.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 8192f54998b8ed3f892243ea5f6e84c6ca5d662a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8192f54998b8ed3f892243ea5… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat May 3 17:40:17 2014 +0800 mshtml: Removed invalid nsAString_InitDepend from HTMLTableRow_put_bgColor and fixed error handling. --- dlls/mshtml/htmltablerow.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 74750bd..331d6c9 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -175,8 +175,9 @@ static HRESULT WINAPI HTMLTableRow_put_bgColor(IHTMLTableRow *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - nsAString_InitDepend(&val, V_BSTR(&v)); - variant_to_nscolor(&v, &val); + if (!variant_to_nscolor(&v, &val)) + return S_OK; + nsres = nsIDOMHTMLTableRowElement_SetBgColor(This->nsrow, &val); nsAString_Finish(&val);

1 0

Nikolay Sivov : ntdll: Fix a 'tlbid' string value leak (Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 4a284644843913231d81997c302e8ceed20a33e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a284644843913231d81997c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:32:39 2014 +0400 ntdll: Fix a 'tlbid' string value leak (Valgrind). --- dlls/ntdll/actctx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 5d88b9a..14e196f 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -851,6 +851,7 @@ static void free_entity_array(struct entity_array *array) RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.base); RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.ps32); RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.name); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.tlib); break; case ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION: RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.tlbid);

1 0

Vincent Povirk : ole32: Initial implementation of transaction locking.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 4f0d36d9a0339f5f853064bbf4fdc0d320ab82f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0d36d9a0339f5f853064bbf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 14:55:56 2014 -0500 ole32: Initial implementation of transaction locking. --- dlls/ole32/storage32.c | 310 ++++++++++++++++++++++++++++++++---------- dlls/ole32/storage32.h | 28 ++++ dlls/ole32/tests/storage32.c | 4 +- 3 files changed, 268 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f0d36d9a0339f5f85306…

1 0

Victor Martinez Calvo : quartz: Check correct dwReserved item before tracing.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 2dbfb2af840e3239435564f070c65876eb14b012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbfb2af840e3239435564f07… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Fri May 2 19:21:44 2014 +0200 quartz: Check correct dwReserved item before tracing. --- dlls/quartz/avisplit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 6cd28da..d74c8ab 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -820,7 +820,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE TRACE("dwChunkId: %.4s\n", (const char *)&pIndex->dwChunkId); if (pIndex->dwReserved[0]) TRACE("dwReserved[0]: %u\n", pIndex->dwReserved[0]); - if (pIndex->dwReserved[2]) + if (pIndex->dwReserved[1]) TRACE("dwReserved[1]: %u\n", pIndex->dwReserved[1]); if (pIndex->dwReserved[2]) TRACE("dwReserved[2]: %u\n", pIndex->dwReserved[2]);

1 0

Victor Martinez Calvo : msdmo: Actually copy output string in IEnumDMO_fnNext.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 0aea3728cca741913410534f411422905e3b8f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aea3728cca741913410534f4… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Fri May 2 19:27:00 2014 +0200 msdmo: Actually copy output string in IEnumDMO_fnNext. --- dlls/msdmo/dmoreg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index fb1caa1..e0c0719 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -615,9 +615,9 @@ static HRESULT WINAPI IEnumDMO_fnNext( hres = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szValue, &len); if (ERROR_SUCCESS == hres) { - Names[count] = HeapAlloc(GetProcessHeap(), 0, strlenW(szValue) + 1); + Names[count] = HeapAlloc(GetProcessHeap(), 0, (strlenW(szValue) + 1) * sizeof(WCHAR)); if (Names[count]) - strcmpW(Names[count], szValue); + strcpyW(Names[count], szValue); } wsprintfW(szGuidKey,szToGuidFmt,szNextKey); CLSIDFromString(szGuidKey, &pCLSID[count]);

1 0

Victor Martinez Calvo : shlwapi: Check correct attributes in PathRelativePath.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: c2ff8f400568d875b87320048098543e78b16f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ff8f400568d875b87320048… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Fri May 2 19:35:24 2014 +0200 shlwapi: Check correct attributes in PathRelativePath. --- dlls/shlwapi/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index eba1f69..080c243 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3533,7 +3533,7 @@ BOOL WINAPI PathRelativePathToW(LPWSTR lpszPath, LPCWSTR lpszFrom, DWORD dwAttrF if(!(dwAttrFrom & FILE_ATTRIBUTE_DIRECTORY)) PathRemoveFileSpecW(szFrom); - if(!(dwAttrFrom & FILE_ATTRIBUTE_DIRECTORY)) + if(!(dwAttrTo & FILE_ATTRIBUTE_DIRECTORY)) PathRemoveFileSpecW(szTo); /* Paths can only be relative if they have a common root */

1 0

Nikolay Sivov : msxml3: Fix a string leak in msxml6 mode (Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: c7f1262613c83cef476dafe9bb7e912148b9c6f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f1262613c83cef476dafe9b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:33:51 2014 +0400 msxml3: Fix a string leak in msxml6 mode (Valgrind). --- dlls/msxml3/schema.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index a4aa083..d694cb3 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1318,11 +1318,13 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection2* iface, BSTR uri) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - xmlChar* name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); + xmlChar* name; + TRACE("(%p)->(%s)\n", This, debugstr_w(uri)); if (This->version == MSXML6) return E_NOTIMPL; + name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); cache_remove_entry(This, name); heap_free(name); return S_OK;

1 0

Nikolay Sivov : dmime: Fix handling of NULL out pointer in QI.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: a596cbb8478372411f8596e28b68ff547ec6aee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a596cbb8478372411f8596e28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:35:15 2014 +0400 dmime: Fix handling of NULL out pointer in QI. --- dlls/dmime/segmentstate.c | 3 +++ dlls/dmime/tests/dmime.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index 8a9ed1f..b1b176c 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -37,6 +37,9 @@ static HRESULT WINAPI DirectMusicSegmentState8_QueryInterface(IDirectMusicSegmen TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); + if (!ppobj) + return E_POINTER; + *ppobj = NULL; if (IsEqualIID(riid, &IID_IUnknown) || diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 669e99e..c1c2caa 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -293,6 +293,9 @@ static void test_COM_segmentstate(void) ok(refcount == 4, "refcount == %u, expected 4\n", refcount); refcount = IUnknown_Release(unk); + hr = IDirectMusicSegmentState8_QueryInterface(dmss8, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got %08x\n", hr); + while (IDirectMusicSegmentState8_Release(dmss8)); }

1 0

Nikolay Sivov : scrrun: Fix use-after-free of version info (Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: c50503d049bd28a05c7a17e16c996c3ac497a138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c50503d049bd28a05c7a17e16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 5 13:58:03 2014 +0400 scrrun: Fix use-after-free of version info (Valgrind). --- dlls/scrrun/filesystem.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index b04637c..b2a1a35 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3657,11 +3657,15 @@ static HRESULT WINAPI filesys_GetFileVersion(IFileSystem3 *iface, BSTR name, BST } ret = VerQueryValueW(ptr, rootW, (void**)&info, &len); - heap_free(ptr); if (!ret) + { + heap_free(ptr); return HRESULT_FROM_WIN32(GetLastError()); + } get_versionstring(info, ver); + heap_free(ptr); + *version = SysAllocString(ver); TRACE("version=%s\n", debugstr_w(ver));

1 0

Nikolay Sivov : scrrun: Fix invalid read/write access to path buffer ( Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 8595d70203c207e75403fb6e7c55d5e18d852456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8595d70203c207e75403fb6e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 5 13:58:25 2014 +0400 scrrun: Fix invalid read/write access to path buffer (Valgrind). --- dlls/scrrun/filesystem.c | 3 --- dlls/scrrun/tests/filesystem.c | 55 +++++++++++++++++++++++++--------------- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index b2a1a35..aead0d2 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2721,9 +2721,6 @@ static HRESULT create_file(BSTR path, IFile **file) return E_FAIL; } - if(path[len-1]=='/' || path[len-1]=='\\') - path[len-1] = 0; - attrs = GetFileAttributesW(f->path); if(attrs==INVALID_FILE_ATTRIBUTES || (attrs&(FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_DEVICE))) { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c258a0f..409cf4b 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -45,6 +45,15 @@ static const WCHAR crlfW[] = {'\r','\n',0}; #define GET_REFCOUNT(iface) \ get_refcount((IUnknown*)iface) +static inline void get_temp_path(const WCHAR *prefix, WCHAR *path) +{ + WCHAR buffW[MAX_PATH]; + + GetTempPathW(MAX_PATH, buffW); + GetTempFileNameW(buffW, prefix, 0, path); + DeleteFileW(path); +} + static void test_interfaces(void) { static const WCHAR nonexistent_dirW[] = { @@ -129,15 +138,13 @@ static void test_interfaces(void) static void test_createfolder(void) { - WCHAR pathW[MAX_PATH], buffW[MAX_PATH]; + WCHAR buffW[MAX_PATH]; HRESULT hr; BSTR path; IFolder *folder; BOOL ret; - GetTempPathW(MAX_PATH, pathW); - GetTempFileNameW(pathW, NULL, 0, buffW); - DeleteFileW(buffW); + get_temp_path(NULL, buffW); ret = CreateDirectoryW(buffW, NULL); ok(ret, "got %d, %d\n", ret, GetLastError()); @@ -528,33 +535,31 @@ static void test_GetAbsolutePathName(void) static void test_GetFile(void) { - static const WCHAR get_file[] = {'g','e','t','_','f','i','l','e','.','t','s','t',0}; - - BSTR path = SysAllocString(get_file); + static const WCHAR slW[] = {'\\',0}; + BSTR path; + WCHAR pathW[MAX_PATH]; FileAttribute fa; VARIANT size; DWORD gfa; IFile *file; HRESULT hr; HANDLE hf; + BOOL ret; + get_temp_path(NULL, pathW); + + path = SysAllocString(pathW); hr = IFileSystem3_GetFile(fs3, path, NULL); ok(hr == E_POINTER, "GetFile returned %x, expected E_POINTER\n", hr); hr = IFileSystem3_GetFile(fs3, NULL, &file); ok(hr == E_INVALIDARG, "GetFile returned %x, expected E_INVALIDARG\n", hr); - if(GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES) { - skip("File already exists, skipping GetFile tests\n"); - SysFreeString(path); - return; - } - file = (IFile*)0xdeadbeef; hr = IFileSystem3_GetFile(fs3, path, &file); ok(!file, "file != NULL\n"); ok(hr == CTL_E_FILENOTFOUND, "GetFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); - hf = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); + hf = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); if(hf == INVALID_HANDLE_VALUE) { skip("Can't create temporary file\n"); SysFreeString(path); @@ -566,7 +571,7 @@ static void test_GetFile(void) ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); hr = IFile_get_Attributes(file, &fa); - gfa = GetFileAttributesW(get_file) & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | + gfa = GetFileAttributesW(pathW) & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ARCHIVE | FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_COMPRESSED); ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); @@ -589,6 +594,18 @@ static void test_GetFile(void) ok(hr == CTL_E_FILENOTFOUND, "DeleteFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); SysFreeString(path); + + /* try with directory */ + lstrcatW(pathW, slW); + ret = CreateDirectoryW(pathW, NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + + path = SysAllocString(pathW); + hr = IFileSystem3_GetFile(fs3, path, &file); + ok(hr == CTL_E_FILENOTFOUND, "GetFile returned %x, expected S_OK\n", hr); + SysFreeString(path); + + RemoveDirectoryW(pathW); } static inline BOOL create_file(const WCHAR *name) @@ -858,9 +875,7 @@ static void test_FolderCollection(void) BSTR str; int found_a = 0, found_b = 0, found_c = 0; - GetTempPathW(MAX_PATH, pathW); - GetTempFileNameW(pathW, fooW, 0, buffW); - DeleteFileW(buffW); + get_temp_path(fooW, buffW); CreateDirectoryW(buffW, NULL); str = SysAllocString(buffW); @@ -1042,9 +1057,7 @@ static void test_FileCollection(void) HANDLE file_a, file_b, file_c; int found_a = 0, found_b = 0, found_c = 0; - GetTempPathW(MAX_PATH, pathW); - GetTempFileNameW(pathW, fooW, 0, buffW); - DeleteFileW(buffW); + get_temp_path(fooW, buffW); CreateDirectoryW(buffW, NULL); str = SysAllocString(buffW);

1 0

Marcus Meissner : ver.dll16: filelen is an in/out parameter (Coverity).
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: e3997294621471a077480787e8961a45351875e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3997294621471a077480787e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 4 12:52:31 2014 +0200 ver.dll16: filelen is an in/out parameter (Coverity). --- dlls/ver.dll16/version.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index 5abe1c4..b2cb9ae 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -522,7 +522,8 @@ DWORD WINAPI VerInstallFile16( UINT16 flags, LPSTR lpszSrcDir, LPSTR lpszDestDir, LPSTR lpszCurDir, LPSTR lpszTmpFile, UINT16 *lpwTmpFileLen ) { - UINT filelen; + UINT filelen = *lpwTmpFileLen; + DWORD retv = VerInstallFileA( flags, lpszSrcFilename, lpszDestFilename, lpszSrcDir, lpszDestDir, lpszCurDir, lpszTmpFile, &filelen);

1 0

Nikolay Sivov : msxml3/tests: Fix a BSTR leak (Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 30410d48fd46e9e58f35e96df9aa323520444bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=30410d48fd46e9e58f35e96df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:33:03 2014 +0400 msxml3/tests: Fix a BSTR leak (Valgrind). --- dlls/msxml3/tests/domdoc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7a2f984..8d8c7c0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11045,7 +11045,6 @@ static void test_xmlns_attribute(void) hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); EXPECT_HR(hr, S_OK); - str = SysAllocString(szAttribute); hr = IXMLDOMDocument_createAttribute(doc, _bstr_("xmlns:dt"), &pAttribute); ok( hr == S_OK, "returns %08x\n", hr ); @@ -11062,16 +11061,16 @@ static void test_xmlns_attribute(void) hr = IXMLDOMDocument_get_documentElement(doc, &elem); EXPECT_HR(hr, S_OK); + str = NULL; hr = IXMLDOMElement_get_xml(elem, &str); ok( hr == S_OK, "got 0x%08x\n", hr); todo_wine ok( lstrcmpW(str, _bstr_("<Testing xmlns:dt=\"urn:schemas-microsoft-com:datatypes\" dt:dt=\"bin.base64\"/>")) == 0, "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); IXMLDOMElement_Release(elem); IXMLDOMAttribute_Release( pAttribute); - SysFreeString(str); - IXMLDOMDocument_Release(doc); free_bstrs();

1 0

Nikolay Sivov : oledb32: Fix IDBInitialize instance leak on error path ( Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 3804423f8cd65922ee74e7722b407769916c5f29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3804423f8cd65922ee74e7722… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:34:09 2014 +0400 oledb32: Fix IDBInitialize instance leak on error path (Valgrind). --- dlls/oledb32/datainit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 9fe3c4f..dfafeb1 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -205,7 +205,7 @@ static const IDBInitializeVtbl dbinit_vtbl = dbinit_Uninitialize }; -static HRESULT create_db_init(void **obj) +static HRESULT create_db_init(IUnknown **obj) { dbinit *This; @@ -220,7 +220,7 @@ static HRESULT create_db_init(void **obj) This->IDBProperties_iface.lpVtbl = &dbprops_vtbl; This->ref = 1; - *obj = &This->IDBInitialize_iface; + *obj = (IUnknown*)&This->IDBInitialize_iface; return S_OK; } @@ -512,7 +512,7 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o hr = CoCreateInstance(&provclsid, outer, clsctx, riid, (void**)datasource); if (FAILED(hr) && IsEqualIID(riid, &IID_IDBInitialize)) - hr = create_db_init((void**)datasource); + hr = create_db_init(datasource); } /* now set properties */ @@ -555,7 +555,7 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o hr = set_dbpropset(name, value, &propset); SysFreeString(name); SysFreeString(value); - if (FAILED(hr)) return hr; + if (FAILED(hr)) break; hr = IDBProperties_SetProperties(dbprops, 1, propset); free_dbpropset(1, propset);

1 0

Nikolay Sivov : msxml3/tests: Fix some stream instance leaks (Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: c9c47459a9709699c2d717d07d6da50f42e91468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c47459a9709699c2d717d07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:33:35 2014 +0400 msxml3/tests: Fix some stream instance leaks (Valgrind). --- dlls/msxml3/tests/saxreader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 646984f..6c6a1b8 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2443,6 +2443,7 @@ static void test_saxreader(void) hr = ISAXXMLReader_parse(reader, var); EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "attribute value normalization", TRUE); + IStream_Release(stream); resolver = (void*)0xdeadbeef; hr = ISAXXMLReader_getEntityResolver(reader, &resolver); @@ -2476,6 +2477,8 @@ static void test_saxreader(void) sprintf(seqname, "%s: cdata test", table->name); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, seqname, TRUE); + IStream_Release(stream); + /* 2. CDATA sections */ stream = create_test_stream(test2_cdata_xml, -1); V_VT(&var) = VT_UNKNOWN; @@ -4244,6 +4247,7 @@ static void test_mxwriter_stream(void) EXPECT_HR(hr, S_OK); ok(pos2.QuadPart == 2, "got wrong position\n"); + IStream_Release(stream); ISAXContentHandler_Release(content); IMXWriter_Release(writer); @@ -5509,6 +5513,7 @@ static void test_mxattr_localname(void) ISAXAttributes_Release(saxattr); IMXAttributes_Release(mxattr); + free_bstrs(); } }

1 0

Vincent Povirk : ole32: Accept STGM_TRANSACTED with no share mode specified.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: b4ade51a84a8cf865e6980d480cacb878a66b0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ade51a84a8cf865e6980d48… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 11:25:25 2014 -0500 ole32: Accept STGM_TRANSACTED with no share mode specified. --- dlls/ole32/storage32.c | 7 +++++++ dlls/ole32/tests/storage32.c | 9 +++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 72c52f1..a2d00b1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8251,6 +8251,10 @@ static HRESULT validateSTGM(DWORD stgm) case STGM_SHARE_DENY_WRITE: case STGM_SHARE_EXCLUSIVE: break; + case 0: + if (!(stgm & STGM_TRANSACTED)) + return E_FAIL; + break; default: return E_FAIL; } @@ -8306,6 +8310,9 @@ static DWORD GetShareModeFromSTGM(DWORD stgm) { switch (STGM_SHARE_MODE(stgm)) { + case 0: + assert(stgm & STGM_TRANSACTED); + /* fall-through */ case STGM_SHARE_DENY_NONE: return FILE_SHARE_READ | FILE_SHARE_WRITE; case STGM_SHARE_DENY_READ: diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 2cb73ce..b5c93ae 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3178,9 +3178,9 @@ static const struct lock_test lock_tests[] = { { STGM_CREATE|STGM_WRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, wodw_locked_bytes, 0, FALSE }, { 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, TRUE }, + { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_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, 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 }, { STGM_READ|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE }, }; @@ -3280,10 +3280,7 @@ static void test_locking(void) IStorage_Release(stg); hr = StgOpenStorage(filename, NULL, current->stg_mode, NULL, 0, &stg); - if (current->stg_mode == (STGM_READ|STGM_TRANSACTED) || current->stg_mode == (STGM_READWRITE|STGM_TRANSACTED)) - todo_wine ok(SUCCEEDED(hr), "StgOpenStorage with mode %x failed with hr %x\n", current->stg_mode, hr); - else - ok(SUCCEEDED(hr), "StgOpenStorage with mode %x failed with hr %x\n", current->stg_mode, hr); + ok(SUCCEEDED(hr), "StgOpenStorage with mode %x failed with hr %x\n", current->stg_mode, hr); if (FAILED(hr)) { DeleteFileW(filename);

1 0

Vincent Povirk : ole32: Use share modes when creating storage files.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 04735d6f398ffb4a93dbf81778765e35c4f414fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=04735d6f398ffb4a93dbf8177… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 10:27:25 2014 -0500 ole32: Use share modes when creating storage files. --- dlls/ole32/storage32.c | 9 +-------- dlls/ole32/tests/storage32.c | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b9e20d8..fd8fe32 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7562,7 +7562,7 @@ static HRESULT create_storagefile( /* * Interpret the STGM value grfMode */ - shareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; + shareMode = GetShareModeFromSTGM(grfMode); accessMode = GetAccessModeFromSTGM(grfMode); if (grfMode & STGM_DELETEONRELEASE) @@ -7570,13 +7570,6 @@ static HRESULT create_storagefile( else fileAttributes = FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS; - if (STGM_SHARE_MODE(grfMode) && !(grfMode & STGM_SHARE_DENY_NONE)) - { - static int fixme; - if (!fixme++) - FIXME("Storage share mode not implemented.\n"); - } - *ppstgOpen = 0; hFile = CreateFileW(pwcsName, diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 6162e61..5eb80bc 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3176,8 +3176,8 @@ static const struct lock_test lock_tests[] = { { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, TRUE }, { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, TRUE }, { STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, 0, FALSE }, - { STGM_CREATE|STGM_READWRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, 0, TRUE }, - { STGM_CREATE|STGM_WRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, wodw_locked_bytes, 0, TRUE }, + { STGM_CREATE|STGM_READWRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, 0, FALSE }, + { STGM_CREATE|STGM_WRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, wodw_locked_bytes, 0, FALSE }, { STGM_SHARE_EXCLUSIVE|STGM_READWRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, TRUE }, { STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, TRUE }, { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_fail_ranges, TRUE },

1 0

Vincent Povirk : ole32: Use symbolic names for range lock offsets.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: a60d41d70ad76df44e29051aa9f01a987ee3581c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60d41d70ad76df44e29051aa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 2 12:52:00 2014 -0500 ole32: Use symbolic names for range lock offsets. --- dlls/ole32/storage32.c | 61 +++++++++++++++++------------------------------- dlls/ole32/storage32.h | 47 ++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a60d41d70ad76df44e290…

1 0

Vincent Povirk : ole32: Map STGM_SHARE_EXCLUSIVE to FILE_SHARE_READ.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 6417a277cf4bdb3a739446d900d07269498d81a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6417a277cf4bdb3a739446d90… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 10:53:26 2014 -0500 ole32: Map STGM_SHARE_EXCLUSIVE to FILE_SHARE_READ. --- dlls/ole32/storage32.c | 3 +-- dlls/ole32/tests/storage32.c | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fd8fe32..72c52f1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8311,9 +8311,8 @@ static DWORD GetShareModeFromSTGM(DWORD stgm) case STGM_SHARE_DENY_READ: return FILE_SHARE_WRITE; case STGM_SHARE_DENY_WRITE: - return FILE_SHARE_READ; case STGM_SHARE_EXCLUSIVE: - return 0; + return FILE_SHARE_READ; } ERR("Invalid share mode!\n"); assert(0); diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 5eb80bc..2cb73ce 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -868,11 +868,9 @@ static void test_storage_refcount(void) r = StgOpenStorage( filename, NULL, STGM_PRIORITY, NULL, 0, &stgprio); ok(r==S_OK, "StgOpenStorage failed with error 0x%08x\n", r); - todo_wine { /* non-transacted mode read/write fails */ r = StgOpenStorage( filename, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg); ok(r==STG_E_LOCKVIOLATION, "StgOpenStorage should return STG_E_LOCKVIOLATION instead of 0x%08x\n", r); - } /* non-transacted mode read-only succeeds */ r = StgOpenStorage( filename, NULL, STGM_SHARE_DENY_WRITE|STGM_READ, NULL, 0, &stg); @@ -3173,13 +3171,13 @@ static const int roex_fail_ranges[] = { 0x0,-1 }; static const struct lock_test lock_tests[] = { { STGM_PRIORITY, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, priority_locked_bytes, pr_fail_ranges, FALSE }, - { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, TRUE }, - { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, TRUE }, + { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, FALSE }, + { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, FALSE }, { STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, 0, FALSE }, { STGM_CREATE|STGM_READWRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, 0, FALSE }, { STGM_CREATE|STGM_WRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, wodw_locked_bytes, 0, FALSE }, - { STGM_SHARE_EXCLUSIVE|STGM_READWRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, TRUE }, - { STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, TRUE }, + { 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, TRUE }, { 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, TRUE },

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: CreateJobs() is a function, not a class method.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: tools Branch: master Commit: 7d089311a0f6430894251b0c47e2800bae94d59d URL: http://source.winehq.org/git/tools.git/?a=commit;h=7d089311a0f6430894251b0c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 2 19:51:06 2014 +0200 testbot/CheckForWinetestUpdate: CreateJobs() is a function, not a class method. --- testbot/bin/CheckForWinetestUpdate.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index c61fdba..6d33a5c 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -57,7 +57,7 @@ sub AddJob my ($BaseJob, $FileNameRandomPart, $Bits) = @_; # First create a new job - my $Jobs = WineTestBot::Jobs->CreateJobs(); + my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 6 : 7); @@ -118,7 +118,7 @@ sub AddJob sub AddReconfigJob { # First create a new job - my $Jobs = WineTestBot::Jobs->CreateJobs(); + my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority(3);

1 0

Francois Gouget : testbot: GetBatchUser() is a function, not a class method.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: tools Branch: master Commit: e61a2389553d4e5e8d263ff8e04abae4ebc5623f URL: http://source.winehq.org/git/tools.git/?a=commit;h=e61a2389553d4e5e8d263ff8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 2 19:50:42 2014 +0200 testbot: GetBatchUser() is a function, not a class method. CreateUsers() is not a class method so there it no reason for GetBatchUser() to call it as if it was. --- testbot/bin/CheckForWinetestUpdate.pl | 5 +++-- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/lib/WineTestBot/Users.pm | 6 ++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 8cbcc9c..c61fdba 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -46,6 +46,7 @@ use HTTP::Response; use HTTP::Status; use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::Users; use WineTestBot::Log; use WineTestBot::Utils; use WineTestBot::VMs; @@ -58,7 +59,7 @@ sub AddJob # First create a new job my $Jobs = WineTestBot::Jobs->CreateJobs(); my $NewJob = $Jobs->Add(); - $NewJob->User(WineTestBot::Users->GetBatchUser()); + $NewJob->User(GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 6 : 7); $NewJob->Remarks("WineTest: " . ($Bits == 32 ? ($BaseJob ? "base" : "other") : "64-bit") . @@ -119,7 +120,7 @@ sub AddReconfigJob # First create a new job my $Jobs = WineTestBot::Jobs->CreateJobs(); my $NewJob = $Jobs->Add(); - $NewJob->User(WineTestBot::Users->GetBatchUser()); + $NewJob->User(GetBatchUser()); $NewJob->Priority(3); $NewJob->Remarks("Update Wine to latest git"); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index a478fbf..cebb064 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -180,7 +180,7 @@ sub Submit } if (! defined($User)) { - $User = $Users->GetBatchUser(); + $User = GetBatchUser(); } my $Disposition = "Submitted job "; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 1f09446..ba1f6c3 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -404,11 +404,9 @@ sub Authenticate $self->AuthenticateBuiltin(@_); } -sub GetBatchUser +sub GetBatchUser() { - my $class = shift; - - return $class->CreateUsers()->GetItem("batch"); + return CreateUsers()->GetItem("batch"); } 1;

1 0

Francois Gouget : testbot/CGI: Fix the GetCurrentSession() call in ObjectModel::CGI::Page.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: tools Branch: master Commit: ca706ed1b11197b5e368ffd57544c2814f0852e7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ca706ed1b11197b5e368ffd5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 2 19:51:39 2014 +0200 testbot/CGI: Fix the GetCurrentSession() call in ObjectModel::CGI::Page. It was passing too many parameters. --- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 0661519..331243c 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -172,7 +172,7 @@ sub GetCurrentSession { my $self = shift; - return $self->{PageBase}->GetCurrentSession($self, @_); + return $self->{PageBase}->GetCurrentSession(); } sub SetCurrentSession

1 0

Francois Gouget : testbot/Engine: Use rmtree() instead of running 'rm -rf' .
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: tools Branch: master Commit: 9c38a40a2e870b92b0161d0268ce8512b2e29be1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9c38a40a2e870b92b0161d02… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 2 19:51:19 2014 +0200 testbot/Engine: Use rmtree() instead of running 'rm -rf'. --- testbot/bin/Engine.pl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index a12f263..f0570d7 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -40,7 +40,10 @@ use Fcntl; use MIME::Parser; use POSIX ":sys_wait_h"; use Socket; +use File::Path; + use ObjectModel::BackEnd; + use WineTestBot::Config; use WineTestBot::Engine::Events; use WineTestBot::Engine::Notify; @@ -465,7 +468,11 @@ sub HandleWinePatchMLSubmission CreatePatches()->NewPatch($Entity); # Clean up - system("rm -rf $WorkDir"); + if (!rmtree($WorkDir)) + { + # Not a fatal error but log it to help diagnosis + LogMsg "Unable to delete '$WorkDir': $!\n"; + } unlink($FullMessageFileName); return "1OK"; @@ -507,7 +514,11 @@ sub HandleWinePatchWebSubmission my $ErrMessage = CreatePatches()->NewPatch($Entity, $WebPatchId); # Clean up - system("rm -rf $WorkDir"); + if (!rmtree($WorkDir)) + { + # Not a fatal error but log it to help diagnosis + LogMsg "Unable to delete '$WorkDir': $!\n"; + } unlink($FullFileName); return defined($ErrMessage) ? "0" . $ErrMessage : "1OK";

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman May 5, 2014

May 5, 2014

Module: website Branch: master Commit: fc6d4afd6a6ef60bffabb3ef6ec1016b2187619e URL: http://source.winehq.org/git/website.git/?a=commit;h=fc6d4afd6a6ef60bffabb3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon May 5 08:53:33 2014 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.18
by Jeremy Newman May 5, 2014

May 5, 2014

Module: website Branch: master Commit: cfd6ab009a795276b37021fd04a50c40b7ca62bc URL: http://source.winehq.org/git/website.git/?a=commit;h=cfd6ab009a795276b37021… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat May 3 07:25:29 2014 +0200 Polish translation for release 1.7.18 --- news/pl/2014050201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2014050201.xml b/news/pl/2014050201.xml new file mode 100644 index 0000000..bfc8872 --- /dev/null +++ b/news/pl/2014050201.xml @@ -0,0 +1,17 @@ +<news> +<date>Maj 2, 2014</date> +<title>Wydano Wine 1.7.18</title> +<body> + Wydanie rozwojowe Wine 1.7.18 jest już dostępne. + <a href="{$root}/announce/1.7.18">Co nowego</a> w tym wydaniu: +<ul> + <li>Ulepszona obsługa obiektów dostępności OLE.</li> + <li>Ulepszenia w wymiarowaniu okien w sterowniku Mac.</li> + <li>Poprawki dla różnych problemów z pamięcią znalezione przez Valgrind.</li> + <li>Kilka funkcji MSHTML więcej.</li> + <li>Kilka porządków w DirectDraw.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.18.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Wine 1.7.18 freigegeben
by Jeremy Newman May 5, 2014

May 5, 2014

Module: website Branch: master Commit: 9cb34ee1d5ee61ac9c31b97447ee087f14a8f479 URL: http://source.winehq.org/git/website.git/?a=commit;h=9cb34ee1d5ee61ac9c31b9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat May 3 18:56:50 2014 +0200 Wine 1.7.18 freigegeben --- news/de/2014050201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2014050201.xml b/news/de/2014050201.xml new file mode 100644 index 0000000..506ee6d --- /dev/null +++ b/news/de/2014050201.xml @@ -0,0 +1,17 @@ +<news> +<date>2. Mai 2014</date> +<title>Wine 1.7.18 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte OLE Accessible Object Unterstützung.</li> + <li>Verbesserungen an der Fenstergrößenanpassung im Mac Treiber.</li> + <li>Fehlerbehebungen für verschiedene Speicherprobleme die mit Valgrind gefunden wurden.</li> + <li>Ein paar neue MSHTML Funktionen.</li> + <li>Einige Aufräumarbeiten an DirectDraw.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.18.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.18
by Jeremy Newman May 5, 2014

May 5, 2014

Module: website Branch: master Commit: 7c8ada766ee0008d5ad9008c092e7c536d6fed76 URL: http://source.winehq.org/git/website.git/?a=commit;h=7c8ada766ee0008d5ad900… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat May 3 08:39:23 2014 +0200 French translation for release 1.7.18 --- news/fr/2014050201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2014050201.xml b/news/fr/2014050201.xml new file mode 100644 index 0000000..ce52717 --- /dev/null +++ b/news/fr/2014050201.xml @@ -0,0 +1,16 @@ +<news> +<date>2 mai 2014</date> +<title>Sortie de Wine 1.7.18</title> +<body> + La version de développement 1.7.18 de Wine est disponible. + <a href="{$root}/announce/1.7.18">Nouveautés</a> de cette version : +<ul> + <li>Meilleure prise en charge de l'API OLE Accessible Object.</li> + <li>Améliorations au dimensionnement des fenêtres dans le pilote Mac.</li> + <li>Correctifs pour différents problèmes mémoire signalés par Valgrind.</li> + <li>Fonctions MSHTML supplémentaires.</li> + <li>Quelques nettoyages dans DirectDraw.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.18.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.18
by Jeremy Newman May 5, 2014

May 5, 2014

Module: website Branch: master Commit: a672e2d09347b9fb72a90378f7d953bee4d0be4a URL: http://source.winehq.org/git/website.git/?a=commit;h=a672e2d09347b9fb72a903… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri May 2 23:56:12 2014 +0300 Ukrainian translation for release 1.7.18 --- news/uk/2014050201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/uk/2014050201.xml b/news/uk/2014050201.xml new file mode 100644 index 0000000..2797465 --- /dev/null +++ b/news/uk/2014050201.xml @@ -0,0 +1,17 @@ +<news> +<date>2 травня 2014</date> +<title>Випущено Wine 1.7.18</title> +<body> + Розробницький реліз Wine 1.7.18 наразі доступний. + <a href="{$root}/announce/1.7.18">Що нового</a> в цьому релізі: +<ul> + <li>Покращена підтримка OLE Accessible Object.</li> + <li>Покращення зміни розмірів вікна у Mac драйвері.</li> + <li>Виправлення різних проблем з пам'яттю знайдених за допомогою Valgrind.</li> + <li>Додано кілька функцій MSHTML.</li> + <li>Деяке чищення коду DirectDraw.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.18.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.18
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: website Branch: master Commit: e9cd518ed8c8a04588fdf434b9f2a6dd8c49e058 URL: http://source.winehq.org/git/website.git/?a=commit;h=e9cd518ed8c8a04588fdf4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 2 20:23:32 2014 +0200 Wine release 1.7.18 --- news/en/2014050201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2014050201.xml b/news/en/2014050201.xml new file mode 100644 index 0000000..a247bd2 --- /dev/null +++ b/news/en/2014050201.xml @@ -0,0 +1,17 @@ +<news> +<date>May 2, 2014</date> +<title>Wine 1.7.18 Released</title> +<body> + The Wine development release 1.7.18 is now available. + <a href="{$root}/announce/1.7.18">What's new</a> in this release: +<ul> + <li>Improved OLE Accessible Object support.</li> + <li>Window sizing improvements in the Mac driver.</li> + <li>Fixes for various memory issues found by Valgrind.</li> + <li>A few more MSHTML functions.</li> + <li>Some DirectDraw cleanups.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.18.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.18 : Alexandre Julliard : Release 1.7.18
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: refs/tags/wine-1.7.18 Tag: 6726af75d18e111579f949c642e4a68d58c315ab URL: http://source.winehq.org/git/wine.git/?a=tag;h=6726af75d18e111579f949c642e4… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 2 20:15:48 2014 +0200 Release 1.7.18

1 0

Alexandre Julliard : Release 1.7.18.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: e8cfb0e5b049e68da9df34ec4e6c6a329de0c1f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8cfb0e5b049e68da9df34ec4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 2 20:15:48 2014 +0200 Release 1.7.18. --- ANNOUNCE | 727 +++++++++++++++++++++++++++++-------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 353 insertions(+), 395 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8cfb0e5b049e68da9df3…

1 0

Francois Gouget : dpnet/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: b95b044bffb097623019f55d7418caee9ec6aa71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95b044bffb097623019f55d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 2 16:44:48 2014 +0200 dpnet/tests: Add a trailing '\n' to an ok() call. --- dlls/dpnet/tests/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index dad5a8e..e7b35f8 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -31,7 +31,7 @@ static void create_directplay_address(void) IDirectPlay8Address *localaddr = NULL; hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); - ok(hr == S_OK, "Failed to create IDirectPlay8Address object"); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); if(SUCCEEDED(hr)) { GUID guidsp;

1 0

Francois Gouget : ole32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 3d70f86fe2b921b47727963ded281c4f0c2cf12c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d70f86fe2b921b47727963de… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 2 16:44:43 2014 +0200 ole32/tests: Add a trailing '\n' to an ok() call. --- dlls/ole32/tests/hglobalstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index cf9fedf..e20d81b 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -267,7 +267,7 @@ static void test_streamonhglobal(IStream *pStream) ll.u.HighPart = 0; ll.u.LowPart = 0x7FFFFFFF; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); - ok(hr == S_OK || hr == STG_E_SEEKERROR /* win8 */, "IStream_Seek"); + ok(hr == S_OK || hr == STG_E_SEEKERROR /* win8 */, "IStream_Seek\n"); if (SUCCEEDED(hr)) ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); else

1 0

Stefan Dösinger : ddraw/tests: Add a test for getdc palette handling.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: a8bcb6c7adeb93bacaa731a1ebef4c668787129a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8bcb6c7adeb93bacaa731a1e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 2 16:11:08 2014 +0200 ddraw/tests: Add a test for getdc palette handling. --- dlls/ddraw/tests/ddraw1.c | 301 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 301 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 301 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 301 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1204 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8bcb6c7adeb93bacaa73…

1 0

Francois Gouget : ddraw: Remove WINAPI on static functions where not needed.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 4e950d9cbc7c8284d6a708d2a07b9a9ee7994d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e950d9cbc7c8284d6a708d2a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 2 16:44:23 2014 +0200 ddraw: Remove WINAPI on static functions where not needed. --- dlls/ddraw/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b561af4..d192348 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -447,7 +447,7 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) return IUnknown_AddRef(surface->texture_outer); } -static HRESULT WINAPI ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectDrawPalette *palette) +static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectDrawPalette *palette) { struct ddraw_palette *palette_impl = unsafe_impl_from_IDirectDrawPalette(palette); struct ddraw_palette *prev;

1 0

Matteo Bruni : d3dcompiler: Remove a couple of noisy traces.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 89cac9c20dd85837f9ac8dc57b83de16dcd0b21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=89cac9c20dd85837f9ac8dc57… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 2 16:30:12 2014 +0200 d3dcompiler: Remove a couple of noisy traces. --- dlls/d3dcompiler_43/hlsl.y | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index ef68547..1efb65b 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1400,7 +1400,6 @@ base_type: KW_VOID { struct hlsl_type *type; - TRACE("Type %s.\n", $1); type = get_type(hlsl_ctx.cur_scope, $1, TRUE); $$ = type; d3dcompiler_free($1); @@ -1409,7 +1408,6 @@ base_type: KW_VOID { struct hlsl_type *type; - TRACE("Struct type %s.\n", $2); type = get_type(hlsl_ctx.cur_scope, $2, TRUE); if (type->type != HLSL_CLASS_STRUCT) {

1 0

Stefan Dösinger : ddraw/tests: Test mipmap GetDC behavior.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 7839ec874f2532ef59090d3b1e66d4ec75661122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7839ec874f2532ef59090d3b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 2 13:43:23 2014 +0200 ddraw/tests: Test mipmap GetDC behavior. --- dlls/ddraw/tests/ddraw1.c | 28 +++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw2.c | 28 +++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw4.c | 28 +++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw7.c | 5 +++++ 4 files changed, 80 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7839ec874f2532ef59090…

1 0

Matteo Bruni : d3dcompiler: add_func_parameter is only used in hlsl.y.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: c37714342ec3339c97338416e67b9fe324173bd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c37714342ec3339c97338416e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 2 16:30:14 2014 +0200 d3dcompiler: add_func_parameter is only used in hlsl.y. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 -- dlls/d3dcompiler_43/hlsl.y | 25 +++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 25 ------------------------- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index f7403f5..eb81ea5 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1106,8 +1106,6 @@ static inline struct hlsl_ir_loop *loop_from_node(const struct hlsl_ir_node *nod BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; -BOOL add_func_parameter(struct list *list, struct parse_parameter *param, - const struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 9f2daba..f37e07e 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -808,6 +808,31 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis return TRUE; } +static BOOL add_func_parameter(struct list *list, struct parse_parameter *param, const struct source_location *loc) +{ + struct hlsl_ir_var *decl = d3dcompiler_alloc(sizeof(*decl)); + + if (!decl) + { + ERR("Out of memory.\n"); + return FALSE; + } + decl->node.type = HLSL_IR_VAR; + decl->node.data_type = param->type; + decl->node.loc = *loc; + decl->name = param->name; + decl->semantic = param->semantic; + decl->modifiers = param->modifiers; + + if (!add_declaration(hlsl_ctx.cur_scope, decl, FALSE)) + { + free_declaration(decl); + return FALSE; + } + list_add_tail(list, &decl->node.entry); + return TRUE; +} + static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tree *funcs, char *name, struct list *params, BOOL exact_signature) { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index c110718..858277a 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -805,31 +805,6 @@ void free_declaration(struct hlsl_ir_var *decl) d3dcompiler_free(decl); } -BOOL add_func_parameter(struct list *list, struct parse_parameter *param, const struct source_location *loc) -{ - struct hlsl_ir_var *decl = d3dcompiler_alloc(sizeof(*decl)); - - if (!decl) - { - ERR("Out of memory.\n"); - return FALSE; - } - decl->node.type = HLSL_IR_VAR; - decl->node.data_type = param->type; - decl->node.loc = *loc; - decl->name = param->name; - decl->semantic = param->semantic; - decl->modifiers = param->modifiers; - - if (!add_declaration(hlsl_ctx.cur_scope, decl, FALSE)) - { - free_declaration(decl); - return FALSE; - } - list_add_tail(list, &decl->node.entry); - return TRUE; -} - struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) {

1 0

Matteo Bruni : d3dcompiler: Pre/post increment/ decrement operators are unary.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: d25486fba4b87981618e0f55a5a7388db95c204f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25486fba4b87981618e0f55a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 2 16:30:13 2014 +0200 d3dcompiler: Pre/post increment/decrement operators are unary. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 10 +++++----- dlls/d3dcompiler_43/hlsl.y | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1be52bc..f7403f5 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -826,6 +826,11 @@ enum hlsl_ir_expr_op { HLSL_IR_UNOP_SAT, + HLSL_IR_UNOP_PREINC, + HLSL_IR_UNOP_PREDEC, + HLSL_IR_UNOP_POSTINC, + HLSL_IR_UNOP_POSTDEC, + HLSL_IR_BINOP_ADD, HLSL_IR_BINOP_SUB, HLSL_IR_BINOP_MUL, @@ -856,11 +861,6 @@ enum hlsl_ir_expr_op { HLSL_IR_BINOP_POW, - HLSL_IR_BINOP_PREINC, - HLSL_IR_BINOP_PREDEC, - HLSL_IR_BINOP_POSTINC, - HLSL_IR_BINOP_POSTDEC, - HLSL_IR_TEROP_LERP, HLSL_IR_SEQUENCE, diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 1efb65b..9f2daba 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1848,7 +1848,7 @@ postfix_expr: primary_expr } operands[0] = $1; operands[1] = operands[2] = NULL; - $$ = &new_expr(HLSL_IR_BINOP_POSTINC, operands, &loc)->node; + $$ = &new_expr(HLSL_IR_UNOP_POSTINC, operands, &loc)->node; /* Post increment/decrement expressions are considered const */ $$->data_type = clone_hlsl_type($$->data_type); $$->data_type->modifiers |= HLSL_MODIFIER_CONST; @@ -1867,7 +1867,7 @@ postfix_expr: primary_expr } operands[0] = $1; operands[1] = operands[2] = NULL; - $$ = &new_expr(HLSL_IR_BINOP_POSTDEC, operands, &loc)->node; + $$ = &new_expr(HLSL_IR_UNOP_POSTDEC, operands, &loc)->node; /* Post increment/decrement expressions are considered const */ $$->data_type = clone_hlsl_type($$->data_type); $$->data_type->modifiers |= HLSL_MODIFIER_CONST; @@ -2040,7 +2040,7 @@ unary_expr: postfix_expr } operands[0] = $2; operands[1] = operands[2] = NULL; - $$ = &new_expr(HLSL_IR_BINOP_PREINC, operands, &loc)->node; + $$ = &new_expr(HLSL_IR_UNOP_PREINC, operands, &loc)->node; } | OP_DEC unary_expr { @@ -2056,7 +2056,7 @@ unary_expr: postfix_expr } operands[0] = $2; operands[1] = operands[2] = NULL; - $$ = &new_expr(HLSL_IR_BINOP_PREDEC, operands, &loc)->node; + $$ = &new_expr(HLSL_IR_UNOP_PREDEC, operands, &loc)->node; } | unary_op unary_expr {

1 0

Stefan Dösinger : wined3d: Remove broken gdi palette code.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 39212d2ffb908f343c42e7f405cb013424bd5bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=39212d2ffb908f343c42e7f40… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 2 13:43:24 2014 +0200 wined3d: Remove broken gdi palette code. --- dlls/ddraw/tests/ddraw1.c | 5 ++--- dlls/ddraw/tests/ddraw2.c | 5 ++--- dlls/ddraw/tests/ddraw4.c | 5 ++--- dlls/ddraw/tests/ddraw7.c | 5 ++--- dlls/wined3d/palette.c | 18 ++---------------- dlls/wined3d/surface.c | 1 - dlls/wined3d/wined3d_private.h | 6 ++---- 7 files changed, 12 insertions(+), 33 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c993e6f..7dd3412 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5097,10 +5097,9 @@ static void test_palette_gdi(void) hr = IDirectDrawSurface_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); - SelectPalette(dc, ddraw_palette_handle, FALSE); i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); @@ -5197,7 +5196,7 @@ static void test_palette_gdi(void) ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); /* Windows 2000 on the testbot assigns a different palette to the primary. Refrast? */ - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); SelectPalette(dc, ddraw_palette_handle, FALSE); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 3433ac1..aaef2bc 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6165,10 +6165,9 @@ static void test_palette_gdi(void) hr = IDirectDrawSurface_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); - SelectPalette(dc, ddraw_palette_handle, FALSE); i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); @@ -6265,7 +6264,7 @@ static void test_palette_gdi(void) ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); /* Windows 2000 on the testbot assigns a different palette to the primary. Refrast? */ - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); SelectPalette(dc, ddraw_palette_handle, FALSE); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ff38553..cc96045 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7067,10 +7067,9 @@ static void test_palette_gdi(void) hr = IDirectDrawSurface4_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); - SelectPalette(dc, ddraw_palette_handle, FALSE); i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); @@ -7167,7 +7166,7 @@ static void test_palette_gdi(void) ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); /* Windows 2000 on the testbot assigns a different palette to the primary. Refrast? */ - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); SelectPalette(dc, ddraw_palette_handle, FALSE); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 62f8ac6..fca2892 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6789,10 +6789,9 @@ static void test_palette_gdi(void) hr = IDirectDrawSurface7_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); - SelectPalette(dc, ddraw_palette_handle, FALSE); i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); @@ -6889,7 +6888,7 @@ static void test_palette_gdi(void) ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); /* Windows 2000 on the testbot assigns a different palette to the primary. Refrast? */ - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); SelectPalette(dc, ddraw_palette_handle, FALSE); diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index e659952..5572d10 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -45,10 +45,7 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) TRACE("%p decreasing refcount to %u.\n", palette, refcount); if (!refcount) - { - DeleteObject(palette->hpal); HeapFree(GetProcessHeap(), 0, palette); - } return refcount; } @@ -61,7 +58,7 @@ HRESULT CDECL wined3d_palette_get_entries(const struct wined3d_palette *palette, if (flags) return WINED3DERR_INVALIDCALL; /* unchecked */ - if (start > palette->palNumEntries || count > palette->palNumEntries - start) + if (start > palette->size || count > palette->size - start) return WINED3DERR_INVALIDCALL; if (palette->flags & WINED3D_PALETTE_8BIT_ENTRIES) @@ -111,9 +108,6 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, palette->palents[255].peGreen = 255; palette->palents[255].peBlue = 255; } - - if (palette->hpal) - SetPaletteEntries(palette->hpal, start, count, palette->palents + start); } /* If the palette is attached to the render target, update all render targets */ @@ -138,19 +132,11 @@ static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wine palette->ref = 1; palette->device = device; palette->flags = flags; - - palette->palNumEntries = entry_count; - palette->hpal = CreatePalette((const LOGPALETTE *)&palette->palVersion); - if (!palette->hpal) - { - WARN("Failed to create palette.\n"); - return E_FAIL; - } + palette->size = entry_count; if (FAILED(hr = wined3d_palette_set_entries(palette, 0, 0, entry_count, entries))) { WARN("Failed to set palette entries, hr %#x.\n", hr); - DeleteObject(palette->hpal); return hr; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 680a815..cd3b5a2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -499,7 +499,6 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) surface->hDC = CreateCompatibleDC(0); SelectObject(surface->hDC, surface->dib.DIBsection); TRACE("Using wined3d palette %p.\n", surface->palette); - SelectPalette(surface->hDC, surface->palette ? surface->palette->hpal : 0, FALSE); surface->flags |= SFLAG_DIBSECTION; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e67f1e..395568a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2957,10 +2957,8 @@ struct wined3d_palette LONG ref; struct wined3d_device *device; - HPALETTE hpal; - WORD palVersion; /*| */ - WORD palNumEntries; /*| LOGPALETTE */ - PALETTEENTRY palents[256]; /*| */ + unsigned int size; + PALETTEENTRY palents[256]; DWORD flags; };

1 0

Akihiro Sagawa : msvfw32: Fix uncompressed bitmap size handling in DrawDibDraw.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: af089289b32dbeec797f810938bca4adc8f717db URL: http://source.winehq.org/git/wine.git/?a=commit;h=af089289b32dbeec797f81093… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 2 22:14:24 2014 +0900 msvfw32: Fix uncompressed bitmap size handling in DrawDibDraw. --- dlls/msvfw32/drawdib.c | 8 ++------ dlls/msvfw32/tests/drawdib.c | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index 2916126..c4e5c40 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -355,12 +355,6 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, if (!(wFlags & DDF_UPDATE)) { - DWORD biSizeImage = lpbi->biSizeImage; - - /* biSizeImage may be set to 0 for BI_RGB (uncompressed) bitmaps */ - if ((lpbi->biCompression == BI_RGB) && (biSizeImage == 0)) - biSizeImage = ((lpbi->biWidth * lpbi->biBitCount + 31) / 32) * 4 * lpbi->biHeight; - if (lpbi->biCompression) { DWORD flags = 0; @@ -374,6 +368,8 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, } else { + /* BI_RGB: lpbi->biSizeImage isn't reliable */ + DWORD biSizeImage = ((lpbi->biWidth * lpbi->biBitCount + 31) / 32) * 4 * lpbi->biHeight; memcpy(whdd->lpvbits, lpBits, biSizeImage); } } diff --git a/dlls/msvfw32/tests/drawdib.c b/dlls/msvfw32/tests/drawdib.c index 24d8631..0a59d82 100644 --- a/dlls/msvfw32/tests/drawdib.c +++ b/dlls/msvfw32/tests/drawdib.c @@ -105,6 +105,12 @@ static void test_DrawDib_sizeimage(void) { 0, 0, 0, "" }, { 0, HEIGHT, 0, "" }, { WIDTH, 0, 0, "" }, + /* [8] zero size (to compare [9], [10] ) */ + { WIDTH, HEIGHT/2, 0, "8b75bf6d54a8645380114fe77505ee0699ffffaa" }, + /* [9] insufficient size */ + { WIDTH, HEIGHT/2, sizeof(RGBQUAD), "8b75bf6d54a8645380114fe77505ee0699ffffaa" }, + /* [10] too much size */ + { WIDTH, HEIGHT/2, WIDTH * HEIGHT * sizeof(RGBQUAD), "8b75bf6d54a8645380114fe77505ee0699ffffaa" }, }; HDC hdc; DWORD src_dib_size, dst_dib_size;

1 0

Henri Verbeet : wined3d: Bump ps_1x_max_value.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 14e3f71c7561d46bab0025b07c9ba5ad0dc1ad45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e3f71c7561d46bab0025b07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 2 12:50:15 2014 +0200 wined3d: Bump ps_1x_max_value. Shader model 4 hardware should generally have real floats for everything, and FLT_MAX matches the value from the Windows drivers for that kind of hardware. OpenGL requires at least 2^10 for colors, and 2^32 for other floats. --- dlls/wined3d/glsl_shader.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c86d400..cece6c1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -34,6 +34,9 @@ #include <limits.h> #include <stdio.h> +#ifdef HAVE_FLOAT_H +# include <float.h> +#endif #include "wined3d_private.h" @@ -6590,7 +6593,10 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s * the shader will generate incorrect results too. Unfortunately, GL deliberately doesn't * offer a way to query this. */ - caps->ps_1x_max_value = 8.0; + if (shader_model >= 4) + caps->ps_1x_max_value = FLT_MAX; + else + caps->ps_1x_max_value = 1024.0f; /* Ideally we'd only set caps like sRGB writes here if supported by both * the shader backend and the fragment pipe, but we can get called before

1 0

Akihiro Sagawa : msvfw32: Drawdib doesn't support inverted DIBs.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 47a3a0528d5bb2ec84b58a00937639413a803727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a3a0528d5bb2ec84b58a009… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 2 22:14:22 2014 +0900 msvfw32: Drawdib doesn't support inverted DIBs. --- dlls/msvfw32/drawdib.c | 17 ++++++++++++++--- dlls/msvfw32/tests/drawdib.c | 7 +++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index 9877e62..2916126 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -246,9 +246,18 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd, DWORD dwSize; /* No compression */ TRACE("Not compressed!\n"); - dwSize = lpbi->biSize + num_colours(lpbi)*sizeof(RGBQUAD); - whdd->lpbiOut = HeapAlloc(GetProcessHeap(), 0, dwSize); - memcpy(whdd->lpbiOut, lpbi, dwSize); + if (lpbi->biHeight <= 0) + { + /* we don't draw inverted DIBs */ + TRACE("detected inverted DIB\n"); + ret = FALSE; + } + else + { + dwSize = lpbi->biSize + num_colours(lpbi)*sizeof(RGBQUAD); + whdd->lpbiOut = HeapAlloc(GetProcessHeap(), 0, dwSize); + memcpy(whdd->lpbiOut, lpbi, dwSize); + } } if (ret) @@ -332,6 +341,8 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, { TRACE("Something changed!\n"); ret = DrawDibBegin(hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, 0); + if (!ret) + return ret; } #undef CHANGED diff --git a/dlls/msvfw32/tests/drawdib.c b/dlls/msvfw32/tests/drawdib.c index 54dd813..24d8631 100644 --- a/dlls/msvfw32/tests/drawdib.c +++ b/dlls/msvfw32/tests/drawdib.c @@ -98,6 +98,13 @@ static void test_DrawDib_sizeimage(void) { WIDTH, HEIGHT, WIDTH * HEIGHT * sizeof(RGBQUAD), "bc943d5ab024b8b0118d0a80aa283055d39942b8" }, /* [1] zero size */ { WIDTH, HEIGHT, 0, "bc943d5ab024b8b0118d0a80aa283055d39942b8" }, + /* error patterns */ + { WIDTH, -HEIGHT, 0, "" }, + { -WIDTH, HEIGHT, 0, "" }, + { -WIDTH, -HEIGHT, 0, "" }, + { 0, 0, 0, "" }, + { 0, HEIGHT, 0, "" }, + { WIDTH, 0, 0, "" }, }; HDC hdc; DWORD src_dib_size, dst_dib_size;

1 0

Huw Davies : kernel32/tests: Fix test for win8 heap layout.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 56019a4dc61017fcfa732bb3c5e85035b09d6f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56019a4dc61017fcfa732bb3c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 2 09:21:01 2014 +0100 kernel32/tests: Fix test for win8 heap layout. --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index a36c373..d8768da 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1127,7 +1127,7 @@ static void test_child_heap( const char *arg ) if (!(heap->flags & HEAP_GROWABLE) || heap->pattern == 0xffeeffee) /* vista layout */ { - ok( heap->flags == 0, "%s: got heap flags %08x expected 0\n", arg, heap->flags ); + ok( (heap->flags & ~HEAP_GROWABLE) == 0, "%s: got heap flags %08x\n", arg, heap->flags ); } else if (heap->pattern == 0xeeeeeeee && heap->flags == 0xeeeeeeee) {

1 0

Henri Verbeet : d3d9/tests: Merge vertexdeclaration.c into device.c.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 301a17d55649b0159f3ecc1e394a3dd6608ecc74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=301a17d55649b0159f3ecc1e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 2 12:50:19 2014 +0200 d3d9/tests: Merge vertexdeclaration.c into device.c. --- dlls/d3d9/tests/Makefile.in | 1 - dlls/d3d9/tests/device.c | 751 +++++++++++++++++++++++++++++- dlls/d3d9/tests/vertexdeclaration.c | 866 ----------------------------------- 3 files changed, 750 insertions(+), 868 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=301a17d55649b0159f3ec…

1 0

Zhenbo Li : mshtml: Added IHTMLTable::width property implementation.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: cfb411c10d234df8885ccc72343257cf9023c3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb411c10d234df8885ccc723… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Apr 29 21:04:54 2014 +0800 mshtml: Added IHTMLTable::width property implementation. --- dlls/mshtml/htmltable.c | 96 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 48 ++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 08a0bf0..fd7c265 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -57,6 +57,57 @@ static inline HTMLTable *impl_from_IHTMLTable3(IHTMLTable3 *iface) return CONTAINING_RECORD(iface, HTMLTable, IHTMLTable3_iface); } +static HRESULT var2str(const VARIANT *p, nsAString *nsstr) +{ + BSTR str; + BOOL ret; + HRESULT hres; + + switch(V_VT(p)) { + case VT_BSTR: + return nsAString_Init(nsstr, V_BSTR(p))? + S_OK : E_OUTOFMEMORY; + case VT_R8: + hres = VarBstrFromR8(V_R8(p), 0, 0, &str); + break; + case VT_R4: + hres = VarBstrFromR4(V_R4(p), 0, 0, &str); + break; + case VT_I4: + hres = VarBstrFromI4(V_I4(p), 0, 0, &str); + break; + default: + FIXME("unsupported arg %s\n", debugstr_variant(p)); + return E_NOTIMPL; + } + if (FAILED(hres)) + return hres; + + ret = nsAString_Init(nsstr, str); + SysFreeString(str); + return ret ? S_OK : E_OUTOFMEMORY; +} + +static HRESULT nsstr_to_truncated_bstr(const nsAString *nsstr, BSTR *ret_ptr) +{ + const PRUnichar *str, *ptr, *end = NULL; + BSTR ret; + + nsAString_GetData(nsstr, &str); + + for(ptr = str; isdigitW(*ptr); ptr++); + if(*ptr == '.') { + for(end = ptr++; isdigitW(*ptr); ptr++); + if(*ptr) + end = NULL; + } + + ret = end ? SysAllocStringLen(str, end-str) : SysAllocString(str); + + *ret_ptr = ret; + return ret ? S_OK : E_OUTOFMEMORY; +} + static HRESULT WINAPI HTMLTable_QueryInterface(IHTMLTable *iface, REFIID riid, void **ppv) { @@ -395,15 +446,52 @@ static HRESULT WINAPI HTMLTable_get_rows(IHTMLTable *iface, IHTMLElementCollecti static HRESULT WINAPI HTMLTable_put_width(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString val; + HRESULT hres; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + hres = var2str(&v, &val); + + if (FAILED(hres)){ + ERR("Set Width(%s) failed when initializing a nsAString, err = %08x\n", + debugstr_variant(&v), hres); + return hres; + } + + nsres = nsIDOMHTMLTableElement_SetWidth(This->nstable, &val); + nsAString_Finish(&val); + + if (NS_FAILED(nsres)){ + ERR("Set Width(%s) failed, err = %08x\n", debugstr_variant(&v), nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLTable_get_width(IHTMLTable *iface, VARIANT *p) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString val; + BSTR bstr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + nsAString_Init(&val, NULL); + nsres = nsIDOMHTMLTableElement_GetWidth(This->nstable, &val); + if (NS_FAILED(nsres)){ + ERR("Get Width failed!\n"); + nsAString_Finish(&val); + return E_FAIL; + } + + hres = nsstr_to_truncated_bstr(&val, &bstr); + nsAString_Finish(&val); + + V_VT(p) = VT_BSTR; + V_BSTR(p) = bstr; + return hres; } static HRESULT WINAPI HTMLTable_put_height(IHTMLTable *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b863ac2..02e0d00 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5916,6 +5916,54 @@ static void test_table_elem(IHTMLElement *elem) ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("11"); + hres = IHTMLTable_put_width(table, v); + ok(hres == S_OK, "put_width = %08x\n", hres); + VariantClear(&v); + IHTMLTable_get_width(table, &v); + ok(hres == S_OK, "get_width = %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("11.9"); + hres = IHTMLTable_put_width(table, v); + ok(hres == S_OK, "put_width = %08x\n", hres); + VariantClear(&v); + IHTMLTable_get_width(table, &v); + ok(hres == S_OK, "get_width = %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("40.2%"); + hres = IHTMLTable_put_width(table, v); + ok(hres == S_OK, "put_width = %08x\n", hres); + VariantClear(&v); + IHTMLTable_get_width(table, &v); + ok(hres == S_OK, "get_width = %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "40.2%"), "Expected 40.2%%, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_I4; + V_I4(&v) = 11; + hres = IHTMLTable_put_width(table, v); + ok(hres == S_OK, "put_width = %08x\n", hres); + IHTMLTable_get_width(table, &v); + ok(hres == S_OK, "get_width = %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_R8; + V_R8(&v) = 11.9; + hres = IHTMLTable_put_width(table, v); + ok(hres == S_OK, "put_width = %08x\n", hres); + IHTMLTable_get_width(table, &v); + ok(hres == S_OK, "get_width = %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IHTMLTable_Release(table); }

1 0

Henri Verbeet : wined3d: Fix a couple of string declarations.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 0eebe0515f76f912da3c2e39693a44075e7d2a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eebe0515f76f912da3c2e396… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 2 12:50:16 2014 +0200 wined3d: Fix a couple of string declarations. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d655c10..653298a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3284,7 +3284,7 @@ static GLuint create_arb_blt_vertex_program(const struct wined3d_gl_info *gl_inf GLuint program_id = 0; GLint pos; - const char *blt_vprogram = + static const char blt_vprogram[] = "!!ARBvp1.0\n" "PARAM c[1] = { { 1, 0.5 } };\n" "MOV result.position, vertex.position;\n" diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bd707eb..32cc191 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1721,7 +1721,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, * So make sure a program is assigned to each context. The first real ARBFP use will set a different * program and the dummy program is destroyed when the context is destroyed. */ - const char *dummy_program = + static const char dummy_program[] = "!!ARBfp1.0\n" "MOV result.color, fragment.color.primary;\n" "END\n"; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eb4b48e..224992d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -439,7 +439,7 @@ static BOOL test_arb_vs_offset_limit(const struct wined3d_gl_info *gl_info) { GLuint prog; BOOL ret = FALSE; - const char *testcode = + static const char testcode[] = "!!ARBvp1.0\n" "PARAM C[66] = { program.env[0..65] };\n" "ADDRESS A0;" @@ -653,7 +653,7 @@ static BOOL match_broken_nv_clip(const struct wined3d_gl_info *gl_info, const ch GLuint prog; BOOL ret = FALSE; GLint pos; - const char *testcode = + static const char testcode[] = "!!ARBvp1.0\n" "OPTION NV_vertex_program2;\n" "MOV result.clip[0], 0.0;\n" @@ -790,7 +790,7 @@ static BOOL match_broken_arb_fog(const struct wined3d_gl_info *gl_info, const ch float color[4] = {0.0f, 1.0f, 0.0f, 0.0f}; GLuint prog; GLint err_pos; - static const char *program_code = + static const char program_code[] = "!!ARBfp1.0\n" "OPTION ARB_fog_linear;\n" "MOV result.color, {1.0, 0.0, 0.0, 0.0};\n" diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cece6c1..d0f2b71 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6022,7 +6022,7 @@ static GLhandleARB create_glsl_blt_shader(const struct wined3d_gl_info *gl_info, GLhandleARB vshader_id, pshader_id; const char *blt_pshader; - static const char *blt_vshader = + static const char blt_vshader[] = "#version 120\n" "void main(void)\n" "{\n" diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3a1fc12..a9b3d9f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1151,7 +1151,7 @@ void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, if (write_mask && write_mask != WINED3DSP_WRITEMASK_ALL) { - static const char *write_mask_chars = "xyzw"; + static const char write_mask_chars[] = "xyzw"; TRACE("."); if (write_mask & WINED3DSP_WRITEMASK_0) TRACE("%c", write_mask_chars[0]); @@ -1207,7 +1207,7 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, if (swizzle != WINED3DSP_NOSWIZZLE) { - static const char *swizzle_chars = "xyzw"; + static const char swizzle_chars[] = "xyzw"; DWORD swizzle_x = swizzle & 0x03; DWORD swizzle_y = (swizzle >> 2) & 0x03; DWORD swizzle_z = (swizzle >> 4) & 0x03;

1 0

Henri Verbeet : ddraw: Cleanup DDRAW_dump_pixelformat().
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 4d887292afb32cb44e40b990c3855dcf8f678632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d887292afb32cb44e40b990c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 2 12:50:17 2014 +0200 ddraw: Cleanup DDRAW_dump_pixelformat(). --- dlls/ddraw/utils.c | 54 ++++++++++++++++------------------------------------ 1 file changed, 16 insertions(+), 38 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 6ac4fc9..ebd355b 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -735,57 +735,35 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) TRACE("( "); DDRAW_dump_pixelformat_flag(pf->dwFlags); if (pf->dwFlags & DDPF_FOURCC) - { - TRACE(", dwFourCC code '%c%c%c%c' (0x%08x) - %d bits per pixel", + TRACE(", dwFourCC code '%c%c%c%c' (0x%08x) - %u bits per pixel", (unsigned char)( pf->dwFourCC &0xff), (unsigned char)((pf->dwFourCC>> 8)&0xff), (unsigned char)((pf->dwFourCC>>16)&0xff), (unsigned char)((pf->dwFourCC>>24)&0xff), pf->dwFourCC, - pf->u1.dwYUVBitCount - ); - } + pf->u1.dwYUVBitCount); if (pf->dwFlags & DDPF_RGB) { - const char *cmd; - TRACE(", RGB bits: %d, ", pf->u1.dwRGBBitCount); - switch (pf->u1.dwRGBBitCount) - { - case 4: cmd = "%1lx"; break; - case 8: cmd = "%02lx"; break; - case 16: cmd = "%04lx"; break; - case 24: cmd = "%06lx"; break; - case 32: cmd = "%08lx"; break; - default: ERR("Unexpected bit depth!\n"); cmd = "%d"; break; - } - TRACE(" R "); TRACE(cmd, pf->u2.dwRBitMask); - TRACE(" G "); TRACE(cmd, pf->u3.dwGBitMask); - TRACE(" B "); TRACE(cmd, pf->u4.dwBBitMask); + TRACE(", RGB bits: %u, R 0x%08x G 0x%08x B 0x%08x", + pf->u1.dwRGBBitCount, + pf->u2.dwRBitMask, + pf->u3.dwGBitMask, + pf->u4.dwBBitMask); if (pf->dwFlags & DDPF_ALPHAPIXELS) - { - TRACE(" A "); TRACE(cmd, pf->u5.dwRGBAlphaBitMask); - } + TRACE(" A 0x%08x", pf->u5.dwRGBAlphaBitMask); if (pf->dwFlags & DDPF_ZPIXELS) - { - TRACE(" Z "); TRACE(cmd, pf->u5.dwRGBZBitMask); - } + TRACE(" Z 0x%08x", pf->u5.dwRGBZBitMask); } if (pf->dwFlags & DDPF_ZBUFFER) - { - TRACE(", Z bits : %d", pf->u1.dwZBufferBitDepth); - } + TRACE(", Z bits: %u", pf->u1.dwZBufferBitDepth); if (pf->dwFlags & DDPF_ALPHA) - { - TRACE(", Alpha bits : %d", pf->u1.dwAlphaBitDepth); - } + TRACE(", Alpha bits: %u", pf->u1.dwAlphaBitDepth); if (pf->dwFlags & DDPF_BUMPDUDV) - { - const char *cmd = "%08lx"; - TRACE(", Bump bits: %d, ", pf->u1.dwBumpBitCount); - TRACE(" U "); TRACE(cmd, pf->u2.dwBumpDuBitMask); - TRACE(" V "); TRACE(cmd, pf->u3.dwBumpDvBitMask); - TRACE(" L "); TRACE(cmd, pf->u4.dwBumpLuminanceBitMask); - } + TRACE(", Bump bits: %u, U 0x%08x V 0x%08x L 0x%08x", + pf->u1.dwBumpBitCount, + pf->u2.dwBumpDuBitMask, + pf->u3.dwBumpDvBitMask, + pf->u4.dwBumpLuminanceBitMask); TRACE(")\n"); }

1 0

Akihiro Sagawa : gdi32/tests: Make bmi structure const.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: b6ef7274c54aa75ae9cd6be3149cc88eb859aa36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ef7274c54aa75ae9cd6be31… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 2 22:14:19 2014 +0900 gdi32/tests: Make bmi structure const. --- dlls/gdi32/tests/dib.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 6e0fccd..d12c752 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1210,17 +1210,17 @@ static const char **current_sha1; static const RECT *current_bounds; static const char *dst_format; -static inline DWORD get_stride(BITMAPINFO *bmi) +static inline DWORD get_stride(const BITMAPINFO *bmi) { return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; } -static inline DWORD get_dib_size(BITMAPINFO *bmi) +static inline DWORD get_dib_size(const BITMAPINFO *bmi) { return get_stride(bmi) * abs(bmi->bmiHeader.biHeight); } -static char *hash_dib(BITMAPINFO *bmi, void *bits) +static char *hash_dib(const BITMAPINFO *bmi, const void *bits) { DWORD dib_size = get_dib_size(bmi); HCRYPTHASH hash; @@ -1288,7 +1288,7 @@ static void skip_compare( int count ) current_bounds++; } -static void compare_hash_broken_todo(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char *info, int num_broken, BOOL todo) +static void compare_hash_broken_todo(HDC hdc, const BITMAPINFO *bmi, BYTE *bits, const char *info, int num_broken, BOOL todo) { char *hash = hash_dib(bmi, bits); BOOL ok_cond; @@ -1332,7 +1332,7 @@ static void compare_hash_broken_todo(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const compare_bounds( hdc, info ); } -static void compare_hash(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char *info) +static void compare_hash(HDC hdc, const BITMAPINFO *bmi, BYTE *bits, const char *info) { compare_hash_broken_todo(hdc, bmi, bits, info, 0, FALSE); } @@ -1615,7 +1615,7 @@ static inline void solid_patblt( HDC hdc, int x, int y, int width, int height, C DeleteObject( SelectObject( hdc, brush ) ); } -static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits) +static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) { char pal_buffer[sizeof(LOGPALETTE) + 255 * sizeof(PALETTEENTRY)]; LOGPALETTE *pal = (LOGPALETTE *)pal_buffer; @@ -2840,7 +2840,7 @@ static inline COLORREF aa_colorref( COLORREF dst, COLORREF text, BYTE glyph ) static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; -static void draw_text_2( HDC hdc, BITMAPINFO *bmi, BYTE *bits, BOOL aa ) +static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) { DWORD dib_size = get_dib_size(bmi), ret; LOGFONTA lf; @@ -2956,7 +2956,7 @@ static void draw_text_2( HDC hdc, BITMAPINFO *bmi, BYTE *bits, BOOL aa ) DeleteObject( font ); } -static void draw_text( HDC hdc, BITMAPINFO *bmi, BYTE *bits ) +static void draw_text( HDC hdc, const BITMAPINFO *bmi, BYTE *bits ) { draw_text_2( hdc, bmi, bits, FALSE );

1 0

Akihiro Sagawa : msvfw32/tests: Add tests for drawdib.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 93089217c3b3d182e8105c6c926c47e05bf8d337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93089217c3b3d182e8105c6c9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 2 22:14:21 2014 +0900 msvfw32/tests: Add tests for drawdib. --- dlls/msvfw32/tests/Makefile.in | 3 +- dlls/msvfw32/tests/drawdib.c | 166 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 1 deletion(-) diff --git a/dlls/msvfw32/tests/Makefile.in b/dlls/msvfw32/tests/Makefile.in index 26cd529..1ae7897 100644 --- a/dlls/msvfw32/tests/Makefile.in +++ b/dlls/msvfw32/tests/Makefile.in @@ -1,5 +1,6 @@ TESTDLL = msvfw32.dll -IMPORTS = msvfw32 +IMPORTS = msvfw32 advapi32 gdi32 C_SRCS = \ + drawdib.c \ msvfw.c diff --git a/dlls/msvfw32/tests/drawdib.c b/dlls/msvfw32/tests/drawdib.c new file mode 100644 index 0000000..54dd813 --- /dev/null +++ b/dlls/msvfw32/tests/drawdib.c @@ -0,0 +1,166 @@ +/* + * Copyright 2014 Akihiro Sagawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN + +#include <windows.h> +#include <vfw.h> +#include <wincrypt.h> +#include <stdlib.h> +#include <string.h> + +#include "wine/test.h" + +#define WIDTH 16 +#define HEIGHT 12 + +static HCRYPTPROV crypt_prov; + +static inline DWORD get_stride(const BITMAPINFO *bmi) +{ + return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; +} + +static inline DWORD get_dib_size(const BITMAPINFO *bmi) +{ + return get_stride(bmi) * abs(bmi->bmiHeader.biHeight); +} + +static char *hash_dib(const BITMAPINFO *bmi, const void *bits) +{ + DWORD dib_size = get_dib_size(bmi); + HCRYPTHASH hash; + char *buf; + BYTE hash_buf[20]; + DWORD hash_size = sizeof(hash_buf); + int i; + static const char *hex = "0123456789abcdef"; + + if(!crypt_prov) return NULL; + + if(!CryptCreateHash(crypt_prov, CALG_SHA1, 0, 0, &hash)) return NULL; + + CryptHashData(hash, bits, dib_size, 0); + + CryptGetHashParam(hash, HP_HASHVAL, NULL, &hash_size, 0); + if(hash_size != sizeof(hash_buf)) return NULL; + + CryptGetHashParam(hash, HP_HASHVAL, hash_buf, &hash_size, 0); + CryptDestroyHash(hash); + + buf = HeapAlloc(GetProcessHeap(), 0, hash_size * 2 + 1); + + for(i = 0; i < hash_size; i++) + { + buf[i * 2] = hex[hash_buf[i] >> 4]; + buf[i * 2 + 1] = hex[hash_buf[i] & 0xf]; + } + buf[i * 2] = '\0'; + + return buf; +} + +static void init_bmi(BITMAPINFO *bmi, LONG width, LONG height, DWORD size) +{ + memset(bmi, 0, sizeof(*bmi)); + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biWidth = width; + bmi->bmiHeader.biHeight = height; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biCompression = BI_RGB; + bmi->bmiHeader.biSizeImage = size; +} + +static void test_DrawDib_sizeimage(void) +{ + const struct { + LONG width, height; + DWORD size; + char hash[41]; + } test_data[] = { + /* [0] correct size */ + { WIDTH, HEIGHT, WIDTH * HEIGHT * sizeof(RGBQUAD), "bc943d5ab024b8b0118d0a80aa283055d39942b8" }, + /* [1] zero size */ + { WIDTH, HEIGHT, 0, "bc943d5ab024b8b0118d0a80aa283055d39942b8" }, + }; + HDC hdc; + DWORD src_dib_size, dst_dib_size; + BOOL r; + HBITMAP dib; + BITMAPINFO src_info, dst_info; + RGBQUAD *src_bits = NULL, *dst_bits; + HDRAWDIB hdd; + unsigned int i; + + hdc = CreateCompatibleDC(NULL); + + init_bmi(&dst_info, WIDTH, HEIGHT, 0); + dib = CreateDIBSection(NULL, &dst_info, DIB_RGB_COLORS, (void **)&dst_bits, NULL, 0); + dst_dib_size = get_dib_size(&dst_info); + ok(dib != NULL, "CreateDIBSection failed\n"); + SelectObject(hdc, dib); + + init_bmi(&src_info, WIDTH, HEIGHT, 0); + src_dib_size = get_dib_size(&src_info); + src_bits = HeapAlloc(GetProcessHeap(), 0, src_dib_size); + ok(src_bits != NULL, "Can't allocate memory\n"); + memset(src_bits, 0x88, src_dib_size); + + hdd = DrawDibOpen(); + ok(hdd != NULL, "DrawDibOpen failed\n"); + + for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); i++) { + char *hash; + memset(dst_bits, 0xff, dst_dib_size); + init_bmi(&src_info, test_data[i].width, test_data[i].height, test_data[i].size); + r = DrawDibDraw(hdd, hdc, + 0, 0, -1, -1, &src_info.bmiHeader, src_bits, + 0, 0, test_data[i].width, test_data[i].height, 0); + if (test_data[i].hash[0]) + ok(r, "[%u] DrawDibDraw failed, expected success\n", i); + else + ok(!r, "[%u] DrawDibDraw succeeded, expected failed\n", i); + if (!r || !test_data[i].hash[0]) + continue; + + hash = hash_dib(&dst_info, dst_bits); + if (!hash) { + win_skip("This platform doesn't support SHA-1 hash\n"); + continue; + } + ok(strcmp(hash, test_data[i].hash) == 0, + "[%u] got %s, expected %s\n", + i, hash, test_data[i].hash); + HeapFree(GetProcessHeap(), 0, hash); + } + + r = DrawDibClose(hdd); + ok(r, "DrawDibClose failed\n"); + + HeapFree(GetProcessHeap(), 0, src_bits); + + DeleteDC(hdc); +} + +START_TEST(drawdib) +{ + CryptAcquireContextW(&crypt_prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + test_DrawDib_sizeimage(); + CryptReleaseContext(crypt_prov, 0); +}

1 0

Henri Verbeet : d3dcompiler: Make some string arrays const.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: ffc01ec6485b062375283ce094177113517f1a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc01ec6485b062375283ce09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 2 12:50:18 2014 +0200 d3dcompiler: Make some string arrays const. --- dlls/d3dcompiler_43/hlsl.y | 4 ++-- dlls/d3dcompiler_43/utils.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 777fb4e..ef68547 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -46,7 +46,7 @@ void hlsl_message(const char *fmt, ...) static const char *hlsl_get_error_level_name(enum hlsl_error_level level) { - const char *names[] = + static const char * const names[] = { "error", "warning", @@ -199,7 +199,7 @@ static void declare_predefined_types(struct hlsl_scope *scope) { struct hlsl_type *type; unsigned int x, y, bt; - static const char *names[] = + static const char * const names[] = { "float", "half", diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 221dad5..c110718 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1974,7 +1974,7 @@ const char *debug_modifiers(DWORD modifiers) static const char *debug_node_type(enum hlsl_ir_node_type type) { - const char *names[] = + static const char * const names[] = { "HLSL_IR_VAR", "HLSL_IR_ASSIGNMENT", @@ -2080,7 +2080,7 @@ static void debug_dump_ir_constant(const struct hlsl_ir_constant *constant) static const char *debug_expr_op(const struct hlsl_ir_expr *expr) { - static const char *op_names[] = + static const char * const op_names[] = { "~", "!",

1 0

Alex Henrie : bcrypt: Add stub for BCryptOpenAlgorithmProvider.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: d5f18414174d93474680743fb555b3ad80de6c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f18414174d93474680743fb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Apr 29 20:24:58 2014 -0600 bcrypt: Add stub for BCryptOpenAlgorithmProvider. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 87623f8..185f950 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -32,7 +32,7 @@ @ stub BCryptHashData @ stub BCryptImportKey @ stub BCryptImportKeyPair -@ stub BCryptOpenAlgorithmProvider +@ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) @ stub BCryptQueryContextConfiguration @ stub BCryptQueryContextFunctionConfiguration @ stub BCryptQueryContextFunctionProperty diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 22da0dd..fcad58c 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -91,3 +91,16 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE algorithm, UCHAR *buffer, ULON FIXME("called with unsupported parameters, returning error\n"); return STATUS_NOT_IMPLEMENTED; } + +NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *algorithm, LPCWSTR algorithmId, + LPCWSTR implementation, DWORD flags) +{ + FIXME("%p, %s, %s, %08x - stub\n", algorithm, wine_dbgstr_w(algorithmId), wine_dbgstr_w(implementation), flags); + + if (!algorithm) + return STATUS_INVALID_PARAMETER; + + *algorithm = NULL; + + return STATUS_NOT_IMPLEMENTED; +}

1 0

Matteo Bruni : d3dx9/tests: Don' t fail a test if volume textures are not supported.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 8ca7617d4de43bdca4fd8c15a987f851553122b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca7617d4de43bdca4fd8c15a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 1 18:37:39 2014 +0200 d3dx9/tests: Don't fail a test if volume textures are not supported. --- dlls/d3dx9_36/tests/volume.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index 860a20b..53260c1 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -83,7 +83,6 @@ static void test_D3DXLoadVolumeFromMemory(IDirect3DDevice9 *device) set_box(&dst_box, 0, 0, 4, 1, 0, 4); hr = D3DXLoadVolumeFromMemory(volume, NULL, &dst_box, pixels, D3DFMT_A8R8G8B8, 16, 16, NULL, &src_box, D3DX_DEFAULT, 0); - ok(hr == D3D_OK, "D3DXLoadVolumeFromMemory returned %#x, expected %#x\n", hr, D3D_OK); if (FAILED(hr)) { win_skip("D3DXLoadVolumeFromMemory failed with error %#x, skipping some tests.\n", hr);

1 0

Matteo Bruni : d3dx9/tests: Fix expected values when mipmaps on cube maps are not supported.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 2a8dae52aa5cccea2974aec168a198e5a2ed5032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8dae52aa5cccea2974aec16… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 1 18:37:40 2014 +0200 d3dx9/tests: Fix expected values when mipmaps on cube maps are not supported. --- dlls/d3dx9_36/tests/texture.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 16cb0e5..fb73bfb 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -402,6 +402,7 @@ static void test_D3DXCheckCubeTextureRequirements(IDirect3DDevice9 *device) size = 284; mipmaps = 20; expected = caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2 ? 10 : 9; + expected = caps.TextureCaps & D3DPTEXTURECAPS_MIPCUBEMAP ? expected : 1; hr = D3DXCheckCubeTextureRequirements(device, &size, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(mipmaps == expected, "Returned mipmaps %d, expected %d\n", mipmaps, expected); @@ -409,6 +410,7 @@ static void test_D3DXCheckCubeTextureRequirements(IDirect3DDevice9 *device) size = 63; mipmaps = 9; expected = caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2 ? 7 : 6; + expected = caps.TextureCaps & D3DPTEXTURECAPS_MIPCUBEMAP ? expected : 1; hr = D3DXCheckCubeTextureRequirements(device, &size, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(mipmaps == expected, "Returned mipmaps %d, expected %d\n", mipmaps, expected);

1 0

Matteo Bruni : d3dx9/tests: Take MaxVolumeExtent into account in some tests.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: c1bf61e56c9cd32615bbc308fa9c5207db2b0fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1bf61e56c9cd32615bbc308f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 1 18:37:41 2014 +0200 d3dx9/tests: Take MaxVolumeExtent into account in some tests. --- dlls/d3dx9_36/tests/texture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index fb73bfb..6322c70 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -471,9 +471,9 @@ static void test_D3DXCheckVolumeTextureRequirements(IDirect3DDevice9 *device) IDirect3DDevice9_GetDeviceCaps(device, &caps); - if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) + if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) || (caps.MaxVolumeExtent < 256)) { - skip("No volume textures support\n"); + skip("Limited or no volume textures support.\n"); return; } @@ -560,7 +560,7 @@ static void test_D3DXCheckVolumeTextureRequirements(IDirect3DDevice9 *device) height = 143; depth = 55; mipmaps = 20; - expected = caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2 ? 10 : 9; + expected = (caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2 && caps.MaxVolumeExtent >= 512) ? 10 : 9; hr = D3DXCheckVolumeTextureRequirements(device, &width, &height, &depth, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(mipmaps == expected, "Returned mipmaps %d, expected %d\n", mipmaps, expected);

1 0

Erich E. Hoover : user32: Reduce the minimum Set[System] Timer from 15 ms to 10 ms.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: b5bd529769696f2b4e4f7d6389f2dc21da5acd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5bd529769696f2b4e4f7d638… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu May 1 07:41:57 2014 -0600 user32: Reduce the minimum Set[System]Timer from 15 ms to 10 ms. --- dlls/user32/message.c | 8 ++------ dlls/user32/tests/msg.c | 26 ++++++++++++++++---------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 1e93c8d..be5d995 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4439,9 +4439,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); - /* MSDN states that the minimum timeout should be USER_TIMER_MINIMUM (10.0 ms), but testing - * indicates that the true minimum is closer to 15.6 ms. */ - timeout = min( max( 15, timeout ), USER_TIMER_MAXIMUM ); + timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM ); SERVER_START_REQ( set_win_timer ) { @@ -4474,9 +4472,7 @@ UINT_PTR WINAPI SetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); - /* MSDN states that the minimum timeout should be USER_TIMER_MINIMUM (10.0 ms), but testing - * indicates that the true minimum is closer to 15.6 ms. */ - timeout = min( max( 15, timeout ), USER_TIMER_MAXIMUM ); + timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM ); SERVER_START_REQ( set_win_timer ) { diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6406190..66b9c7e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8390,8 +8390,8 @@ static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT_PTR id, DWORD dwTime) } #define TIMER_ID 0x19 -#define TIMER_COUNT_EXPECTED 64 -#define TIMER_COUNT_TOLERANCE 9 +#define TIMER_COUNT_EXPECTED 100 +#define TIMER_COUNT_TOLERANCE 10 static int count = 0; static void CALLBACK callback_count(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) @@ -8442,8 +8442,9 @@ static void test_timers(void) ok( KillTimer(info.hWnd, TIMER_ID), "KillTimer failed\n"); /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, - * but testing indicates that the minimum timeout is actually about 15.6 ms. Since there is - * some measurement error between test runs we're allowing for ±8 counts (~2 ms). + * which occurs sometimes, but most testing on the VMs indicates a minimum timeout closer to + * 15.6 ms. Since there is some measurement error between test runs we are allowing for + * ±9 counts (~4 ms) around the expected value. */ count = 0; id = SetTimer(info.hWnd, TIMER_ID, 0, callback_count); @@ -8452,8 +8453,9 @@ static void test_timers(void) start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) DispatchMessageA(&msg); - ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE - || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3 */, + ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ + || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */ + || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, "did not get expected count for minimum timeout (%d != ~%d).\n", count, TIMER_COUNT_EXPECTED); ok(KillTimer(info.hWnd, id), "KillTimer failed\n"); @@ -8473,7 +8475,9 @@ static void test_timers(void) syscount++; DispatchMessageA(&msg); } - ok(abs(syscount-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE, + ok(abs(syscount-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE + || broken(abs(syscount-64) < TIMER_COUNT_TOLERANCE) /* most common */ + || broken(syscount > 4000 && syscount < 12000) /* win2k3sp0 */, "did not get expected count for minimum timeout (%d != ~%d).\n", syscount, TIMER_COUNT_EXPECTED); todo_wine ok(count == 0, "did not get expected count for callback timeout (%d != 0).\n", @@ -8507,8 +8511,9 @@ static void test_timers_no_wnd(void) ok(count == 1, "killing replaced timer did not work (%i).\n", count); /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, - * but testing indicates that the minimum timeout is actually about 15.6 ms. Since there is - * some measurement error between test runs we're allowing for ±8 counts (~2 ms). + * which occurs sometimes, but most testing on the VMs indicates a minimum timeout closer to + * 15.6 ms. Since there is some measurement error between test runs we are allowing for + * ±9 counts (~4 ms) around the expected value. */ count = 0; id = SetTimer(NULL, 0, 0, callback_count); @@ -8516,7 +8521,8 @@ static void test_timers_no_wnd(void) start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA(&msg); - ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE, + ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ + || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */, "did not get expected count for minimum timeout (%d != ~%d).\n", count, TIMER_COUNT_EXPECTED); KillTimer(NULL, id);

1 0

Matteo Bruni : d3dx9/tests: Release the device when skipping some tests.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 96e9a70661aabc69e8429d9511fe88465e87163e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e9a70661aabc69e8429d951… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 1 18:37:38 2014 +0200 d3dx9/tests: Release the device when skipping some tests. --- dlls/d3dx9_36/tests/shader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 80c0f64..694540c 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6131,6 +6131,7 @@ static void test_registerset(void) || caps.PixelShaderVersion < D3DPS_VERSION(3, 0)) { skip("Skipping: Test requires VS >= 3 and PS >= 3.\n"); + IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); DestroyWindow(wnd); return; @@ -6435,6 +6436,7 @@ static void test_registerset_defaults(void) || caps.PixelShaderVersion < D3DPS_VERSION(3, 0)) { skip("Skipping: Test requires VS >= 3 and PS >= 3.\n"); + IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); DestroyWindow(wnd); return;

1 0

Piotr Caban : oleacc: Add tests for default client accessible object.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 7c029e02aed77b88a3e0342a071a91359c7614d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c029e02aed77b88a3e0342a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:56:44 2014 +0200 oleacc: Add tests for default client accessible object. --- dlls/oleacc/tests/Makefile.in | 2 +- dlls/oleacc/tests/main.c | 114 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/tests/Makefile.in b/dlls/oleacc/tests/Makefile.in index 2b0157d..7773ba9 100644 --- a/dlls/oleacc/tests/Makefile.in +++ b/dlls/oleacc/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = oleacc.dll -IMPORTS = ole32 oleacc user32 +IMPORTS = ole32 oleacc oleaut32 user32 C_SRCS = \ main.c diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index c5c50b8..0162d72 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -215,6 +215,11 @@ static LRESULT WINAPI test_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA { switch(msg) { case WM_GETOBJECT: + if(lparam == OBJID_QUERYCLASSNAMEIDX) { + ok(!wparam, "wparam = %lx\n", wparam); + return 0; + } + ok(wparam==0xffffffff || broken(wparam==0x8000), "wparam = %lx\n", wparam); if(lparam == (DWORD)OBJID_CURSOR) return E_UNEXPECTED; @@ -274,6 +279,114 @@ static void test_AccessibleObjectFromWindow(void) DestroyWindow(hwnd); } +static void test_default_client_accessible_object(void) +{ + static const WCHAR testW[] = {'t','e','s','t',' ','t',' ','&','j','u','n','k',0}; + static const WCHAR shortcutW[] = {'A','l','t','+','t',0}; + + IAccessible *acc; + HWND chld, hwnd; + HRESULT hr; + VARIANT vid, v; + BSTR str; + LONG l; + + hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + chld = CreateWindowA("static", "message", WS_CHILD, + 0, 0, 0, 0, hwnd, NULL, NULL, NULL); + ok(chld != NULL, "CreateWindow failed\n"); + + hr = CreateStdAccessibleObject(NULL, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == E_FAIL, "got %x\n", hr); + + hr = CreateStdAccessibleObject(hwnd, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == S_OK, "got %x\n", hr); + + hr = IAccessible_get_accChildCount(acc, &l); + ok(hr == S_OK, "got %x\n", hr); + ok(l == 1, "l = %d\n", l); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, testW), "name = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + V_I4(&vid) = 1; + str = (void*)0xdeadbeef; + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == E_INVALIDARG, "got %x\n", hr); + ok(!str, "str != NULL\n"); + V_I4(&vid) = CHILDID_SELF; + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accValue(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accDescription(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (void*)0xdeadbeef; + hr = IAccessible_get_accRole(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == ROLE_SYSTEM_CLIENT, "V_I4(&v) = %d\n", V_I4(&v)); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (void*)0xdeadbeef; + hr = IAccessible_get_accState(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == (STATE_SYSTEM_FOCUSABLE|STATE_SYSTEM_INVISIBLE) || + broken(V_I4(&v) == STATE_SYSTEM_INVISIBLE), "V_I4(&v) = %x\n", V_I4(&v)); + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accHelp(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, shortcutW), "str = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accDefaultAction(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + DestroyWindow(hwnd); + + hr = IAccessible_get_accChildCount(acc, &l); + ok(hr == S_OK, "got %x\n", hr); + ok(l == 0, "l = %d\n", l); + + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == E_INVALIDARG, "got %x\n", hr); + + hr = IAccessible_get_accValue(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + + hr = IAccessible_get_accRole(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == ROLE_SYSTEM_CLIENT, "V_I4(&v) = %d\n", V_I4(&v)); + + hr = IAccessible_get_accState(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == STATE_SYSTEM_INVISIBLE, "V_I4(&v) = %x\n", V_I4(&v)); + + IAccessible_Release(acc); +} + START_TEST(main) { int argc; @@ -304,6 +417,7 @@ START_TEST(main) test_getroletext(); test_LresultFromObject(argv[0]); test_AccessibleObjectFromWindow(); + test_default_client_accessible_object(); unregister_window_class(); CoUninitialize();

1 0

Alexandre Julliard : comctl32/imagelist: Correctly resize the alpha flags when clearing the image list.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 1dd04884d754427723377a2fed5b58e5ebb6d3b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dd04884d754427723377a2fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 17:19:54 2014 +0200 comctl32/imagelist: Correctly resize the alpha flags when clearing the image list. --- dlls/comctl32/imagelist.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index eedf7c5..dfdb46a 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2376,6 +2376,12 @@ ImageList_Remove (HIMAGELIST himl, INT i) for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; + if (himl->has_alpha) + { + HeapFree( GetProcessHeap(), 0, himl->has_alpha ); + himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); + } + hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); SelectObject (himl->hdcImage, hbmNewImage); DeleteObject (himl->hbmImage);

1 0

Piotr Caban : oleacc: Add Client_get_accChildCount implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 99d0590b012f7890f0d314a6ebf479dc0c2ed016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d0590b012f7890f0d314a6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:17 2014 +0200 oleacc: Add Client_get_accChildCount implementation. --- dlls/oleacc/client.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index e7ff812..5e5ee6f 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -120,8 +120,15 @@ static HRESULT WINAPI Client_get_accParent(IAccessible *iface, IDispatch **ppdis static HRESULT WINAPI Client_get_accChildCount(IAccessible *iface, LONG *pcountChildren) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p)\n", This, pcountChildren); - return E_NOTIMPL; + HWND cur; + + TRACE("(%p)->(%p)\n", This, pcountChildren); + + *pcountChildren = 0; + for(cur = GetWindow(This->hwnd, GW_CHILD); cur; cur = GetWindow(cur, GW_HWNDNEXT)) + (*pcountChildren)++; + + return S_OK; } static HRESULT WINAPI Client_get_accChild(IAccessible *iface,

1 0

Huw Davies : shlwapi/tests: Fix win8 test failures.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: ddf861da00497f7c04d40af466bcb73647546f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf861da00497f7c04d40af46… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 1 09:29:30 2014 +0100 shlwapi/tests: Fix win8 test failures. --- dlls/shlwapi/tests/ordinal.c | 43 +++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 676c431..6833095 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -289,14 +289,15 @@ static void test_GetAcceptLanguagesA(void) When the buffer is large enough, the default language is returned When the buffer is too small for that fallback, win7_32 and w2k8_64 - and above fail with HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), but - recent os succeed and return a partial result while - older os succeed and overflow the buffer */ + fail with HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), win8 fails + with HRESULT_FROM_WIN32(ERROR_MORE_DATA), other versions succeed and + return a partial result while older os succeed and overflow the buffer */ ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len)), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == exactsize)), "==_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); if (exactsize > 1) { @@ -307,7 +308,8 @@ static void test_GetAcceptLanguagesA(void) ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len)), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == exactsize - 1)), "-1_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); } @@ -318,15 +320,16 @@ static void test_GetAcceptLanguagesA(void) ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len)), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == 1)), "=1_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); len = maxlen; hr = pGetAcceptLanguagesA( NULL, &len); /* w2k3 and below: E_FAIL and untouched len, - since w2k8: S_OK and needed size (excluding 0) */ - ok( ((hr == S_OK) && (len == exactsize)) || + since w2k8: S_OK and needed size (excluding 0), win8 S_OK and size including 0. */ + ok( ((hr == S_OK) && ((len == exactsize) || (len == exactsize + 1))) || ((hr == E_FAIL) && (len == maxlen)), "NULL,max #%d: got 0x%x with %d and %s\n", i, hr, len, buffer); @@ -349,7 +352,8 @@ static void test_GetAcceptLanguagesA(void) buffer[maxlen] = 0; hr = pGetAcceptLanguagesA( buffer, &len); ok( (((hr == S_OK) || (hr == E_INVALIDARG)) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_CANNOT_COPY)) && !len), "=2: got 0x%x with %d and %s\n", hr, len, buffer); len = 1; @@ -357,20 +361,21 @@ static void test_GetAcceptLanguagesA(void) buffer[maxlen] = 0; hr = pGetAcceptLanguagesA( buffer, &len); /* When the buffer is too small, win7_32 and w2k8_64 and above fail with - HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), other versions succeed - and return a partial 0 terminated result while other versions + HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), win8 ERROR_CANNOT_COPY, + other versions succeed and return a partial 0 terminated result while other versions fail with E_INVALIDARG and return a partial unterminated result */ ok( (((hr == S_OK) || (hr == E_INVALIDARG)) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_CANNOT_COPY)) && !len), "=1: got 0x%x with %d and %s\n", hr, len, buffer); len = 0; memset(buffer, '#', maxlen); buffer[maxlen] = 0; hr = pGetAcceptLanguagesA( buffer, &len); - /* w2k3 and below: E_FAIL, since w2k8: E_INVALIDARG */ - ok((hr == E_FAIL) || (hr == E_INVALIDARG), - "got 0x%x (expected E_FAIL or E_INVALIDARG)\n", hr); + /* w2k3 and below: E_FAIL, since w2k8: E_INVALIDARG, win8 ERROR_CANNOT_COPY */ + ok((hr == E_FAIL) || (hr == E_INVALIDARG) || (hr == __HRESULT_FROM_WIN32(ERROR_CANNOT_COPY)), + "got 0x%x\n", hr); memset(buffer, '#', maxlen); buffer[maxlen] = 0; @@ -2290,7 +2295,9 @@ static void test_IUnknown_QueryServiceExec(void) /* null source pointer */ hr = pIUnknown_QueryServiceExec(NULL, &dummy_serviceid, &dummy_groupid, 0, 0, 0, 0); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL || + hr == E_NOTIMPL, /* win 8 */ + "got 0x%08x\n", hr); /* expected trace: IUnknown_QueryServiceExec( ptr1, serviceid, groupid, arg1, arg2, arg3, arg4); @@ -2406,7 +2413,9 @@ static void test_IUnknown_ProfferService(void) /* null source pointer */ hr = pIUnknown_ProfferService(NULL, &dummy_serviceid, 0, 0); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL || + hr == E_NOTIMPL, /* win 8 */ + "got 0x%08x\n", hr); /* expected trace: IUnknown_ProfferService( ptr1, serviceid, arg1, arg2);

1 0

Piotr Caban : oleacc: Add Client_get_accName implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: a5f78530ddf45b7773a11af92117993abfb9c8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f78530ddf45b7773a11af92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:24 2014 +0200 oleacc: Add Client_get_accName implementation. --- dlls/oleacc/Makefile.in | 2 +- dlls/oleacc/client.c | 25 +++++++++++++++++++++++-- dlls/oleacc/main.c | 11 +++++++++++ dlls/oleacc/oleacc_private.h | 1 + 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index d33f867..778791e 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -1,6 +1,6 @@ MODULE = oleacc.dll IMPORTLIB = oleacc -IMPORTS = ole32 user32 uuid +IMPORTS = uuid oleaut32 ole32 user32 C_SRCS = \ client.c \ diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 5e5ee6f..30673d3 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -142,8 +142,29 @@ static HRESULT WINAPI Client_get_accChild(IAccessible *iface, static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR *pszName) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszName); - return E_NOTIMPL; + WCHAR name[1024]; + UINT i, len; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszName); + + *pszName = NULL; + if(convert_child_id(&varID) != CHILDID_SELF || !IsWindow(This->hwnd)) + return E_INVALIDARG; + + len = SendMessageW(This->hwnd, WM_GETTEXT, sizeof(name)/sizeof(WCHAR), (LPARAM)name); + if(!len) + return S_FALSE; + + for(i=0; i<len; i++) { + if(name[i] == '&') { + len--; + memmove(name+i, name+i+1, (len-i)*sizeof(WCHAR)); + break; + } + } + + *pszName = SysAllocStringLen(name, len); + return *pszName ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT varID, BSTR *pszValue) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 63dfe99..2777a38 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -70,6 +70,17 @@ const char *debugstr_variant(const VARIANT *v) } } +int convert_child_id(VARIANT *v) +{ + switch(V_VT(v)) { + case VT_I4: + return V_I4(v); + default: + FIXME("unhandled child ID variant type: %d\n", V_VT(v)); + return -1; + } +} + HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, REFIID riidInterface, void** ppvObject ) { diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index dbb0f8c..ebbab4c 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -21,6 +21,7 @@ HRESULT create_client_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; +int convert_child_id(VARIANT *v) DECLSPEC_HIDDEN; static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) {

1 0

Piotr Caban : oleaut32: Handle VariantCopy errors in VariantChangeTypeEx.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: d1469144e9a5e300223703cb69d32e6e6c25b28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1469144e9a5e300223703cb6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 12:14:27 2014 +0200 oleaut32: Handle VariantCopy errors in VariantChangeTypeEx. --- dlls/oleaut32/tests/vartype.c | 7 +++++++ dlls/oleaut32/variant.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index ea5065f..b873d82 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -6269,6 +6269,13 @@ static void test_ChangeType_keep_dst(void) hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_INT); ok(hres == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx returns %08x\n", hres); ok(V_VT(&v2) == VT_INT && V_INT(&v2) == 4, "VariantChangeTypeEx changed dst variant\n"); + V_VT(&v2) = 0xff; /* incorrect variant type */ + hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_INT); + ok(hres == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx returns %08x\n", hres); + ok(V_VT(&v2) == 0xff, "VariantChangeTypeEx changed dst variant\n"); + hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_BSTR); + ok(hres == DISP_E_BADVARTYPE, "VariantChangeTypeEx returns %08x\n", hres); + ok(V_VT(&v2) == 0xff, "VariantChangeTypeEx changed dst variant\n"); SysFreeString(bstr); } diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 053903e..c3bd225 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1042,7 +1042,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, if (SUCCEEDED(res)) { V_VT(&vTmp) = vt; - VariantCopy(pvargDest, &vTmp); + res = VariantCopy(pvargDest, &vTmp); } VariantClear(&vTmp); VariantClear(&vSrcDeref);

1 0

Alexandre Julliard : user32: Don' t bother returning a value from the SetWindowRgn driver entry point.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 6a0f3df68cb22ca341a0ca2dd642d426c74e5cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0f3df68cb22ca341a0ca2dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 12:31:14 2014 +0200 user32: Don't bother returning a value from the SetWindowRgn driver entry point. --- dlls/user32/driver.c | 7 +++---- dlls/user32/user_private.h | 2 +- dlls/winemac.drv/window.c | 4 +--- dlls/winex11.drv/window.c | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 672f194..e0bc38c 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -457,9 +457,8 @@ static void CDECL nulldrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { } -static int CDECL nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +static void CDECL nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { - return 1; } static void CDECL nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) @@ -757,9 +756,9 @@ static void CDECL loaderdrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, load_driver()->pSetLayeredWindowAttributes( hwnd, key, alpha, flags ); } -static int CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +static void CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { - return load_driver()->pSetWindowRgn( hwnd, hrgn, redraw ); + load_driver()->pSetWindowRgn( hwnd, hrgn, redraw ); } static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f2345e8..2bb869a 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -105,7 +105,7 @@ typedef struct tagUSER_DRIVER { void (CDECL *pSetFocus)(HWND); void (CDECL *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); void (CDECL *pSetParent)(HWND,HWND,HWND); - int (CDECL *pSetWindowRgn)(HWND,HRGN,BOOL); + void (CDECL *pSetWindowRgn)(HWND,HRGN,BOOL); void (CDECL *pSetWindowIcon)(HWND,UINT,HICON); void (CDECL *pSetWindowStyle)(HWND,INT,STYLESTRUCT*); void (CDECL *pSetWindowText)(HWND,LPCWSTR); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 6ef227c..e61a517 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1374,7 +1374,7 @@ void CDECL macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent) * * Assign specified region to window (for non-rectangular windows) */ -int CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) +void CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) { struct macdrv_win_data *data; @@ -1393,8 +1393,6 @@ int CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) if (procid != GetCurrentProcessId()) SendMessageW(hwnd, WM_MACDRV_SET_WIN_REGION, 0, 0); } - - return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d98b9f6..77cf304 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2435,7 +2435,7 @@ done: * * Assign specified region to window (for non-rectangular windows) */ -int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +void CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { struct x11drv_win_data *data; @@ -2448,7 +2448,6 @@ int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { SendMessageW( hwnd, WM_X11DRV_SET_WIN_REGION, 0, 0 ); } - return TRUE; }

1 0

Thomas Faber : qmgr: Register WINE_REGISTRY resource in DllRegisterServer instead of a nonexistent inf file.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 8365eb8753db51ab078080afe423301885644a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8365eb8753db51ab078080afe… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu May 1 13:48:00 2014 +0200 qmgr: Register WINE_REGISTRY resource in DllRegisterServer instead of a nonexistent inf file. --- dlls/qmgr/qmgr_main.c | 77 ++----------------------------------------------- 1 file changed, 3 insertions(+), 74 deletions(-) diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c index 051c3a5..97c206a 100644 --- a/dlls/qmgr/qmgr_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -28,6 +28,7 @@ #include "winreg.h" #include "advpub.h" #include "olectl.h" +#include "rpcproxy.h" #include "winsvc.h" #include "bits.h" @@ -41,9 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); /* Handle to the base address of this DLL */ static HINSTANCE hInst; -/* Other GUIDs used by this module */ -DEFINE_GUID(CLSID_BackgroundCopyQMgr, 0x69AD4AEE, 0x51BE, 0x439b, 0xA9,0x2C, 0x86,0xAE,0x49,0x0E,0x8B,0x30); - /* Entry point for DLL */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -62,81 +60,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -static HRESULT init_register_strtable(STRTABLEA *strtable) -{ -#define CLSID_EXPANSION_ENTRY(id) { "CLSID_" #id, &CLSID_ ## id } - static const struct { - const char *name; - const CLSID *clsid; - } expns[] = { - CLSID_EXPANSION_ENTRY(BackgroundCopyQMgr), - CLSID_EXPANSION_ENTRY(BackgroundCopyManager) - }; -#undef CLSID_EXPANSION_ENTRY - static STRENTRYA pse[sizeof expns / sizeof expns[0]]; - DWORD i; - - strtable->cEntries = sizeof pse / sizeof pse[0]; - strtable->pse = pse; - for (i = 0; i < strtable->cEntries; i++) { - static const char dummy_sample[] = "{12345678-1234-1234-1234-123456789012}"; - const CLSID *clsid = expns[i].clsid; - pse[i].pszName = qmgr_strdup(expns[i].name); - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, sizeof dummy_sample); - if (!pse[i].pszName || !pse[i].pszValue) - return E_OUTOFMEMORY; - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], - clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], - clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); - } - - return S_OK; -} - -static void cleanup_register_strtable(STRTABLEA *strtable) -{ - DWORD i; - for (i = 0; i < strtable->cEntries; i++) { - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName); - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue); - if (!strtable->pse[i].pszName || !strtable->pse[i].pszValue) - return; - } -} - -/* Use an INF file to register or unregister the DLL */ -static HRESULT register_server(BOOL do_register) -{ - HRESULT hr; - STRTABLEA strtable; - HMODULE hAdvpack; - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - TRACE("(%x)\n", do_register); - - hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - - hr = init_register_strtable(&strtable); - if (SUCCEEDED(hr)) - hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", - &strtable); - cleanup_register_strtable(&strtable); - - if (FAILED(hr)) - ERR("RegInstall failed: %08x\n", hr); - - return hr; -} - HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + return __wine_register_resources(hInst); } HRESULT WINAPI DllUnregisterServer(void) { - return register_server(FALSE); + return __wine_unregister_resources(hInst); }

1 0

Huw Davies : ole32/tests: Fix win8 test failures.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: dcfd901c83a8ac413bf913ada38211d2e60183c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcfd901c83a8ac413bf913ada… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 1 11:12:56 2014 +0100 ole32/tests: Fix win8 test failures. --- dlls/ole32/tests/hglobalstream.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index b509fb5..cf9fedf 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -261,14 +261,17 @@ static void test_streamonhglobal(IStream *pStream) ok(ull.u.LowPart == 0x80000008, "should have set LowPart to 0x80000008 instead of %08x\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); - /* IStream_Seek -- seek wraps position/size on integer overflow */ + /* IStream_Seek -- seek wraps position/size on integer overflow, but not on win8 */ ull.u.HighPart = 0xCAFECAFE; ull.u.LowPart = 0xCAFECAFE; ll.u.HighPart = 0; ll.u.LowPart = 0x7FFFFFFF; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); - ok_ole_success(hr, "IStream_Seek"); - ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); + ok(hr == S_OK || hr == STG_E_SEEKERROR /* win8 */, "IStream_Seek"); + if (SUCCEEDED(hr)) + ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); + else + ok(ull.u.LowPart == 0x80000008, "should have set LowPart to 0x80000008 instead of %08x\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); hr = IStream_Commit(pStream, STGC_DEFAULT);

1 0

Piotr Caban : oleacc: Add Client_get_accValue implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 5224f093713e2231dcb77a8050bea8bc9aec2485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5224f093713e2231dcb77a805… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:31 2014 +0200 oleacc: Add Client_get_accValue implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 30673d3..e16d3f8 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -170,8 +170,13 @@ static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT varID, BSTR *pszValue) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszValue); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszValue); + + *pszValue = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_get_accDescription(IAccessible *iface,

1 0

Piotr Caban : oleacc: Add Client_get_accDescription implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 1eb9d7e703930ae99ec920a5ce58eb774563eed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb9d7e703930ae99ec920a5c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:37 2014 +0200 oleacc: Add Client_get_accDescription implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index e16d3f8..48c8d1c 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -183,8 +183,13 @@ static HRESULT WINAPI Client_get_accDescription(IAccessible *iface, VARIANT varID, BSTR *pszDescription) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDescription); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDescription); + + *pszDescription = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARIANT *pvarRole)

1 0

Piotr Caban : oleacc: Add Client_get_accRole implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 2c8bb773b6e750f5696b48cfee44a2aaee977090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8bb773b6e750f5696b48cfe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:42 2014 +0200 oleacc: Add Client_get_accRole implementation. --- dlls/oleacc/client.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 48c8d1c..7af5c38 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -195,8 +195,17 @@ static HRESULT WINAPI Client_get_accDescription(IAccessible *iface, static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARIANT *pvarRole) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarRole); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarRole); + + if(convert_child_id(&varID) != CHILDID_SELF) { + V_VT(pvarRole) = VT_EMPTY; + return E_INVALIDARG; + } + + V_VT(pvarRole) = VT_I4; + V_I4(pvarRole) = ROLE_SYSTEM_CLIENT; + return S_OK; } static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState)

1 0

Piotr Caban : oleacc: Add Client_get_accHelpTopic implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: f196551a4d465f726f19ecbc4e74a22d9ee51975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f196551a4d465f726f19ecbc4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:58 2014 +0200 oleacc: Add Client_get_accHelpTopic implementation. --- dlls/oleacc/client.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 88009f3..a60ec24 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -238,9 +238,31 @@ static HRESULT WINAPI Client_get_accHelpTopic(IAccessible *iface, static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, VARIANT varID, BSTR *pszKeyboardShortcut) { + static const WCHAR shortcut_fmt[] = {'A','l','t','+','!',0}; Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszKeyboardShortcut); - return E_NOTIMPL; + WCHAR name[1024]; + UINT i, len; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszKeyboardShortcut); + + *pszKeyboardShortcut = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + + len = SendMessageW(This->hwnd, WM_GETTEXT, sizeof(name)/sizeof(WCHAR), (LPARAM)name); + for(i=0; i<len; i++) { + if(name[i] == '&') + break; + } + if(i+1 >= len) + return S_FALSE; + + *pszKeyboardShortcut = SysAllocString(shortcut_fmt); + if(!*pszKeyboardShortcut) + return E_OUTOFMEMORY; + + (*pszKeyboardShortcut)[4] = name[i+1]; + return S_OK; } static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *pvarID)

1 0

Piotr Caban : oleacc: Add Client_get_accRole implementaiton.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 0793010063a0714ec523438f675412aeeb59480c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0793010063a0714ec523438f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:15:03 2014 +0200 oleacc: Add Client_get_accRole implementaiton. --- dlls/oleacc/client.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index a60ec24..e768657 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -211,8 +211,28 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); - return E_NOTIMPL; + LONG style; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); + + if(convert_child_id(&varID) != CHILDID_SELF) { + V_VT(pvarState) = VT_EMPTY; + return E_INVALIDARG; + } + + V_VT(pvarState) = VT_I4; + V_I4(pvarState) = 0; + + style = GetWindowLongW(This->hwnd, GWL_STYLE); + if(style & WS_DISABLED) + V_I4(pvarState) |= STATE_SYSTEM_UNAVAILABLE; + else if(IsWindow(This->hwnd)) + V_I4(pvarState) |= STATE_SYSTEM_FOCUSABLE; + if(GetFocus() == This->hwnd) + V_I4(pvarState) |= STATE_SYSTEM_FOCUSED; + if(!(style & WS_VISIBLE)) + V_I4(pvarState) |= STATE_SYSTEM_INVISIBLE; + return S_OK; } static HRESULT WINAPI Client_get_accHelp(IAccessible *iface, VARIANT varID, BSTR *pszHelp)

1 0

Piotr Caban : oleacc: Add Client_get_accDefaultAction implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: acc45124d630f0c315c0f8841e6c3f021eff050e URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc45124d630f0c315c0f8841… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:53 2014 +0200 oleacc: Add Client_get_accDefaultAction implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 104ebdb..88009f3 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -261,8 +261,13 @@ static HRESULT WINAPI Client_get_accDefaultAction(IAccessible *iface, VARIANT varID, BSTR *pszDefaultAction) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDefaultAction); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDefaultAction); + + *pszDefaultAction = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_accSelect(IAccessible *iface, LONG flagsSelect, VARIANT varID)

1 0

Piotr Caban : oleacc: Add Client_get_accHelp implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 4ecee6f7d824e4d734b5b93f3448ccb1ffe05cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ecee6f7d824e4d734b5b93f3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:48 2014 +0200 oleacc: Add Client_get_accHelp implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 7af5c38..104ebdb 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -218,8 +218,13 @@ static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VAR static HRESULT WINAPI Client_get_accHelp(IAccessible *iface, VARIANT varID, BSTR *pszHelp) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszHelp); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszHelp); + + *pszHelp = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_get_accHelpTopic(IAccessible *iface,

1 0

Piotr Caban : oleacc: Add default client accessible object stub.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: da8005c75ecabac85731dd2dd47e80dcf99ed189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8005c75ecabac85731dd2dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:13:54 2014 +0200 oleacc: Add default client accessible object stub. --- dlls/oleacc/Makefile.in | 3 +- dlls/oleacc/client.c | 319 ++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/main.c | 53 ++++++- dlls/oleacc/oleacc_private.h | 33 +++++ 4 files changed, 403 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da8005c75ecabac85731d…

1 0

Jérôme Gardou : msi: Expand REG_EXPAND_SZ keys when resolving AppSearch entries.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 70225a4de3acc2cb15034eae2b7f929078602f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70225a4de3acc2cb15034eae2… Author: Jérôme Gardou <jerome.gardou(a)reactos.org> Date: Wed Apr 30 16:08:43 2014 +0200 msi: Expand REG_EXPAND_SZ keys when resolving AppSearch entries. --- dlls/msi/appsearch.c | 13 +++++++++++++ dlls/msi/tests/package.c | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 0d9c302..ae8c5c8 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -451,6 +451,19 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT if (sz == 0) goto end; + /* expand if needed */ + if (regType == REG_EXPAND_SZ) + { + sz = ExpandEnvironmentStringsW((LPCWSTR)value, NULL, 0); + if (sz) + { + LPWSTR buf = msi_alloc(sz * sizeof(WCHAR)); + ExpandEnvironmentStringsW((LPCWSTR)value, buf, sz); + msi_free(value); + value = (LPBYTE)buf; + } + } + if ((regType == REG_SZ || regType == REG_EXPAND_SZ) && (ptr = strchrW((LPWSTR)value, '"')) && (end = strchrW(++ptr, '"'))) *end = '\0'; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a0c0455..043baf9 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3689,6 +3689,8 @@ static void test_appsearch(void) MSIHANDLE hdb; CHAR prop[MAX_PATH]; DWORD size; + HKEY hkey; + const char reg_expand_value[] = "%systemroot%\\system32\\notepad.exe"; hdb = create_package_db(); ok ( hdb, "failed to create package database\n" ); @@ -3702,12 +3704,23 @@ static void test_appsearch(void) r = add_appsearch_entry( hdb, "'NOTEPAD', 'NewSignature2'" ); ok( r == ERROR_SUCCESS, "cannot add entry: %d\n", r ); + r = add_appsearch_entry( hdb, "'REGEXPANDVAL', 'NewSignature3'" ); + ok( r == ERROR_SUCCESS, "cannot add entry: %d\n", r ); + r = create_reglocator_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); r = add_reglocator_entry( hdb, "NewSignature1", 0, "htmlfile\\shell\\open\\command", "", 1 ); ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); + r = RegCreateKeyExA(HKEY_CURRENT_USER, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); + ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); + r = RegSetValueExA(hkey, NULL, 0, REG_EXPAND_SZ, (const BYTE*)reg_expand_value, strlen(reg_expand_value) + 1); + ok( r == ERROR_SUCCESS, "Could not set key value: %d.\n", r); + RegCloseKey(hkey); + r = add_reglocator_entry( hdb, "NewSignature3", 1, "Software\\Winetest_msi", "", 1 ); + ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); + r = create_drlocator_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create DrLocator table: %d\n", r ); @@ -3723,6 +3736,9 @@ static void test_appsearch(void) r = add_signature_entry( hdb, "'NewSignature2', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); ok( r == ERROR_SUCCESS, "cannot add signature: %d\n", r ); + r = add_signature_entry( hdb, "'NewSignature3', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); + ok( r == ERROR_SUCCESS, "cannot add signature: %d\n", r ); + r = package_from_db( hdb, &hpkg ); if (r == ERROR_INSTALL_PACKAGE_REJECTED) { @@ -3749,9 +3765,15 @@ static void test_appsearch(void) r = MsiGetPropertyA( hpkg, "NOTEPAD", prop, &size ); ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + size = sizeof(prop); + r = MsiGetPropertyA( hpkg, "REGEXPANDVAL", prop, &size ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + done: MsiCloseHandle( hpkg ); DeleteFileA(msifile); + RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Winetest_msi"); } static void test_appsearch_complocator(void)

1 0

Ken Thomases : configure: Use the discovered LCMS2_LIBS when testing linking against lcms2.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: dfa98dfb497bf40324831661d90741a7f2865a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa98dfb497bf40324831661d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 30 17:48:09 2014 -0500 configure: Use the discovered LCMS2_LIBS when testing linking against lcms2. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1bca827..0db221c 100755 --- a/configure +++ b/configure @@ -11755,7 +11755,7 @@ if ${ac_cv_lib_lcms2_cmsOpenProfileFromFile+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-llcms2 $LIBS" +LIBS="-llcms2 $LCMS2_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/configure.ac b/configure.ac index 46602d6..673323a 100644 --- a/configure.ac +++ b/configure.ac @@ -1442,7 +1442,7 @@ then if test "$ac_cv_header_lcms2_h" = "yes" then AC_CHECK_LIB(lcms2, cmsOpenProfileFromFile, - [AC_DEFINE(HAVE_LCMS2, 1, [Define if you have the LittleCMS development environment])],[LCMS2_LIBS=""]) + [AC_DEFINE(HAVE_LCMS2, 1, [Define if you have the LittleCMS development environment])],[LCMS2_LIBS=""],[$LCMS2_LIBS]) else LCMS2_CFLAGS="" LCMS2_LIBS=""

1 0

Hans Leidekker : msi: Avoid a crash when MIME entries point to non-existing extensions.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 95d72ae6f012968486402ac82f2758b9ee44008c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d72ae6f012968486402ac82… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 1 10:07:23 2014 +0200 msi: Avoid a crash when MIME entries point to non-existing extensions. --- dlls/msi/classes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 2719a8e..df5c817 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -1452,14 +1452,14 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( mt, &package->mimes, MSIMIME, entry ) { - LPWSTR extension, key; + LPWSTR extension = NULL, key; /* * check if the MIME is to be installed. Either as requested by an * extension or Class */ if ((!mt->Class || mt->Class->action != INSTALLSTATE_LOCAL) && - mt->Extension->action != INSTALLSTATE_LOCAL) + (!mt->Extension || mt->Extension->action != INSTALLSTATE_LOCAL)) { TRACE("MIME %s not scheduled to be installed\n", debugstr_w(mt->ContentType)); continue; @@ -1467,7 +1467,7 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) TRACE("Registering MIME type %s\n", debugstr_w(mt->ContentType)); - extension = msi_alloc( (strlenW( mt->Extension->Extension ) + 2) * sizeof(WCHAR) ); + if (mt->Extension) extension = msi_alloc( (strlenW( mt->Extension->Extension ) + 2) * sizeof(WCHAR) ); key = msi_alloc( (strlenW( mt->ContentType ) + strlenW( szMIMEDatabase ) + 1) * sizeof(WCHAR) ); if (extension && key) @@ -1510,7 +1510,7 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) LPWSTR mime_key; if ((!mime->Class || mime->Class->action != INSTALLSTATE_ABSENT) && - mime->Extension->action != INSTALLSTATE_ABSENT) + (!mime->Extension || mime->Extension->action != INSTALLSTATE_ABSENT)) { TRACE("MIME %s not scheduled to be removed\n", debugstr_w(mime->ContentType)); continue;

1 0

Thomas Faber : usp10: Do not write to last script item if buffer space is insufficient.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 3f9c9eaa549e342870af2ee9454a93d29090c1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9c9eaa549e342870af2ee94… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu May 1 08:57:09 2014 +0200 usp10: Do not write to last script item if buffer space is insufficient. --- dlls/usp10/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 94785b2..ae164d2 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1616,12 +1616,12 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, * item is set up to prevent random behaviour if the caller erroneously * checks the n+1 structure */ index++; + if (index + 1 > cMaxItems) return E_OUTOFMEMORY; memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos); /* Set one SCRIPT_STATE item being returned */ - if (index + 1 > cMaxItems) return E_OUTOFMEMORY; if (pcItems) *pcItems = index; /* Set SCRIPT_ITEM */

1 0

Francois Gouget : testbot/web: ObjectModel::CGI::Page::initialize() does not take a Collection argument.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: tools Branch: master Commit: 9bfab74f78f79fd0829af32a702dca166a6594ab URL: http://source.winehq.org/git/tools.git/?a=commit;h=9bfab74f78f79fd0829af32a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:22:25 2014 +0200 testbot/web: ObjectModel::CGI::Page::initialize() does not take a Collection argument. --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index cfe966b..d0ba188 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -196,7 +196,7 @@ sub _initialize { my $self = shift; - $self->SUPER::_initialize(@_, CreateJobs()); + $self->SUPER::_initialize(@_); } sub OutputDot

1 0

Francois Gouget : testbot/lib: Add calls to the parent InitializeNew() method.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: tools Branch: master Commit: c05902e1f83cb191f5707346fc3f760cd5e03b10 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c05902e1f83cb191f5707346… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:37:23 2014 +0200 testbot/lib: Add calls to the parent InitializeNew() method. --- testbot/lib/WineTestBot/Branches.pm | 1 + testbot/lib/WineTestBot/Users.pm | 1 + 2 files changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index 56f9965..ce975f1 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -38,6 +38,7 @@ sub InitializeNew my $self = shift; $self->IsDefault(!1); + $self->SUPER::InitializeNew(); } package WineTestBot::Branches; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index a0034ee..1f09446 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -44,6 +44,7 @@ sub InitializeNew $self->Status('active'); $self->Password("*"); + $self->SUPER::InitializeNew(); } sub GeneratePasswordHash

1 0

Francois Gouget : testbot/WineSendLog: Remove FatalError().
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: tools Branch: master Commit: 4ae0a6dc40acb17291cd5ddeb4b3625a088a86f7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4ae0a6dc40acb17291cd5dde… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:22:59 2014 +0200 testbot/WineSendLog: Remove FatalError(). Its main point was to trace the JobId but the $Job parameter was never used. So the code is clearer without it. --- testbot/bin/WineSendLog.pl | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index b375447..24cdd48 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -42,16 +42,6 @@ use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::StepsTasks; -sub FatalError -{ - my ($ErrMessage, $Job) = @_; - - my $JobKey = defined($Job) ? $Job->GetKey() : "0"; - - LogMsg "$JobKey $ErrMessage"; - - exit 1; -} sub IsBotFailure { @@ -535,17 +525,19 @@ if ($JobId =~ /^(\d+)$/) } else { - FatalError "Invalid JobId $JobId\n"; + LogMsg "Invalid JobId $JobId\n"; + exit(1); } my $Job = CreateJobs()->GetItem($JobId); if (! defined($Job)) { - FatalError "Job $JobId doesn't exist\n"; + LogMsg "Job $JobId doesn't exist\n"; + exit(1); } SendLog($Job); LogMsg "Log for job $JobId sent\n"; -exit; +exit(0);

1 0

Francois Gouget : testbot/CGI: Fix the CallGenerateError(Div|Popup)() calls in CollectionBlock.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: tools Branch: master Commit: 21c991065acc16bb51faec0a5e0cc54f52ff9915 URL: http://source.winehq.org/git/tools.git/?a=commit;h=21c991065acc16bb51faec0a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:34:19 2014 +0200 testbot/CGI: Fix the CallGenerateError(Div|Popup)() calls in CollectionBlock. They were passing too many parameters. --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 79c21ef..b663208 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -196,14 +196,14 @@ sub CallGenerateErrorDiv { my $self = shift; - $self->{EnclosingPage}->GenerateErrorDiv($self, @_); + $self->{EnclosingPage}->GenerateErrorDiv(); } sub CallGenerateErrorPopup { my $self = shift; - $self->{EnclosingPage}->GenerateErrorPopup($self, @_); + $self->{EnclosingPage}->GenerateErrorPopup(); } sub CallGenerateFormEnd

1 0

Francois Gouget : testbot/lib: Remove Roles::HasRole(), it' s unused and does not make sense.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: tools Branch: master Commit: b524951e9c26955e3f2d0c3416f4d8a8e8860469 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b524951e9c26955e3f2d0c34… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:36:56 2014 +0200 testbot/lib: Remove Roles::HasRole(), it's unused and does not make sense. See WineTestBot::User::HasRole() instead. --- testbot/lib/WineTestBot/Roles.pm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index 620566a..2d74016 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -35,11 +35,6 @@ use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotItem Exporter); -sub HasRole -{ - my $self = shift; - my $RoleName = shift; -} package WineTestBot::Roles;

1 0