December 2014 - Wine-commits

Nikolay Sivov : dwrite: Implement GetDesignGlyphAdvances().
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 415e0b3f54968017014060a0cddab6f639f63def URL: http://source.winehq.org/git/wine.git/?a=commit;h=415e0b3f54968017014060a0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 9 10:00:45 2014 +0300 dwrite: Implement GetDesignGlyphAdvances(). --- dlls/dwrite/font.c | 20 +++++++++++++++--- dlls/dwrite/tests/font.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ef4c32c..ebea17d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -500,11 +500,25 @@ static BOOL WINAPI dwritefontface1_IsMonospacedFont(IDWriteFontFace2 *iface) } static HRESULT WINAPI dwritefontface1_GetDesignGlyphAdvances(IDWriteFontFace2 *iface, - UINT32 glyph_count, UINT16 const *indices, INT32 *advances, BOOL is_sideways) + UINT32 glyph_count, UINT16 const *glyphs, INT32 *advances, BOOL is_sideways) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%u %p %p %d): stub\n", This, glyph_count, indices, advances, is_sideways); - return E_NOTIMPL; + UINT32 i; + + TRACE("(%p)->(%u %p %p %d)\n", This, glyph_count, glyphs, advances, is_sideways); + + for (i = 0; i < glyph_count; i++) { + DWRITE_GLYPH_METRICS metrics = { 0 }; + HRESULT hr; + + hr = IDWriteFontFace2_GetDesignGlyphMetrics(iface, glyphs + i, 1, &metrics, is_sideways); + if (FAILED(hr)) + return hr; + + advances[i] = is_sideways ? metrics.advanceHeight : metrics.advanceWidth; + } + + return S_OK; } static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontFace2 *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index db554eb..b8bf75c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2636,6 +2636,58 @@ static void test_IsMonospacedFont(void) IDWriteFontCollection_Release(collection); } +static void test_GetDesignGlyphAdvances(void) +{ + IDWriteFontFace1 *fontface1; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + IDWriteFontFile *file; + HRESULT hr; + + factory = create_factory(); + + create_testfontfile(test_fontfile); + + hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE, 1, &file, + 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Release(file); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + if (hr == S_OK) { + UINT32 codepoint; + UINT16 index; + INT32 advance; + + codepoint = 'A'; + index = 0; + hr = IDWriteFontFace1_GetGlyphIndices(fontface1, &codepoint, 1, &index); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(index > 0, "got %u\n", index); + + advance = 0; + hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, &index, &advance, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advance == 1000, "got %i\n", advance); + + advance = 0; + hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, &index, &advance, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advance == 2048, "got %i\n", advance); + + IDWriteFontFace1_Release(fontface1); + } + else + win_skip("GetDesignGlyphAdvances() is not supported.\n"); + + IDWriteFontFace_Release(fontface); + IDWriteFactory_Release(factory); + DeleteFileW(test_fontfile); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2670,6 +2722,7 @@ START_TEST(font) test_CreateStreamFromKey(); test_ReadFileFragment(); test_GetDesignGlyphMetrics(); + test_GetDesignGlyphAdvances(); test_IsMonospacedFont(); IDWriteFactory_Release(factory);

1 0

Nikolay Sivov : dwrite: Update to IDWriteFactory2.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: de741ffe52f3d49ff867e1ed87c81dd4259f67f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de741ffe52f3d49ff867e1ed8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 9 16:31:00 2014 +0300 dwrite: Update to IDWriteFactory2. --- dlls/dwrite/dwrite_private.h | 6 +- dlls/dwrite/font.c | 28 ++--- dlls/dwrite/gdiinterop.c | 10 +- dlls/dwrite/main.c | 238 +++++++++++++++++++++++++++++-------------- 4 files changed, 182 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de741ffe52f3d49ff867e…

1 0

André Hentschel : qmgr/tests: Remove unused macro.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 8ae3c7ae275b0a85ce189ec0734f381e2c9658a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae3c7ae275b0a85ce189ec07… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 00:59:16 2014 +0100 qmgr/tests: Remove unused macro. --- dlls/qmgr/tests/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qmgr/tests/file.c b/dlls/qmgr/tests/file.c index c77ff11..5e6eb34 100644 --- a/dlls/qmgr/tests/file.c +++ b/dlls/qmgr/tests/file.c @@ -28,7 +28,6 @@ #include "bits.h" /* Globals used by many tests */ -#define NUM_FILES 1 static const WCHAR test_remoteName[] = {'r','e','m','o','t','e', 0}; static const WCHAR test_localName[] = {'l','o','c','a','l', 0}; static WCHAR test_localFile[MAX_PATH];

1 0

André Hentschel : ntdll: Remove unused macros.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 550f556dca616ae1a639e16f0170d483029f040d URL: http://source.winehq.org/git/wine.git/?a=commit;h=550f556dca616ae1a639e16f0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 00:59:28 2014 +0100 ntdll: Remove unused macros. --- dlls/ntdll/signal_i386.c | 1 - dlls/ntdll/time.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 13df4bb..1a69bc0 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -177,7 +177,6 @@ typedef struct ucontext #define FPU_sig(context) ((FLOATING_SAVE_AREA*)((context)->uc_mcontext.fpregs)) #define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpregs->status >> 16) ? (XMM_SAVE_AREA32 *)(FPU_sig(context) + 1) : NULL) -#define VM86_EAX 0 /* the %eax value while vm86_enter is executing */ #define VIF_FLAG 0x00080000 #define VIP_FLAG 0x00100000 diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 5ec5a1c..0f14a3e 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -74,12 +74,8 @@ static RTL_CRITICAL_SECTION TIME_tz_section = { &critsect_debug, -1, 0, 0, 0, 0 #define HOURSPERDAY 24 #define EPOCHWEEKDAY 1 /* Jan 1, 1601 was Monday */ #define DAYSPERWEEK 7 -#define EPOCHYEAR 1601 -#define DAYSPERNORMALYEAR 365 -#define DAYSPERLEAPYEAR 366 #define MONSPERYEAR 12 #define DAYSPERQUADRICENTENNIUM (365 * 400 + 97) -#define DAYSPERNORMALCENTURY (365 * 100 + 24) #define DAYSPERNORMALQUADRENNIUM (365 * 4 + 1) /* 1601 to 1970 is 369 years plus 89 leap days */

1 0

Bruno Jesus : ws2_32: Implement getsockopt(SO_BSP_STATE).
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 1c4cb6303647901affac8320bf49c388e34e515d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c4cb6303647901affac8320b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Dec 8 20:55:45 2014 -0200 ws2_32: Implement getsockopt(SO_BSP_STATE). --- dlls/ws2_32/socket.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 21 ++++++++++++-- include/winsock.h | 1 + 3 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1864dfd..b6aad67 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3095,6 +3095,79 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } release_sock_fd( s, fd ); return ret; + case WS_SO_BSP_STATE: + { + int req_size, addr_size; + WSAPROTOCOL_INFOW infow; + CSADDR_INFO *csinfo; + + ret = ws_protocol_info(s, TRUE, &infow, &addr_size); + if (ret) + { + if (infow.iAddressFamily == WS_AF_INET) + addr_size = sizeof(struct sockaddr_in); + else if (infow.iAddressFamily == WS_AF_INET6) + addr_size = sizeof(struct sockaddr_in6); + else + { + FIXME("Family %d is unsupported for SO_BSP_STATE", infow.iAddressFamily); + SetLastError(WSAEAFNOSUPPORT); + return SOCKET_ERROR; + } + + req_size = sizeof(CSADDR_INFO) + addr_size * 2; + if (*optlen < req_size) + { + ret = 0; + SetLastError(WSAEFAULT); + } + else + { + union generic_unix_sockaddr uaddr; + socklen_t uaddrlen = sizeof(uaddr); + + if ( (fd = get_sock_fd( s, 0, NULL )) == -1) + return SOCKET_ERROR; + + csinfo = (CSADDR_INFO*) optval; + + /* Check if the sock is bound */ + if (!getsockname(fd, &uaddr.addr, &uaddrlen) && + is_sockaddr_bound(&uaddr.addr, uaddrlen)) + { + csinfo->LocalAddr.lpSockaddr = + (LPSOCKADDR) (optval + sizeof(CSADDR_INFO)); + ws_sockaddr_u2ws(&uaddr.addr, csinfo->LocalAddr.lpSockaddr, &addr_size); + csinfo->LocalAddr.iSockaddrLength = addr_size; + } + else + { + csinfo->LocalAddr.lpSockaddr = NULL; + csinfo->LocalAddr.iSockaddrLength = 0; + } + + /* Check if the sock is connected */ + if (!getpeername(fd, &uaddr.addr, &uaddrlen) && + is_sockaddr_bound(&uaddr.addr, uaddrlen)) + { + csinfo->RemoteAddr.lpSockaddr = + (LPSOCKADDR) (optval + sizeof(CSADDR_INFO) + addr_size); + ws_sockaddr_u2ws(&uaddr.addr, csinfo->RemoteAddr.lpSockaddr, &addr_size); + csinfo->RemoteAddr.iSockaddrLength = addr_size; + } + else + { + csinfo->RemoteAddr.lpSockaddr = NULL; + csinfo->RemoteAddr.iSockaddrLength = 0; + } + + csinfo->iSocketType = infow.iSocketType; + csinfo->iProtocol = infow.iProtocol; + release_sock_fd( s, fd ); + } + } + return ret ? 0 : SOCKET_ERROR; + } case WS_SO_DONTLINGER: { struct linger lingval; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f0946c9..49ebbf5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1486,9 +1486,9 @@ todo_wine } /* Test SO_BSP_STATE - Present only in >= Win 2008 */ - s = socket(AF_INET, SOCK_STREAM, 0); + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(s != INVALID_SOCKET, "Failed to create socket\n"); - s2 = socket(AF_INET, SOCK_STREAM, 0); + s2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(s2 != INVALID_SOCKET, "Failed to create socket\n"); SetLastError(0xdeadbeef); @@ -1571,6 +1571,23 @@ todo_wine ok(!err, "Expected 0, got %d\n", err); ok(!memcmp(&saddr, csinfoB.cs.LocalAddr.lpSockaddr, size), "Expected matching addresses\n"); ok(!memcmp(&saddr, csinfoA.cs.RemoteAddr.lpSockaddr, size), "Expected matching addresses\n"); + + SetLastError(0xdeadbeef); + size = sizeof(CSADDR_INFO); + err = getsockopt(s, SOL_SOCKET, SO_BSP_STATE, (char *) &csinfoA, &size); + ok(err, "Expected non-zero\n"); + ok(size == sizeof(CSADDR_INFO), "Got %d\n", size); + ok(GetLastError() == WSAEFAULT, "Expected 10014, got %d\n", GetLastError()); + + /* At least for IPv4 the size is exactly 56 bytes */ + size = sizeof(*csinfoA.cs.LocalAddr.lpSockaddr) * 2 + sizeof(csinfoA.cs); + err = getsockopt(s, SOL_SOCKET, SO_BSP_STATE, (char *) &csinfoA, &size); + ok(!err, "Expected 0, got %d\n", err); + size--; + SetLastError(0xdeadbeef); + err = getsockopt(s, SOL_SOCKET, SO_BSP_STATE, (char *) &csinfoA, &size); + ok(err, "Expected non-zero\n"); + ok(GetLastError() == WSAEFAULT, "Expected 10014, got %d\n", GetLastError()); } else ok(GetLastError() == WSAENOPROTOOPT, "Expected 10042, got %d\n", GetLastError()); diff --git a/include/winsock.h b/include/winsock.h index 21e984c..50237e8 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -697,6 +697,7 @@ typedef struct WS(WSAData) #define WS_SO_RCVTIMEO 0x1006 #define WS_SO_ERROR 0x1007 #define WS_SO_TYPE 0x1008 +#define WS_SO_BSP_STATE 0x1009 #define WS_IOCPARM_MASK 0x7f #define WS_IOC_VOID 0x20000000

1 0

Michael Stefaniuc : comctl32: Remove a stray unused GetFocus() statement ( PVS-Studio).
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 47fa711bbcff49e28d605eecabff70e229cb5c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47fa711bbcff49e28d605eeca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 9 22:11:03 2014 +0100 comctl32: Remove a stray unused GetFocus() statement (PVS-Studio). --- dlls/comctl32/toolbar.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index a1b7966..a329c26 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5067,8 +5067,6 @@ TOOLBAR_SetHotItem2 (TOOLBAR_INFO *infoPtr, INT nHotItem, LPARAM lParam) TOOLBAR_SetHotItemEx(infoPtr, nHotItem, lParam); - GetFocus(); - return (nOldHotItem < 0) ? -1 : (LRESULT)nOldHotItem; }

1 0

Hans Leidekker : cryptnet: Add support for base64 encoded certificates, CRLs and CTLs in CryptRetrieveObjectByUrl.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 5e6490a835fff0d2ebe5ee78e04276757143f0b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6490a835fff0d2ebe5ee78e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:44:00 2014 +0100 cryptnet: Add support for base64 encoded certificates, CRLs and CTLs in CryptRetrieveObjectByUrl. --- dlls/cryptnet/cryptnet_main.c | 53 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index df9eb49..90057d9 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1184,10 +1184,27 @@ static BOOL WINAPI CRYPT_CreateBlob(LPCSTR pszObjectOid, typedef BOOL (WINAPI *AddContextToStore)(HCERTSTORE hCertStore, const void *pContext, DWORD dwAddDisposition, const void **ppStoreContext); +static BOOL decode_base64_blob( const CRYPT_DATA_BLOB *in, CRYPT_DATA_BLOB *out ) +{ + BOOL ret; + DWORD len = in->cbData; + + while (len && !in->pbData[len - 1]) len--; + if (!CryptStringToBinaryA( (char *)in->pbData, len, CRYPT_STRING_BASE64_ANY, + NULL, &out->cbData, NULL, NULL )) return FALSE; + + if (!(out->pbData = CryptMemAlloc( out->cbData ))) return FALSE; + ret = CryptStringToBinaryA( (char *)in->pbData, len, CRYPT_STRING_BASE64_ANY, + out->pbData, &out->cbData, NULL, NULL ); + if (!ret) CryptMemFree( out->pbData ); + return ret; +} + static BOOL CRYPT_CreateContext(const CRYPT_BLOB_ARRAY *pObject, DWORD dwExpectedContentTypeFlags, AddContextToStore addFunc, void **ppvContext) { BOOL ret = TRUE; + CRYPT_DATA_BLOB blob; if (!pObject->cBlob) { @@ -1197,9 +1214,20 @@ static BOOL CRYPT_CreateContext(const CRYPT_BLOB_ARRAY *pObject, } else if (pObject->cBlob == 1) { - if (!CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &pObject->rgBlob[0], - dwExpectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, - NULL, NULL, NULL, NULL, (const void **)ppvContext)) + if (decode_base64_blob(&pObject->rgBlob[0], &blob)) + { + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + dwExpectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_BINARY, 0, + NULL, NULL, NULL, NULL, NULL, (const void **)ppvContext); + CryptMemFree(blob.pbData); + } + else + { + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &pObject->rgBlob[0], + dwExpectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_BINARY, 0, + NULL, NULL, NULL, NULL, NULL, (const void **)ppvContext); + } + if (!ret) { SetLastError(CRYPT_E_NO_MATCH); ret = FALSE; @@ -1217,10 +1245,21 @@ static BOOL CRYPT_CreateContext(const CRYPT_BLOB_ARRAY *pObject, for (i = 0; i < pObject->cBlob; i++) { - if (CryptQueryObject(CERT_QUERY_OBJECT_BLOB, - &pObject->rgBlob[i], dwExpectedContentTypeFlags, - CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, - NULL, &context)) + if (decode_base64_blob(&pObject->rgBlob[i], &blob)) + { + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + dwExpectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_BINARY, + 0, NULL, NULL, NULL, NULL, NULL, &context); + CryptMemFree(blob.pbData); + } + else + { + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, + &pObject->rgBlob[i], dwExpectedContentTypeFlags, + CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, + NULL, &context); + } + if (ret) { if (!addFunc(store, context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE;

1 0

Hans Leidekker : winhttp/tests: Handle more potential connection failures.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 0d50168570e77f917abbefd16a7209ae3644741a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d50168570e77f917abbefd16… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:44:38 2014 +0100 winhttp/tests: Handle more potential connection failures. --- dlls/winhttp/tests/notification.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 13 +++---------- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index ffbea03..e14af6d 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -186,6 +186,11 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); setup_test( &info, winhttp_receive_response, __LINE__ ); @@ -209,6 +214,11 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); setup_test( &info, winhttp_receive_response, __LINE__ ); @@ -253,6 +263,11 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); setup_test( &info, winhttp_receive_response, __LINE__ ); @@ -276,6 +291,11 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); setup_test( &info, winhttp_receive_response, __LINE__ ); @@ -288,6 +308,7 @@ static void test_connection_cache( void ) ok(status == 200, "request failed unexpectedly %u\n", status); setup_test( &info, winhttp_close_handle, __LINE__ ); +done: WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); @@ -353,6 +374,11 @@ static void test_redirect( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); setup_test( &info, winhttp_receive_response, __LINE__ ); @@ -365,6 +391,7 @@ static void test_redirect( void ) ok(status == 200, "request failed unexpectedly %u\n", status); setup_test( &info, winhttp_close_handle, __LINE__ ); +done: WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); @@ -435,6 +462,15 @@ static void test_async( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); + CloseHandle( info.wait ); + return; + } ok(ret, "failed to send request %u\n", GetLastError()); WaitForSingleObject( info.wait, INFINITE ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1c56923..eda83e4 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -954,7 +954,7 @@ static void test_request_parameter_defaults(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + if (!ret && (GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT || GetLastError() == ERROR_WINHTTP_TIMEOUT)) { skip("connection failed, skipping\n"); goto done; @@ -3044,12 +3044,8 @@ static void test_WinHttpGetProxyForUrl(void) options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; memset( &info, 0, sizeof(info) ); - SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); - error = GetLastError(); - if (!ret) ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED || - error == ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT, "got %u\n", error ); - else + if (ret) { trace("Proxy.AccessType=%u\n", info.dwAccessType); trace("Proxy.Proxy=%s\n", wine_dbgstr_w(info.lpszProxy)); @@ -3063,11 +3059,8 @@ static void test_WinHttpGetProxyForUrl(void) options.lpszAutoConfigUrl = wpadW; memset( &info, 0, sizeof(info) ); - SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); - error = GetLastError(); - if (!ret) ok( error == ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT, "got %u\n", error ); - else + if (ret) { trace("Proxy.AccessType=%u\n", info.dwAccessType); trace("Proxy.Proxy=%s\n", wine_dbgstr_w(info.lpszProxy));

1 0

Hans Leidekker : winhttp: Enable automatic authentication by default in the request object.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 1eb86e1fca71f634b54bf105703c1247d87b39ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb86e1fca71f634b54bf1057… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:45:46 2014 +0100 winhttp: Enable automatic authentication by default in the request object. --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d497d7a..62e9c75 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2932,7 +2932,7 @@ static void initialize_request( struct winhttp_request *request ) request->bytes_read = 0; request->error = ERROR_SUCCESS; request->logon_policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM; - request->disable_feature = WINHTTP_DISABLE_AUTHENTICATION; + request->disable_feature = 0; request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL;

1 0

Hans Leidekker : winhttp: Fill the read buffer first in drain_content.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 4ac817b6c0c300fbf3f30a3ba2fe78651b8ab88c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac817b6c0c300fbf3f30a3ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:46:23 2014 +0100 winhttp: Fill the read buffer first in drain_content. --- dlls/winhttp/request.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 62e9c75..75a229d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2148,6 +2148,7 @@ static void drain_content( request_t *request ) DWORD bytes_read; char buffer[2048]; + refill_buffer( request, FALSE ); for (;;) { if (!read_data( request, buffer, sizeof(buffer), &bytes_read, FALSE ) || !bytes_read) return;

1 0