May 2017 - Wine-commits - list.winehq.org

Stefan Dösinger : ws2_32: Don' t post completion packet if receiving fails with error immediately.
by Alexandre Julliard 16 May '17

16 May '17

Module: wine Branch: master Commit: 7a1142035d7ee04839417176ff93fd0953e2a4e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1142035d7ee04839417176f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 15 19:06:32 2017 +0200 ws2_32: Don't post completion packet if receiving fails with error immediately. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 - dlls/ws2_32/tests/sock.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f6db832..e464b58 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7744,9 +7744,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (errno != EAGAIN) { - int loc_errno = errno; err = wsaErrno(); - if (cvalue) WS_AddCompletion( s, cvalue, sock_get_ntstatus(loc_errno), 0 ); goto error; } } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 023eb42..57455c0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -9184,6 +9184,7 @@ static void test_completion_port(void) struct sockaddr_in bindAddress; GUID acceptExGuid = WSAID_ACCEPTEX; LPFN_ACCEPTEX pAcceptEx = NULL; + fd_set fds_recv; memset(buf, 0, sizeof(buf)); previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); @@ -9299,6 +9300,167 @@ static void test_completion_port(void) if (dest != INVALID_SOCKET) closesocket(dest); + /* Test IOCP response on successful immediate read. */ + tcp_socketpair(&src, &dest); + if (src == INVALID_SOCKET || dest == INVALID_SOCKET) + { + skip("failed to create sockets\n"); + goto end; + } + + bufs.len = sizeof(buf); + bufs.buf = buf; + flags = 0; + SetLastError(0xdeadbeef); + + iret = WSASend(src, &bufs, 1, &num_bytes, 0, &ov, NULL); + ok(!iret, "WSASend failed - %d, last error %u\n", iret, GetLastError()); + ok(num_bytes == sizeof(buf), "Managed to send %d\n", num_bytes); + + io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + set_blocking(dest, FALSE); + + FD_ZERO(&fds_recv); + FD_SET(dest, &fds_recv); + select(dest + 1, &fds_recv, NULL, NULL, NULL); + + num_bytes = 0xdeadbeef; + flags = 0; + + iret = WSARecv(dest, &bufs, 1, &num_bytes, &flags, &ov, NULL); + ok(!iret, "WSARecv failed - %d, last error %u\n", iret, GetLastError()); + ok(num_bytes == sizeof(buf), "Managed to read %d\n", num_bytes); + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + ok(bret == TRUE, "failed to get completion status %u\n", bret); + ok(GetLastError() == 0xdeadbeef, "Last error was %d\n", GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(num_bytes == sizeof(buf), "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); + + /* Test IOCP response on graceful shutdown. */ + closesocket(src); + + FD_ZERO(&fds_recv); + FD_SET(dest, &fds_recv); + select(dest + 1, &fds_recv, NULL, NULL, NULL); + + num_bytes = 0xdeadbeef; + flags = 0; + memset(&ov, 0, sizeof(ov)); + + iret = WSARecv(dest, &bufs, 1, &num_bytes, &flags, &ov, NULL); + ok(!iret, "WSARecv failed - %d, last error %u\n", iret, GetLastError()); + ok(!num_bytes, "Managed to read %d\n", num_bytes); + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + ok(bret == TRUE, "failed to get completion status %u\n", bret); + ok(GetLastError() == 0xdeadbeef, "Last error was %d\n", GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(!num_bytes, "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); + + closesocket(src); + src = INVALID_SOCKET; + closesocket(dest); + dest = INVALID_SOCKET; + + /* Test IOCP response on hard shutdown. This was the condition that triggered + * a crash in an actual app (bug 38980). */ + tcp_socketpair(&src, &dest); + if (src == INVALID_SOCKET || dest == INVALID_SOCKET) + { + skip("failed to create sockets\n"); + goto end; + } + + bufs.len = sizeof(buf); + bufs.buf = buf; + flags = 0; + memset(&ov, 0, sizeof(ov)); + + ling.l_onoff = 1; + ling.l_linger = 0; + iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); + ok(!iret, "Failed to set linger %d\n", GetLastError()); + + io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + set_blocking(dest, FALSE); + + closesocket(src); + src = INVALID_SOCKET; + + FD_ZERO(&fds_recv); + FD_SET(dest, &fds_recv); + select(dest + 1, &fds_recv, NULL, NULL, NULL); + + num_bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + + /* Somehow a hard shutdown doesn't work on my Linux box. It seems SO_LINGER is ignored. */ + iret = WSARecv(dest, &bufs, 1, &num_bytes, &flags, &ov, NULL); + todo_wine ok(iret == SOCKET_ERROR, "WSARecv failed - %d\n", iret); + todo_wine ok(GetLastError() == WSAECONNRESET, "Last error was %d\n", GetLastError()); + todo_wine ok(num_bytes == 0xdeadbeef, "Managed to read %d\n", num_bytes); + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + todo_wine ok(bret == FALSE, "GetQueuedCompletionStatus returned %u\n", bret ); + todo_wine ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + todo_wine ok(key == 0xdeadbeef, "Key is %lu\n", key); + todo_wine ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + todo_wine ok(!olp, "Overlapped structure is at %p\n", olp); + + closesocket(dest); + + /* Test reading from a non-connected socket, mostly because the above test is marked todo. */ + dest = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(dest != INVALID_SOCKET, "socket() failed\n"); + + io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + set_blocking(dest, FALSE); + + num_bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + memset(&ov, 0, sizeof(ov)); + + iret = WSARecv(dest, &bufs, 1, &num_bytes, &flags, &ov, NULL); + ok(iret == SOCKET_ERROR, "WSARecv failed - %d\n", iret); + ok(GetLastError() == WSAENOTCONN, "Last error was %d\n", GetLastError()); + ok(num_bytes == 0xdeadbeef, "Managed to read %d\n", num_bytes); + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + ok(bret == FALSE, "GetQueuedCompletionStatus returned %u\n", bret ); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); + + num_bytes = 0xdeadbeef; + closesocket(dest); + dest = socket(AF_INET, SOCK_STREAM, 0); if (dest == INVALID_SOCKET) {

1 0

Ken Thomases : winemac: Move the logic for posting a KEYBOARD_CHANGED event if the keyboard type changes into the setter of the keyboardType property.
by Alexandre Julliard 16 May '17

16 May '17

Module: wine Branch: master Commit: 48548812fe221ecffad120071847b4210dac74fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=48548812fe221ecffad120071… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 15 17:17:46 2017 -0500 winemac: Move the logic for posting a KEYBOARD_CHANGED event if the keyboard type changes into the setter of the keyboardType property. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.h | 1 - dlls/winemac.drv/cocoa_app.m | 9 +++++++++ dlls/winemac.drv/cocoa_window.m | 10 +--------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 6ca3fcb..1ca0bd7 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -116,7 +116,6 @@ enum { - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout processEvents:(BOOL)processEvents; - - (void) keyboardSelectionDidChange; - (void) noteKey:(uint16_t)keyCode pressed:(BOOL)pressed; - (void) window:(WineWindow*)window isBeingDragged:(BOOL)dragged; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 4013e03..2325654 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -453,6 +453,15 @@ static NSString* WineLocalizedString(unsigned int stringID) } } + - (void) setKeyboardType:(CGEventSourceKeyboardType)newType + { + if (newType != keyboardType) + { + keyboardType = newType; + [self keyboardSelectionDidChange]; + } + } + - (void) enabledKeyboardInputSourcesChanged { macdrv_layout_list_needs_update = TRUE; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a9290c3..2333c1f 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1929,15 +1929,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi event->key.time_ms = [controller ticksForEventTime:[theEvent timestamp]]; if ((cgevent = [theEvent CGEvent])) - { - CGEventSourceKeyboardType keyboardType = CGEventGetIntegerValueField(cgevent, - kCGKeyboardEventKeyboardType); - if (keyboardType != controller.keyboardType) - { - controller.keyboardType = keyboardType; - [controller keyboardSelectionDidChange]; - } - } + controller.keyboardType = CGEventGetIntegerValueField(cgevent, kCGKeyboardEventKeyboardType); [queue postEvent:event];

1 0

Ken Thomases : winemac: Ignore spurious or redundant notifications that the keyboard input source changed.
by Alexandre Julliard 16 May '17

16 May '17

Module: wine Branch: master Commit: feb19ee6695c358313190115498fb4d78d26193d URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb19ee6695c3583131901154… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 15 17:17:47 2017 -0500 winemac: Ignore spurious or redundant notifications that the keyboard input source changed. In particular, when an input method for an Asian language (e.g. Pinyin) is selected, we were getting repeated notifications. Querying the selected input method upon receiving them suggested that the keyboard layout changed to U.S. then back to Pinyin, then several redundant notifications with no apparent change. Since the handler for the posted KEYBOARD_CHANGED events sends WM_CANCELMODE to the active window, this was having bad effects. The spurious notifications can be distinguished by there being no current text input context or client. To detect redundant notifications, we track the last keyboard input source and keyboard layout input source and compare with the new ones to see if they really changed. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.h | 2 ++ dlls/winemac.drv/cocoa_app.m | 49 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 1ca0bd7..e76a47c 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -50,6 +50,8 @@ enum { NSMutableSet* triedWindows; unsigned long windowFocusSerial; + TISInputSourceRef lastKeyboardInputSource; + TISInputSourceRef lastKeyboardLayoutInputSource; CGEventSourceKeyboardType keyboardType; NSEvent* lastFlagsChanged; BOOL inputSourceIsInputMethod; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 2325654..77be095 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -413,13 +413,45 @@ static NSString* WineLocalizedString(unsigned int stringID) } } - - (void) keyboardSelectionDidChange + static BOOL EqualInputSource(TISInputSourceRef source1, TISInputSourceRef source2) { - TISInputSourceRef inputSourceLayout; + if (!source1 && !source2) + return TRUE; + if (!source1 || !source2) + return FALSE; + return CFEqual(source1, source2); + } - inputSourceIsInputMethodValid = FALSE; + - (void) keyboardSelectionDidChange:(BOOL)force + { + TISInputSourceRef inputSource, inputSourceLayout; + + if (!force) + { + NSTextInputContext* context = [NSTextInputContext currentInputContext]; + if (!context || ![context client]) + return; + } + inputSource = TISCopyCurrentKeyboardInputSource(); inputSourceLayout = TISCopyCurrentKeyboardLayoutInputSource(); + if (!force && EqualInputSource(inputSource, lastKeyboardInputSource) && + EqualInputSource(inputSourceLayout, lastKeyboardLayoutInputSource)) + { + if (inputSource) CFRelease(inputSource); + if (inputSourceLayout) CFRelease(inputSourceLayout); + return; + } + + if (lastKeyboardInputSource) + CFRelease(lastKeyboardInputSource); + lastKeyboardInputSource = inputSource; + if (lastKeyboardLayoutInputSource) + CFRelease(lastKeyboardLayoutInputSource); + lastKeyboardLayoutInputSource = inputSourceLayout; + + inputSourceIsInputMethodValid = FALSE; + if (inputSourceLayout) { CFDataRef uchr; @@ -434,7 +466,7 @@ static NSString* WineLocalizedString(unsigned int stringID) event->keyboard_changed.keyboard_type = self.keyboardType; event->keyboard_changed.iso_keyboard = (KBGetLayoutType(self.keyboardType) == kKeyboardISO); event->keyboard_changed.uchr = CFDataCreateCopy(NULL, uchr); - event->keyboard_changed.input_source = TISCopyCurrentKeyboardInputSource(); + event->keyboard_changed.input_source = (TISInputSourceRef)CFRetain(inputSource); if (event->keyboard_changed.uchr) { @@ -448,17 +480,20 @@ static NSString* WineLocalizedString(unsigned int stringID) macdrv_release_event(event); } - - CFRelease(inputSourceLayout); } } + - (void) keyboardSelectionDidChange + { + [self keyboardSelectionDidChange:NO]; + } + - (void) setKeyboardType:(CGEventSourceKeyboardType)newType { if (newType != keyboardType) { keyboardType = newType; - [self keyboardSelectionDidChange]; + [self keyboardSelectionDidChange:YES]; } }

1 0

Nikolay Sivov : dplayx/tests: Added missing assignment (Coverity).
by Alexandre Julliard 16 May '17

16 May '17

Module: wine Branch: master Commit: 3998052ca67450ea8c03c5c639ac734380ca0d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3998052ca67450ea8c03c5c63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 16 11:23:59 2017 +0300 dplayx/tests: Added missing assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index e8737ab..015585d 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6808,7 +6808,7 @@ static HRESULT set_firewall( enum firewall_op op ) hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); if (hr != S_OK) goto done; - INetFwProfile_get_AuthorizedApplications( profile, &apps ); + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); ok( hr == S_OK, "got %08x\n", hr ); if (hr != S_OK) goto done;

1 0

Nikolay Sivov : dpnet/tests: Added missing assignment (Coverity).
by Alexandre Julliard 16 May '17

16 May '17

Module: wine Branch: master Commit: 32ea1f0b8ca33a91b8b80469180c1df5f6587b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32ea1f0b8ca33a91b8b804691… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 16 11:24:00 2017 +0300 dpnet/tests: Added missing assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 89dd020..698082d 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -279,7 +279,7 @@ HRESULT set_firewall( enum firewall_op op ) hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); if (hr != S_OK) goto done; - INetFwProfile_get_AuthorizedApplications( profile, &apps ); + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); ok( hr == S_OK, "got %08x\n", hr ); if (hr != S_OK) goto done;

1 0

Nikolay Sivov : comctl32/tests: Remove useless rand() calls (cppcheck).
by Alexandre Julliard 16 May '17

16 May '17

Module: wine Branch: master Commit: 298ef9b93b1129e5484c60606a8b4d6a5b62fa14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=298ef9b93b1129e5484c60606… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 16 11:27:21 2017 +0300 comctl32/tests: Remove useless rand() calls (cppcheck). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/header.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index defd635..ae75199 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1560,7 +1560,6 @@ static void test_header_order (void) { hdi.lParam = i; SendMessageA(hWndHeader, HDM_INSERTITEMA, rand1[i], (LPARAM)&hdi); - rand(); } check_order(ids1, ord1, 5, "insert without iOrder"); @@ -1570,7 +1569,6 @@ static void test_header_order (void) hdi.lParam = i + 5; hdi.iOrder = rand2[i]; SendMessageA(hWndHeader, HDM_INSERTITEMA, rand3[i], (LPARAM)&hdi); - rand(); rand(); } check_order(ids2, ord2, 10, "insert with order"); @@ -1579,7 +1577,6 @@ static void test_header_order (void) { hdi.iOrder = rand5[i]; SendMessageA(hWndHeader, HDM_SETITEMA, rand4[i], (LPARAM)&hdi); - rand(); rand(); } check_order(ids2, ord3, 10, "setitems changing order");

1 0

Jacek Caban : d3d11.idl: Added D3D11_QUERY_DATA_PIPELINE_STATISTICS declaration.
by Alexandre Julliard 16 May '17

16 May '17

Module: wine Branch: master Commit: 393efc3f4d6d89e09221d83e88735ef91f595e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=393efc3f4d6d89e09221d83e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 16 18:07:18 2017 +0200 d3d11.idl: Added D3D11_QUERY_DATA_PIPELINE_STATISTICS declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 371ff2f..5c47d83 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -1832,6 +1832,21 @@ typedef struct D3D11_QUERY_DATA_TIMESTAMP_DISJOINT BOOL Disjoint; } D3D11_QUERY_DATA_TIMESTAMP_DISJOINT; +typedef struct D3D11_QUERY_DATA_PIPELINE_STATISTICS +{ + UINT64 IAVertices; + UINT64 IAPrimitives; + UINT64 VSInvocations; + UINT64 GSInvocations; + UINT64 GSPrimitives; + UINT64 CInvocations; + UINT64 CPrimitives; + UINT64 PSInvocations; + UINT64 HSInvocations; + UINT64 DSInvocations; + UINT64 CSInvocations; +} D3D11_QUERY_DATA_PIPELINE_STATISTICS; + [ object, local,

1 0

Jacek Caban : ws2_32: Don' t try to match host name in getaddrinfo if AI_NUMERICHOST hint is specified.
by Alexandre Julliard 16 May '17

16 May '17

Module: wine Branch: master Commit: efdb722c179a476e728c9fe22d738f5d90ac23d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efdb722c179a476e728c9fe22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 16 17:47:45 2017 +0200 ws2_32: Don't try to match host name in getaddrinfo if AI_NUMERICHOST hint is specified. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e464b58..44bd667 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6620,7 +6620,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr /* getaddrinfo(3) is thread safe, no need to wrap in CS */ result = getaddrinfo(node, servname, punixhints, &unixaires); - if (result && !strcmp(hostname, node)) + if (result && (!hints || !(hints->ai_flags & WS_AI_NUMERICHOST)) && !strcmp(hostname, node)) { /* If it didn't work it means the host name IP is not in /etc/hosts, try again * by sending a NULL host and avoid sending a NULL servname too because that diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 57455c0..677a750 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7425,6 +7425,14 @@ static void test_getaddrinfo(void) ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); pfreeaddrinfo(result); + hint.ai_flags = AI_NUMERICHOST; + result = (void*)0xdeadbeef; + ret = pgetaddrinfo("localhost", "80", &hint, &result); + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected WSAHOST_NOT_FOUND, got %d\n", WSAGetLastError()); + ok(!result, "result = %p\n", result); + hint.ai_flags = 0; + /* try to get information from the computer name, result is the same * as if requesting with an empty host name. */ ret = pgetaddrinfo(name, NULL, NULL, &result);

1 0

Rosanne DiMesio : Update fixNoteLinks
by Jeremy Newman 16 May '17

16 May '17

Module: appdb Branch: master Commit: 9ade568cd1289277229d04498c02eee8c2ae8257 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9ade568cd1289277229d0449… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Sun May 14 20:15:05 2017 -0500 Update fixNoteLinks Restores call to query_affected_rows and fixes a typo. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin.php b/admin.php index fe1ccc6..90d1fc8 100644 --- a/admin.php +++ b/admin.php @@ -173,7 +173,7 @@ function fixNoteLinks() echo " $iCount in total "; // Create links for ordinary notes - echo " Creating tags for ordinar notes "; + echo " Creating tags for ordinary notes "; $hResult = query_parameters("SELECT * FROM appNotes WHERE versionId > '0' AND linkedWith = '0'"); $iTagsCreated = 0; @@ -199,7 +199,7 @@ function fixNoteLinks() echo " Deleting note links "; $hResult = query_parameters("DELETE FROM appNotes WHERE linkedWith != '0'"); - echo "Deleted ".query_num_rows()." links "; + echo "Deleted ".query_affected_rows()." links "; }

1 0

Rosanne DiMesio : Implement query_affected_rows
by Jeremy Newman 16 May '17

16 May '17

Module: appdb Branch: master Commit: a96e24abf2ae46f70bc623b979d56003470714d8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a96e24abf2ae46f70bc623b9… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Sun May 14 22:24:28 2017 -0500 Implement query_affected_rows Supersedes https://source.winehq.org/patches/data/133803. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/query.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/query.php b/include/query.php index a4b82d8..70fdd20 100644 --- a/include/query.php +++ b/include/query.php @@ -176,6 +176,12 @@ function query_num_rows($hResult) return $hResult->num_rows; } +function query_affected_rows() +{ + global $hAppdbLink; + return $hAppdbLink->affected_rows; +} + function query_escape_string($sString) { global $hAppdbLink;

1 0