wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : msctf: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: e41fa21c0426b7d97292854459a92a1d47ff252e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e41fa21c0426b7d972928544… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:29:05 2022 +0100 msctf: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/Makefile.in | 1 - dlls/msctf/categorymgr.c | 4 ++-- dlls/msctf/compartmentmgr.c | 6 +++--- dlls/msctf/context.c | 30 +++++++++++++++--------------- dlls/msctf/documentmgr.c | 6 +++--- dlls/msctf/inputprocessor.c | 24 ++++++++++++------------ dlls/msctf/msctf.c | 4 ++-- dlls/msctf/range.c | 4 ++-- dlls/msctf/threadmgr.c | 16 ++++++++-------- 9 files changed, 47 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e41fa21c0426b7d97292…

1 0

Eric Pouech : msasn1: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 2a233ce210aa583026930973946ecfd8461fb3c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a233ce210aa583026930973… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:28:53 2022 +0100 msasn1: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/Makefile.in | 1 - dlls/msasn1/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msasn1/Makefile.in b/dlls/msasn1/Makefile.in index afdfa2657ee..6d55907cff2 100644 --- a/dlls/msasn1/Makefile.in +++ b/dlls/msasn1/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msasn1.dll IMPORTLIB = msasn1 diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 2ebaa8c485c..4614a5b292e 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -36,7 +36,7 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, { ASN1module_t module = NULL; - TRACE("(%08x %08x %08x %u %p %p %p %p %u)\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); + TRACE("(%08lx %08x %08lx %lu %p %p %p %p %lu)\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); if (!encoder || !decoder || !freemem || !size) return module; @@ -83,7 +83,7 @@ ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t module, ASN1encoding_t *encod { ASN1encoding_t enc; - TRACE("(%p %p %p %u %p)\n", module, encoder, buf, bufsize, parent); + TRACE("(%p %p %p %lu %p)\n", module, encoder, buf, bufsize, parent); if (!module || !encoder) return ASN1_ERR_BADARGS; @@ -133,7 +133,7 @@ ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t module, ASN1decoding_t *decod { ASN1decoding_t dec; - TRACE("(%p %p %p %u %p)\n", module, decoder, buf, bufsize, parent); + TRACE("(%p %p %p %lu %p)\n", module, decoder, buf, bufsize, parent); if (!module || !decoder) return ASN1_ERR_BADARGS; @@ -179,7 +179,7 @@ void WINAPI ASN1_CloseDecoder(ASN1decoding_t decoder) ASN1error_e WINAPI ASN1_Decode(ASN1decoding_t decoder, void **outdata, ASN1uint32_t pdunum, ASN1uint32_t flags, ASN1octet_t *buf, ASN1uint32_t bufsize) { - FIXME("(%p %p %u %08x %p %u): Stub!\n", decoder, outdata, pdunum, flags, buf, bufsize); + FIXME("(%p %p %lu %08lx %p %lu): Stub!\n", decoder, outdata, pdunum, flags, buf, bufsize); if (!decoder) return ASN1_ERR_BADARGS;

1 0

Eric Pouech : msado15: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 2424f03a594f05f630a93ef646d46a6f174da98b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2424f03a594f05f630a93ef6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:28:41 2022 +0100 msado15: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/Makefile.in | 1 - dlls/msado15/command.c | 12 +++---- dlls/msado15/connection.c | 20 ++++++------ dlls/msado15/main.c | 4 +-- dlls/msado15/recordset.c | 82 +++++++++++++++++++++++------------------------ dlls/msado15/stream.c | 14 ++++---- 6 files changed, 66 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2424f03a594f05f630a9…

1 0

Eric Pouech : http.sys: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 3542152c236748733b7c71a9308cbcdc17b02c93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3542152c236748733b7c71a9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 00:23:34 2022 -0600 http.sys: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/Makefile.in | 1 - dlls/http.sys/http.c | 16 ++++++++-------- dlls/http.sys/request.h | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/http.sys/Makefile.in b/dlls/http.sys/Makefile.in index b8740120e84..b79f11cf930 100644 --- a/dlls/http.sys/Makefile.in +++ b/dlls/http.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = http.sys IMPORTS = ntoskrnl ws2_32 diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index e655edfeea2..523c70ee12c 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -510,10 +510,10 @@ static void receive_data(struct connection *conn) ioctlsocket(conn->socket, FIONREAD, &available); if (available) { - TRACE("%u more bytes of data available, trying with larger buffer.\n", available); + TRACE("%lu more bytes of data available, trying with larger buffer.\n", available); if (!(conn->buffer = heap_realloc(conn->buffer, conn->len + available))) { - ERR("Failed to allocate %u bytes of memory.\n", conn->len + available); + ERR("Failed to allocate %lu bytes of memory.\n", conn->len + available); close_connection(conn); return; } @@ -730,7 +730,7 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) struct connection *conn; NTSTATUS ret; - TRACE("addr %s, id %s, flags %#x, bits %u.\n", wine_dbgstr_longlong(params->addr), + TRACE("addr %s, id %s, flags %#lx, bits %lu.\n", wine_dbgstr_longlong(params->addr), wine_dbgstr_longlong(params->id), params->flags, params->bits); EnterCriticalSection(&http_cs); @@ -821,13 +821,13 @@ static NTSTATUS http_receive_body(struct request_queue *queue, IRP *irp) struct connection *conn; NTSTATUS ret; - TRACE("id %s, bits %u.\n", wine_dbgstr_longlong(params->id), params->bits); + TRACE("id %s, bits %lu.\n", wine_dbgstr_longlong(params->id), params->bits); EnterCriticalSection(&http_cs); if ((conn = get_connection(params->id))) { - TRACE("%u bits remaining.\n", conn->content_len); + TRACE("%lu bits remaining.\n", conn->content_len); if (conn->content_len) { @@ -875,7 +875,7 @@ static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) ret = http_receive_body(queue, irp); break; default: - FIXME("Unhandled ioctl %#x.\n", stack->Parameters.DeviceIoControl.IoControlCode); + FIXME("Unhandled ioctl %#lx.\n", stack->Parameters.DeviceIoControl.IoControlCode); ret = STATUS_NOT_IMPLEMENTED; } @@ -987,12 +987,12 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) RtlInitUnicodeString(&string, L"\\Device\\Http"); attr.ObjectName = &string; if ((ret = NtCreateDirectoryObject(&directory_obj, 0, &attr)) && ret != STATUS_OBJECT_NAME_COLLISION) - ERR("Failed to create \\Device\\Http directory, status %#x.\n", ret); + ERR("Failed to create \\Device\\Http directory, status %#lx.\n", ret); RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) { - ERR("Failed to create request queue device, status %#x.\n", ret); + ERR("Failed to create request queue device, status %#lx.\n", ret); NtClose(directory_obj); return ret; } diff --git a/dlls/http.sys/request.h b/dlls/http.sys/request.h index a1b77b67dc5..f044db3bb2c 100644 --- a/dlls/http.sys/request.h +++ b/dlls/http.sys/request.h @@ -167,7 +167,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) irp_size += unk_headers_count * sizeof(struct http_unknown_header); - TRACE("Need %u bytes, have %u.\n", irp_size, output_len); + TRACE("Need %lu bytes, have %lu.\n", irp_size, output_len); irp->IoStatus.Information = irp_size; memset(irp->AssociatedIrp.SystemBuffer, 0, output_len);

1 0

Zebediah Figura : kernelbase: Do not return the question mark as part of the query string from UrlGetPart().
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: c57992f8dcb5b25322aea2664aff8f96e6a58895 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c57992f8dcb5b25322aea266… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 20:37:10 2022 -0600 kernelbase: Do not return the question mark as part of the query string from UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 7 +++++-- dlls/shlwapi/tests/url.c | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 823fb51a68e..d14316f05ee 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4246,8 +4246,11 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) if (*work == '/') { /* see if query string */ - pl->query = wcschr(work, '?'); - if (pl->query) pl->query_len = lstrlenW(pl->query); + if ((pl->query = wcschr( work, '?' ))) + { + ++pl->query; + pl->query_len = lstrlenW(pl->query); + } } SuccessExit: TRACE("parse successful: scheme=%p(%ld), user=%p(%ld), pass=%p(%ld), host=%p(%ld), port=%p(%ld), query=%p(%ld)\n", diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 18ff5021986..1b26204a94f 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -612,14 +612,14 @@ static void test_UrlGetPart(void) {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_PASSWORD, 0, S_OK, "bar"}, {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_PORT, 0, S_OK, "21"}, - {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_QUERY, 0, S_OK, "query=x&return=y", .todo_result = TRUE}, + {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_QUERY, 0, S_OK, "query=x&return=y"}, {"http://foo:bar@localhost:21/internal.php#anchor", URL_PART_QUERY, 0, S_FALSE, ""}, {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_SCHEME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http"}, {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_USERNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:foo"}, {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_PASSWORD, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:bar"}, {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:localhost"}, {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_PORT, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:21"}, - {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_QUERY, URL_PARTFLAG_KEEPSCHEME, S_OK, "query=x&return=y", .todo_result = TRUE}, + {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_QUERY, URL_PARTFLAG_KEEPSCHEME, S_OK, "query=x&return=y"}, {"http://localhost/", URL_PART_USERNAME, 0, E_INVALIDARG, .todo_hr = TRUE}, {"http://localhost/", URL_PART_PASSWORD, 0, E_INVALIDARG, .todo_hr = TRUE}, @@ -688,7 +688,7 @@ static void test_UrlGetPart(void) {"file://foo:bar@localhost:21/file?query=x", URL_PART_PASSWORD, 0, E_FAIL, .todo_hr = TRUE}, {"file://foo:bar@localhost:21/file?query=x", URL_PART_HOSTNAME, 0, S_OK, "foo:bar@localhost:21", .todo_result = TRUE}, {"file://foo:bar@localhost:21/file?query=x", URL_PART_PORT, 0, E_FAIL, .todo_hr = TRUE}, - {"file://foo:bar@localhost:21/file?query=x", URL_PART_QUERY, 0, S_OK, "query=x", .todo_result = TRUE}, + {"file://foo:bar@localhost:21/file?query=x", URL_PART_QUERY, 0, S_OK, "query=x"}, {"http://user:pass 123(a)www.wine hq.org", URL_PART_HOSTNAME, 0, S_OK, "www.wine hq.org"}, {"http://user:pass 123(a)www.wine hq.org", URL_PART_PASSWORD, 0, S_OK, "pass 123"}, {"about:blank", URL_PART_SCHEME, 0, S_OK, "about"},

1 0

Zebediah Figura : kernelbase: Allow usernames and passwords to contain any characters in UrlGetPart().
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 932daf59c38b83a6baa12ad06bc1258ce52fc1c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=932daf59c38b83a6baa12ad0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 20:37:09 2022 -0600 kernelbase: Allow usernames and passwords to contain any characters in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 52 +++++++----------------------------------------- dlls/shlwapi/tests/url.c | 27 +++++++++++-------------- 2 files changed, 19 insertions(+), 60 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index dfb37006da8..823fb51a68e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -77,7 +77,6 @@ struct parsed_url enum url_scan_type { SCHEME, - USERPASS, }; static WCHAR *heap_strdupAtoW(const char *str) @@ -4175,42 +4174,6 @@ static const WCHAR * scan_url(const WCHAR *start, DWORD *size, enum url_scan_typ *size = 0; break; - case USERPASS: - for (;;) - { - if (isalnum(*start) || - /* user/password only characters */ - (*start == ';') || - (*start == '?') || - (*start == '&') || - (*start == '=') || - /* *extra* characters */ - (*start == '!') || - (*start == '*') || - (*start == '\'') || - (*start == '(') || - (*start == ')') || - (*start == ',') || - /* *safe* characters */ - (*start == '$') || - (*start == '_') || - (*start == '+') || - (*start == '-') || - (*start == '.') || - (*start == ' ')) - { - start++; - (*size)++; - } - else if (*start == '%' && isxdigit(start[1]) && isxdigit(start[2])) - { - start += 3; - *size += 3; - } - else break; - } - break; - default: FIXME("unknown type %d\n", type); return L""; @@ -4240,13 +4203,13 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) if ((*work != '/') || (*(work+1) != '/')) goto SuccessExit; pl->username = work + 2; - work = scan_url(pl->username, &pl->username_len, USERPASS); - if (*work == ':' ) + work = parse_url_element( pl->username, L":@/\\?#" ); + pl->username_len = work - pl->username; + if (*work == ':') { - /* parse password */ - work++; - pl->password = work; - work = scan_url(pl->password, &pl->password_len, USERPASS); + pl->password = work + 1; + work = parse_url_element( pl->password, L"@/\\?#" ); + pl->password_len = work - pl->password; if (*work != '@') { /* what we just parsed must be the hostname and port @@ -4262,14 +4225,13 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) pl->password_len = 0; pl->password = 0; } - else if (!*work || *work == '/' || *work == '.') + else { /* what was parsed was hostname, so reset pointers and let it parse */ pl->username_len = pl->password_len = 0; work = pl->username - 1; pl->username = pl->password = 0; } - else goto ErrorExit; pl->hostname = work + 1; work = parse_url_element( pl->hostname, L":/\\?#" ); diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index c4afb1375e9..18ff5021986 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -652,32 +652,32 @@ static void test_UrlGetPart(void) {"http://host:port:q", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host:port:q", URL_PART_PORT, 0, S_OK, "port:q"}, - {"http://user:pass:q@host", URL_PART_USERNAME, 0, S_OK, "user", .todo_hr = TRUE}, - {"http://user:pass:q@host", URL_PART_PASSWORD, 0, S_OK, "pass:q", .todo_hr = TRUE}, + {"http://user:pass:q@host", URL_PART_USERNAME, 0, S_OK, "user"}, + {"http://user:pass:q@host", URL_PART_PASSWORD, 0, S_OK, "pass:q"}, {"http://user@host@q", URL_PART_USERNAME, 0, S_OK, "user"}, {"http://user@host@q", URL_PART_HOSTNAME, 0, S_OK, "host@q"}, {"http:localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, {"http:/localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, - {"http://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, + {"http://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, {"http:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, - {"ftp://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, + {"ftp://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"ftp:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, - {"http://host?a:b@c:d", URL_PART_HOSTNAME, 0, S_OK, "host", .todo_result = TRUE}, + {"http://host?a:b@c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host?a:b@c:d", URL_PART_QUERY, 0, S_OK, "a:b@c:d", .todo_hr = TRUE}, - {"http://host#a:b@c:d", URL_PART_HOSTNAME, 0, S_OK, "host", .todo_hr = TRUE}, + {"http://host#a:b@c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host#a:b@c:d", URL_PART_QUERY, 0, S_FALSE, ""}, /* All characters, other than those with special meaning, are allowed. */ {"http://foo:bar@google.*.com:21/internal.php?query=x&return=y", URL_PART_HOSTNAME, 0, S_OK, "google.*.com"}, - {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff:pass@host", URL_PART_USERNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", .todo_hr = TRUE}, - {"http://user: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff@host", URL_PART_PASSWORD, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", .todo_hr = TRUE}, - {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_HOSTNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", .todo_hr = TRUE}, + {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff:pass@host", URL_PART_USERNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, + {"http://user: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff@host", URL_PART_PASSWORD, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, + {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_HOSTNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, {"http://host: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_PORT, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, {"http:///index.html", URL_PART_HOSTNAME, 0, S_FALSE, ""}, @@ -837,7 +837,7 @@ static void test_UrlGetPart(void) size = 1; wcscpy(bufferW, L"x"); hr = UrlGetPartW(urlW, bufferW, &size, part, flags); - todo_wine_if ((tests[i].todo_hr || tests[i].hr == S_FALSE) && !(strchr(url, '"') && part == URL_PART_USERNAME)) + todo_wine_if (tests[i].todo_hr || tests[i].hr == S_FALSE) { if (tests[i].hr == S_OK) ok(hr == E_POINTER, "Got hr %#x.\n", hr); @@ -880,11 +880,8 @@ static void test_UrlGetPart(void) } else { - todo_wine_if (strchr(url, '"') && part == URL_PART_USERNAME) - { - ok(size == ARRAY_SIZE(bufferW), "Got size %u.\n", size); - ok(!wcscmp(bufferW, L"x"), "Got result %s.\n", debugstr_w(bufferW)); - } + ok(size == ARRAY_SIZE(bufferW), "Got size %u.\n", size); + ok(!wcscmp(bufferW, L"x"), "Got result %s.\n", debugstr_w(bufferW)); } winetest_pop_context();

1 0

Zebediah Figura : kernelbase: Allow ports to contain any characters in UrlGetPart().
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 0b9b73d6ef4df37cb82f95d3706f6a02f1cca28a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9b73d6ef4df37cb82f95d3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 20:37:08 2022 -0600 kernelbase: Allow ports to contain any characters in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 16 +++------------- dlls/shlwapi/tests/url.c | 6 +++--- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 954faf47a99..dfb37006da8 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -77,7 +77,6 @@ struct parsed_url enum url_scan_type { SCHEME, - PORT, USERPASS, }; @@ -4212,14 +4211,6 @@ static const WCHAR * scan_url(const WCHAR *start, DWORD *size, enum url_scan_typ } break; - case PORT: - while (*start >= '0' && *start <= '9') - { - start++; - (*size)++; - } - break; - default: FIXME("unknown type %d\n", type); return L""; @@ -4286,10 +4277,9 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) if (*work == ':') { - /* parse port */ - work++; - pl->port = work; - work = scan_url(pl->port, &pl->port_len, PORT); + pl->port = work + 1; + work = parse_url_element( pl->port, L"/\\?#" ); + pl->port_len = work - pl->port; } if (*work == '/') { diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 07d3ebfa331..c4afb1375e9 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -630,7 +630,7 @@ static void test_UrlGetPart(void) {"http://localhost:port/", URL_PART_USERNAME, 0, E_INVALIDARG, .todo_hr = TRUE}, {"http://localhost:port/", URL_PART_PASSWORD, 0, E_INVALIDARG, .todo_hr = TRUE}, {"http://localhost:port/", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"http://localhost:port/", URL_PART_PORT, 0, S_OK, "port", .todo_hr = TRUE}, + {"http://localhost:port/", URL_PART_PORT, 0, S_OK, "port"}, {"http://:", URL_PART_HOSTNAME, 0, S_FALSE, ""}, {"http://:", URL_PART_PORT, 0, S_FALSE, ""}, @@ -651,7 +651,7 @@ static void test_UrlGetPart(void) {"http://:@", URL_PART_HOSTNAME, 0, S_FALSE, ""}, {"http://host:port:q", URL_PART_HOSTNAME, 0, S_OK, "host"}, - {"http://host:port:q", URL_PART_PORT, 0, S_OK, "port:q", .todo_hr = TRUE}, + {"http://host:port:q", URL_PART_PORT, 0, S_OK, "port:q"}, {"http://user:pass:q@host", URL_PART_USERNAME, 0, S_OK, "user", .todo_hr = TRUE}, {"http://user:pass:q@host", URL_PART_PASSWORD, 0, S_OK, "pass:q", .todo_hr = TRUE}, {"http://user@host@q", URL_PART_USERNAME, 0, S_OK, "user"}, @@ -678,7 +678,7 @@ static void test_UrlGetPart(void) {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff:pass@host", URL_PART_USERNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", .todo_hr = TRUE}, {"http://user: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff@host", URL_PART_PASSWORD, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", .todo_hr = TRUE}, {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_HOSTNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", .todo_hr = TRUE}, - {"http://host: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_PORT, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", .todo_hr = TRUE}, + {"http://host: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_PORT, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, {"http:///index.html", URL_PART_HOSTNAME, 0, S_FALSE, ""}, {"http:///index.html", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:", .todo_hr = TRUE},

1 0

Zebediah Figura : kernelbase: Allow hostnames to contain any characters in UrlGetPart().
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 4ff109c3d6a40241edb1d5d642ed7aec2f69277a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ff109c3d6a40241edb1d5d6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 20:37:07 2022 -0600 kernelbase: Allow hostnames to contain any characters in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 26 +++++++++++++------------- dlls/shlwapi/tests/url.c | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 28717c25f79..954faf47a99 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -77,7 +77,6 @@ struct parsed_url enum url_scan_type { SCHEME, - HOST, PORT, USERPASS, }; @@ -4221,14 +4220,6 @@ static const WCHAR * scan_url(const WCHAR *start, DWORD *size, enum url_scan_typ } break; - case HOST: - while (isalnum(*start) || *start == '-' || *start == '.' || *start == ' ' || *start == '*') - { - start++; - (*size)++; - } - break; - default: FIXME("unknown type %d\n", type); return L""; @@ -4237,6 +4228,15 @@ static const WCHAR * scan_url(const WCHAR *start, DWORD *size, enum url_scan_typ return start; } +static const WCHAR *parse_url_element( const WCHAR *url, const WCHAR *separators ) +{ + const WCHAR *p; + + if ((p = wcspbrk( url, separators ))) + return p; + return url + wcslen( url ); +} + static LONG parse_url(const WCHAR *url, struct parsed_url *pl) { const WCHAR *work; @@ -4280,10 +4280,10 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) } else goto ErrorExit; - /* now start parsing hostname or hostnumber */ - work++; - pl->hostname = work; - work = scan_url(pl->hostname, &pl->hostname_len, HOST); + pl->hostname = work + 1; + work = parse_url_element( pl->hostname, L":/\\?#" ); + pl->hostname_len = work - pl->hostname; + if (*work == ':') { /* parse port */ diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 904d3e7bb5b..07d3ebfa331 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -655,7 +655,7 @@ static void test_UrlGetPart(void) {"http://user:pass:q@host", URL_PART_USERNAME, 0, S_OK, "user", .todo_hr = TRUE}, {"http://user:pass:q@host", URL_PART_PASSWORD, 0, S_OK, "pass:q", .todo_hr = TRUE}, {"http://user@host@q", URL_PART_USERNAME, 0, S_OK, "user"}, - {"http://user@host@q", URL_PART_HOSTNAME, 0, S_OK, "host@q", .todo_result = TRUE}, + {"http://user@host@q", URL_PART_HOSTNAME, 0, S_OK, "host@q"}, {"http:localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, {"http:/localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE},

1 0

Zebediah Figura : kernelbase: Also return E_FAIL when trying to parse username, password, or port for non-Internet URLs.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: ef64aea701376bf19a4969756cf5a42b6b68ecbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef64aea701376bf19a496975… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 20:37:06 2022 -0600 kernelbase: Also return E_FAIL when trying to parse username, password, or port for non-Internet URLs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 34 ++++++++++++++++++---------------- dlls/shlwapi/tests/url.c | 6 +++--- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index b753ce3dd2e..28717c25f79 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4329,6 +4329,24 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p hr = parse_url(url, &pl); + switch (scheme) + { + case URL_SCHEME_FILE: + case URL_SCHEME_FTP: + case URL_SCHEME_GOPHER: + case URL_SCHEME_HTTP: + case URL_SCHEME_HTTPS: + case URL_SCHEME_TELNET: + case URL_SCHEME_NEWS: + case URL_SCHEME_NNTP: + case URL_SCHEME_SNEWS: + break; + + default: + if (part != URL_PART_SCHEME && part != URL_PART_QUERY) + return E_FAIL; + } + switch (part) { case URL_PART_SCHEME: @@ -4344,22 +4362,6 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p break; case URL_PART_HOSTNAME: - switch (scheme) - { - case URL_SCHEME_FILE: - case URL_SCHEME_FTP: - case URL_SCHEME_GOPHER: - case URL_SCHEME_HTTP: - case URL_SCHEME_HTTPS: - case URL_SCHEME_TELNET: - case URL_SCHEME_NEWS: - case URL_SCHEME_NNTP: - case URL_SCHEME_SNEWS: - break; - default: - return E_FAIL; - } - if (scheme == URL_SCHEME_FILE && (!pl.hostname_len || (pl.hostname_len == 1 && *(pl.hostname + 1) == ':'))) { *out = '\0'; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 729b069a772..904d3e7bb5b 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -601,10 +601,10 @@ static void test_UrlGetPart(void) tests[] = { {"hi", URL_PART_SCHEME, 0, S_FALSE, ""}, - {"hi", URL_PART_USERNAME, 0, E_FAIL, .todo_hr = TRUE}, - {"hi", URL_PART_PASSWORD, 0, E_FAIL, .todo_hr = TRUE}, + {"hi", URL_PART_USERNAME, 0, E_FAIL}, + {"hi", URL_PART_PASSWORD, 0, E_FAIL}, {"hi", URL_PART_HOSTNAME, 0, E_FAIL}, - {"hi", URL_PART_PORT, 0, E_FAIL, .todo_hr = TRUE}, + {"hi", URL_PART_PORT, 0, E_FAIL}, {"hi", URL_PART_QUERY, 0, S_FALSE, ""}, {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_SCHEME, 0, S_OK, "http"},

1 0

Matteo Bruni : include: Add missing CreateProcessWithTokenW() declaration.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 824fcbae7d804ed3c7f5bcaadb155aa2b0761f33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=824fcbae7d804ed3c7f5bcaa… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 14 20:35:20 2022 -0600 include: Add missing CreateProcessWithTokenW() declaration. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 0a0bfde9d10..a8744eb417a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1901,6 +1901,7 @@ WINBASEAPI BOOL WINAPI CreateProcessInternalA(HANDLE,LPCSTR,LPSTR,LPSECUR WINBASEAPI BOOL WINAPI CreateProcessInternalW(HANDLE,LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION,HANDLE*); #define CreateProcessInternal WINELIB_NAME_AW(CreateProcessInternal) WINADVAPI BOOL WINAPI CreateProcessWithLogonW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPCWSTR,LPWSTR,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); +WINADVAPI BOOL WINAPI CreateProcessWithTokenW(HANDLE,DWORD,LPCWSTR,LPWSTR,DWORD,void *,LPCWSTR,STARTUPINFOW *,PROCESS_INFORMATION *); WINBASEAPI HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); WINBASEAPI HANDLE WINAPI CreateRemoteThreadEx(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPPROC_THREAD_ATTRIBUTE_LIST,LPDWORD); WINADVAPI BOOL WINAPI CreateRestrictedToken(HANDLE,DWORD,DWORD,PSID_AND_ATTRIBUTES,DWORD,PLUID_AND_ATTRIBUTES,DWORD,PSID_AND_ATTRIBUTES,PHANDLE);

1 0

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 February 2022