October 2020 - Wine-commits

Nikolay Sivov : mf/evr: Implement stream state change events.
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: 5a68001d695dd21348d9045be00ae9b8e2abf926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a68001d695dd21348d9045b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 16 16:38:11 2020 +0300 mf/evr: Implement stream state change events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 84 insertions(+), 8 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 0cd13c25501..957d0e0f797 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -35,6 +35,13 @@ enum video_renderer_flags EVR_PRESENTER_INITED_SERVICES = 0x8, }; +enum video_renderer_state +{ + EVR_STATE_STOPPED = 0, + EVR_STATE_RUNNING, + EVR_STATE_PAUSED, +}; + enum video_stream_flags { EVR_STREAM_PREROLLING = 0x1, @@ -77,6 +84,7 @@ struct video_renderer IMFTransform *mixer; IMFVideoPresenter *presenter; unsigned int flags; + unsigned int state; struct video_stream **streams; size_t stream_size; @@ -1338,30 +1346,98 @@ static ULONG WINAPI video_renderer_clock_sink_Release(IMFClockStateSink *iface) static HRESULT WINAPI video_renderer_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) { - FIXME("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + size_t i; - return E_NOTIMPL; + TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + + EnterCriticalSection(&renderer->cs); + + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStarted, &GUID_NULL, S_OK, NULL); + + EnterCriticalSection(&stream->cs); + if (!(stream->flags & EVR_STREAM_PREROLLED)) + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkRequestSample, + &GUID_NULL, S_OK, NULL); + stream->flags |= EVR_STREAM_PREROLLED; + LeaveCriticalSection(&stream->cs); + } + renderer->state = EVR_STATE_RUNNING; + + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static HRESULT WINAPI video_renderer_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, debugstr_time(systime)); + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + size_t i; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + EnterCriticalSection(&renderer->cs); + + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStopped, &GUID_NULL, S_OK, NULL); + + EnterCriticalSection(&stream->cs); + stream->flags &= ~EVR_STREAM_PREROLLED; + LeaveCriticalSection(&stream->cs); + } + renderer->state = EVR_STATE_STOPPED; + + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static HRESULT WINAPI video_renderer_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, debugstr_time(systime)); + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + size_t i; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + EnterCriticalSection(&renderer->cs); + + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPaused, &GUID_NULL, S_OK, NULL); + } + renderer->state = EVR_STATE_PAUSED; + + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static HRESULT WINAPI video_renderer_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, debugstr_time(systime)); + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + size_t i; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + EnterCriticalSection(&renderer->cs); + + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStarted, &GUID_NULL, S_OK, NULL); + } + renderer->state = EVR_STATE_RUNNING; + + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static HRESULT WINAPI video_renderer_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate)

1 0

Zebediah Figura : ws2_32/tests: Rewrite the CF_DEFER test in test_AcceptEx().
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: d1461b622eaf5acd1515e9c8925134e6d878d3fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1461b622eaf5acd1515e9c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 14:57:27 2020 -0500 ws2_32/tests: Rewrite the CF_DEFER test in test_AcceptEx(). The previous test in fact regularly failed on Windows, hidden by the presence of broken(), since both sockets could be connected before the listener was signaled. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 92 ++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 58 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ba03e16ebb1..834cca71960 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7413,18 +7413,14 @@ static void test_ConnectEx(void) static void test_AcceptEx(void) { - SOCKET listener = INVALID_SOCKET; - SOCKET acceptor = INVALID_SOCKET; - SOCKET connector = INVALID_SOCKET; - SOCKET connector2 = INVALID_SOCKET; + SOCKET listener, acceptor, acceptor2, connector, connector2; struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress; int socklen, optlen; GUID acceptExGuid = WSAID_ACCEPTEX, getAcceptExGuid = WSAID_GETACCEPTEXSOCKADDRS; LPFN_ACCEPTEX pAcceptEx = NULL; LPFN_GETACCEPTEXSOCKADDRS pGetAcceptExSockaddrs = NULL; fd_set fds_accept, fds_send; - struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ - int got, conn1, i; + static const struct timeval timeout = {1, 0}; DWORD bytesReturned, connect_time; char buffer[1024], ipbuffer[32]; OVERLAPPED overlapped; @@ -7703,66 +7699,47 @@ todo_wine iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - FD_ZERO ( &fds_accept ); - FD_ZERO ( &fds_send ); + buffer[0] = '0'; - FD_SET ( listener, &fds_accept ); - FD_SET ( connector, &fds_send ); + FD_ZERO(&fds_accept); + FD_SET(listener, &fds_accept); + iret = select(0, &fds_accept, NULL, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - buffer[0] = '0'; - got = 0; - conn1 = 0; + acceptor2 = WSAAccept(listener, NULL, NULL, AlwaysDeferConditionFunc, 0); + ok(acceptor2 == INVALID_SOCKET, "expected failure\n"); + ok(WSAGetLastError() == WSATRY_AGAIN, "got error %u\n", WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, + sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); - for (i = 0; i < 4000; ++i) - { - fd_set fds_openaccept = fds_accept, fds_opensend = fds_send; + FD_ZERO(&fds_send); + FD_SET(connector, &fds_send); + iret = select(0, NULL, &fds_send, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - wsa_ok ( ( select ( 0, &fds_openaccept, &fds_opensend, NULL, &timeout ) ), SOCKET_ERROR !=, - "acceptex test(%d): could not select on socket, errno %d\n" ); + iret = send(connector, "1", 1, 0); + ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError()); - /* check for incoming requests */ - if ( FD_ISSET ( listener, &fds_openaccept ) ) { - got++; - if (got == 1) { - SOCKET tmp = WSAAccept(listener, NULL, NULL, (LPCONDITIONPROC) AlwaysDeferConditionFunc, 0); - ok(tmp == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection, %d\n", WSAGetLastError()); - bret = pAcceptEx(listener, acceptor, buffer, 0, - sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, - &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); - } - else if (got == 2) { - /* this should be socket #2 */ - SOCKET tmp = accept(listener, NULL, NULL); - ok(tmp != INVALID_SOCKET, "accept failed %d\n", WSAGetLastError()); - closesocket(tmp); - } - else { - ok(FALSE, "Got more than 2 connections?\n"); - } - } - if ( conn1 && FD_ISSET ( connector2, &fds_opensend ) ) { - /* Send data on second socket, and stop */ - send(connector2, "2", 1, 0); - FD_CLR ( connector2, &fds_send ); + iret = connect(connector2, (struct sockaddr *)&bindAddress, sizeof(bindAddress)); + ok(iret == SOCKET_ERROR, "expected failure\n"); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - break; - } - if ( FD_ISSET ( connector, &fds_opensend ) ) { - /* Once #1 is connected, allow #2 to connect */ - conn1 = 1; + iret = select(0, &fds_accept, NULL, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - send(connector, "1", 1, 0); - FD_CLR ( connector, &fds_send ); + acceptor2 = accept(listener, NULL, NULL); + ok(acceptor2 != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(acceptor2); - iret = connect(connector2, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - FD_SET ( connector2, &fds_send ); - } - } + FD_ZERO(&fds_send); + FD_SET(connector2, &fds_send); + iret = select(0, NULL, &fds_send, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - ok (got == 2 || broken(got == 1) /* NT4 */, - "Did not get both connections, got %d\n", got); + iret = send(connector2, "2", 1, 0); + ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 0); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); @@ -7774,7 +7751,6 @@ todo_wine set_blocking(acceptor, TRUE); iret = recv( acceptor, buffer, 2, 0); ok(iret == 1, "Failed to get data, %d, errno: %d\n", iret, WSAGetLastError()); - ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]); closesocket(connector);

1 0

Zebediah Figura : ws2_32/tests: Remove some workarounds for no longer supported versions of Windows.
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: 102c7903ead405d3236dfd843d40b96c38d784ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=102c7903ead405d3236dfd84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 14:57:28 2020 -0500 ws2_32/tests: Remove some workarounds for no longer supported versions of Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 86 +++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 55 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 834cca71960..9143518f4e8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1048,8 +1048,8 @@ static void WINAPI event_client ( client_params *par ) break; } n = recv ( mem->s, recv_p, min ( recv_last - recv_p, par->buflen ), 0 ); - if ( n < 0 && ( err = WSAGetLastError()) != WSAEWOULDBLOCK ) - ok ( 0, "event_client (%x): read error: %d\n", id, err ); + ok(n >= 0 || WSAGetLastError() == WSAEWOULDBLOCK, + "event_client (%x): got error %u\n", id, WSAGetLastError()); } } @@ -1364,16 +1364,15 @@ static void test_set_getsockopt(void) for( i = 0; i < ARRAY_SIZE(linger_testvals);i++) { size = sizeof(lingval); lingval = linger_testvals[i]; - err = setsockopt(s, SOL_SOCKET, SO_LINGER, (char *) &lingval, size); - if( !err) - err = getsockopt(s, SOL_SOCKET, SO_LINGER, (char *) &lingval, &size); - ok( !err, "get/setsockopt(SO_LINGER) failed error: %d\n", WSAGetLastError()); - ok( !lingval.l_onoff == !linger_testvals[i].l_onoff && - (lingval.l_linger == linger_testvals[i].l_linger || - (!lingval.l_linger && !linger_testvals[i].l_onoff)) - , "getsockopt(SO_LINGER #%d) returned wrong value %d,%d not %d,%d\n", i, - lingval.l_onoff, lingval.l_linger, - linger_testvals[i].l_onoff, linger_testvals[i].l_linger); + err = setsockopt(s, SOL_SOCKET, SO_LINGER, (char *)&lingval, size); + ok(!err, "Test %u: failed to set SO_LINGER, error %u\n", i, WSAGetLastError()); + err = getsockopt(s, SOL_SOCKET, SO_LINGER, (char *)&lingval, &size); + ok(!err, "Test %u: failed to get SO_LINGER, error %u\n", i, WSAGetLastError()); + ok(!lingval.l_onoff == !linger_testvals[i].l_onoff, "Test %u: expected %d, got %d\n", + i, linger_testvals[i].l_onoff, lingval.l_onoff); + if (lingval.l_onoff) + ok(lingval.l_linger == linger_testvals[i].l_linger, "Test %u: expected %d, got %d\n", + i, linger_testvals[i].l_linger, lingval.l_linger); } size = sizeof(lingval); @@ -2583,8 +2582,7 @@ static void test_WSASocket(void) sock = WSASocketA(AF_IPX, SOCK_DGRAM, NSPROTO_IPX, NULL, 0, 0); if (sock == INVALID_SOCKET) { - err = WSAGetLastError(); - ok(err == WSAEAFNOSUPPORT || broken(err == WSAEPROTONOSUPPORT), "Expected 10047, received %d\n", err); + ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); skip("IPX is not supported\n"); } else @@ -3752,11 +3750,7 @@ static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len, BOOL non if (!nonblock) ok(!ret, "connecting to accepting socket failed %d\n", WSAGetLastError()); else if (ret == SOCKET_ERROR) - { - DWORD error = WSAGetLastError(); - ok(error == WSAEWOULDBLOCK || error == WSAEINPROGRESS, - "expected 10035 or 10036, got %d\n", error); - } + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); return connector; } @@ -4648,13 +4642,11 @@ static void test_ioctlsocket(void) ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &arg, 0, NULL, 0, &arg, NULL, NULL); ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); - ret = WSAGetLastError(); - ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, NULL, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); - ret = WSAGetLastError(); - ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); make_keepalive(kalive, 0, 0, 0); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); @@ -4835,8 +4827,8 @@ static void test_send(void) bytes_sent = 0; WSASetLastError(12345); ret = WSASend(dst, &buf, 1, &bytes_sent, 0, &ov, NULL); - ok((ret == SOCKET_ERROR && WSAGetLastError() == ERROR_IO_PENDING) || broken(bytes_sent == buflen), - "Failed to start overlapped send %d - %d - %d/%d\n", ret, WSAGetLastError(), bytes_sent, buflen); + ok(ret == SOCKET_ERROR, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "wrong error %u\n", WSAGetLastError()); /* don't check for completion yet, we may need to drain the buffer while still sending */ set_blocking(src, FALSE); @@ -6087,8 +6079,8 @@ static void test_WSARecv(void) ok(dwret == WAIT_OBJECT_0, "Waiting for disconnect event failed with %d + errno %d\n", dwret, GetLastError()); bret = GetOverlappedResult((HANDLE)dest, &ov, &bytesReturned, FALSE); - todo_wine ok(!bret && (GetLastError() == ERROR_NETNAME_DELETED || broken(GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */), - "Did not get disconnect event: %d, error %d\n", bret, GetLastError()); + todo_wine ok(!bret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED, "got error %u\n", GetLastError()); ok(bytesReturned == 0, "Bytes received is %d\n", bytesReturned); closesocket(dest); dest = INVALID_SOCKET; @@ -6105,17 +6097,17 @@ static void test_WSARecv(void) addr.sin_family = AF_INET; addr.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(server, (struct sockaddr *)&addr, sizeof(addr)); - if (iret) goto end; + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); len = sizeof(addr); iret = getsockname(server, (struct sockaddr *)&addr, &len); - if (iret) goto end; + ok(!iret, "failed to get address, error %u\n", WSAGetLastError()); iret = listen(server, 1); - if (iret) goto end; + ok(!iret, "failed to listen, error %u\n", WSAGetLastError()); iret = connect(src, (struct sockaddr *)&addr, sizeof(addr)); - if (iret) goto end; + ok(!iret, "failed to connect, error %u\n", WSAGetLastError()); len = sizeof(addr); dest = accept(server, (struct sockaddr *)&addr, &len); @@ -6772,7 +6764,7 @@ static void test_GetAddrInfoW(void) result2 = NULL; ret = GetAddrInfoW(idn_domain, NULL, NULL, &result2); - if (ret == WSAHOST_NOT_FOUND && broken(1)) + if (broken(ret == WSAHOST_NOT_FOUND)) { FreeAddrInfoW(result); win_skip("IDN resolution not supported in Win <= 7\n"); @@ -8590,9 +8582,6 @@ static void test_WSAAsyncGetServByPort(void) HANDLE ret; char buffer[MAXGETHOSTSTRUCT]; - if (!hwnd) - return; - /* FIXME: The asynchronous window messages should be tested. */ /* Parameters are not checked when initiating the asynchronous operation. */ @@ -8620,9 +8609,6 @@ static void test_WSAAsyncGetServByName(void) HANDLE ret; char buffer[MAXGETHOSTSTRUCT]; - if (!hwnd) - return; - /* FIXME: The asynchronous window messages should be tested. */ /* Parameters are not checked when initiating the asynchronous operation. */ @@ -9391,19 +9377,13 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED || - GetLastError() == ERROR_OPERATION_ABORTED || - GetLastError() == ERROR_CONNECTION_ABORTED || - GetLastError() == ERROR_PIPE_NOT_CONNECTED /* win 2000 */, - "Last error was %d\n", GetLastError()); + todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED + || GetLastError() == ERROR_CONNECTION_ABORTED, "got error %u\n", GetLastError()); ok(key == 125, "Key is %lu\n", key); ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT || - olp->Internal == (ULONG)STATUS_CANCELLED || - olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED || - olp->Internal == (ULONG)STATUS_PIPE_DISCONNECTED /* win 2000 */), - "Internal status is %lx\n", olp ? olp->Internal : 0); + todo_wine ok((NTSTATUS)olp->Internal == STATUS_CANCELLED + || (NTSTATUS)olp->Internal == STATUS_CONNECTION_ABORTED, "got status %#lx\n", olp->Internal); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -9550,14 +9530,10 @@ todo_wine ok(error == WSAEFAULT, "expected 10014, got %d\n", error); ret = WSALookupServiceBeginW(qs, 0, &hnd); - error = WSAGetLastError(); ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); -todo_wine - ok(error == WSAEINVAL - || broken(error == ERROR_INVALID_PARAMETER) /* == XP */ - || broken(error == WSAEFAULT) /* == NT */ - || broken(error == WSASERVICE_NOT_FOUND) /* == 2000 */, - "expected 10022, got %d\n", error); + todo_wine ok(WSAGetLastError() == ERROR_INVALID_PARAMETER + || broken(WSAGetLastError() == WSASERVICE_NOT_FOUND) /* win10 1809 */, + "got error %u\n", WSAGetLastError()); ret = WSALookupServiceEnd(NULL); error = WSAGetLastError();

1 0

Michael Stefaniuc : taskmgr: There's no need to GetProcAddress() IsHungAppWindow().
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: 054be18f75c42d654464888747d377829da5c1c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=054be18f75c42d6544648887… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 15 23:09:39 2020 +0200 taskmgr: There's no need to GetProcAddress() IsHungAppWindow(). It's available since Win2K. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/applpage.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 5a005290be4..6b2e04077c2 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -238,10 +238,6 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) HICON hIcon; WCHAR wszText[256]; BOOL bLargeIcon = TaskManagerSettings.View_LargeIcons; - BOOL bHung = FALSE; - typedef int (__stdcall *IsHungAppWindowProc)(HWND); - IsHungAppWindowProc IsHungAppWindow; - /* Skip our window */ if (hWnd == hMainWnd) @@ -270,14 +266,7 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) if (!hIcon) hIcon = LoadIconW(hInst, bLargeIcon ? MAKEINTRESOURCEW(IDI_WINDOW) : MAKEINTRESOURCEW(IDI_WINDOWSM)); - bHung = FALSE; - - IsHungAppWindow = (IsHungAppWindowProc)(FARPROC)GetProcAddress(GetModuleHandleW(wszUser32), "IsHungAppWindow"); - - if (IsHungAppWindow) - bHung = IsHungAppWindow(hWnd); - - AddOrUpdateHwnd(hWnd, wszText, hIcon, bHung); + AddOrUpdateHwnd(hWnd, wszText, hIcon, IsHungAppWindow(hWnd)); return TRUE; }

1 0

Michael Stefaniuc : taskmgr: SwitchToThisWindow() is available, remove alternate code path.
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: ef10cd8b6da2ff4a032aebd0f345cdcb8b42d1c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef10cd8b6da2ff4a032aebd0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 15 23:09:40 2020 +0200 taskmgr: SwitchToThisWindow() is available, remove alternate code path. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/applpage.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 6b2e04077c2..b35881c2323 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -47,8 +47,6 @@ static int nApplicationPageHeight; static HANDLE hApplicationPageEvent = NULL; /* When this event becomes signaled then we refresh the app list */ static BOOL bSortAscending = TRUE; -static const WCHAR wszUser32[] = {'U','S','E','R','3','2','.','D','L','L',0}; - static void ApplicationPageUpdate(void) { /* Enable or disable the "End Task" & "Switch To" buttons */ @@ -743,19 +741,7 @@ void ApplicationPage_OnSwitchTo(void) } } if (pAPLI) { - typedef void (WINAPI *PROCSWITCHTOTHISWINDOW) (HWND, BOOL); - PROCSWITCHTOTHISWINDOW SwitchToThisWindow; - - HMODULE hUser32 = GetModuleHandleW(wszUser32); - SwitchToThisWindow = (PROCSWITCHTOTHISWINDOW)GetProcAddress(hUser32, "SwitchToThisWindow"); - if (SwitchToThisWindow) { - SwitchToThisWindow(pAPLI->hWnd, TRUE); - } else { - if (IsIconic(pAPLI->hWnd)) - ShowWindow(pAPLI->hWnd, SW_RESTORE); - BringWindowToTop(pAPLI->hWnd); - SetForegroundWindow(pAPLI->hWnd); - } + SwitchToThisWindow(pAPLI->hWnd, TRUE); if (TaskManagerSettings.MinimizeOnUse) ShowWindow(hMainWnd, SW_MINIMIZE); }

1 0

Paul Gofman : wined3d: Add GPU information for NVIDIA GeForce GTX 1080 Mobile.
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: 18d1b2453f5f45ee694a1c4ffaa9e5448e3c3e73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18d1b2453f5f45ee694a1c4f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 15 01:21:53 2020 +0300 wined3d: Add GPU information for NVIDIA GeForce GTX 1080 Mobile. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 108a190bf61..c11fa22cc38 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -441,6 +441,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_KEPLER, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_KEPLER, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080M, "NVIDIA GeForce GTX 1080M", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_KEPLER, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_KEPLER, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_KEPLER, 12288}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 901c809d875..6d7dcbc91dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2967,6 +2967,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, + CARD_NVIDIA_GEFORCE_GTX1080M = 0x1be0, CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_NVIDIA_TITANV = 0x1d81,

1 0

Huw Davies : riched20: Pass a paragraph ptr to the table update flags function.
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: 77f1894f21a872394e3d92872cbf78e705c8b470 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f1894f21a872394e3d9287… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 16 12:08:06 2020 +0100 riched20: Pass a paragraph ptr to the table update flags function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 431f89faed3..2d5072e232e 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -211,23 +211,20 @@ void ME_MarkAllForWrapping(ME_TextEditor *editor) ME_MarkForWrapping(editor, editor->pBuffer->pFirst->member.para.next_para, editor->pBuffer->pLast); } -static void ME_UpdateTableFlags(ME_DisplayItem *para) +static void table_update_flags( ME_Paragraph *para ) { - para->member.para.fmt.dwMask |= PFM_TABLE|PFM_TABLEROWDELIMITER; - if (para->member.para.pCell) { - para->member.para.nFlags |= MEPF_CELL; - } else { - para->member.para.nFlags &= ~MEPF_CELL; - } - if (para->member.para.nFlags & MEPF_ROWEND) { - para->member.para.fmt.wEffects |= PFE_TABLEROWDELIMITER; - } else { - para->member.para.fmt.wEffects &= ~PFE_TABLEROWDELIMITER; - } - if (para->member.para.nFlags & (MEPF_ROWSTART|MEPF_CELL|MEPF_ROWEND)) - para->member.para.fmt.wEffects |= PFE_TABLE; - else - para->member.para.fmt.wEffects &= ~PFE_TABLE; + para->fmt.dwMask |= PFM_TABLE | PFM_TABLEROWDELIMITER; + + if (para->pCell) para->nFlags |= MEPF_CELL; + else para->nFlags &= ~MEPF_CELL; + + if (para->nFlags & MEPF_ROWEND) para->fmt.wEffects |= PFE_TABLEROWDELIMITER; + else para->fmt.wEffects &= ~PFE_TABLEROWDELIMITER; + + if (para->nFlags & (MEPF_ROWSTART | MEPF_CELL | MEPF_ROWEND)) + para->fmt.wEffects |= PFE_TABLE; + else + para->fmt.wEffects &= ~PFE_TABLE; } static inline BOOL para_num_same_list( const PARAFORMAT2 *item, const PARAFORMAT2 *base ) @@ -638,8 +635,8 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, } else { new_para->member.para.pCell = run_para->member.para.pCell; } - ME_UpdateTableFlags(run_para); - ME_UpdateTableFlags(new_para); + table_update_flags( &run_para->member.para ); + table_update_flags( &new_para->member.para ); } /* force rewrap of the */

1 0

Huw Davies : riched20: Return a paragraph ptr from the paragraph creation function.
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: 9b3a538c35628e069a2b7af8439e19cc91e4d66c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b3a538c35628e069a2b7af8… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 16 12:08:07 2020 +0100 riched20: Return a paragraph ptr from the paragraph creation function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 92 +++++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 2d5072e232e..49cf4ad3063 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -29,14 +29,14 @@ void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) para_mark_add( editor, para ); } -static ME_DisplayItem *make_para(ME_TextEditor *editor) +static ME_Paragraph *para_create( ME_TextEditor *editor ) { ME_DisplayItem *item = ME_MakeDI(diParagraph); ME_SetDefaultParaFormat(editor, &item->member.para.fmt); item->member.para.nFlags = MEPF_REWRAP; - return item; + return &item->member.para; } void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) @@ -130,7 +130,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) LOGFONTW lf; HFONT hf; ME_TextBuffer *text = editor->pBuffer; - ME_DisplayItem *para = make_para(editor); + ME_Paragraph *para = para_create( editor ); ME_Run *run; ME_Style *style; int eol_len; @@ -175,25 +175,25 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) } eol_len = editor->bEmulateVersion10 ? 2 : 1; - para->member.para.text = ME_MakeStringN( cr_lf, eol_len ); + para->text = ME_MakeStringN( cr_lf, eol_len ); run = run_create( style, MERF_ENDPARA ); run->nCharOfs = 0; run->len = eol_len; - run->para = &para->member.para; - para->member.para.eop_run = run; + run->para = para; + para->eop_run = run; - ME_InsertBefore(text->pLast, para); - ME_InsertBefore(text->pLast, run_get_di( run )); - para->member.para.prev_para = text->pFirst; - para->member.para.next_para = text->pLast; - text->pFirst->member.para.next_para = para; - text->pLast->member.para.prev_para = para; + ME_InsertBefore( text->pLast, para_get_di( para) ); + ME_InsertBefore( text->pLast, run_get_di( run ) ); + para->prev_para = text->pFirst; + para->next_para = text->pLast; + text->pFirst->member.para.next_para = para_get_di( para ); + text->pLast->member.para.prev_para = para_get_di( para ); text->pLast->member.para.nCharOfs = editor->bEmulateVersion10 ? 2 : 1; wine_rb_init( &editor->marked_paras, para_mark_compare ); - para_mark_add( editor, &para->member.para ); + para_mark_add( editor, para ); ME_DestroyContext(&c); } @@ -518,7 +518,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, { ME_DisplayItem *next_para = NULL; ME_DisplayItem *run_para = NULL; - ME_DisplayItem *new_para = make_para(editor); + ME_Paragraph *new_para = para_create( editor ); ME_Run *end_run; int ofs, i; ME_DisplayItem *pp; @@ -543,7 +543,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, if (run_para->member.para.fmt.wNumbering) para_num_clear_list( editor, &run_para->member.para, &run_para->member.para.fmt ); - new_para->member.para.text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); + new_para->text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); end_run = run_create( style, run_flags ); ofs = end_run->nCharOfs = run->member.run.nCharOfs; @@ -560,7 +560,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, if (editor->pCursors[i].pPara == run_para && run->member.run.nCharOfs <= editor->pCursors[i].pRun->member.run.nCharOfs) { - editor->pCursors[i].pPara = new_para; + editor->pCursors[i].pPara = para_get_di( new_para ); } } @@ -568,38 +568,38 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, pp = run; while(pp->type == diRun) { pp->member.run.nCharOfs -= ofs; - pp->member.run.para = &new_para->member.para; + pp->member.run.para = new_para; pp = ME_FindItemFwd(pp, diRunOrParagraphOrEnd); } - new_para->member.para.nCharOfs = run_para->member.para.nCharOfs + ofs; - new_para->member.para.nCharOfs += eol_len; - new_para->member.para.nFlags = 0; - para_mark_rewrap( editor, &new_para->member.para ); + new_para->nCharOfs = run_para->member.para.nCharOfs + ofs; + new_para->nCharOfs += eol_len; + new_para->nFlags = 0; + para_mark_rewrap( editor, new_para ); /* FIXME initialize format style and call ME_SetParaFormat blah blah */ - new_para->member.para.fmt = run_para->member.para.fmt; - new_para->member.para.border = run_para->member.para.border; + new_para->fmt = run_para->member.para.fmt; + new_para->border = run_para->member.para.border; /* insert paragraph into paragraph double linked list */ - new_para->member.para.prev_para = run_para; - new_para->member.para.next_para = next_para; - run_para->member.para.next_para = new_para; - next_para->member.para.prev_para = new_para; + new_para->prev_para = run_para; + new_para->next_para = next_para; + run_para->member.para.next_para = para_get_di( new_para ); + next_para->member.para.prev_para = para_get_di( new_para ); /* insert end run of the old paragraph, and new paragraph, into DI double linked list */ - ME_InsertBefore(run, new_para); - ME_InsertBefore( new_para, run_get_di( end_run )); + ME_InsertBefore( run, para_get_di( new_para ) ); + ME_InsertBefore( para_get_di( new_para ), run_get_di( end_run ) ); /* Fix up the paras' eop_run ptrs */ - new_para->member.para.eop_run = run_para->member.para.eop_run; + new_para->eop_run = run_para->member.para.eop_run; run_para->member.para.eop_run = end_run; if (!editor->bEmulateVersion10) { /* v4.1 */ if (paraFlags & (MEPF_ROWSTART|MEPF_CELL)) { ME_DisplayItem *cell = ME_MakeDI(diCell); - ME_InsertBefore(new_para, cell); - new_para->member.para.pCell = cell; + ME_InsertBefore( para_get_di( new_para ), cell ); + new_para->pCell = cell; cell->member.cell.next_cell = NULL; if (paraFlags & MEPF_ROWSTART) { @@ -610,7 +610,9 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, cell->member.cell.nNestingLevel = run_para->member.para.pCell->member.cell.nNestingLevel + 1; else cell->member.cell.nNestingLevel = 1; - } else { + } + else + { cell->member.cell.prev_cell = run_para->member.para.pCell; assert(cell->member.cell.prev_cell); cell->member.cell.prev_cell->member.cell.next_cell = cell; @@ -619,37 +621,39 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, cell->member.cell.nNestingLevel = cell->member.cell.prev_cell->member.cell.nNestingLevel; cell->member.cell.parent_cell = cell->member.cell.prev_cell->member.cell.parent_cell; } - } else if (paraFlags & MEPF_ROWEND) { + } + else if (paraFlags & MEPF_ROWEND) + { run_para->member.para.nFlags |= MEPF_ROWEND; run_para->member.para.pCell = run_para->member.para.pCell->member.cell.parent_cell; - new_para->member.para.pCell = run_para->member.para.pCell; + new_para->pCell = run_para->member.para.pCell; assert(run_para->member.para.prev_para->member.para.nFlags & MEPF_CELL); assert(!(run_para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART)); - if (new_para->member.para.pCell != new_para->member.para.next_para->member.para.pCell - && new_para->member.para.next_para->member.para.pCell - && !new_para->member.para.next_para->member.para.pCell->member.cell.prev_cell) + if (new_para->pCell != new_para->next_para->member.para.pCell + && new_para->next_para->member.para.pCell + && !new_para->next_para->member.para.pCell->member.cell.prev_cell) { /* Row starts just after the row that was ended. */ - new_para->member.para.nFlags |= MEPF_ROWSTART; + new_para->nFlags |= MEPF_ROWSTART; } - } else { - new_para->member.para.pCell = run_para->member.para.pCell; } + else new_para->pCell = run_para->member.para.pCell; + table_update_flags( &run_para->member.para ); - table_update_flags( &new_para->member.para ); + table_update_flags( new_para ); } /* force rewrap of the */ if (run_para->member.para.prev_para->type == diParagraph) para_mark_rewrap( editor, &run_para->member.para.prev_para->member.para ); - para_mark_rewrap( editor, &new_para->member.para.prev_para->member.para ); + para_mark_rewrap( editor, &new_para->prev_para->member.para ); /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */ ME_PropagateCharOffset(next_para, eol_len); editor->nParagraphs++; - return new_para; + return para_get_di( new_para ); } /* join tp with tp->member.para.next_para, keeping tp's style; this

1 0

Huw Davies : riched20: Use paragraph and run ptrs in the paragraph splitting function.
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: d3fb8b29c111c3d383e461bf58e305699e10330f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3fb8b29c111c3d383e461bf… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 16 12:08:08 2020 +0100 riched20: Use paragraph and run ptrs in the paragraph splitting function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 98 +++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 49cf4ad3063..e9246fa7cf7 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -516,12 +516,9 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME_Style *style, const WCHAR *eol_str, int eol_len, int paraFlags) { - ME_DisplayItem *next_para = NULL; - ME_DisplayItem *run_para = NULL; - ME_Paragraph *new_para = para_create( editor ); - ME_Run *end_run; + ME_Paragraph *new_para = para_create( editor ), *old_para, *next_para; + ME_Run *end_run, *next_run; int ofs, i; - ME_DisplayItem *pp; int run_flags = MERF_ENDPARA; if (!editor->bEmulateVersion10) { /* v4.1 */ @@ -536,66 +533,67 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, assert(!(paraFlags & (MEPF_CELL|MEPF_ROWSTART|MEPF_ROWEND))); } assert(run->type == diRun); - run_para = ME_GetParagraph(run); - assert(run_para->member.para.fmt.cbSize == sizeof(PARAFORMAT2)); + old_para = &ME_GetParagraph( run )->member.para; + assert( old_para->fmt.cbSize == sizeof(PARAFORMAT2) ); /* Clear any cached para numbering following this paragraph */ - if (run_para->member.para.fmt.wNumbering) - para_num_clear_list( editor, &run_para->member.para, &run_para->member.para.fmt ); + if (old_para->fmt.wNumbering) + para_num_clear_list( editor, old_para, &old_para->fmt ); - new_para->text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); + new_para->text = ME_VSplitString( old_para->text, run->member.run.nCharOfs ); end_run = run_create( style, run_flags ); ofs = end_run->nCharOfs = run->member.run.nCharOfs; end_run->len = eol_len; end_run->para = run->member.run.para; - ME_AppendString( run_para->member.para.text, eol_str, eol_len ); - next_para = run_para->member.para.next_para; - assert(next_para == ME_FindItemFwd(run_para, diParagraphOrEnd)); + ME_AppendString( old_para->text, eol_str, eol_len ); + next_para = &old_para->next_para->member.para; - add_undo_join_paras( editor, run_para->member.para.nCharOfs + ofs ); + add_undo_join_paras( editor, old_para->nCharOfs + ofs ); /* Update selection cursors to point to the correct paragraph. */ - for (i = 0; i < editor->nCursors; i++) { - if (editor->pCursors[i].pPara == run_para && + for (i = 0; i < editor->nCursors; i++) + { + if (editor->pCursors[i].pPara == para_get_di( old_para ) && run->member.run.nCharOfs <= editor->pCursors[i].pRun->member.run.nCharOfs) { editor->pCursors[i].pPara = para_get_di( new_para ); } } - /* the new paragraph will have a different starting offset, so let's update its runs */ - pp = run; - while(pp->type == diRun) { - pp->member.run.nCharOfs -= ofs; - pp->member.run.para = new_para; - pp = ME_FindItemFwd(pp, diRunOrParagraphOrEnd); + /* the new paragraph will have a different starting offset, so update its runs */ + for (next_run = &run->member.run; next_run; next_run = run_next( next_run )) + { + next_run->nCharOfs -= ofs; + next_run->para = new_para; } - new_para->nCharOfs = run_para->member.para.nCharOfs + ofs; + + new_para->nCharOfs = old_para->nCharOfs + ofs; new_para->nCharOfs += eol_len; new_para->nFlags = 0; para_mark_rewrap( editor, new_para ); /* FIXME initialize format style and call ME_SetParaFormat blah blah */ - new_para->fmt = run_para->member.para.fmt; - new_para->border = run_para->member.para.border; + new_para->fmt = old_para->fmt; + new_para->border = old_para->border; /* insert paragraph into paragraph double linked list */ - new_para->prev_para = run_para; - new_para->next_para = next_para; - run_para->member.para.next_para = para_get_di( new_para ); - next_para->member.para.prev_para = para_get_di( new_para ); + new_para->prev_para = para_get_di( old_para ); + new_para->next_para = para_get_di( next_para ); + old_para->next_para = para_get_di( new_para ); + next_para->prev_para = para_get_di( new_para ); /* insert end run of the old paragraph, and new paragraph, into DI double linked list */ ME_InsertBefore( run, para_get_di( new_para ) ); ME_InsertBefore( para_get_di( new_para ), run_get_di( end_run ) ); /* Fix up the paras' eop_run ptrs */ - new_para->eop_run = run_para->member.para.eop_run; - run_para->member.para.eop_run = end_run; + new_para->eop_run = old_para->eop_run; + old_para->eop_run = end_run; - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (paraFlags & (MEPF_ROWSTART|MEPF_CELL)) + if (!editor->bEmulateVersion10) /* v4.1 */ + { + if (paraFlags & (MEPF_ROWSTART | MEPF_CELL)) { ME_DisplayItem *cell = ME_MakeDI(diCell); ME_InsertBefore( para_get_di( new_para ), cell ); @@ -603,32 +601,32 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, cell->member.cell.next_cell = NULL; if (paraFlags & MEPF_ROWSTART) { - run_para->member.para.nFlags |= MEPF_ROWSTART; + old_para->nFlags |= MEPF_ROWSTART; cell->member.cell.prev_cell = NULL; - cell->member.cell.parent_cell = run_para->member.para.pCell; - if (run_para->member.para.pCell) - cell->member.cell.nNestingLevel = run_para->member.para.pCell->member.cell.nNestingLevel + 1; + cell->member.cell.parent_cell = old_para->pCell; + if (old_para->pCell) + cell->member.cell.nNestingLevel = old_para->pCell->member.cell.nNestingLevel + 1; else cell->member.cell.nNestingLevel = 1; } else { - cell->member.cell.prev_cell = run_para->member.para.pCell; + cell->member.cell.prev_cell = old_para->pCell; assert(cell->member.cell.prev_cell); cell->member.cell.prev_cell->member.cell.next_cell = cell; - assert(run_para->member.para.nFlags & MEPF_CELL); - assert(!(run_para->member.para.nFlags & MEPF_ROWSTART)); + assert( old_para->nFlags & MEPF_CELL ); + assert( !(old_para->nFlags & MEPF_ROWSTART) ); cell->member.cell.nNestingLevel = cell->member.cell.prev_cell->member.cell.nNestingLevel; cell->member.cell.parent_cell = cell->member.cell.prev_cell->member.cell.parent_cell; } } else if (paraFlags & MEPF_ROWEND) { - run_para->member.para.nFlags |= MEPF_ROWEND; - run_para->member.para.pCell = run_para->member.para.pCell->member.cell.parent_cell; - new_para->pCell = run_para->member.para.pCell; - assert(run_para->member.para.prev_para->member.para.nFlags & MEPF_CELL); - assert(!(run_para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART)); + old_para->nFlags |= MEPF_ROWEND; + old_para->pCell = old_para->pCell->member.cell.parent_cell; + new_para->pCell = old_para->pCell; + assert( old_para->prev_para->member.para.nFlags & MEPF_CELL ); + assert( !(old_para->prev_para->member.para.nFlags & MEPF_ROWSTART) ); if (new_para->pCell != new_para->next_para->member.para.pCell && new_para->next_para->member.para.pCell && !new_para->next_para->member.para.pCell->member.cell.prev_cell) @@ -637,20 +635,20 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, new_para->nFlags |= MEPF_ROWSTART; } } - else new_para->pCell = run_para->member.para.pCell; + else new_para->pCell = old_para->pCell; - table_update_flags( &run_para->member.para ); + table_update_flags( old_para ); table_update_flags( new_para ); } /* force rewrap of the */ - if (run_para->member.para.prev_para->type == diParagraph) - para_mark_rewrap( editor, &run_para->member.para.prev_para->member.para ); + if (old_para->prev_para->type == diParagraph) + para_mark_rewrap( editor, &old_para->prev_para->member.para ); para_mark_rewrap( editor, &new_para->prev_para->member.para ); /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */ - ME_PropagateCharOffset(next_para, eol_len); + ME_PropagateCharOffset( para_get_di( next_para ), eol_len ); editor->nParagraphs++; return para_get_di( new_para );

1 0

Huw Davies : riched20: Pass a run ptr to, and return a para ptr from, the para splitting function.
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: f758d1effd0869c43ad82910dd3bd2e30f0807f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f758d1effd0869c43ad82910… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 16 12:08:09 2020 +0100 riched20: Pass a run ptr to, and return a para ptr from, the para splitting function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 14 ++++++++------ dlls/riched20/para.c | 38 +++++++++++++++++++------------------- dlls/riched20/table.c | 10 +++++----- dlls/riched20/undo.c | 20 ++++++++++---------- 5 files changed, 43 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f758d1effd0869c43ad8…

1 0