January 2016 - Wine-commits

Hans Leidekker : webservices: Parse attribute names.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: 477b76497f33968f42ee28107d8a6d8c96de6ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=477b76497f33968f42ee28107… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 14:53:40 2016 +0100 webservices: Parse attribute names. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 3ea38ac..184335f 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -822,6 +822,32 @@ HRESULT append_attribute( WS_XML_ELEMENT_NODE *elem, WS_XML_ATTRIBUTE *attr ) return S_OK; } +static HRESULT parse_name( const unsigned char *str, unsigned int len, + WS_XML_STRING **prefix, WS_XML_STRING **localname ) +{ + const unsigned char *name_ptr = str, *prefix_ptr = NULL; + unsigned int i, name_len = len, prefix_len = 0; + + for (i = 0; i < len; i++) + { + if (str[i] == ':') + { + prefix_ptr = str; + prefix_len = i; + name_ptr = &str[i + 1]; + name_len -= i + 1; + break; + } + } + if (!(*prefix = alloc_xml_string( prefix_ptr, prefix_len ))) return E_OUTOFMEMORY; + if (!(*localname = alloc_xml_string( name_ptr, name_len ))) + { + heap_free( *prefix ); + return E_OUTOFMEMORY; + } + return S_OK; +} + static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) { WS_XML_ATTRIBUTE *attr; @@ -842,10 +868,9 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) } if (!len) goto error; + if ((hr = parse_name( start, len, &attr->prefix, &attr->localName )) != S_OK) goto error; + if (!attr->prefix->length) attr->prefix->bytes = NULL; hr = E_OUTOFMEMORY; - if (!(attr->localName = alloc_xml_string( start, len ))) goto error; - if (!(attr->prefix = alloc_xml_string( NULL, 0 ))) goto error; - attr->prefix->bytes = NULL; if (!(attr->ns = alloc_xml_string( NULL, 0 ))) goto error; attr->ns->bytes = NULL;

1 0

Hans Leidekker : webservices: Parse element names.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: d641bc080be5e319db2fdbe9381e8ba16170c1c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d641bc080be5e319db2fdbe93… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 14:53:41 2016 +0100 webservices: Parse element names. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 184335f..ae3d62a 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -944,10 +944,9 @@ static HRESULT read_element( struct reader *reader ) } if (!len) goto error; + if ((hr = parse_name( start, len, &elem->prefix, &elem->localName )) != S_OK) goto error; + if (!elem->prefix->length) elem->prefix->bytes = NULL; hr = E_OUTOFMEMORY; - if (!(elem->localName = alloc_xml_string( start, len ))) goto error; - if (!(elem->prefix = alloc_xml_string( NULL, 0 ))) goto error; - elem->prefix->bytes = NULL; if (!(elem->ns = alloc_xml_string( NULL, 0 ))) goto error; for (;;) @@ -1064,16 +1063,23 @@ static BOOL cmp_localname( const unsigned char *name1, ULONG len1, const unsigne return TRUE; } -static struct node *find_parent_element( struct node *node, const unsigned char *localname, ULONG len ) +static struct node *find_parent_element( struct node *node, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname ) { struct node *parent; - WS_XML_STRING *name; + const WS_XML_STRING *str; for (parent = node; parent; parent = parent->parent) { if (parent->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) continue; - name = ((WS_XML_ELEMENT_NODE *)parent)->localName; - if (!cmp_localname( name->bytes, name->length, localname, len )) continue; + if (!localname) return parent; + + str = parent->hdr.prefix; + if (!cmp_localname( str->bytes, str->length, prefix->bytes, prefix->length )) continue; + + str = parent->hdr.localName; + if (!cmp_localname( str->bytes, str->length, localname->bytes, localname->length )) continue; + return parent; } return NULL; @@ -1084,6 +1090,8 @@ static HRESULT read_endelement( struct reader *reader ) struct node *node, *parent; unsigned int len = 0, ch, skip; const unsigned char *start; + WS_XML_STRING *prefix, *localname; + HRESULT hr; switch (reader->state) { @@ -1111,8 +1119,12 @@ static HRESULT read_endelement( struct reader *reader ) read_skip( reader, skip ); len += skip; } - if (!(parent = find_parent_element( reader->current, start, len ))) - return WS_E_INVALID_FORMAT; + + if ((hr = parse_name( start, len, &prefix, &localname )) != S_OK) return hr; + parent = find_parent_element( reader->current, prefix, localname ); + heap_free( prefix ); + heap_free( localname ); + if (!parent) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; read_insert_node( reader, parent, node );

1 0

Hans Leidekker : webservices/tests: Add more tests for WsReadEndElement.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: a443318d18786191f58ada6964a242be09db2bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a443318d18786191f58ada696… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 14:53:42 2016 +0100 webservices/tests: Add more tests for WsReadEndElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 67 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 8a6ba3e..58d1b2b 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -869,6 +869,39 @@ static void test_WsReadStartElement(void) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); ok( !memcmp( elem->localName->bytes, "node2", 5), "wrong name\n" ); } + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", node->nodeType ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + /* WsReadEndElement advances reader to EOF */ + hr = WsReadEndElement( reader, NULL ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + WsFreeReader( reader ); } @@ -924,6 +957,40 @@ static void test_WsReadEndElement(void) ok( hr == S_OK, "got %08x\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + hr = set_input( reader, data2, sizeof(data2) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof(data2) - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", node->nodeType ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + /* WsReadEndElement advances reader to EOF */ + hr = WsReadEndElement( reader, NULL ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + hr = set_input( reader, data5, sizeof(data5) - 1 ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Changhui Liu : hidclass.sys: Properly quit hid_device_thread when both completion event and halt event are signaled.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: 3f2055b1cf47812dc3453d69d420d3f9481efe74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f2055b1cf47812dc3453d69d… Author: Changhui Liu <liuchanghui(a)linuxdeepin.com> Date: Wed Jan 20 14:11:42 2016 +0800 hidclass.sys: Properly quit hid_device_thread when both completion event and halt event are signaled. Signed-off-by: Changhui Liu <liuchanghui(a)linuxdeepin.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 41b5405..886a77a 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -261,7 +261,7 @@ static DWORD CALLBACK hid_device_thread(void *args) NTSTATUS ntrc; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - events[0] = CreateEventA(NULL, FALSE, FALSE, NULL); + events[0] = CreateEventA(NULL, TRUE, FALSE, NULL); events[1] = ext->halt_event; if (ext->information.Polled) @@ -336,12 +336,13 @@ static DWORD CALLBACK hid_device_thread(void *args) if (ntrc == STATUS_PENDING) { - rc = WaitForMultipleObjects(2, events, FALSE, INFINITE); - - if (rc == WAIT_OBJECT_0 + 1) - exit_now = TRUE; + WaitForMultipleObjects(2, events, FALSE, INFINITE); } + rc = WaitForSingleObject(ext->halt_event, 0); + if (rc == WAIT_OBJECT_0) + exit_now = TRUE; + if (!exit_now && irp->IoStatus.u.Status == STATUS_SUCCESS) { packet->reportId = buffer[0]; @@ -368,7 +369,7 @@ static DWORD CALLBACK hid_device_thread(void *args) void HID_StartDeviceThread(DEVICE_OBJECT *device) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - ext->halt_event = CreateEventA(NULL, FALSE, FALSE, NULL); + ext->halt_event = CreateEventA(NULL, TRUE, FALSE, NULL); ext->thread = CreateThread(NULL, 0, hid_device_thread, device, 0, NULL); }

1 0

Huw Davies : ole32: The type of the size of IMalloc'ed blocks is SIZE_T.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: bf5dca19763f31c6c5abc2d57db944e4549c5a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5dca19763f31c6c5abc2d57… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 19 16:19:09 2016 +0000 ole32: The type of the size of IMalloc'ed blocks is SIZE_T. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 6 +++--- dlls/mapi32/imalloc.c | 10 +++++----- dlls/ole32/ifs.c | 48 +++++++++++++++++++++++++----------------------- include/objbase.h | 4 ++-- include/objidl.idl | 18 +++++++++--------- 5 files changed, 44 insertions(+), 42 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 94fb558..d63da8c 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2821,7 +2821,7 @@ static ULONG WINAPI MimeAlloc_Release( static LPVOID WINAPI MimeAlloc_Alloc( IMimeAllocator* iface, - ULONG cb) + SIZE_T cb) { return CoTaskMemAlloc(cb); } @@ -2829,7 +2829,7 @@ static LPVOID WINAPI MimeAlloc_Alloc( static LPVOID WINAPI MimeAlloc_Realloc( IMimeAllocator* iface, LPVOID pv, - ULONG cb) + SIZE_T cb) { return CoTaskMemRealloc(pv, cb); } @@ -2841,7 +2841,7 @@ static void WINAPI MimeAlloc_Free( CoTaskMemFree(pv); } -static ULONG WINAPI MimeAlloc_GetSize( +static SIZE_T WINAPI MimeAlloc_GetSize( IMimeAllocator* iface, LPVOID pv) { diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index 90f29a1..3e95a6c 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -112,9 +112,9 @@ static ULONG WINAPI IMAPIMalloc_fnRelease(LPMALLOC iface) /************************************************************************** * IMAPIMalloc_Alloc */ -static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, DWORD cb) +static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, SIZE_T cb) { - TRACE("(%p)->(%d)\n", iface, cb); + TRACE("(%p)->(%ld)\n", iface, cb); return LocalAlloc(LMEM_FIXED, cb); } @@ -122,9 +122,9 @@ static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, DWORD cb) /************************************************************************** * IMAPIMalloc_Realloc */ -static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb) +static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, SIZE_T cb) { - TRACE("(%p)->(%p, %d)\n", iface, pv, cb); + TRACE("(%p)->(%p, %ld)\n", iface, pv, cb); if (!pv) return LocalAlloc(LMEM_FIXED, cb); @@ -148,7 +148,7 @@ static void WINAPI IMAPIMalloc_fnFree(LPMALLOC iface, LPVOID pv) /************************************************************************** * IMAPIMalloc_GetSize */ -static DWORD WINAPI IMAPIMalloc_fnGetSize(LPMALLOC iface, LPVOID pv) +static SIZE_T WINAPI IMAPIMalloc_fnGetSize(LPMALLOC iface, LPVOID pv) { TRACE("(%p)->(%p)\n", iface, pv); return LocalSize(pv); diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 18fd1fd..6868897 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -143,8 +143,8 @@ static BOOL RemoveMemoryLocation(LPCVOID pMem) /****************************************************************************** * IMalloc32_QueryInterface [VTABLE] */ -static HRESULT WINAPI IMalloc_fnQueryInterface(LPMALLOC iface,REFIID refiid,LPVOID *obj) { - +static HRESULT WINAPI IMalloc_fnQueryInterface(IMalloc *iface, REFIID refiid, void **obj) +{ TRACE("(%s,%p)\n",debugstr_guid(refiid),obj); if (IsEqualIID(&IID_IUnknown,refiid) || IsEqualIID(&IID_IMalloc,refiid)) { @@ -157,21 +157,22 @@ static HRESULT WINAPI IMalloc_fnQueryInterface(LPMALLOC iface,REFIID refiid,LPVO /****************************************************************************** * IMalloc32_AddRefRelease [VTABLE] */ -static ULONG WINAPI IMalloc_fnAddRefRelease (LPMALLOC iface) { +static ULONG WINAPI IMalloc_fnAddRefRelease(IMalloc *iface) +{ return 1; } /****************************************************************************** * IMalloc32_Alloc [VTABLE] */ -static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface, DWORD cb) { - - LPVOID addr; +static void * WINAPI IMalloc_fnAlloc(IMalloc *iface, SIZE_T cb) +{ + void *addr; - TRACE("(%d)\n",cb); + TRACE("(%ld)\n",cb); if(Malloc32.pSpy) { - DWORD preAllocResult; + SIZE_T preAllocResult; EnterCriticalSection(&IMalloc32_SpyCS); preAllocResult = IMallocSpy_PreAlloc(Malloc32.pSpy, cb); @@ -198,14 +199,14 @@ static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface, DWORD cb) { /****************************************************************************** * IMalloc32_Realloc [VTABLE] */ -static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) { - - LPVOID pNewMemory; +static void * WINAPI IMalloc_fnRealloc(IMalloc *iface, void *pv, SIZE_T cb) +{ + void *pNewMemory; - TRACE("(%p,%d)\n",pv,cb); + TRACE("(%p,%ld)\n",pv,cb); if(Malloc32.pSpy) { - LPVOID pRealMemory; + void *pRealMemory; BOOL fSpyed; EnterCriticalSection(&IMalloc32_SpyCS); @@ -250,8 +251,8 @@ static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) { /****************************************************************************** * IMalloc32_Free [VTABLE] */ -static VOID WINAPI IMalloc_fnFree(LPMALLOC iface,LPVOID pv) { - +static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) +{ BOOL fSpyed = FALSE; TRACE("(%p)\n",pv); @@ -286,9 +287,9 @@ static VOID WINAPI IMalloc_fnFree(LPMALLOC iface,LPVOID pv) { * win95: size allocated (4 byte boundarys) * win2k: size originally requested !!! (allocated on 8 byte boundarys) */ -static DWORD WINAPI IMalloc_fnGetSize(LPMALLOC iface,LPVOID pv) { - - DWORD cb; +static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv) +{ + SIZE_T cb; BOOL fSpyed = FALSE; TRACE("(%p)\n",pv); @@ -311,8 +312,8 @@ static DWORD WINAPI IMalloc_fnGetSize(LPMALLOC iface,LPVOID pv) { /****************************************************************************** * IMalloc32_DidAlloc [VTABLE] */ -static INT WINAPI IMalloc_fnDidAlloc(LPMALLOC iface,LPVOID pv) { - +static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *pv) +{ BOOL fSpyed = FALSE; int didAlloc; @@ -335,7 +336,8 @@ static INT WINAPI IMalloc_fnDidAlloc(LPMALLOC iface,LPVOID pv) { /****************************************************************************** * IMalloc32_HeapMinimize [VTABLE] */ -static VOID WINAPI IMalloc_fnHeapMinimize(LPMALLOC iface) { +static void WINAPI IMalloc_fnHeapMinimize(IMalloc *iface) +{ TRACE("()\n"); if(Malloc32.pSpy) { @@ -398,7 +400,7 @@ HRESULT WINAPI CoGetMalloc(DWORD context, IMalloc **imalloc) * Success: Pointer to newly allocated memory block. * Failure: NULL. */ -LPVOID WINAPI CoTaskMemAlloc(ULONG size) +LPVOID WINAPI CoTaskMemAlloc(SIZE_T size) { return IMalloc_Alloc(&Malloc32.IMalloc_iface,size); } @@ -432,7 +434,7 @@ VOID WINAPI CoTaskMemFree(LPVOID ptr) * Success: Pointer to newly allocated memory block. * Failure: NULL. */ -LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, ULONG size) +LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, SIZE_T size) { return IMalloc_Realloc(&Malloc32.IMalloc_iface, pvOld, size); } diff --git a/include/objbase.h b/include/objbase.h index 23594ac..d73f220 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -304,9 +304,9 @@ HRESULT WINAPI CoGetInstanceFromFile(COSERVERINFO* pServerInfo, CLSID* pClsid, I HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, IStorage* pstg, DWORD dwCount, MULTI_QI* pResults); HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC* lpMalloc); -LPVOID WINAPI CoTaskMemAlloc(ULONG size) __WINE_ALLOC_SIZE(1); +LPVOID WINAPI CoTaskMemAlloc(SIZE_T size) __WINE_ALLOC_SIZE(1); void WINAPI CoTaskMemFree(LPVOID ptr); -LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, ULONG size); +LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, SIZE_T size); HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy); HRESULT WINAPI CoRevokeMallocSpy(void); diff --git a/include/objidl.idl b/include/objidl.idl index c18442f..335282d 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -162,16 +162,16 @@ interface IMalloc : IUnknown typedef [unique] IMalloc *LPMALLOC; LPVOID Alloc( - [in] ULONG cb); + [in] SIZE_T cb); LPVOID Realloc( [in] LPVOID pv, - [in] ULONG cb); + [in] SIZE_T cb); void Free( [in] LPVOID pv); - ULONG GetSize( + SIZE_T GetSize( [in] LPVOID pv); int DidAlloc(LPVOID pv); @@ -188,8 +188,8 @@ interface IMallocSpy : IUnknown { typedef [unique] IMallocSpy *LPMALLOCSPY; - ULONG PreAlloc( - [in] ULONG cbRequest); + SIZE_T PreAlloc( + [in] SIZE_T cbRequest); LPVOID PostAlloc( [in] LPVOID pActual); @@ -201,9 +201,9 @@ interface IMallocSpy : IUnknown void PostFree( [in] BOOL fSpyed); - ULONG PreRealloc( + SIZE_T PreRealloc( [in] LPVOID pRequest, - [in] ULONG cbRequest, + [in] SIZE_T cbRequest, [out] LPVOID *ppNewRequest, [in] BOOL fSpyed); @@ -215,8 +215,8 @@ interface IMallocSpy : IUnknown [in] LPVOID pRequest, [in] BOOL fSpyed); - ULONG PostGetSize( - [in] ULONG cbActual, + SIZE_T PostGetSize( + [in] SIZE_T cbActual, [in] BOOL fSpyed); LPVOID PreDidAlloc(

1 0

Andrew Eikum : xaudio2_9: Add xaudio2_9.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: 121a69e028b98b5b976c972e10bcb1f1c90dd770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=121a69e028b98b5b976c972e1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 19 12:29:29 2016 -0600 xaudio2_9: Add xaudio2_9. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 2 ++ dlls/xaudio2_7/compat.c | 8 ++++++++ dlls/xaudio2_7/xaudio_dll.c | 1 + dlls/xaudio2_9/Makefile.in | 13 +++++++++++++ dlls/xaudio2_9/xaudio2_9.spec | 6 ++++++ include/xaudio2.idl | 7 +++++-- 7 files changed, 38 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d82731e..a17ad55 100755 --- a/configure +++ b/configure @@ -1408,6 +1408,7 @@ enable_xaudio2_5 enable_xaudio2_6 enable_xaudio2_7 enable_xaudio2_8 +enable_xaudio2_9 enable_xinput1_1 enable_xinput1_2 enable_xinput1_3 @@ -13720,6 +13721,7 @@ then enable_xaudio2_6=${enable_xaudio2_6:-no} enable_xaudio2_7=${enable_xaudio2_7:-no} enable_xaudio2_8=${enable_xaudio2_8:-no} + enable_xaudio2_9=${enable_xaudio2_9:-no} fi if test "$ac_cv_header_kstat_h" = "yes" @@ -18035,6 +18037,7 @@ wine_fn_config_dll xaudio2_6 enable_xaudio2_6 clean wine_fn_config_dll xaudio2_7 enable_xaudio2_7 clean wine_fn_config_test dlls/xaudio2_7/tests xaudio2_7_test wine_fn_config_dll xaudio2_8 enable_xaudio2_8 clean +wine_fn_config_dll xaudio2_9 enable_xaudio2_9 clean wine_fn_config_dll xinput1_1 enable_xinput1_1 wine_fn_config_dll xinput1_2 enable_xinput1_2 wine_fn_config_dll xinput1_3 enable_xinput1_3 implib xinput diff --git a/configure.ac b/configure.ac index d2eac29..23fee7b 100644 --- a/configure.ac +++ b/configure.ac @@ -1685,6 +1685,7 @@ then enable_xaudio2_6=${enable_xaudio2_6:-no} enable_xaudio2_7=${enable_xaudio2_7:-no} enable_xaudio2_8=${enable_xaudio2_8:-no} + enable_xaudio2_9=${enable_xaudio2_9:-no} fi dnl **** Check for libkstat **** @@ -3401,6 +3402,7 @@ WINE_CONFIG_DLL(xaudio2_6,,[clean]) WINE_CONFIG_DLL(xaudio2_7,,[clean]) WINE_CONFIG_TEST(dlls/xaudio2_7/tests) WINE_CONFIG_DLL(xaudio2_8,,[clean]) +WINE_CONFIG_DLL(xaudio2_9,,[clean]) WINE_CONFIG_DLL(xinput1_1) WINE_CONFIG_DLL(xinput1_2) WINE_CONFIG_DLL(xinput1_3,,[implib],[xinput]) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index 9488529..f2f7cd8 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -78,6 +78,14 @@ * Change parameter of IXAudio2::CreateMasteringVoice * Add Flags parameter to IXAudio2SourceVoice::GetState * Add IXAudio2MasteringVoice::GetChannelMask + * Add DisableLateField member to XAUDIO2FX_REVERB_PARAMETERS + * + * 2.9 + * Change IID_IXAudio2 + * New flags: XAUDIO2_STOP_ENGINE_WHEN_IDLE, XAUDIO2_1024_QUANTUM, + * XAUDIO2_NO_VIRTUAL_AUDIO_CLIENT + * ABI break: + * Add SideDelay member to XAUDIO2FX_REVERB_PARAMETERS */ #include "config.h" diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index ac1b2fe..4f0a11f 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1192,6 +1192,7 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IXAudio28) || IsEqualGUID(riid, &IID_IXAudio2)) *ppvObject = &This->IXAudio2_iface; else if(IsEqualGUID(riid, &IID_IXAudio27)){ diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in new file mode 100644 index 0000000..ceb2216 --- /dev/null +++ b/dlls/xaudio2_9/Makefile.in @@ -0,0 +1,13 @@ +EXTRADEFS = -DXAUDIO2_VER=9 +MODULE = xaudio2_9.dll +IMPORTS = advapi32 ole32 user32 uuid +EXTRALIBS = $(OPENAL_LIBS) +PARENTSRC = ../xaudio2_7 + +C_SRCS = \ + compat.c \ + x3daudio.c \ + xapofx.c \ + xaudio_dll.c + +IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_9/xaudio2_9.spec b/dlls/xaudio2_9/xaudio2_9.spec new file mode 100644 index 0000000..0b9f238 --- /dev/null +++ b/dlls/xaudio2_9/xaudio2_9.spec @@ -0,0 +1,6 @@ +@ stdcall XAudio2Create(ptr long long) +@ stdcall CreateAudioVolumeMeter(ptr) +@ stdcall CreateAudioReverb(ptr) +@ cdecl CreateFX(ptr ptr ptr long) +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) +@ cdecl X3DAudioInitialize(long float ptr) diff --git a/include/xaudio2.idl b/include/xaudio2.idl index 58cbe0a..9d8ace2 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -1001,11 +1001,14 @@ interface IXAudio27 : IUnknown [in, defaultvalue(NULL)] void* pReserved); } +/* XAudio2 2.8's IXAudio2 is identical to 2.9's */ +cpp_quote("DEFINE_GUID(IID_IXAudio28, 0x60d8dac8, 0x5aa1, 0x4e8e, 0xb5, 0x97, 0x2f, 0x5e, 0x28, 0x83, 0xd4, 0x84);") + [ object, - uuid(60d8dac8-5aa1-4e8e-b597-2f5e2883d484), + uuid(2b02e3cf-2e0b-4ec3-be45-1b2a3fe7210d) ] -/* XAudio2 2.8's IXAudio2 interface. */ +/* XAudio2 2.9's IXAudio2 interface. */ interface IXAudio2 : IUnknown { HRESULT RegisterForCallbacks([in] IXAudio2EngineCallback* pCallback);

1 0

Nikolay Sivov : dwrite: Underline origin is always at the left run boundary.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: adfd1ad2ce17f651274b49b848f2ec7119cca2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=adfd1ad2ce17f651274b49b84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 19 23:23:00 2016 +0300 dwrite: Underline origin is always at the left run boundary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index f765dc6..6b5bec7 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -428,6 +428,11 @@ static HRESULT format_set_optical_alignment(struct dwrite_textformat_data *forma return S_OK; } +static BOOL is_run_rtl(const struct layout_effective_run *run) +{ + return run->run->u.regular.run.bidiLevel & 1; +} + static struct layout_run *alloc_layout_run(enum layout_run_kind kind) { struct layout_run *ret; @@ -3144,7 +3149,8 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, LIST_FOR_EACH_ENTRY(u, &This->underlines, struct layout_underline, entry) { IDWriteTextRenderer_DrawUnderline(renderer, context, - u->run->origin_x + run->align_dx + origin_x, + /* horizontal underline always grows from left to right, width is always added to origin regardless of run direction */ + (is_run_rtl(u->run) ? u->run->origin_x - u->run->width : u->run->origin_x) + run->align_dx + origin_x, SNAP_COORD(u->run->origin_y + origin_y), &u->u, u->run->effect);

1 0

Nikolay Sivov : dwrite: Underline reading direction matches run direction.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: 6024656f9877a27a1dc47b6c5ea9a0f3323d266f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6024656f9877a27a1dc47b6c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 19 23:23:01 2016 +0300 dwrite: Underline reading direction matches run direction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 6b5bec7..9109924 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1546,7 +1546,8 @@ static HRESULT layout_add_underline(struct dwrite_textlayout *layout, struct lay however Y grows from baseline down for horizontal baseline. */ u->u.offset = -offset; u->u.runHeight = 0.0f; /* FIXME */ - u->u.readingDirection = layout->format.readingdir; + u->u.readingDirection = is_run_rtl(cur) ? DWRITE_READING_DIRECTION_RIGHT_TO_LEFT : + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT; u->u.flowDirection = layout->format.flow; u->u.localeName = cur->run->u.regular.descr.localeName; u->u.measuringMode = layout->measuringmode;

1 0

Nikolay Sivov : d3dx9/tests: Fix some test failures.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: 7b38f204586c6441d3666e8082d170fc341bd0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b38f204586c6441d3666e808… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 00:17:48 2016 +0300 d3dx9/tests: Fix some test failures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 7c86190..1afba18 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -11109,21 +11109,25 @@ static void D3DXCreateAnimationControllerTest(void) hr = D3DXCreateAnimationController(0, 0, 0, 0, NULL); ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + animation = (void*)0xdeadbeef; hr = D3DXCreateAnimationController(0, 1, 1, 1, &animation); ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); - ok(!animation, "Got unexpected animation %p.\n", animation); + ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation); + animation = (void*)0xdeadbeef; hr = D3DXCreateAnimationController(1, 0, 1, 1, &animation); ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); - ok(!animation, "Got unexpected animation %p.\n", animation); + ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation); + animation = (void*)0xdeadbeef; hr = D3DXCreateAnimationController(1, 1, 0, 1, &animation); ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); - ok(!animation, "Got unexpected animation %p.\n", animation); + ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation); + animation = (void*)0xdeadbeef; hr = D3DXCreateAnimationController(1, 1, 1, 0, &animation); ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); - ok(!animation, "Got unexpected animation %p.\n", animation); + ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation); hr = D3DXCreateAnimationController(1, 1, 1, 1, &animation); ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr);

1 0

Alexandre Julliard : kernel32/tests: Avoid sizeof in a trace.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: b23ab91e66d788a6a28c618a467b9e2ff11f35e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23ab91e66d788a6a28c618a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 20 16:42:45 2016 +0900 kernel32/tests: Avoid sizeof in a trace. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b760e9a..385e8e4 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4678,7 +4678,7 @@ static void test_GetSystemPreferredUILanguages(void) buffer = HeapAlloc(GetProcessHeap(), 0, size_buffer * sizeof(WCHAR)); if (!buffer) { - skip("Failed to allocate memory with size %d\n", size_buffer * sizeof(WCHAR)); + skip("Failed to allocate memory for %d chars\n", size_buffer); return; }

1 0