wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

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

20 Jan '16

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 20 Jan '16

20 Jan '16

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

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

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

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: 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: Avoid some casts.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: adcdb4c2bdae36169fdd38646605c96ab549c95e URL: http://source.winehq.org/git/wine.git/?a=commit;h=adcdb4c2bdae36169fdd38646… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 14:53:39 2016 +0100 webservices: Avoid some casts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 66 +++++++++++++++++----------------- dlls/webservices/webservices_private.h | 4 +-- dlls/webservices/writer.c | 22 ++++++------ 3 files changed, 46 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adcdb4c2bdae36169fdd3…

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 20 Jan '16

20 Jan '16

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 : bcrypt: Support retrieving hash length from algorithm handles.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: 11279badf212e4cec7211662aea8b44d206f2f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11279badf212e4cec7211662a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 14:51:44 2016 +0100 bcrypt: Support retrieving hash length from algorithm handles. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 20 ++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 24 ++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 6393d59..4871f20 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -438,6 +438,11 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, value = OBJECT_LENGTH_SHA1; break; } + else if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) + { + value = HASH_DIGEST_LENGTH_SHA1; + break; + } FIXME( "unsupported sha1 algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; @@ -447,6 +452,11 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, value = OBJECT_LENGTH_SHA256; break; } + else if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) + { + value = HASH_DIGEST_LENGTH_SHA256; + break; + } FIXME( "unsupported sha256 algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; @@ -456,6 +466,11 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, value = OBJECT_LENGTH_SHA384; break; } + else if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) + { + value = HASH_DIGEST_LENGTH_SHA384; + break; + } FIXME( "unsupported sha384 algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; @@ -465,6 +480,11 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, value = OBJECT_LENGTH_SHA512; break; } + else if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) + { + value = HASH_DIGEST_LENGTH_SHA512; + break; + } FIXME( "unsupported sha512 algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 2e45600..721221c 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -123,6 +123,12 @@ static void test_sha1(void) ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 20, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + hash = NULL; len = sizeof(buf); ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); @@ -196,6 +202,12 @@ static void test_sha256(void) ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 32, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + hash = NULL; len = sizeof(buf); ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); @@ -269,6 +281,12 @@ static void test_sha384(void) ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 48, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + hash = NULL; len = sizeof(buf); ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); @@ -343,6 +361,12 @@ static void test_sha512(void) ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 64, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + hash = NULL; len = sizeof(buf); ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0);

1 0

Hans Leidekker : bcrypt: Accept NULL implementation in BCryptOpenAlgorithmProvider.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: e3e2805b25a7264674a865e395bbb48da8629e9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e2805b25a7264674a865e39… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 14:51:43 2016 +0100 bcrypt: Accept NULL implementation in BCryptOpenAlgorithmProvider. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fdd6911..6393d59 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -209,7 +209,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR FIXME( "algorithm %s not supported\n", debugstr_w(id) ); return STATUS_NOT_IMPLEMENTED; } - if (!implementation || strcmpW( implementation, MS_PRIMITIVE_PROVIDER )) + if (implementation && strcmpW( implementation, MS_PRIMITIVE_PROVIDER )) { FIXME( "implementation %s not supported\n", debugstr_w(implementation) ); return STATUS_NOT_IMPLEMENTED;

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016