- Wine-Devel - list.winehq.org

[PATCH] wpcap: Accept interfaces without associated IPv4 or IPv6 address.
by Hans Leidekker Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wpcap/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 3a0b2381697..67d55b8f3f0 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -323,7 +323,7 @@ static struct pcap_interface *build_win32_device( const struct pcap_interface *u if (!(ret = calloc( 1, sizeof(*ret) ))) return NULL; if (!(ret->name = build_win32_name( source, adapter_name ))) goto err; if (!(ret->description = build_win32_description( unix_dev ))) goto err; - if (!(ret->addresses = build_win32_addresses( unix_dev->addresses ))) goto err; + ret->addresses = build_win32_addresses( unix_dev->addresses ); ret->flags = unix_dev->flags; return ret; -- 2.30.2

1 0

[PATCH 2/3] msvcrt: Don't crash on NULL in fclose.
by Piotr Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 4 ++++ dlls/msvcrt/tests/file.c | 3 +++ 2 files changed, 7 insertions(+)

1 0

[PATCH 1/3] ucrtbase: Add __std_terminate export.
by Piotr Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/ucrtbase.spec | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 7/7] win32u: Use syscall interface for some palette functions.
by Jacek Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 5 ----- dlls/win32u/syscall.c | 5 +++++ dlls/win32u/win32u.spec | 10 ++++----- dlls/win32u/win32u_private.h | 5 ----- dlls/win32u/wrappers.c | 25 ----------------------- dlls/wow64win/gdi.c | 39 ++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 5 +++++ 7 files changed, 54 insertions(+), 40 deletions(-)

2 1

[PATCH 6/7] win32u: Use syscall interface for some mapping functions.
by Jacek Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 4 ---- dlls/win32u/wrappers.c | 12 ------------ dlls/wow64win/gdi.c | 22 ++++++++++++++++++++++ dlls/wow64win/syscall.h | 4 +++- 7 files changed, 29 insertions(+), 21 deletions(-)

2 1

[PATCH 4/7] win32u: Use syscall interface for some font functions.
by Jacek Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 8 --- dlls/win32u/syscall.c | 8 +++ dlls/win32u/win32u.spec | 16 +++--- dlls/win32u/win32u_private.h | 14 ----- dlls/win32u/wrappers.c | 46 ----------------- dlls/wow64win/gdi.c | 89 ++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 8 +++ dlls/wow64win/wow64win_private.h | 12 +++++ 8 files changed, 125 insertions(+), 76 deletions(-)

2 1

[PATCH 3/7] win32u: Use syscall interface for some DC functions.
by Jacek Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 7 ----- dlls/win32u/syscall.c | 7 +++++ dlls/win32u/win32u.spec | 14 ++++----- dlls/win32u/win32u_private.h | 8 ----- dlls/win32u/wrappers.c | 35 --------------------- dlls/wow64win/gdi.c | 60 ++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 9 +++++- 7 files changed, 82 insertions(+), 58 deletions(-)

2 1

[PATCH 2/7] win32u: Use syscall interface for region functions.
by Jacek Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 13 ---- dlls/win32u/syscall.c | 13 ++++ dlls/win32u/win32u.spec | 26 ++++---- dlls/win32u/win32u_private.h | 14 ---- dlls/win32u/wrappers.c | 66 ------------------- dlls/wow64win/gdi.c | 121 +++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 15 ++++- 7 files changed, 161 insertions(+), 107 deletions(-)

2 1

[PATCH 1/7] win32u: Use syscall interface for bitmap functions.
by Jacek Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 6 --- dlls/win32u/syscall.c | 6 +++ dlls/win32u/win32u.spec | 12 +++--- dlls/win32u/win32u_private.h | 9 ----- dlls/win32u/wrappers.c | 33 ---------------- dlls/wow64win/gdi.c | 68 ++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 8 +++- dlls/wow64win/wow64win_private.h | 12 ++++++ 8 files changed, 99 insertions(+), 55 deletions(-)

2 1

[PATCH] wininet: Support option INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT for http connections
by Alistair Leslie-Hughes Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 13 +++++++++++++ dlls/wininet/tests/http.c | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8e40a4cee2b..d0150c235a3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2330,6 +2330,19 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *(ULONG*)buffer = hdr->ErrorMask; *size = sizeof(ULONG); + return ERROR_SUCCESS; + case INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT: + TRACE("INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT\n"); + + if (*size < sizeof(PCERT_CHAIN_CONTEXT)) + return ERROR_INSUFFICIENT_BUFFER; + + if(!req->server->cert_chain) + return ERROR_INTERNET_INCORRECT_HANDLE_STATE; + + *((PCERT_CHAIN_CONTEXT*)buffer) = (PCERT_CHAIN_CONTEXT)CertDuplicateCertificateChain(req->server->cert_chain); + *size = sizeof(PCERT_CHAIN_CONTEXT); + return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b3fcc93b704..567f63b9c8a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -7129,6 +7129,7 @@ static void test_secure_connection(void) INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; char certstr1[512], certstr2[512]; BOOL ret; + PCCERT_CHAIN_CONTEXT ctx = NULL; ses = InternetOpenA("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); @@ -7160,6 +7161,14 @@ static void test_secure_connection(void) test_cert_struct(req, &test_winehq_org_cert); + size = sizeof(PCCERT_CHAIN_CONTEXT); + ret = InternetQueryOptionA(req, INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT, &ctx, &size); + ok(ret || GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE /* < IE8*/, "InternetQueryOption failed: %d\n", GetLastError()); + if (ret) + { + CertFreeCertificateChain(ctx); + } + /* Querying the same option through InternetQueryOptionW still results in * ANSI strings being returned. */ @@ -8099,6 +8108,7 @@ static void test_cert_string(void) char actual[512]; DWORD size; BOOL res; + PCCERT_CHAIN_CONTEXT ctx = NULL; ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); ok( ses != NULL, "InternetOpenA failed\n" ); @@ -8119,6 +8129,10 @@ static void test_cert_string(void) ok( size == 0, "unexpected size: %u\n", size ); ok( actual[0] == 0x55, "unexpected byte: %02x\n", actual[0] ); + size = sizeof(PCCERT_CHAIN_CONTEXT); + res = InternetQueryOptionA(req, INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT, &ctx, &size); + ok(!res && (GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_STATE), "InternetQueryOption failed: %d\n", GetLastError()); + InternetCloseHandle( req ); InternetCloseHandle( con ); InternetCloseHandle( ses ); -- 2.33.0

2 1