February 2017 - Wine-commits

Bruno Jesus : include: Add missing GetIfTable2 to netioapi.h.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 08cae050154a3706df1e418f526d943ab77b9b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08cae050154a3706df1e418f5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Feb 26 22:28:09 2017 -0300 include: Add missing GetIfTable2 to netioapi.h. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/netioapi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/netioapi.h b/include/netioapi.h index 0e777c7..2faa5d6 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -108,6 +108,7 @@ DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LUID*); DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); +DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); #endif /* __WINE_NETIOAPI_H */

1 0

Henri Verbeet : usp10: Introduce an enumeration for GSUB lookup types.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 66dce1e75f3cebfcd383921041eae4e9f04ec487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66dce1e75f3cebfcd38392104… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 23 08:10:29 2017 +0100 usp10: Introduce an enumeration for GSUB lookup types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 1ad9c39..a1ad3dc 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -61,6 +61,18 @@ enum gpos_lookup_type GPOS_LOOKUP_POSITION_EXTENSION = 0x9, }; +enum gsub_lookup_type +{ + GSUB_LOOKUP_SINGLE = 0x1, + GSUB_LOOKUP_MULTIPLE = 0x2, + GSUB_LOOKUP_ALTERNATE = 0x3, + GSUB_LOOKUP_LIGATURE = 0x4, + GSUB_LOOKUP_CONTEXT = 0x5, + GSUB_LOOKUP_CONTEXT_CHAINED = 0x6, + GSUB_LOOKUP_EXTENSION = 0x7, + GSUB_LOOKUP_CONTEXT_CHAINED_REVERSE = 0x8, +}; + typedef struct { WORD platformID; WORD encodingID; @@ -851,7 +863,7 @@ static const BYTE *GSUB_get_subtable(const OT_LookupTable *look, int index) { int offset = GET_BE_WORD(look->SubTable[index]); - if (GET_BE_WORD(look->LookupType) == 7) + if (GET_BE_WORD(look->LookupType) == GSUB_LOOKUP_EXTENSION) { const GSUB_ExtensionPosFormat1 *ext = (const GSUB_ExtensionPosFormat1 *)((const BYTE *)look + offset); if (GET_BE_WORD(ext->SubstFormat) == 1) @@ -1423,14 +1435,16 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int offset; - int type; + enum gsub_lookup_type type; const OT_LookupTable *look; offset = GET_BE_WORD(lookup->Lookup[lookup_index]); look = (const OT_LookupTable*)((const BYTE*)lookup + offset); type = GET_BE_WORD(look->LookupType); - TRACE("type %i, flag %x, subtables %i\n",type,GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); - if (type == 7) + TRACE("type %#x, flag %#x, subtables %u.\n", type, + GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); + + if (type == GSUB_LOOKUP_EXTENSION) { if (GET_BE_WORD(look->SubTableCount)) { @@ -1452,23 +1466,23 @@ static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD } switch(type) { - case 1: + case GSUB_LOOKUP_SINGLE: return GSUB_apply_SingleSubst(look, glyphs, glyph_index, write_dir, glyph_count); - case 2: + case GSUB_LOOKUP_MULTIPLE: return GSUB_apply_MultipleSubst(look, glyphs, glyph_index, write_dir, glyph_count); - case 3: + case GSUB_LOOKUP_ALTERNATE: return GSUB_apply_AlternateSubst(look, glyphs, glyph_index, write_dir, glyph_count); - case 4: + case GSUB_LOOKUP_LIGATURE: return GSUB_apply_LigatureSubst(look, glyphs, glyph_index, write_dir, glyph_count); - case 5: + case GSUB_LOOKUP_CONTEXT: return GSUB_apply_ContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); - case 6: + case GSUB_LOOKUP_CONTEXT_CHAINED: return GSUB_apply_ChainContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); - case 7: + case GSUB_LOOKUP_EXTENSION: FIXME("Extension Substitution types not valid here\n"); break; default: - FIXME("We do not handle SubType %i\n",type); + FIXME("Unhandled GSUB lookup type %#x.\n", type); } return GSUB_E_NOGLYPH; }

1 0

Nikolay Sivov : usp10: Filter out DeltaFormat == 0 too, valid range is [1, 3].
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 892393bb76110ab936b98e79fef2299c13df5d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892393bb76110ab936b98e79f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 22 12:14:50 2017 +0300 usp10: Filter out DeltaFormat == 0 too, valid range is [1, 3]. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a1ad3dc..4f3b559 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1512,7 +1512,7 @@ static INT GPOS_get_device_table_value(const OT_DeviceTable *DeviceTable, WORD p TRACE("device table, format %#x, index %i\n", format, index); - if (format & ~0x3) + if (format < 1 || format > 3) { WARN("invalid delta format %#x\n", format); return 0;

1 0

Francois Gouget : usp10: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 1a42ee31982eaa665448bddbe62aaa7f34557779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a42ee31982eaa665448bddbe… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 11:25:37 2017 +0100 usp10: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their type names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f8a6aa5..9a558b4 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -710,17 +710,17 @@ typedef struct { WORD target; } FindGlyph_struct; -static inline void *heap_alloc(SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline BOOL heap_free(LPVOID mem) +static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); }

1 0

André Hentschel : usp10: Fix ScriptGetProperties spec file entry.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: b32fb231e6e4821a585e6165b743c367afa35e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32fb231e6e4821a585e6165b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 21:28:15 2017 +0100 usp10: Fix ScriptGetProperties spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 3880895..3e97d91 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -13,7 +13,7 @@ @ stdcall ScriptGetFontScriptTags(long ptr ptr long ptr ptr) @ stdcall ScriptGetGlyphABCWidth(ptr ptr long ptr) @ stdcall ScriptGetLogicalWidths(ptr long long ptr ptr ptr ptr) -@ stdcall ScriptGetProperties(ptr long) +@ stdcall ScriptGetProperties(ptr ptr) @ stdcall ScriptIsComplex(wstr long long) @ stdcall ScriptItemize(wstr long long ptr ptr ptr ptr) @ stdcall ScriptItemizeOpenType(wstr long long ptr ptr ptr ptr ptr)

1 0

Bruno Jesus : ws2_32/tests: Add a 2 buffer WSARecv test.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 803418c239934093e7a1d1fad3ee2d8079ee5817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=803418c239934093e7a1d1fad… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Sat Feb 25 12:46:49 2017 -0300 ws2_32/tests: Add a 2 buffer WSARecv test. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b42c078..b61905e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6626,7 +6626,7 @@ static void test_WSARecv(void) { SOCKET src, dest, server = INVALID_SOCKET; char buf[20]; - WSABUF bufs; + WSABUF bufs[2]; WSAOVERLAPPED ov; DWORD bytesReturned, flags, id; struct linger ling; @@ -6645,8 +6645,8 @@ static void test_WSARecv(void) memset(&ov, 0, sizeof(ov)); flags = 0; - bufs.len = 2; - bufs.buf = buf; + bufs[0].len = 2; + bufs[0].buf = buf; /* Send 4 bytes and receive in two calls of 2 */ SetLastError(0xdeadbeef); @@ -6655,31 +6655,49 @@ static void test_WSARecv(void) ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); SetLastError(0xdeadbeef); bytesReturned = 0xdeadbeef; - iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); + iret = WSARecv(dest, bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); - ok(bytesReturned, "Expected 2, got %d\n", bytesReturned); + ok(bytesReturned == 2, "Expected 2, got %d\n", bytesReturned); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); SetLastError(0xdeadbeef); bytesReturned = 0xdeadbeef; - iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); + iret = WSARecv(dest, bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); - ok(bytesReturned, "Expected 2, got %d\n", bytesReturned); + ok(bytesReturned == 2, "Expected 2, got %d\n", bytesReturned); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); - bufs.len = 4; + bufs[0].len = 4; SetLastError(0xdeadbeef); iret = send(src, "test", 4, 0); ok(iret == 4, "Expected 4, got %d\n", iret); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); SetLastError(0xdeadbeef); bytesReturned = 0xdeadbeef; - iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); + iret = WSARecv(dest, bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); - ok(bytesReturned, "Expected 4, got %d\n", bytesReturned); + ok(bytesReturned == 4, "Expected 4, got %d\n", bytesReturned); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); - bufs.len = sizeof(buf); + /* Test 2 buffers */ + bufs[0].len = 4; + bufs[1].len = 5; + bufs[1].buf = buf + 10; + SetLastError(0xdeadbeef); + iret = send(src, "deadbeefs", 9, 0); + ok(iret == 9, "Expected 9, got %d\n", iret); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + bytesReturned = 0xdeadbeef; + iret = WSARecv(dest, bufs, 2, &bytesReturned, &flags, NULL, NULL); + ok(!iret, "Expected 0, got %d\n", iret); + ok(bytesReturned == 9, "Expected 9, got %d\n", bytesReturned); + bufs[0].buf[4] = '\0'; + bufs[1].buf[5] = '\0'; + ok(!strcmp(bufs[0].buf, "dead"), "buf[0] doesn't match: %s != dead\n", bufs[0].buf); + ok(!strcmp(bufs[1].buf, "beefs"), "buf[1] doesn't match: %s != beefs\n", bufs[1].buf); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); + bufs[0].len = sizeof(buf); ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError()); if (!ov.hEvent) @@ -6690,10 +6708,10 @@ static void test_WSARecv(void) iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); ok(!iret, "Failed to set linger %d\n", GetLastError()); - iret = WSARecv(dest, &bufs, 1, NULL, &flags, &ov, NULL); + iret = WSARecv(dest, bufs, 1, NULL, &flags, &ov, NULL); ok(iret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, "WSARecv failed - %d error %d\n", iret, GetLastError()); - iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, &ov, NULL); + iret = WSARecv(dest, bufs, 1, &bytesReturned, &flags, &ov, NULL); ok(iret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, "WSARecv failed - %d error %d\n", iret, GetLastError()); closesocket(src);

1 0

Chris Morgan : winex11: Wrap XInput2 dependent functions with appropriate #ifdef.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 9c83e5ccf2f4c9d8662baa85c35f5147ccaae883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c83e5ccf2f4c9d8662baa85c… Author: Chris Morgan <chmorgan(a)gmail.com> Date: Fri Feb 24 08:06:52 2017 -0500 winex11: Wrap XInput2 dependent functions with appropriate #ifdef. Signed-off-by: Chris Morgan <chmorgan(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 6027a6e..259263d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -246,6 +246,7 @@ void sync_window_cursor( Window window ) set_window_cursor( window, cursor ); } +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H /*********************************************************************** * update_relative_valuators */ @@ -281,6 +282,7 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator } } } +#endif /***********************************************************************

1 0

Nikolay Sivov : shell32: Implement SHGetPropertyStoreFromParsingName() as a wrapper over IShellItem2.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: f2499d20d4eb6dcce8984d5ef887648112f4f1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2499d20d4eb6dcce8984d5ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 27 17:19:23 2017 +0300 shell32: Implement SHGetPropertyStoreFromParsingName() as a wrapper over IShellItem2. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 9 --------- dlls/shell32/shellitem.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 7e1c7d5..1a22150 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -964,15 +964,6 @@ HRESULT WINAPI SHGetPropertyStoreForWindow(HWND hwnd, REFIID riid, void **ppv) return E_NOTIMPL; } -/************************************************************************* - * SHGetPropertyStoreFromParsingName [SHELL32.@] - */ -HRESULT WINAPI SHGetPropertyStoreFromParsingName(PCWSTR pszPath, IBindCtx *pbc, GETPROPERTYSTOREFLAGS flags, REFIID riid, void **ppv) -{ - FIXME("(%s %p %u %p %p) stub!\n", debugstr_w(pszPath), pbc, flags, riid, ppv); - return E_NOTIMPL; -} - /*************************************************************************/ typedef struct diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 57f5fa6..1e19f7c 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1331,6 +1331,24 @@ HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl, return ret; } +HRESULT WINAPI SHGetPropertyStoreFromParsingName(const WCHAR *path, IBindCtx *pbc, GETPROPERTYSTOREFLAGS flags, + REFIID riid, void **ppv) +{ + IShellItem2 *item; + HRESULT hr; + + TRACE("(%s %p %#x %p %p)\n", debugstr_w(path), pbc, flags, riid, ppv); + + hr = SHCreateItemFromParsingName(path, pbc, &IID_IShellItem2, (void **)&item); + if(SUCCEEDED(hr)) + { + hr = IShellItem2_GetPropertyStore(item, flags, riid, ppv); + IShellItem2_Release(item); + } + + return hr; +} + static HRESULT WINAPI CustomDestinationList_QueryInterface(ICustomDestinationList *iface, REFIID riid, void **obj) { CustomDestinationList *This = impl_from_ICustomDestinationList(iface);

1 0

Jacek Caban : wininet: Improved netconn_drain_content.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 7b42dc4931201a078029fb35d51cb1d0c75e2d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b42dc4931201a078029fb35d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 27 15:20:26 2017 +0100 wininet: Improved netconn_drain_content. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 15 ++++++++------ dlls/wininet/tests/http.c | 52 +++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 55 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 635b7d6..21b93dd 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2682,17 +2682,20 @@ static BOOL netconn_drain_content(data_stream_t *stream, http_request_t *req) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; BYTE buf[1024]; - int len; + int len, res; + size_t size; - if(netconn_end_of_data(stream, req)) - return TRUE; + if(netconn_stream->content_length == ~0u) + return FALSE; - do { - if(NETCON_recv(req->netconn, buf, sizeof(buf), FALSE, &len) != ERROR_SUCCESS) + while(netconn_stream->content_read < netconn_stream->content_length) { + size = min(sizeof(buf), netconn_stream->content_length-netconn_stream->content_read); + res = NETCON_recv(req->netconn, buf, size, FALSE, &len); + if(res || !len) return FALSE; netconn_stream->content_read += len; - }while(netconn_stream->content_read < netconn_stream->content_length); + } return TRUE; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fb64e3c..6df30fa 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4652,7 +4652,14 @@ static void _readex_expect_sync_data(unsigned line, HINTERNET req, DWORD flags, _readex_expect_sync_data_len(line, req, flags, buf, buf_size, exdata, strlen(exdata)); } -static void send_response_and_wait(const char *response, BOOL close_connection, INTERNET_BUFFERSW *buf) +static void close_connection(void) +{ + char c; + SetEvent(conn_wait_event); + recv(server_socket, &c, 1, 0); +} + +static void send_response_and_wait(const char *response, BOOL do_close_connection, INTERNET_BUFFERSW *buf) { DWORD orig_size = buf->dwBufferLength; @@ -4661,11 +4668,8 @@ static void send_response_and_wait(const char *response, BOOL close_connection, if(response) server_send_string(response); - if(close_connection) { - char c; - SetEvent(conn_wait_event); - recv(server_socket, &c, 1, 0); - } + if(do_close_connection) + close_connection(); WaitForSingleObject(hCompleteEvent, INFINITE); @@ -4821,6 +4825,41 @@ static void test_http_read(int port) CloseHandle(server_req_rec_event); } +static void test_connection_break(int port) +{ + INTERNET_BUFFERSW ib; + test_request_t req; + char buf[24000]; + + if(!is_ie7plus) + return; + + hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + conn_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); + server_req_rec_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + memset(&ib, 0, sizeof(ib)); + ib.dwStructSize = sizeof(ib); + ib.lpvBuffer = buf; + + trace("Testing InternetReadFileExW on broken connection...\n"); + + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Content-Length: 10000\r\n" + "\r\n" + "xx"); + + /* close connection and make sure that it's closed on handle release. */ + close_connection(); + SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); + SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); + close_async_handle(req.session, hCompleteEvent, 2); + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); +} + static void test_long_url(int port) { char long_path[INTERNET_MAX_PATH_LENGTH*2] = "/echo_request?"; @@ -4919,6 +4958,7 @@ static void test_http_connection(void) test_basic_auth_credentials_reuse(si.port); test_async_read(si.port); test_http_read(si.port); + test_connection_break(si.port); test_long_url(si.port); test_remove_dot_segments(si.port);

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 42a62ad83920bcdeeddb67f8053eb0717cd63fa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a62ad83920bcdeeddb67f80… Author: Kim Malmo <berencamlost(a)msn.com> Date: Mon Feb 27 15:31:52 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index da76ed9..3af4b72 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-02 16:00+0100\n" +"PO-Revision-Date: 2017-02-27 16:00+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -12220,17 +12220,13 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Eksporterer den valgte greinen av registeret til en tekstfil" #: regedit.rc:187 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Bekreft sletting av verdi" +msgstr "Bekreft sletting av nøkkel" #: regedit.rc:188 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "Vil du virkelig slette registernøkkel \"%1\"?" +msgstr "Vil du virkelig slette registernøkkel \"%1\" og alle dens undernøkler?" #: regsvr32.rc:32 msgid ""

1 0