March 2018 - Wine-Devel - list.winehq.org

[PATCH 1/2] bcrypt: Add support for BCRYPT_OPAQUE_KEY_BLOB.
by Hans Leidekker March 29, 2018

March 29, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 99 ++++++++++++++++++++++++++++++---------------- dlls/bcrypt/tests/bcrypt.c | 27 +++++++++++-- 2 files changed, 88 insertions(+), 38 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 1490089cf7..1e56062b81 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1018,6 +1018,40 @@ static ULONG get_block_size( struct algorithm *alg ) return ret; } +static NTSTATUS key_import( BCRYPT_ALG_HANDLE algorithm, const WCHAR *type, BCRYPT_KEY_HANDLE *key, UCHAR *object, + ULONG object_len, UCHAR *input, ULONG input_len ) +{ + ULONG len; + + if (!strcmpW( type, BCRYPT_KEY_DATA_BLOB )) + { + BCRYPT_KEY_DATA_BLOB_HEADER *header = (BCRYPT_KEY_DATA_BLOB_HEADER *)input; + + if (input_len < sizeof(BCRYPT_KEY_DATA_BLOB_HEADER)) return STATUS_BUFFER_TOO_SMALL; + if (header->dwMagic != BCRYPT_KEY_DATA_BLOB_MAGIC) return STATUS_INVALID_PARAMETER; + if (header->dwVersion != BCRYPT_KEY_DATA_BLOB_VERSION1) + { + FIXME( "unknown key data blob version %u\n", header->dwVersion ); + return STATUS_INVALID_PARAMETER; + } + len = header->cbKeyData; + if (len + sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) > input_len) return STATUS_INVALID_PARAMETER; + + return BCryptGenerateSymmetricKey( algorithm, key, object, object_len, (UCHAR *)&header[1], len, 0 ); + } + else if (!strcmpW( type, BCRYPT_OPAQUE_KEY_BLOB )) + { + if (input_len < sizeof(len)) return STATUS_BUFFER_TOO_SMALL; + len = *(ULONG *)input; + if (len + sizeof(len) > input_len) return STATUS_INVALID_PARAMETER; + + return BCryptGenerateSymmetricKey( algorithm, key, object, object_len, input + sizeof(len), len, 0 ); + } + + FIXME( "unsupported key type %s\n", debugstr_w(type) ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, ULONG output_len, ULONG *size ) { if (!strcmpW( type, BCRYPT_KEY_DATA_BLOB )) @@ -1034,6 +1068,17 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); return STATUS_SUCCESS; } + else if (!strcmpW( type, BCRYPT_OPAQUE_KEY_BLOB )) + { + ULONG len, req_size = sizeof(len) + key->u.s.secret_len; + + *size = req_size; + if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; + + *(ULONG *)output = key->u.s.secret_len; + memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); + return STATUS_SUCCESS; + } FIXME( "unsupported key type %s\n", debugstr_w(type) ); return STATUS_NOT_IMPLEMENTED; @@ -1829,7 +1874,8 @@ static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *ha return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_destroy( struct key *key ) +static NTSTATUS key_import( BCRYPT_ALG_HANDLE algorithm, const WCHAR *type, BCRYPT_KEY_HANDLE *key, UCHAR *object, + ULONG object_len, UCHAR *input, ULONG input_len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; @@ -1841,6 +1887,12 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_destroy( struct key *key ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static inline BOOL key_is_symmetric( struct key *key ) { ERR( "support for keys not available at build time\n" ); @@ -1880,9 +1932,9 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptImportKey(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, LPCWSTR type, - BCRYPT_KEY_HANDLE *key, PUCHAR object, ULONG object_len, PUCHAR input, - ULONG input_len, ULONG flags) +NTSTATUS WINAPI BCryptImportKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, LPCWSTR type, + BCRYPT_KEY_HANDLE *key, PUCHAR object, ULONG object_len, PUCHAR input, + ULONG input_len, ULONG flags ) { struct algorithm *alg = algorithm; @@ -1894,50 +1946,27 @@ NTSTATUS WINAPI BCryptImportKey(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE d if (decrypt_key) { - FIXME("Decrypting of key not yet supported\n"); - return STATUS_NO_MEMORY; - } - - if (!strcmpW(type, BCRYPT_KEY_DATA_BLOB)) - { - BCRYPT_KEY_DATA_BLOB_HEADER *key_header = (BCRYPT_KEY_DATA_BLOB_HEADER*)input; - - if (input_len < sizeof(BCRYPT_KEY_DATA_BLOB_HEADER)) - return STATUS_BUFFER_TOO_SMALL; - - if (key_header->dwMagic != BCRYPT_KEY_DATA_BLOB_MAGIC) - return STATUS_INVALID_PARAMETER; - - if (key_header->dwVersion != BCRYPT_KEY_DATA_BLOB_VERSION1) - { - FIXME("Unknown key data blob version: %d\n", key_header->dwVersion); - return STATUS_INVALID_PARAMETER; - } - - if (key_header->cbKeyData + sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) > input_len) - return STATUS_INVALID_PARAMETER; - - return BCryptGenerateSymmetricKey(algorithm, key, object, object_len, (UCHAR*)&key_header[1], key_header->cbKeyData, 0); + FIXME( "decryption of key not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; } - FIXME("Unsupported key type: %s\n", debugstr_w(type)); - return STATUS_INVALID_PARAMETER; + return key_import( algorithm, type, key, object, object_len, input, input_len ); } -NTSTATUS WINAPI BCryptExportKey(BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE encrypt_key, LPCWSTR type, - PUCHAR output, ULONG output_len, ULONG *size, ULONG flags) +NTSTATUS WINAPI BCryptExportKey( BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE encrypt_key, LPCWSTR type, + PUCHAR output, ULONG output_len, ULONG *size, ULONG flags ) { struct key *key = export_key; TRACE("%p, %p, %s, %p, %u, %p, %u\n", key, encrypt_key, debugstr_w(type), output, output_len, size, flags); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (!output || !output_len || !size) return STATUS_INVALID_PARAMETER; + if (!output || !type || !size) return STATUS_INVALID_PARAMETER; if (encrypt_key) { - FIXME("Encryption of key not yet supported\n"); - return STATUS_NO_MEMORY; + FIXME( "encryption of key not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; } return key_export( key, type, output, output_len, size ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 7d59f6d4c1..2a499711bd 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1393,7 +1393,7 @@ static void test_BCryptDecrypt(void) static void test_key_import_export(void) { UCHAR buffer1[sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + 16]; - UCHAR buffer2[sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + 16]; + UCHAR buffer2[sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + 16], *buf; BCRYPT_KEY_DATA_BLOB_HEADER *key_data1 = (void*)buffer1; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key; @@ -1408,6 +1408,7 @@ static void test_key_import_export(void) key_data1->cbKeyData = 16; memset(&key_data1[1], 0x11, 16); + key = NULL; ret = pBCryptImportKey(aes, NULL, BCRYPT_KEY_DATA_BLOB, &key, NULL, 0, buffer1, sizeof(buffer1), 0); ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* vista */, "got %08x\n", ret); if (ret == STATUS_INVALID_PARAMETER) @@ -1415,11 +1416,12 @@ static void test_key_import_export(void) win_skip("broken BCryptImportKey\n"); return; } + ok(key != NULL, "key not set\n"); size = 0; - ret = pBCryptExportKey(key, NULL, BCRYPT_KEY_DATA_BLOB, buffer2, 1, &size, 0); + ret = pBCryptExportKey(key, NULL, BCRYPT_KEY_DATA_BLOB, buffer2, 0, &size, 0); ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == sizeof(buffer2), "Got %u\n", size); + ok(size == sizeof(buffer2), "got %u\n", size); size = 0; memset(buffer2, 0xff, sizeof(buffer2)); @@ -1428,6 +1430,25 @@ static void test_key_import_export(void) ok(size == sizeof(buffer2), "Got %u\n", size); ok(!memcmp(buffer1, buffer2, sizeof(buffer1)), "Expected exported key to match imported key\n"); + /* opaque blob */ + size = 0; + ret = pBCryptExportKey(key, NULL, BCRYPT_OPAQUE_KEY_BLOB, buffer2, 0, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size > 0, "got zero\n"); + + buf = HeapAlloc(GetProcessHeap(), 0, size); + ret = pBCryptExportKey(key, NULL, BCRYPT_OPAQUE_KEY_BLOB, buf, size, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + key = NULL; + ret = pBCryptImportKey(aes, NULL, BCRYPT_OPAQUE_KEY_BLOB, &key, NULL, 0, buf, size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(key != NULL, "key not set\n"); + HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- 2.11.0

1 0

[PATCH] wininet: Add support for FormatMessage
by Alistair Leslie-Hughes March 29, 2018

March 29, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/Makefile.in | 3 ++ dlls/wininet/tests/internet.c | 60 ++++++++++++++++++++++++++++++++ dlls/wininet/winineterror.mc | 81 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 dlls/wininet/winineterror.mc diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index be69ea53b0..6789c9d336 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -17,3 +17,6 @@ C_SRCS = \ utility.c RC_SRCS = wininet.rc + +MC_SRCS = \ + winineterror.mc diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index dd15a4b8a0..123a1becfd 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1797,6 +1797,65 @@ todo_wine ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); } +static void test_format_message(HMODULE hdll) +{ + DWORD ret; + CHAR out[0x100] = {0}; + + /* These messages come from wininet and not the system. */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM , NULL, ERROR_INTERNET_TIMEOUT, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret == 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_TIMEOUT, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_INTERNAL_ERROR, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_INVALID_URL, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_UNRECOGNIZED_SCHEME, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_NAME_NOT_RESOLVED, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_INVALID_OPERATION, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0 || broken(!ret) /* XP, w2k3 */, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_OPERATION_CANCELLED, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_ITEM_NOT_FOUND, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_CANNOT_CONNECT, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_CONNECTION_ABORTED, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_SEC_CERT_DATE_INVALID, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_SEC_CERT_CN_INVALID, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); +} + /* ############################### */ START_TEST(internet) @@ -1863,4 +1922,5 @@ START_TEST(internet) test_InternetSetOption(); test_end_browser_session(); + test_format_message(hdll); } diff --git a/dlls/wininet/winineterror.mc b/dlls/wininet/winineterror.mc new file mode 100644 index 0000000000..703a4dd30e --- /dev/null +++ b/dlls/wininet/winineterror.mc @@ -0,0 +1,81 @@ +; +; Copyright 2018 Alsitair Leslie-Hughes +; +; This library is free software; you can redistribute it and/or +; modify it under the terms of the GNU Lesser General Public +; License as published by the Free Software Foundation; either +; version 2.1 of the License, or (at your option) any later version. +; +; This library is distributed in the hope that it will be useful, +; but WITHOUT ANY WARRANTY; without even the implied warranty of +; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +; Lesser General Public License for more details. +; +; You should have received a copy of the GNU Lesser General Public +; License along with this library; if not, write to the Free Software +; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +; + +LanguageNames=(ENU=0x409:winerr) + +MessageId=12002 +SymbolicName=ERROR_INTERNET_TIMEOUT +Language=ENU +The request has timed out. +. +MessageId=12004 +SymbolicName=ERROR_INTERNET_INTERNAL_ERROR +Language=ENU +An internal error has occurred. +. +MessageId=12005 +SymbolicName=ERROR_INTERNET_INVALID_URL +Language=ENU +The URL is invalid. +. +MessageId=12006 +SymbolicName=ERROR_INTERNET_UNRECOGNIZED_SCHEME +Language=ENU +The URL scheme could not be recognized or is not supported. +. +MessageId=12007 +SymbolicName=ERROR_INTERNET_NAME_NOT_RESOLVED +Language=ENU +The server name could not be resolved. +. +MessageId=12016 +SymbolicName=ERROR_INTERNET_INVALID_OPERATION +Language=ENU +The requested operation is invalid. +. +MessageId=12017 +SymbolicName=ERROR_INTERNET_OPERATION_CANCELLED +Language=ENU +The operation was canceled, usually because the handle on which the request was operating was closed before the operation completed. +. +MessageId=12028 +SymbolicName=ERROR_INTERNET_ITEM_NOT_FOUND +Language=ENU +The requested item could not be located. +. +MessageId=12029 +SymbolicName=ERROR_INTERNET_CANNOT_CONNECT +Language=ENU +The attempt to connect to the server failed. +. +MessageId=12030 +SymbolicName=ERROR_INTERNET_CONNECTION_ABORTED +Language=ENU +The connection with the server has been terminated. +. +MessageId=12037 +SymbolicName=ERROR_INTERNET_SEC_CERT_DATE_INVALID +Language=ENU +SSL certificate date that was received from the server is bad. The certificate is expired. +. +MessageId=12038 +SymbolicName=ERROR_INTERNET_SEC_CERT_CN_INVALID +Language=ENU +SSL certificate common name (host name field) is incorrect. +. + -- 2.16.2

1 0

[PATCH] advapi32: Use larger buffers for domain names.
by Dmitry Timoshkov March 29, 2018

March 29, 2018

Otherwise GetComputerNameExW(ComputerNamePhysicalDnsDomain) and GetComputerNameExW(ComputerNameDnsDomain) fail if the names don't fit into MAX_COMPUTERNAME_LENGTH characters. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/lsa.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 95bfe09446..354db65929 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -771,9 +771,9 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( SID sid; DWORD sid_subauthority[3]; } domain_sid; - WCHAR domain_name[MAX_COMPUTERNAME_LENGTH + 1]; - WCHAR dns_domain_name[MAX_COMPUTERNAME_LENGTH + 1]; - WCHAR dns_forest_name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR domain_name[256]; + WCHAR dns_domain_name[256]; + WCHAR dns_forest_name[256]; } *xdi; struct { @@ -785,7 +785,7 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( xdi = heap_alloc_zero(sizeof(*xdi)); if (!xdi) return STATUS_NO_MEMORY; - dwSize = MAX_COMPUTERNAME_LENGTH + 1; + dwSize = 256; if (GetComputerNameExW(ComputerNamePhysicalDnsDomain, xdi->domain_name, &dwSize)) { WCHAR *dot; @@ -799,7 +799,7 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( TRACE("setting Name to %s\n", debugstr_w(xdi->info.Name.Buffer)); } - dwSize = MAX_COMPUTERNAME_LENGTH + 1; + dwSize = 256; if (GetComputerNameExW(ComputerNameDnsDomain, xdi->dns_domain_name, &dwSize)) { xdi->info.DnsDomainName.Buffer = xdi->dns_domain_name; -- 2.16.2

1 0

[PATCH] wininet: Fix negated check for drain_content result (clang)
by André Hentschel March 28, 2018

March 28, 2018

Introduced with 4f40039cd785c916cd25e5e9b4a0c75dab53a50a Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/wininet/http.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d77e528..f28f7c5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5091,7 +5091,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->session->password, host)) { heap_free(requestString); - if(!drain_content(request, TRUE) == ERROR_SUCCESS) { + if (drain_content(request, TRUE) != ERROR_SUCCESS) + { FIXME("Could not drain content\n"); http_release_netconn(request, FALSE); } @@ -5119,7 +5120,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, NULL)) { heap_free(requestString); - if(!drain_content(request, TRUE) == ERROR_SUCCESS) { + if (drain_content(request, TRUE) != ERROR_SUCCESS) + { FIXME("Could not drain content\n"); http_release_netconn(request, FALSE); } -- 2.7.4

2 1

[PATCH] gdiplus: Resample first row and first column when src_pointf.[X,Y] is very close to src[x,y].
by Jactry Zeng March 28, 2018

March 28, 2018

For bug 33410: https://bugs.winehq.org/show_bug.cgi?id=33410 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

2 1

[PATCH 5/5] kernel32: Reimplement TransactNamedPipe on top of FSCTL_PIPE_TRANSCEIVE.
by Jacek Caban March 28, 2018

March 28, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/sync.c | 36 ++++++++---- dlls/kernel32/tests/pipe.c | 138 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 12 deletions(-)

1 0

[PATCH 4/5] ntdll/tests: Add FSCTL_PIPE_TRANSCEIVE tests.
by Jacek Caban March 28, 2018

March 28, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)

1 0

[PATCH 3/5] server: Add FSCTL_PIPE_TRANSCEIVE implementation.
by Jacek Caban March 28, 2018

March 28, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 57 insertions(+), 8 deletions(-)

1 0

[PATCH 2/5] server: Add a helper for queuing pipe message.
by Jacek Caban March 28, 2018

March 28, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-)

1 0

[PATCH 1/5] server: Don't change iosb without associated async in wake_message.
by Jacek Caban March 28, 2018

March 28, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)

1 0