wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Henri Verbeet : wined3d: Add a conversion function for WINED3DFMT_X8D24_UNORM.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 2ed609f15da7c7f8bde54f6d4d895c72f96dd950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed609f15da7c7f8bde54f6d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 24 11:22:09 2017 +0200 wined3d: Add a conversion function for WINED3DFMT_X8D24_UNORM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 78ada57..2bdc9e2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -828,6 +828,26 @@ static void convert_s8_uint_d24_float(const BYTE *src, BYTE *dst, UINT src_row_p } } +static void convert_x8_d24_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) +{ + unsigned int x, y, z; + + for (z = 0; z < depth; ++z) + { + for (y = 0; y < height; ++y) + { + const DWORD *source = (const DWORD *)(src + z * src_slice_pitch + y * src_row_pitch); + DWORD *dest = (DWORD *)(dst + z * dst_slice_pitch + y * dst_row_pitch); + + for (x = 0; x < width; ++x) + { + dest[x] = source[x] << 8 | source[x] >> 16; + } + } + } +} + static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD color) { /* FIXME: Is this really how color keys are supposed to work? I think it @@ -1571,14 +1591,14 @@ static const struct wined3d_format_texture_info format_texture_info[] = | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_FRAMEBUFFER_OBJECT, NULL}, {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 4, WINED3DFMT_FLAG_DEPTH, - WINED3D_GL_EXT_NONE, NULL}, + WINED3D_GL_EXT_NONE, convert_x8_d24_unorm}, {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 4, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, - ARB_DEPTH_TEXTURE, NULL}, + ARB_DEPTH_TEXTURE, convert_x8_d24_unorm}, {WINED3DFMT_S4X4_UINT_D24_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW,

1 0

Henri Verbeet : wined3d: Just fail if looking up the guessed GPU info fails in wined3d_adapter_init_gl_caps ().
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 01092d645f03858278d66035bad58d96fc26cc04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01092d645f03858278d66035b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 24 11:22:08 2017 +0200 wined3d: Just fail if looking up the guessed GPU info fails in wined3d_adapter_init_gl_caps(). This should never happen. Note that the previous code would return a GPU with 64 TiB of VRAM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4115453..53f8232 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -33,7 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(winediag); -#define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024) #define DEFAULT_REFRESH_RATE 0 /* The driver names reflect the lowest GPU supported @@ -4339,8 +4338,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, if (!(gpu_description = query_gpu_description(gl_info, &vram_bytes))) { - static const struct gpu_description default_gpu_description = - {HW_VENDOR_NVIDIA, CARD_NVIDIA_RIVA_128, "Direct3D HAL", DRIVER_UNKNOWN, WINE_DEFAULT_VIDMEM}; enum wined3d_pci_vendor vendor; enum wined3d_pci_device device; @@ -4354,7 +4351,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, if (!(gpu_description = get_gpu_description(vendor, device))) { ERR("Card %04x:%04x not found in driver DB.\n", vendor, device); - gpu_description = &default_gpu_description; + return FALSE; } } fixup_extensions(gl_info, caps_gl_ctx, gl_renderer_str, gl_vendor,

1 0

Jacek Caban : rpcrt4: Use HEAP_ZERO_MEMORY to alloc RpcServerProtseq objects.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 6b53b79e18a8345ef53d4217cb56afe9891a7574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b53b79e18a8345ef53d4217c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 24 13:52:24 2017 +0200 rpcrt4: Use HEAP_ZERO_MEMORY to alloc RpcServerProtseq objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 4 ---- dlls/rpcrt4/rpc_transport.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 901801e..dcfac70 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -947,14 +947,10 @@ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, const char *Protseq, RpcSe (*ps)->MaxCalls = MaxCalls; (*ps)->Protseq = RPCRT4_strdupA(Protseq); (*ps)->ops = ops; - (*ps)->MaxCalls = 0; list_init(&(*ps)->listeners); list_init(&(*ps)->connections); InitializeCriticalSection(&(*ps)->cs); (*ps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcServerProtseq.cs"); - (*ps)->is_listening = FALSE; - (*ps)->mgr_mutex = NULL; - (*ps)->server_ready_event = NULL; list_add_head(&protseqs, &(*ps)->entry); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index e6e9aaa..e2fbbfd 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -642,7 +642,7 @@ typedef struct _RpcServerProtseq_np static RpcServerProtseq *rpcrt4_protseq_np_alloc(void) { - RpcServerProtseq_np *ps = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps)); + RpcServerProtseq_np *ps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ps)); if (ps) ps->mgr_event = CreateEventW(NULL, FALSE, FALSE, NULL); return &ps->common; @@ -1507,7 +1507,7 @@ typedef struct _RpcServerProtseq_sock static RpcServerProtseq *rpcrt4_protseq_sock_alloc(void) { - RpcServerProtseq_sock *ps = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps)); + RpcServerProtseq_sock *ps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ps)); if (ps) { static BOOL wsa_inited;

1 0

Jacek Caban : rpcrt4: Add close_read implementation for TCP connections.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 28f865b134279c1bcbe9fbd1f5eaaf0a4129a765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f865b134279c1bcbe9fbd1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 24 13:52:19 2017 +0200 rpcrt4: Add close_read implementation for TCP connections. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 293d09f..e6e9aaa 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1461,7 +1461,8 @@ static int rpcrt4_conn_tcp_close(RpcConnection *conn) static void rpcrt4_conn_tcp_close_read(RpcConnection *conn) { - /* FIXME */ + RpcConnection_tcp *connection = (RpcConnection_tcp *) conn; + shutdown(connection->sock, SD_RECEIVE); } static void rpcrt4_conn_tcp_cancel_call(RpcConnection *conn)

1 0

Jacek Caban : rpcrt4: Add close_read implementation for named pipe connections.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 29f0b2824068496eca4a0e19ce3e464d965cf010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29f0b2824068496eca4a0e19c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 24 13:52:14 2017 +0200 rpcrt4: Add close_read implementation for named pipe connections. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 6f83a24..293d09f 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -69,6 +69,7 @@ typedef struct _RpcConnection_np HANDLE listen_event; IO_STATUS_BLOCK io_status; HANDLE event_cache; + BOOL read_closed; } RpcConnection_np; static RpcConnection *rpcrt4_conn_np_alloc(void) @@ -384,7 +385,6 @@ static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int count) { RpcConnection_np *connection = (RpcConnection_np *) conn; - IO_STATUS_BLOCK io_status; HANDLE event; NTSTATUS status; @@ -392,14 +392,23 @@ static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int c if (!event) return -1; - status = NtReadFile(connection->pipe, event, NULL, NULL, &io_status, buffer, count, NULL, NULL); + if (connection->read_closed) + status = STATUS_CANCELLED; + else + status = NtReadFile(connection->pipe, event, NULL, NULL, &connection->io_status, buffer, count, NULL, NULL); if (status == STATUS_PENDING) { + /* check read_closed again before waiting to avoid a race */ + if (connection->read_closed) + { + IO_STATUS_BLOCK io_status; + NtCancelIoFileEx(connection->pipe, &connection->io_status, &io_status); + } WaitForSingleObject(event, INFINITE); - status = io_status.Status; + status = connection->io_status.Status; } release_np_event(connection, event); - return status && status != STATUS_BUFFER_OVERFLOW ? -1 : io_status.Information; + return status && status != STATUS_BUFFER_OVERFLOW ? -1 : connection->io_status.Information; } static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigned int count) @@ -451,7 +460,11 @@ static int rpcrt4_conn_np_close(RpcConnection *conn) static void rpcrt4_conn_np_close_read(RpcConnection *conn) { - /* FIXME */ + RpcConnection_np *connection = (RpcConnection_np*)conn; + IO_STATUS_BLOCK io_status; + + connection->read_closed = TRUE; + NtCancelIoFileEx(connection->pipe, &connection->io_status, &io_status); } static void rpcrt4_conn_np_cancel_call(RpcConnection *conn)

1 0

Jacek Caban : rpcrt4: Introduce op for closing connection read end and use it when shutting down server.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 42ba4d731abf24ba0653c5a9f709de18ab33b82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ba4d731abf24ba0653c5a9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 24 13:52:07 2017 +0200 rpcrt4: Introduce op for closing connection read end and use it when shutting down server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_binding.h | 6 ++++++ dlls/rpcrt4/rpc_server.c | 3 +++ dlls/rpcrt4/rpc_transport.c | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index ff14bbd..affc060 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -104,6 +104,7 @@ struct connection_ops { int (*read)(RpcConnection *conn, void *buffer, unsigned int len); int (*write)(RpcConnection *conn, const void *buffer, unsigned int len); int (*close)(RpcConnection *conn); + void (*close_read)(RpcConnection *conn); void (*cancel_call)(RpcConnection *conn); RPC_STATUS (*is_server_listening)(const char *endpoint); int (*wait_for_incoming_data)(RpcConnection *conn); @@ -197,6 +198,11 @@ static inline int rpcrt4_conn_close(RpcConnection *Connection) return Connection->ops->close(Connection); } +static inline void rpcrt4_conn_close_read(RpcConnection *connection) +{ + connection->ops->close_read(connection); +} + static inline void rpcrt4_conn_cancel_call(RpcConnection *Connection) { Connection->ops->cancel_call(Connection); diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index b76185b..901801e 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -669,9 +669,12 @@ static DWORD CALLBACK RPCRT4_server_thread(LPVOID the_arg) { /* cleanup */ cps->ops->free_wait_array(cps, objs); + EnterCriticalSection(&cps->cs); LIST_FOR_EACH_ENTRY(conn, &cps->listeners, RpcConnection, protseq_entry) RPCRT4_CloseConnection(conn); + LIST_FOR_EACH_ENTRY(conn, &cps->connections, RpcConnection, protseq_entry) + rpcrt4_conn_close_read(conn); LeaveCriticalSection(&cps->cs); if (res == 0 && !std_listen) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index b88eeb7..6f83a24 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -449,6 +449,11 @@ static int rpcrt4_conn_np_close(RpcConnection *conn) return 0; } +static void rpcrt4_conn_np_close_read(RpcConnection *conn) +{ + /* FIXME */ +} + static void rpcrt4_conn_np_cancel_call(RpcConnection *conn) { RpcConnection_np *connection = (RpcConnection_np *)conn; @@ -1441,6 +1446,11 @@ static int rpcrt4_conn_tcp_close(RpcConnection *conn) return 0; } +static void rpcrt4_conn_tcp_close_read(RpcConnection *conn) +{ + /* FIXME */ +} + static void rpcrt4_conn_tcp_cancel_call(RpcConnection *conn) { RpcConnection_tcp *connection = (RpcConnection_tcp *) conn; @@ -3066,6 +3076,11 @@ static int rpcrt4_ncacn_http_close(RpcConnection *Connection) return 0; } +static void rpcrt4_ncacn_http_close_read(RpcConnection *conn) +{ + rpcrt4_ncacn_http_close(conn); /* FIXME */ +} + static void rpcrt4_ncacn_http_cancel_call(RpcConnection *Connection) { RpcConnection_http *httpc = (RpcConnection_http *) Connection; @@ -3119,6 +3134,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_np_read, rpcrt4_conn_np_write, rpcrt4_conn_np_close, + rpcrt4_conn_np_close_read, rpcrt4_conn_np_cancel_call, rpcrt4_ncacn_np_is_server_listening, rpcrt4_conn_np_wait_for_incoming_data, @@ -3140,6 +3156,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_np_read, rpcrt4_conn_np_write, rpcrt4_conn_np_close, + rpcrt4_conn_np_close_read, rpcrt4_conn_np_cancel_call, rpcrt4_ncalrpc_np_is_server_listening, rpcrt4_conn_np_wait_for_incoming_data, @@ -3161,6 +3178,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_tcp_read, rpcrt4_conn_tcp_write, rpcrt4_conn_tcp_close, + rpcrt4_conn_tcp_close_read, rpcrt4_conn_tcp_cancel_call, rpcrt4_conn_tcp_is_server_listening, rpcrt4_conn_tcp_wait_for_incoming_data, @@ -3182,6 +3200,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_ncacn_http_read, rpcrt4_ncacn_http_write, rpcrt4_ncacn_http_close, + rpcrt4_ncacn_http_close_read, rpcrt4_ncacn_http_cancel_call, rpcrt4_ncacn_http_is_server_listening, rpcrt4_ncacn_http_wait_for_incoming_data,

1 0

Alexandre Julliard : server: Don' t increment the clipboard sequence number for delayed rendering or synthesized formats.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 719e28bd2c8393e5940df11894ea3e03ce35e2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719e28bd2c8393e5940df1189… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 13:03:39 2017 +0200 server: Don't increment the clipboard sequence number for delayed rendering or synthesized formats. Based on a patch by Piotr Caban. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 9 +++++++-- dlls/user32/tests/clipboard.c | 15 +++++++-------- include/wine/server_protocol.h | 4 +++- server/clipboard.c | 30 ++++++++++++++++++++++++------ server/protocol.def | 1 + server/request.h | 7 ++++--- server/trace.c | 1 + 7 files changed, 47 insertions(+), 20 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index d33459c..2fc5c76 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -1047,6 +1047,7 @@ HANDLE WINAPI GetClipboardData( UINT format ) SERVER_START_REQ( get_clipboard_data ) { req->format = format; + req->render = render; if (cache) { req->cached = 1; @@ -1081,13 +1082,17 @@ HANDLE WINAPI GetClipboardData( UINT format ) if (render) /* try rendering it */ { render = FALSE; - if (owner) + if (from) + { + render_synthesized_format( format, from ); + continue; + } + else if (owner) { TRACE( "%s sending WM_RENDERFORMAT to %p\n", debugstr_format( format ), owner ); SendMessageW( owner, WM_RENDERFORMAT, format, 0 ); continue; } - if (from) return render_synthesized_format( format, from ); } TRACE( "%s returning 0\n", debugstr_format( format )); return 0; diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 434a325..f0a24cb 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -768,8 +768,7 @@ static void test_synthesized(void) broken( tests[i].format == CF_DIBV5 && cf == CF_DIB ), /* >= Vista */ "%u: couldn't get data, cf %04x err %d\n", i, cf, GetLastError()); seq = GetClipboardSequenceNumber(); - todo_wine_if(cf != tests[i].format && cf != CF_LOCALE) - ok(seq == old_seq, "sequence changed (test %d %d)\n", i, cf); + ok(seq == old_seq, "sequence changed (test %d %d)\n", i, cf); switch (cf) { case CF_LOCALE: @@ -935,7 +934,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA handle = SetClipboardData( CF_TEXT, create_textA() ); ok( handle != 0, "SetClipboardData failed: %d\n", GetLastError() ); seq = GetClipboardSequenceNumber(); - todo_wine ok( seq == old_seq, "sequence changed\n" ); + ok( seq == old_seq, "sequence changed\n" ); old_seq = seq; handle = CreateThread( NULL, 0, clipboard_render_data_thread, NULL, 0, NULL ); @@ -943,7 +942,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA ok( WaitForSingleObject(handle, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); CloseHandle( handle ); seq = GetClipboardSequenceNumber(); - todo_wine ok( seq == old_seq, "sequence changed\n" ); + ok( seq == old_seq, "sequence changed\n" ); } break; @@ -1250,7 +1249,7 @@ static DWORD WINAPI clipboard_thread(void *param) SetClipboardData( CF_WAVE, 0 ); seq = GetClipboardSequenceNumber(); - todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); + ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; if (!cross_thread) { @@ -1521,13 +1520,13 @@ static DWORD WINAPI clipboard_thread(void *param) old_seq = GetClipboardSequenceNumber(); run_process( "get_clipboard_data" ); seq = GetClipboardSequenceNumber(); - todo_wine ok( seq == old_seq, "sequence changed\n" ); + ok( seq == old_seq, "sequence changed\n" ); do_render_format = FALSE; count = SendMessageA( win, WM_USER+1, 0, 0 ); - todo_wine ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); + ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); count = SendMessageA( win, WM_USER+2, 0, 0 ); - todo_wine ok( count == 1 || broken(!pAddClipboardFormatListener) /* < Vista */, "WM_CLIPBOARDUPDATE not received\n" ); + ok( count == 1 || broken(!pAddClipboardFormatListener) /* < Vista */, "WM_CLIPBOARDUPDATE not received\n" ); fmt = SendMessageA( win, WM_USER+4, 0, 0 ); ok( fmt == CF_TEXT, "WM_RENDERFORMAT received\n" ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index cee0f57..0d7a7cd 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4522,8 +4522,10 @@ struct get_clipboard_data_request { struct request_header __header; unsigned int format; + int render; int cached; unsigned int seqno; + char __pad_28[4]; }; struct get_clipboard_data_reply { @@ -6416,6 +6418,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 531 +#define SERVER_PROTOCOL_VERSION 532 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/clipboard.c b/server/clipboard.c index a93319a..160eb46 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -57,6 +57,7 @@ struct clipboard unsigned int lcid; /* locale id to use for synthesizing text formats */ unsigned int seqno; /* clipboard change sequence number */ unsigned int open_seqno; /* sequence number at open time */ + unsigned int rendering; /* format rendering recursion counter */ struct list formats; /* list of data formats */ unsigned int format_count; /* count of data formats */ unsigned int format_map; /* existence bitmap for formats < CF_MAX */ @@ -366,6 +367,7 @@ DECL_HANDLER(open_clipboard) } if (!clipboard->open_thread) clipboard->open_seqno = clipboard->seqno; /* first open */ + if (clipboard->open_thread != current) clipboard->rendering = 0; clipboard->open_win = win; clipboard->open_thread = current; @@ -418,9 +420,10 @@ DECL_HANDLER(set_clipboard_data) free( format->data ); format->from = 0; - format->seqno = clipboard->seqno++; + format->seqno = clipboard->seqno; format->size = get_req_data_size(); format->data = data; + if (!clipboard->rendering) clipboard->seqno++; if (req->format == CF_TEXT || req->format == CF_OEMTEXT || req->format == CF_UNICODETEXT) clipboard->lcid = req->lcid; @@ -445,15 +448,30 @@ DECL_HANDLER(get_clipboard_data) if (!(format = get_format( clipboard, req->format ))) { set_error( STATUS_OBJECT_NAME_NOT_FOUND ); - return; + goto done; } reply->from = format->from; reply->total = format->size; reply->seqno = format->seqno; - if (!format->data && !format->from) reply->owner = clipboard->owner; - if (req->cached && req->seqno == format->seqno) return; /* client-side cache still valid */ - if (format->size <= get_reply_max_size()) set_reply_data( format->data, format->size ); - else set_error( STATUS_BUFFER_OVERFLOW ); + reply->owner = clipboard->owner; + + if (!format->data && req->render) /* try rendering it client-side */ + { + if (format->from || clipboard->owner) clipboard->rendering++; + return; + } + + if (req->cached && req->seqno == format->seqno) goto done; /* client-side cache still valid */ + + if (format->size > get_reply_max_size()) + { + set_error( STATUS_BUFFER_OVERFLOW ); + return; + } + set_reply_data( format->data, format->size ); + +done: + if (!req->render) clipboard->rendering--; } diff --git a/server/protocol.def b/server/protocol.def index 6cafa70..7eaaec2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3184,6 +3184,7 @@ enum caret_state /* Fetch a data format from the clipboard */ @REQ(get_clipboard_data) unsigned int format; /* clipboard format of the data */ + int render; /* will we try to render it if missing? */ int cached; /* do we already have it in the client-side cache? */ unsigned int seqno; /* sequence number for the data in the cache */ @REPLY diff --git a/server/request.h b/server/request.h index 8b9d9b6..ad89f30 100644 --- a/server/request.h +++ b/server/request.h @@ -2040,9 +2040,10 @@ C_ASSERT( sizeof(struct set_clipboard_data_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_clipboard_data_reply, seqno) == 8 ); C_ASSERT( sizeof(struct set_clipboard_data_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_request, format) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_request, cached) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_request, seqno) == 20 ); -C_ASSERT( sizeof(struct get_clipboard_data_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_request, render) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_request, cached) == 20 ); +C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_request, seqno) == 24 ); +C_ASSERT( sizeof(struct get_clipboard_data_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_reply, from) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_reply, owner) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_reply, seqno) == 16 ); diff --git a/server/trace.c b/server/trace.c index 7b33043..6e23184 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3775,6 +3775,7 @@ static void dump_set_clipboard_data_reply( const struct set_clipboard_data_reply static void dump_get_clipboard_data_request( const struct get_clipboard_data_request *req ) { fprintf( stderr, " format=%08x", req->format ); + fprintf( stderr, ", render=%d", req->render ); fprintf( stderr, ", cached=%d", req->cached ); fprintf( stderr, ", seqno=%08x", req->seqno ); }

1 0

Sebastian Lackner : appwiz.cpl: Use sha256 checksums to validate Mono/ Gecko downloads.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 4213a83525d5c22d43ab18b50001529185a1fed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4213a83525d5c22d43ab18b50… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed May 17 20:06:07 2017 -0600 appwiz.cpl: Use sha256 checksums to validate Mono/Gecko downloads. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/Makefile.in | 2 +- dlls/appwiz.cpl/addons.c | 55 +++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 31 deletions(-) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index a8341fa..97bc150 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -1,5 +1,5 @@ MODULE = appwiz.cpl -IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 ole32 user32 comdlg32 +IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 ole32 user32 comdlg32 bcrypt DELAYIMPORTS = msi C_SRCS = \ diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index c3847b5..dcd6535 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -42,6 +42,7 @@ #include "shellapi.h" #include "urlmon.h" #include "msi.h" +#include "bcrypt.h" #include "appwiz.h" #include "res.h" @@ -55,17 +56,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #ifdef __i386__ #define ARCH_STRING "x86" -#define GECKO_SHA "f9a937e9a46d47fda701d257e60601f22e7a4510" +#define GECKO_SHA "3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a" #elif defined(__x86_64__) #define ARCH_STRING "x86_64" -#define GECKO_SHA "8efa810b1ac83d59e0171d4347d21730560926da" +#define GECKO_SHA "c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d" #else #define ARCH_STRING "" #define GECKO_SHA "???" #endif #define MONO_VERSION "4.7.0" -#define MONO_SHA "ff05e1d2a93c3a07672cefc7a8f3a087d75828ac" +#define MONO_SHA "7698474dd9cb9eb80796b5812dff37386ba97b78b21ca23b20079ca5ad6ca5a1" typedef struct { const char *version; @@ -110,28 +111,16 @@ static WCHAR *msi_file; static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); static const WCHAR kernel32_dllW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; - -/* SHA definitions are copied from advapi32. They aren't available in headers. */ - -typedef struct { - ULONG Unknown[6]; - ULONG State[5]; - ULONG Count[2]; - UCHAR Buffer[64]; -} SHA_CTX, *PSHA_CTX; - -void WINAPI A_SHAInit(PSHA_CTX); -void WINAPI A_SHAUpdate(PSHA_CTX,const unsigned char*,UINT); -void WINAPI A_SHAFinal(PSHA_CTX,PULONG); - static BOOL sha_check(const WCHAR *file_name) { const unsigned char *file_map; HANDLE file, map; - ULONG sha[5]; - char buf[2*sizeof(sha)+1]; - SHA_CTX ctx; DWORD size, i; + BCRYPT_HASH_HANDLE hash = NULL; + BCRYPT_ALG_HANDLE alg = NULL; + UCHAR sha[32]; + char buf[1024]; + BOOL ret = FALSE; file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); if(file == INVALID_HANDLE_VALUE) { @@ -151,21 +140,27 @@ static BOOL sha_check(const WCHAR *file_name) if(!file_map) return FALSE; - A_SHAInit(&ctx); - A_SHAUpdate(&ctx, file_map, size); - A_SHAFinal(&ctx, sha); - - UnmapViewOfFile(file_map); + if(BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0)) + goto end; + if(BCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0)) + goto end; + if(BCryptHashData(hash, (UCHAR *)file_map, size, 0)) + goto end; + if(BCryptFinishHash(hash, sha, sizeof(sha), 0)) + goto end; for(i=0; i < sizeof(sha); i++) - sprintf(buf + i*2, "%02x", *((unsigned char*)sha+i)); + sprintf(buf + i * 2, "%02x", sha[i]); - if(strcmp(buf, addon->sha)) { + ret = !strcmp(buf, addon->sha); + if(!ret) WARN("Got %s, expected %s\n", buf, addon->sha); - return FALSE; - } - return TRUE; +end: + UnmapViewOfFile(file_map); + if(hash) BCryptDestroyHash(hash); + if(alg) BCryptCloseAlgorithmProvider(alg, 0); + return ret; } static void set_status(DWORD id)

1 0

Rosanne DiMesio : Fix comment header in Comments Management
by Jeremy Newman 24 May '17

24 May '17

Module: appdb Branch: master Commit: f32ec85e61edb2640d38733325170f8a9d58428e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f32ec85e61edb2640d387333… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed May 24 13:17:22 2017 -0500 Fix comment header in Comments Management The application name wasn't displaying at all and all comments were labeled "has maintainer" regardless of maintainership status. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/comment.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/comment.php b/include/comment.php index c2c425d..3fb8b94 100644 --- a/include/comment.php +++ b/include/comment.php @@ -249,14 +249,15 @@ class Comment { private function output_comment($bShowAppName = false, $bShowForm = true) { // by line - $sBy = " by ".forum_lookup_user($this->oOwner->iUserId)." on ".$this->sDateCreated."\n"; + $sBy = " by ".forum_lookup_user($this->oOwner->iUserId)." on ".$this->sDateCreated." \n"; + if ($bShowAppName) { $oVersion = new version($this->iVersionId); - $sBy .= " Application: ".version::fullNameLink($this->iVersionId). - " (".$oVersion->bHasMaintainer ? 'has maintainer' : 'no maintainers'.")\n"; - } - + $sBy .= "Application: ".version::fullNameLink($this->iVersionId); + $sBy .= ($oVersion->bHasMaintainer ? ' (has maintainer)' : ' (no maintainers)'); + } + $sFooter = ""; if ($bShowForm) {

1 0

Jacek Caban : rpcrt4: Store all active connections in RpcServerProtseq.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: ef267f115f76a3041e0da4a0f0dbd7ffb4a022e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef267f115f76a3041e0da4a0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 23 17:39:39 2017 +0200 rpcrt4: Store all active connections in RpcServerProtseq. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 1 + dlls/rpcrt4/rpc_server.h | 1 + dlls/rpcrt4/rpc_transport.c | 32 +++++++++++++++++++++----------- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 1327171..b76185b 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -946,6 +946,7 @@ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, const char *Protseq, RpcSe (*ps)->ops = ops; (*ps)->MaxCalls = 0; list_init(&(*ps)->listeners); + list_init(&(*ps)->connections); InitializeCriticalSection(&(*ps)->cs); (*ps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcServerProtseq.cs"); (*ps)->is_listening = FALSE; diff --git a/dlls/rpcrt4/rpc_server.h b/dlls/rpcrt4/rpc_server.h index a3c476e..130dde7 100644 --- a/dlls/rpcrt4/rpc_server.h +++ b/dlls/rpcrt4/rpc_server.h @@ -34,6 +34,7 @@ typedef struct _RpcServerProtseq UINT MaxCalls; /* RO */ /* list of listening connections */ struct list listeners; /* CS cs */ + struct list connections; /* CS cs */ CRITICAL_SECTION cs; /* is the server currently listening? */ diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 6b308c8..b88eeb7 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(rpc); -static RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection); +static RpcConnection *rpcrt4_spawn_connection(RpcConnection *old_connection); /**** ncacn_np support ****/ @@ -744,7 +744,7 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, 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); + cconn = rpcrt4_spawn_connection(&conn->common); else ERR("listen failed %x\n", conn->io_status.Status); break; @@ -1595,7 +1595,7 @@ static int rpcrt4_protseq_sock_wait_for_new_connection(RpcServerProtseq *protseq { if (b_handle == conn->sock_event) { - RPCRT4_SpawnConnection(&cconn, &conn->common); + cconn = rpcrt4_spawn_connection(&conn->common); break; } } @@ -3311,16 +3311,26 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, return RPC_S_OK; } -static RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection) +static RpcConnection *rpcrt4_spawn_connection(RpcConnection *old_connection) { - RPC_STATUS err; + RpcConnection *connection; + RPC_STATUS err; - err = RPCRT4_CreateConnection(Connection, OldConnection->server, rpcrt4_conn_get_name(OldConnection), - OldConnection->NetworkAddr, OldConnection->Endpoint, NULL, - OldConnection->AuthInfo, OldConnection->QOS, OldConnection->CookieAuth); - if (err == RPC_S_OK) - rpcrt4_conn_handoff(OldConnection, *Connection); - return err; + err = RPCRT4_CreateConnection(&connection, old_connection->server, rpcrt4_conn_get_name(old_connection), + old_connection->NetworkAddr, old_connection->Endpoint, NULL, + old_connection->AuthInfo, old_connection->QOS, old_connection->CookieAuth); + if (err != RPC_S_OK) + return NULL; + + rpcrt4_conn_handoff(old_connection, connection); + if (old_connection->protseq) + { + EnterCriticalSection(&old_connection->protseq->cs); + connection->protseq = old_connection->protseq; + list_add_tail(&old_connection->protseq->connections, &connection->protseq_entry); + LeaveCriticalSection(&old_connection->protseq->cs); + } + return connection; } RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn )

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2017