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

Jacek Caban : rpcrt4: Simplify rpcrt4_conn_np_write implementation.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: f62b9d69ae06df67cce3e0b6d7eb2a5470470290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62b9d69ae06df67cce3e0b6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:03:46 2017 +0200 rpcrt4: Simplify rpcrt4_conn_np_write implementation. There is no need for the loop. Named pipes always do complete writes. Also use NtWriteFile like we do for reading to not mess with GetLastError(). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 60975ca..bc2f4a3 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -429,24 +429,18 @@ static int rpcrt4_conn_np_read(RpcConnection *Connection, return count; } -static int rpcrt4_conn_np_write(RpcConnection *Connection, - const void *buffer, unsigned int count) +static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigned int count) { - RpcConnection_np *npc = (RpcConnection_np *) Connection; - const char *buf = buffer; - BOOL ret = TRUE; - unsigned int bytes_left = count; + RpcConnection_np *connection = (RpcConnection_np *) conn; + IO_STATUS_BLOCK io_status; + NTSTATUS status; - while (bytes_left) - { - DWORD bytes_written; - ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, NULL); - if (!ret || !bytes_written) - break; - bytes_left -= bytes_written; - buf += bytes_written; - } - return ret ? count : -1; + status = NtWriteFile(connection->pipe, NULL, NULL, NULL, &io_status, buffer, count, NULL, NULL); + if (status) + return -1; + + assert(io_status.Information == count); + return count; } static int rpcrt4_conn_np_close(RpcConnection *Connection)

1 0

Jacek Caban : rpcrt4: Simplify rpcrt4_conn_np_read implementation.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: bd6f8071d87a6f3dd72ee6358fe2051e5b772aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6f8071d87a6f3dd72ee6358… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:04:02 2017 +0200 rpcrt4: Simplify rpcrt4_conn_np_read implementation. Since RPC messages are sent as a single message, if it's too short, it means the message is broken and we let the caller to handle an error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index bc2f4a3..6fa1e60 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -409,24 +409,14 @@ static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection return status; } -static int rpcrt4_conn_np_read(RpcConnection *Connection, - void *buffer, unsigned int count) +static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int count) { - RpcConnection_np *npc = (RpcConnection_np *) Connection; - IO_STATUS_BLOCK io_status; - char *buf = buffer; - unsigned int bytes_left = count; - NTSTATUS status; + RpcConnection_np *connection = (RpcConnection_np *) conn; + IO_STATUS_BLOCK io_status; + NTSTATUS status; - while (bytes_left) - { - status = NtReadFile(npc->pipe, NULL, NULL, NULL, &io_status, buf, bytes_left, NULL, NULL); - if (status && status != STATUS_BUFFER_OVERFLOW) - return -1; - bytes_left -= io_status.Information; - buf += io_status.Information; - } - return count; + status = NtReadFile(connection->pipe, NULL, NULL, NULL, &io_status, buffer, count, NULL, NULL); + return status && status != STATUS_BUFFER_OVERFLOW ? -1 : io_status.Information; } static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigned int count)

1 0

Jacek Caban : rpcrt4: Use named pipe in overlapped mode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 4f4ac8c40ee5b7a0adc7d3589667b889556ffcb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4ac8c40ee5b7a0adc7d3589… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:04:15 2017 +0200 rpcrt4: Use named pipe in overlapped mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 6fa1e60..98fa597 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -75,6 +75,16 @@ static RpcConnection *rpcrt4_conn_np_alloc(void) return &npc->common; } +static HANDLE get_np_event(void) +{ + return CreateEventW(NULL, TRUE, FALSE, NULL); +} + +static void release_np_event(HANDLE event) +{ + CloseHandle(event); +} + static DWORD CALLBACK listen_thread(void *arg) { RpcConnection_np *npc = arg; @@ -123,7 +133,7 @@ static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pnam RpcConnection_np *npc = (RpcConnection_np *) Connection; TRACE("listening on %s\n", pname); - npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX, + npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, PIPE_UNLIMITED_INSTANCES, RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); @@ -175,7 +185,7 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, dwFlags |= SECURITY_CONTEXT_TRACKING; } pipe = CreateFileA(pname, GENERIC_READ|GENERIC_WRITE, 0, NULL, - OPEN_EXISTING, dwFlags, 0); + OPEN_EXISTING, dwFlags | FILE_FLAG_OVERLAPPED, 0); if (pipe != INVALID_HANDLE_VALUE) break; err = GetLastError(); if (err == ERROR_PIPE_BUSY) { @@ -413,9 +423,20 @@ static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int c { RpcConnection_np *connection = (RpcConnection_np *) conn; IO_STATUS_BLOCK io_status; + HANDLE event; NTSTATUS status; - status = NtReadFile(connection->pipe, NULL, NULL, NULL, &io_status, buffer, count, NULL, NULL); + event = get_np_event(); + if (!event) + return -1; + + status = NtReadFile(connection->pipe, event, NULL, NULL, &io_status, buffer, count, NULL, NULL); + if (status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + status = io_status.Status; + } + release_np_event(event); return status && status != STATUS_BUFFER_OVERFLOW ? -1 : io_status.Information; } @@ -423,9 +444,20 @@ static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigne { RpcConnection_np *connection = (RpcConnection_np *) conn; IO_STATUS_BLOCK io_status; + HANDLE event; NTSTATUS status; - status = NtWriteFile(connection->pipe, NULL, NULL, NULL, &io_status, buffer, count, NULL, NULL); + event = get_np_event(); + if (!event) + return -1; + + status = NtWriteFile(connection->pipe, event, NULL, NULL, &io_status, buffer, count, NULL, NULL); + if (status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + status = io_status.Status; + } + release_np_event(event); if (status) return -1;

1 0

Jacek Caban : rpcrt4: Use non-blocking listening on named pipes.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 6e7a2978e7e1be40dc0e05f307dbefac3bbfaf24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7a2978e7e1be40dc0e05f30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:04:31 2017 +0200 rpcrt4: Use non-blocking listening on named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 139 ++++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 77 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 98fa597..afcb0e7 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -38,6 +38,7 @@ #include "winerror.h" #include "wininet.h" #include "winternl.h" +#include "winioctl.h" #include "wine/unicode.h" #include "rpc.h" @@ -63,10 +64,10 @@ static RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnecti typedef struct _RpcConnection_np { - RpcConnection common; - HANDLE pipe; - HANDLE listen_thread; - BOOL listening; + RpcConnection common; + HANDLE pipe; + HANDLE listen_event; + IO_STATUS_BLOCK io_status; } RpcConnection_np; static RpcConnection *rpcrt4_conn_np_alloc(void) @@ -85,49 +86,6 @@ static void release_np_event(HANDLE event) CloseHandle(event); } -static DWORD CALLBACK listen_thread(void *arg) -{ - RpcConnection_np *npc = arg; - for (;;) - { - if (ConnectNamedPipe(npc->pipe, NULL)) - return RPC_S_OK; - - switch(GetLastError()) - { - case ERROR_PIPE_CONNECTED: - return RPC_S_OK; - case ERROR_HANDLES_CLOSED: - /* connection closed during listen */ - return RPC_S_NO_CONTEXT_AVAILABLE; - case ERROR_NO_DATA_DETECTED: - /* client has disconnected, retry */ - DisconnectNamedPipe( npc->pipe ); - break; - default: - npc->listening = FALSE; - WARN("Couldn't ConnectNamedPipe (error was %d)\n", GetLastError()); - return RPC_S_OUT_OF_RESOURCES; - } - } -} - -static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) -{ - if (npc->listening) - return RPC_S_OK; - - npc->listening = TRUE; - npc->listen_thread = CreateThread(NULL, 0, listen_thread, npc, 0, NULL); - if (!npc->listen_thread) - { - npc->listening = FALSE; - ERR("Couldn't create listen thread (error was %d)\n", GetLastError()); - return RPC_S_OUT_OF_RESOURCES; - } - return RPC_S_OK; -} - static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) { RpcConnection_np *npc = (RpcConnection_np *) Connection; @@ -333,14 +291,12 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse static void rpcrt4_conn_np_handoff(RpcConnection_np *old_npc, RpcConnection_np *new_npc) { - /* because of the way named pipes work, we'll transfer the connected pipe - * to the child, then reopen the server binding to continue listening */ + /* because of the way named pipes work, we'll transfer the connected pipe + * to the child, then reopen the server binding to continue listening */ - new_npc->pipe = old_npc->pipe; - new_npc->listen_thread = old_npc->listen_thread; - old_npc->pipe = 0; - old_npc->listen_thread = 0; - old_npc->listening = FALSE; + new_npc->pipe = old_npc->pipe; + old_npc->pipe = 0; + assert(!old_npc->listen_event); } static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection *new_conn) @@ -465,19 +421,21 @@ static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigne return count; } -static int rpcrt4_conn_np_close(RpcConnection *Connection) +static int rpcrt4_conn_np_close(RpcConnection *conn) { - RpcConnection_np *npc = (RpcConnection_np *) Connection; - if (npc->pipe) { - FlushFileBuffers(npc->pipe); - CloseHandle(npc->pipe); - npc->pipe = 0; - } - if (npc->listen_thread) { - CloseHandle(npc->listen_thread); - npc->listen_thread = 0; - } - return 0; + RpcConnection_np *connection = (RpcConnection_np *) conn; + if (connection->pipe) + { + FlushFileBuffers(connection->pipe); + CloseHandle(connection->pipe); + connection->pipe = 0; + } + if (connection->listen_event) + { + CloseHandle(connection->listen_event); + connection->listen_event = 0; + } + return 0; } static void rpcrt4_conn_np_cancel_call(RpcConnection *Connection) @@ -677,9 +635,33 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p /* open and count connections */ *count = 1; LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) { - rpcrt4_conn_listen_pipe(conn); - if (conn->listen_thread) - (*count)++; + if (!conn->listen_event) + { + NTSTATUS status; + HANDLE event; + + event = get_np_event(); + if (!event) + continue; + + status = NtFsControlFile(conn->pipe, event, NULL, NULL, &conn->io_status, FSCTL_PIPE_LISTEN, NULL, 0, NULL, 0); + switch (status) + { + case STATUS_SUCCESS: + case STATUS_PIPE_CONNECTED: + conn->io_status.Status = status; + SetEvent(event); + break; + case STATUS_PENDING: + break; + default: + ERR("pipe listen error %x\n", status); + continue; + } + + conn->listen_event = event; + } + (*count)++; } /* make array of connections */ @@ -697,8 +679,8 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p objs[0] = npps->mgr_event; *count = 1; LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) { - if ((objs[*count] = conn->listen_thread)) - (*count)++; + if (conn->listen_event) + objs[(*count)++] = conn->listen_event; } LeaveCriticalSection(&protseq->cs); return objs; @@ -741,13 +723,16 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, b_handle = objs[res - WAIT_OBJECT_0]; /* find which connection got a RPC */ EnterCriticalSection(&protseq->cs); - LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) { - if (b_handle == conn->listen_thread) { - DWORD exit_code; - if (GetExitCodeThread(conn->listen_thread, &exit_code) && exit_code == RPC_S_OK) + LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) + { + if (b_handle == conn->listen_event) + { + release_np_event(conn->listen_event); + conn->listen_event = NULL; + if (conn->io_status.Status == STATUS_SUCCESS || conn->io_status.Status == STATUS_PIPE_CONNECTED) RPCRT4_SpawnConnection(&cconn, &conn->common); - CloseHandle(conn->listen_thread); - conn->listen_thread = 0; + else + ERR("listen failed %x\n", conn->io_status.Status); break; } }

1 0

Jacek Caban : rpcrt4: Cache event handle in RpcConnection_np object.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 372c9e0db57099dd9d4277009f5f625562bc6343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=372c9e0db57099dd9d4277009… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:04:43 2017 +0200 rpcrt4: Cache event handle in RpcConnection_np object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index afcb0e7..ab87daa 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -68,6 +68,7 @@ typedef struct _RpcConnection_np HANDLE pipe; HANDLE listen_event; IO_STATUS_BLOCK io_status; + HANDLE event_cache; } RpcConnection_np; static RpcConnection *rpcrt4_conn_np_alloc(void) @@ -76,14 +77,17 @@ static RpcConnection *rpcrt4_conn_np_alloc(void) return &npc->common; } -static HANDLE get_np_event(void) +static HANDLE get_np_event(RpcConnection_np *connection) { - return CreateEventW(NULL, TRUE, FALSE, NULL); + HANDLE event = InterlockedExchangePointer(&connection->event_cache, NULL); + return event ? event : CreateEventW(NULL, TRUE, FALSE, NULL); } -static void release_np_event(HANDLE event) +static void release_np_event(RpcConnection_np *connection, HANDLE event) { - CloseHandle(event); + event = InterlockedExchangePointer(&connection->event_cache, event); + if (event) + CloseHandle(event); } static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) @@ -382,7 +386,7 @@ static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int c HANDLE event; NTSTATUS status; - event = get_np_event(); + event = get_np_event(connection); if (!event) return -1; @@ -392,7 +396,7 @@ static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int c WaitForSingleObject(event, INFINITE); status = io_status.Status; } - release_np_event(event); + release_np_event(connection, event); return status && status != STATUS_BUFFER_OVERFLOW ? -1 : io_status.Information; } @@ -403,7 +407,7 @@ static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigne HANDLE event; NTSTATUS status; - event = get_np_event(); + event = get_np_event(connection); if (!event) return -1; @@ -413,7 +417,7 @@ static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigne WaitForSingleObject(event, INFINITE); status = io_status.Status; } - release_np_event(event); + release_np_event(connection, event); if (status) return -1; @@ -435,6 +439,11 @@ static int rpcrt4_conn_np_close(RpcConnection *conn) CloseHandle(connection->listen_event); connection->listen_event = 0; } + if (connection->event_cache) + { + CloseHandle(connection->event_cache); + connection->event_cache = 0; + } return 0; } @@ -640,7 +649,7 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p NTSTATUS status; HANDLE event; - event = get_np_event(); + event = get_np_event(conn); if (!event) continue; @@ -727,7 +736,7 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, { if (b_handle == conn->listen_event) { - release_np_event(conn->listen_event); + release_np_event(conn, conn->listen_event); conn->listen_event = NULL; if (conn->io_status.Status == STATUS_SUCCESS || conn->io_status.Status == STATUS_PIPE_CONNECTED) RPCRT4_SpawnConnection(&cconn, &conn->common);

1 0

Jacek Caban : rpcrt4: Implement cancel_call for named pipes.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: b54833890a21d1d5e3feeba74a7084b729fca30d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54833890a21d1d5e3feeba74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:04:50 2017 +0200 rpcrt4: Implement cancel_call for named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index ab87daa..1e7a62b 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -447,9 +447,10 @@ static int rpcrt4_conn_np_close(RpcConnection *conn) return 0; } -static void rpcrt4_conn_np_cancel_call(RpcConnection *Connection) +static void rpcrt4_conn_np_cancel_call(RpcConnection *conn) { - /* FIXME: implement when named pipe writes use overlapped I/O */ + RpcConnection_np *connection = (RpcConnection_np *)conn; + CancelIoEx(connection->pipe, NULL); } static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *Connection)

1 0

Hugh McMaster : regedit: Always assign focus to the default value when refreshing the listview.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 5474b7a43ed42174911ad41c5240eae98b110c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5474b7a43ed42174911ad41c5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 22 13:02:52 2017 +0000 regedit: Always assign focus to the default value when refreshing the listview. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 11147a7..d8589b8 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -109,8 +109,7 @@ static void MakeMULTISZDisplayable(LPWSTR multi) /******************************************************************************* * Local module support methods */ -static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, - void* ValBuf, DWORD dwCount, BOOL bHighlight) +static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, void *ValBuf, DWORD dwCount) { LINE_INFO* linfo; LVITEMW item; @@ -137,9 +136,7 @@ static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; item.pszText = Name ? Name : LPSTR_TEXTCALLBACKW; item.cchTextMax = Name ? lstrlenW(item.pszText) : 0; - if (bHighlight) { - item.stateMask = item.state = LVIS_FOCUSED; - } + switch (dwValType) { case REG_SZ: @@ -552,20 +549,25 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli valSize = max_val_size; if (RegQueryValueExW(hKey, NULL, NULL, &valType, valBuf, &valSize) == ERROR_FILE_NOT_FOUND) { - AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0, !highlightValue); + AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0); } for(index = 0; index < val_count; index++) { - BOOL bSelected = (valName == highlightValue); /* NOT a bug, we check for double NULL here */ valNameLen = max_val_name_len; valSize = max_val_size; valType = 0; errCode = RegEnumValueW(hKey, index, valName, &valNameLen, NULL, &valType, valBuf, &valSize); if (errCode != ERROR_SUCCESS) goto done; valBuf[valSize] = 0; - if (highlightValue && !lstrcmpW(valName, highlightValue)) - bSelected = TRUE; - AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize, bSelected); + AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize); + } + + memset(&item, 0, sizeof(item)); + if (!highlightValue) + { + item.state = item.stateMask = LVIS_FOCUSED; + SendMessageW(hwndLV, LVM_SETITEMSTATE, 0, (LPARAM)&item); } + SendMessageW(hwndLV, LVM_SORTITEMS, (WPARAM)hwndLV, (LPARAM)CompareFunc); g_currentRootKey = hKeyRoot;

1 0

Hugh McMaster : regedit: Re-select the listview item after renaming is complete.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: c5d38ce42778726c7a243520e015d38d0bebc160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d38ce42778726c7a243520e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 22 13:03:01 2017 +0000 regedit: Re-select the listview item after renaming is complete. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index d8589b8..a78a406 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -400,11 +400,16 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR LPNMLVDISPINFOW dispInfo = (LPNMLVDISPINFOW)lParam; LPWSTR oldName = GetItemText(hWnd, dispInfo->item.iItem); LONG ret; + LVITEMW item; + if (!oldName) return -1; /* cannot rename a default value */ ret = RenameValue(hWnd, g_currentRootKey, g_currentPath, oldName, dispInfo->item.pszText); if (ret) { RefreshListView(hWnd, g_currentRootKey, g_currentPath, dispInfo->item.pszText); + item.state = LVIS_FOCUSED | LVIS_SELECTED; + item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + SendMessageW(hWnd, LVM_SETITEMSTATE, dispInfo->item.iItem, (LPARAM)&item); } HeapFree(GetProcessHeap(), 0, oldName); return 0;

1 0

Nikolay Sivov : uiautomationcore: Added UiaRaiseAutomationEvent stub.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: e2a251a0a38de9b62027c3e0a9075dc0ed567d70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a251a0a38de9b62027c3e0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 21 14:46:08 2017 +0300 uiautomationcore: Added UiaRaiseAutomationEvent stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 9 +++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 6e795ab..31b7d3e 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -84,3 +84,12 @@ LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, FIXME("(%p, %lx, %lx, %p) stub!\n", hwnd, wParam, lParam, elprov); return 0; } + +/*********************************************************************** + * UiaRaiseAutomationEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id) +{ + FIXME("(%p, %d): stub\n", provider, id); + return E_NOTIMPL; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index bff1303..48a06b2 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -78,7 +78,7 @@ @ stub UiaNodeRelease @ stub UiaPatternRelease @ stub UiaRaiseAsyncContentLoadedEvent -@ stub UiaRaiseAutomationEvent +@ stdcall UiaRaiseAutomationEvent(ptr long) @ stub UiaRaiseAutomationPropertyChangedEvent @ stub UiaRaiseStructureChangedEvent @ stub UiaRegisterProviderCallback diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 6c1752e..12c509f 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -52,6 +52,7 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value); HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); +HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);

1 0

Henri Verbeet : wined3d: Allow (some) blits with fixups in the arbfp and ffp blitters with ORM_BACKBUFFER.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: d37146885801ae384a1cae54edea426b7b58a6a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37146885801ae384a1cae54e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 21 17:53:39 2017 +0200 wined3d: Allow (some) blits with fixups in the arbfp and ffp blitters with ORM_BACKBUFFER. When using ORM_BACKBUFFER, formats with fixups may need to be loaded into WINED3D_LOCATION_DRAWABLE. Before commit cad4badbcf25992e0c61521aa15e639c2611f5d6, surface_load_drawable() would always use the device blitter, without checking whether the blitter actually supports the blit. The FBO blitter would be able to handle these blits, but is unavailable when using ORM_BACKBUFFER. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 6 ++++++ dlls/wined3d/surface.c | 20 ++++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index aa17fb1..4b35c94 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7767,6 +7767,12 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, /* We only support YUV conversions. */ if (!is_complex_fixup(src_format->color_fixup)) { + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) + { + WARN("Claiming fixup support because of ORM_BACKBUFFER.\n"); + return TRUE; + } + TRACE("[FAILED]\n"); return FALSE; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c68c4c1..08bf156 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2485,8 +2485,8 @@ static void ffp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, - DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, - DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) + DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, + DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) { BOOL decompress; @@ -2521,8 +2521,16 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, if (!is_identity_fixup(src_format->color_fixup) || !is_identity_fixup(dst_format->color_fixup)) { - TRACE("Fixups are not supported.\n"); - return FALSE; + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER + && dst_format->id == src_format->id && dst_location == WINED3D_LOCATION_DRAWABLE) + { + WARN("Claiming fixup support because of ORM_BACKBUFFER.\n"); + } + else + { + TRACE("Fixups are not supported.\n"); + return FALSE; + } } if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) @@ -2632,8 +2640,8 @@ static void ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ device = dst_resource->device; if (!ffp_blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, op, - src_resource->usage, src_resource->pool, src_resource->format, - dst_resource->usage, dst_resource->pool, dst_resource->format)) + src_resource->usage, src_resource->pool, src_resource->format, src_location, + dst_resource->usage, dst_resource->pool, dst_resource->format, dst_location)) { if ((next = blitter->next)) next->ops->blitter_blit(next, op, context, src_surface, src_location,

1 0