January 2016 - Wine-Commits

André Hentschel : htaccess: Use https for wiki.winehq.org
by Jeremy Newman Jan. 20, 2016

Jan. 20, 2016

Module: website Branch: master Commit: 68df846195e0c5b3901dc920fdba9f269c14c3e9 URL: http://source.winehq.org/git/website.git/?a=commit;h=68df846195e0c5b3901dc9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 20 20:12:31 2016 +0100 htaccess: Use https for wiki.winehq.org Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/htaccess.sample | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index 775e8ad..e969153 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -40,35 +40,35 @@ RedirectPermanent /download.shtml https://www.winehq.org/download RedirectPermanent /download.html https://www.winehq.org/download RedirectPermanent /download-mirrors.html https://www.winehq.org/download RedirectPermanent /download-mirrors.shtml https://www.winehq.org/download -RedirectPermanent /site/download-deb http://wiki.winehq.org/Debian -RedirectPermanent /download/debian http://wiki.winehq.org/Debian -RedirectPermanent /download/ubuntu http://wiki.winehq.org/Ubuntu +RedirectPermanent /site/download-deb https://wiki.winehq.org/Debian +RedirectPermanent /download/debian https://wiki.winehq.org/Debian +RedirectPermanent /download/ubuntu https://wiki.winehq.org/Ubuntu RedirectPermanent /site/getting_help https://www.winehq.org/help RedirectPermanent /support.shtml https://www.winehq.org/help RedirectPermanent /News/status.html https://www.winehq.org/status -RedirectPermanent /wiki http://wiki.winehq.org/ -RedirectPermanent /faq http://wiki.winehq.org/FAQ -RedirectPermanent /site/faq http://wiki.winehq.org/FAQ -RedirectPermanent /FAQ http://wiki.winehq.org/FAQ -RedirectPermanent /site/docs/wine-faq/index http://wiki.winehq.org/FAQ +RedirectPermanent /wiki https://wiki.winehq.org/ +RedirectPermanent /faq https://wiki.winehq.org/FAQ +RedirectPermanent /site/faq https://wiki.winehq.org/FAQ +RedirectPermanent /FAQ https://wiki.winehq.org/FAQ +RedirectPermanent /site/docs/wine-faq/index https://wiki.winehq.org/FAQ RedirectPermanent /screenshots https://appdb.winehq.org/ RedirectPermanent /site/screenshots https://appdb.winehq.org/ -RedirectPermanent /howto http://wiki.winehq.org/HowTo -RedirectPermanent /site/howto http://wiki.winehq.org/HowTo -RedirectPermanent /myths http://wiki.winehq.org/Debunking_Wine_Myths -RedirectPermanent /site/myths http://wiki.winehq.org/Debunking_Wine_Myths -RedirectPermanent /cvs http://wiki.winehq.org/GitWine -RedirectPermanent /site/cvs http://wiki.winehq.org/GitWine -RedirectPermanent /git http://wiki.winehq.org/GitWine -RedirectPermanent /site/git http://wiki.winehq.org/GitWine -RedirectPermanent /site/who http://wiki.winehq.org/WhosWho -RedirectPermanent /todo http://wiki.winehq.org/KnownIssues -RedirectPermanent /site/history http://wiki.winehq.org/WineHistory -RedirectPermanent /fun_projects http://wiki.winehq.org/Fun_Projects -RedirectPermanent /winelib http://wiki.winehq.org/Winelib +RedirectPermanent /howto https://wiki.winehq.org/HowTo +RedirectPermanent /site/howto https://wiki.winehq.org/HowTo +RedirectPermanent /myths https://wiki.winehq.org/Debunking_Wine_Myths +RedirectPermanent /site/myths https://wiki.winehq.org/Debunking_Wine_Myths +RedirectPermanent /cvs https://wiki.winehq.org/GitWine +RedirectPermanent /site/cvs https://wiki.winehq.org/GitWine +RedirectPermanent /git https://wiki.winehq.org/GitWine +RedirectPermanent /site/git https://wiki.winehq.org/GitWine +RedirectPermanent /site/who https://wiki.winehq.org/WhosWho +RedirectPermanent /todo https://wiki.winehq.org/KnownIssues +RedirectPermanent /site/history https://wiki.winehq.org/WineHistory +RedirectPermanent /fun_projects https://wiki.winehq.org/Fun_Projects +RedirectPermanent /winelib https://wiki.winehq.org/Winelib RedirectMatch ^/download/deb.*$ https://www.winehq.org/download/ -RedirectMatch ^/site/wineconf/?$ http://wiki.winehq.org/WineConf -RedirectMatch ^/wineconf/?$ http://wiki.winehq.org/WineConf +RedirectMatch ^/site/wineconf/?$ https://wiki.winehq.org/WineConf +RedirectMatch ^/wineconf/?$ https://wiki.winehq.org/WineConf # fix documentation links RedirectMatch ^/docs/wineusr-guide$ https://www.winehq.org/docs/wineusr-guide/index @@ -86,7 +86,7 @@ RedirectMatch ^/docs/([a-z-]+)/$ https://www.winehq.org/docs/$1/i RedirectMatch ^/(APPS|Apps|apps)$ https://appdb.winehq.org/ RedirectMatch ^/(APPS|Apps|apps)/query\.cgi$ https://appdb.winehq.org/ RedirectMatch ^/apps\.cgi$ https://appdb.winehq.org/ -RedirectMatch ^/(FAQ|Faq)$ http://wiki.winehq.org/FAQ +RedirectMatch ^/(FAQ|Faq)$ https://wiki.winehq.org/FAQ RedirectMatch ^/(BUGS|Bugs|bugs)$ https://bugs.winehq.org/ RedirectMatch ^/(TROUBLE|Trouble|trouble)$ https://wiki.winehq.org/FAQ

1 0

Akihiro Sagawa : comctl32: Prevent invalid focus change notifications from LVS_OWNERDATA lists.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: af4a757ad2cacbd238486632d0f7bd6f0a94483f URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4a757ad2cacbd238486632d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 20 22:34:42 2016 +0900 comctl32: Prevent invalid focus change notifications from LVS_OWNERDATA lists. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 68a5515..419a823 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8808,6 +8808,7 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl if (infoPtr->dwStyle & LVS_OWNERDATA) { INT nOldCount = infoPtr->nItemCount; + infoPtr->nItemCount = nItems; if (nItems < nOldCount) { @@ -8820,7 +8821,6 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl } } - infoPtr->nItemCount = nItems; LISTVIEW_UpdateScroll(infoPtr); /* the flags are valid only in ownerdata report and list modes */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 2afa44d..a6910d2 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3418,6 +3418,28 @@ static void test_ownerdata(void) style = GetWindowLongPtrA(hwnd, GWL_STYLE); ok(style & LVS_SORTDESCENDING, "Expected LVS_SORTDESCENDING to be set\n"); DestroyWindow(hwnd); + + /* The focused item is updated after the invalidation */ + hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 3, 0); + expect(TRUE, res); + + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 0, 0); + expect(TRUE, res); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "ownerdata setitemcount", FALSE); + + res = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + expect(-1, res); + DestroyWindow(hwnd); } static void test_norecompute(void)

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: 1d36e01fcc5066d108489d1bcbe2f4ffd0b94f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d36e01fcc5066d108489d1bc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 14:53:38 2016 +0100 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index 594a6ba..7599c96 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -290,6 +290,55 @@ typedef enum { WS_WRITE_NILLABLE_POINTER = 4 } WS_WRITE_OPTION; +typedef struct _WS_BOOL_DESCRIPTION { + BOOL value; +} WS_BOOL_DESCRIPTION; + +typedef struct _WS_INT8_DESCRIPTION { + char minValue; + char maxValue; +} WS_INT8_DESCRIPTION; + +typedef struct _WS_INT16_DESCRIPTION { + short minValue; + short maxValue; +} WS_INT16_DESCRIPTION; + +typedef struct _WS_INT32_DESCRIPTION { + int minValue; + int maxValue; +} WS_INT32_DESCRIPTION; + +typedef struct _WS_INT64_DESCRIPTION { + __int64 minValue; + __int64 maxValue; +} WS_INT64_DESCRIPTION; + +typedef struct _WS_UINT8_DESCRIPTION { + BYTE minValue; + BYTE maxValue; +} WS_UINT8_DESCRIPTION; + +typedef struct _WS_UINT16_DESCRIPTION { + USHORT minValue; + USHORT maxValue; +} WS_UINT16_DESCRIPTION; + +typedef struct _WS_UINT32_DESCRIPTION { + ULONG minValue; + ULONG maxValue; +} WS_UINT32_DESCRIPTION; + +typedef struct _WS_UINT64_DESCRIPTION { + unsigned __int64 minValue; + unsigned __int64 maxValue; +} WS_UINT64_DESCRIPTION; + +typedef struct _WS_WSZ_DESCRIPTION { + ULONG minCharCount; + ULONG maxCharCount; +} WS_WSZ_DESCRIPTION; + typedef enum { WS_TYPE_ATTRIBUTE_FIELD_MAPPING, WS_ATTRIBUTE_FIELD_MAPPING, @@ -367,6 +416,13 @@ typedef struct _WS_ATTRIBUTE_DESCRIPTION { void *typeDescription; } WS_ATTRIBUTE_DESCRIPTION; +typedef struct _WS_ELEMENT_DESCRIPTION { + WS_XML_STRING *elementLocalName; + WS_XML_STRING *elementNs; + WS_TYPE type; + void *typeDescription; +} WS_ELEMENT_DESCRIPTION; + typedef struct _WS_STRING { ULONG length; WCHAR *chars; @@ -430,6 +486,25 @@ typedef struct _WS_XML_UTF8_TEXT { WS_XML_STRING value; } WS_XML_UTF8_TEXT; +typedef enum { + WS_BOOL_VALUE_TYPE, + WS_INT8_VALUE_TYPE, + WS_INT16_VALUE_TYPE, + WS_INT32_VALUE_TYPE, + WS_INT64_VALUE_TYPE, + WS_UINT8_VALUE_TYPE, + WS_UINT16_VALUE_TYPE, + WS_UINT32_VALUE_TYPE, + WS_UINT64_VALUE_TYPE, + WS_FLOAT_VALUE_TYPE, + WS_DOUBLE_VALUE_TYPE, + WS_DECIMAL_VALUE_TYPE, + WS_DATETIME_VALUE_TYPE, + WS_TIMESPAN_VALUE_TYPE, + WS_GUID_VALUE_TYPE, + WS_DURATION_VALUE_TYPE +} WS_VALUE_TYPE; + typedef struct _WS_XML_ATTRIBUTE { BYTE singleQuote; BYTE isXmlNs; @@ -491,6 +566,7 @@ HRESULT WINAPI WsMoveReader(WS_XML_READER*, WS_MOVE_TO, BOOL*, WS_ERROR*); HRESULT WINAPI WsMoveWriter(WS_XML_WRITER*, WS_MOVE_TO, BOOL*, WS_ERROR*); HRESULT WINAPI WsReadAttribute(WS_XML_READER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsReadEndAttribute(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsReadEndElement(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsReadNode(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsReadStartAttribute(WS_XML_READER*, ULONG, WS_ERROR*); @@ -508,6 +584,11 @@ HRESULT WINAPI WsSetOutput(WS_XML_WRITER*, const WS_XML_WRITER_ENCODING*, const const WS_XML_WRITER_PROPERTY*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetOutputToBuffer(WS_XML_WRITER*, WS_XML_BUFFER*, const WS_XML_WRITER_PROPERTY*, ULONG, WS_ERROR*); +HRESULT WINAPI WsSkipNode(WS_XML_READER*, WS_ERROR*); +HRESULT WINAPI WsWriteAttribute(WS_XML_WRITER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_WRITE_OPTION, + const void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsWriteElement(WS_XML_WRITER*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, + const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteEndAttribute(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndElement(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndStartElement(WS_XML_WRITER*, WS_ERROR*); @@ -518,6 +599,11 @@ HRESULT WINAPI WsWriteStartElement(WS_XML_WRITER*, const WS_XML_STRING*, const W HRESULT WINAPI WsWriteText(WS_XML_WRITER*, const WS_XML_TEXT*, WS_ERROR*); HRESULT WINAPI WsWriteType(WS_XML_WRITER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsWriteValue(WS_XML_WRITER*, WS_VALUE_TYPE, const void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsWriteXmlBuffer(WS_XML_WRITER*, WS_XML_BUFFER*, WS_ERROR*); +HRESULT WINAPI WsWriteXmlBufferToBytes(WS_XML_WRITER*, WS_XML_BUFFER*, const WS_XML_WRITER_ENCODING*, + const WS_XML_WRITER_PROPERTY*, ULONG, WS_HEAP*, void**, + ULONG*, WS_ERROR*); HRESULT WINAPI WsXmlStringEquals(const WS_XML_STRING*, const WS_XML_STRING*, WS_ERROR*); #define WS_S_ASYNC 0x003d0000

1 0

Hans Leidekker : webservices: Parse attribute names.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

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

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

Jan. 20, 2016

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

Hans Leidekker : webservices: Parse element names.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

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

Piotr Caban : msvcrt: Fix size test of structure returned by _Gettnames.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: 9189eb2208ac4129ada43c6bdec832ea0b961a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9189eb2208ac4129ada43c6bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 11:42:03 2016 +0100 msvcrt: Fix size test of structure returned by _Gettnames. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 65bb74b..f4d86bc 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -671,12 +671,12 @@ static void test__Gettnames(void) return; ret = _Gettnames(); - size = ret->data-(char*)ret; + size = ret->str[0]-(char*)ret; /* Newer version of the structure stores both ascii and unicode strings. * Unicode strings are only initialized on Windows 7 */ if(sizeof(void*) == 8) - ok(size==0x2c0 || broken(size==0x170), "structure size: %x\n", size); + ok(size==0x2c0 || broken(size==0x168), "structure size: %x\n", size); else ok(size==0x164 || broken(size==0xb8), "structure size: %x\n", size);

1 0

Stefan Dösinger : d3d8: Don' t validate 2D texture lock coordinates.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: a2d3b3a5a58cdacb8bf09cb927a3421d9e3cc32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2d3b3a5a58cdacb8bf09cb92… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jan 18 22:20:05 2016 +0000 d3d8: Don't validate 2D texture lock coordinates. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/surface.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 679f094..ec263b1 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -204,26 +204,36 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, struct wined3d_box box; struct wined3d_map_desc map_desc; HRESULT hr; + D3DRESOURCETYPE type; TRACE("iface %p, locked_rect %p, rect %s, flags %#x.\n", iface, locked_rect, wine_dbgstr_rect(rect), flags); wined3d_mutex_lock(); + + if (surface->texture) + type = IDirect3DBaseTexture8_GetType(&surface->texture->IDirect3DBaseTexture8_iface); + else + type = D3DRTYPE_SURFACE; + if (rect) { D3DSURFACE_DESC desc; IDirect3DSurface8_GetDesc(iface, &desc); - if ((rect->left < 0) + if (type != D3DRTYPE_TEXTURE + && ((rect->left < 0) || (rect->top < 0) || (rect->left >= rect->right) || (rect->top >= rect->bottom) || (rect->right > desc.Width) - || (rect->bottom > desc.Height)) + || (rect->bottom > desc.Height))) { WARN("Trying to lock an invalid rectangle, returning D3DERR_INVALIDCALL\n"); wined3d_mutex_unlock(); + locked_rect->Pitch = 0; + locked_rect->pBits = NULL; return D3DERR_INVALIDCALL; } box.left = rect->left; @@ -243,7 +253,7 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, locked_rect->Pitch = map_desc.row_pitch; locked_rect->pBits = map_desc.data; } - else + else if (type != D3DRTYPE_TEXTURE) { locked_rect->Pitch = 0; locked_rect->pBits = NULL;

1 0

Stefan Dösinger : d3d8/tests: Block validation checks the surface size too.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: 5b63c93f3e0b5ba21195a90db3aef170df9c6df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b63c93f3e0b5ba21195a90db… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jan 18 22:20:09 2016 +0000 d3d8/tests: Block validation checks the surface size too. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 18ea559..c1dc886 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -5350,7 +5350,7 @@ static void test_surface_blocks(void) IDirect3DSurface8 *surface; D3DLOCKED_RECT locked_rect; IDirect3DDevice8 *device; - unsigned int i, j, w, h; + unsigned int i, j, k, w, h; IDirect3D8 *d3d; ULONG refcount; HWND window; @@ -5358,6 +5358,21 @@ static void test_surface_blocks(void) RECT rect; BOOL tex_pow2, cube_pow2; D3DCAPS8 caps; + static const RECT invalid[] = + { + {60, 60, 60, 68}, /* 0 height */ + {60, 60, 68, 60}, /* 0 width */ + {68, 60, 60, 68}, /* left > right */ + {60, 68, 68, 60}, /* top > bottom */ + {-8, 60, 0, 68}, /* left < surface */ + {60, -8, 68, 0}, /* top < surface */ + {-16, 60, -8, 68}, /* right < surface */ + {60, -16, 68, -8}, /* bottom < surface */ + {60, 60, 136, 68}, /* right > surface */ + {60, 60, 68, 136}, /* bottom > surface */ + {136, 60, 144, 68}, /* left > surface */ + {60, 136, 68, 144}, /* top > surface */ + }; window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -5573,6 +5588,19 @@ static void test_surface_blocks(void) } } + for (k = 0; k < sizeof(invalid) / sizeof(*invalid); ++k) + { + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, &invalid[k], 0); + ok(FAILED(hr) == !pools[j].success, "Invalid lock %s(%#x), expected %s, format %s, pool %s, case %u.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", hr, pools[j].success ? "success" : "failure", + formats[i].name, pools[j].name, k); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + } + } + SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height); hr = IDirect3DSurface8_LockRect(surface, &locked_rect, &rect, 0); ok(hr == D3D_OK, "Got unexpected hr %#x for format %s, pool %s.\n", hr, formats[i].name, pools[j].name);

1 0

Józef Kucia : wined3d: Do not update surface when empty box is passed.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: 3d7c666005d5aac1c810dcf1fc82498df8d9b91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7c666005d5aac1c810dcf1f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 19 22:28:05 2016 +0100 wined3d: Do not update surface when empty box is passed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7c5a4c2..d308083 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4070,7 +4070,8 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str if (box) { if (box->left >= box->right || box->right > sub_resource->width - || box->top >= box->bottom || box->bottom > sub_resource->height) + || box->top >= box->bottom || box->bottom > sub_resource->height + || box->front >= box->back) { WARN("Invalid box (%u, %u, %u)->(%u, %u, %u) specified.\n", box->left, box->top, box->front, box->right, box->bottom, box->back);

1 0