January 2022 - Wine-devel - list.winehq.org

[RFC PATCH 00/11] Fix sock_recv reordering issue (#52401)
by Jinoh Kang 22 Jan '22

22 Jan '22

As discussed in https://www.winehq.org/pipermail/wine-devel/2022-January/204710.html, I converted my previous patch serie to use APCs instead of a new select op. "Talk is cheap. Show me the code." -Linus I was, well, the original proposer of the APC approach; now, this patch serie serves as my counterargument to this approach. I tried my best to minimize the complexity introduced by this patch serie; however, the APC approach resulted in net increase in the number of patches: - server: Add a helper function to trigger synchronous completion of I/O via APC_ASYNC_IO. - include: Add a helper function to test if a status indicates deferred completion. - server: Add helpers for synchronous APC delivery via ordinary server call reply. - server: Prevent I/O synchronous completion requests from firing APC interrupts if possible. - ntdll: Make server_select and server_wait accept extra "inline_apc" argument. - ntdll: Don't interrupt sock_recv with an I/O synchronous completion APC. The APC approach *did* enable code reuse of async_recv_proc, albeit with the following drawbacks: - We need to modify async_recv_proc anyway. - Deferring the synchronous I/O to the APC callback makes the synchronous I/O code flow much less obvious. (Implicit call flow: sock_recv -> async_recv_proc -> sock_recv) In the meantime, the following patches are common to both approaches: - ntdll: Don't call try_recv before server call in sock_recv. - server: Replace redundant recv_socket status fields with force_async boolean field. Further notes are placed in each patch. As always, feedbacks welcome. Jinoh Kang (11): server: Allow calling async_handoff() with status code STATUS_ALERTED. server: Add a helper function to trigger synchronous completion of I/O via APC_ASYNC_IO. include: Add a helper function to test if a status indicates deferred completion. server: Attempt to complete I/O request immediately in recv_socket. server: Add helpers for synchronous APC delivery via ordinary server call reply. server: Prevent I/O synchronous completion requests from firing APC interrupts if possible. ntdll: Make server_select and server_wait accept extra "inline_apc" argument. ntdll: Add a helper to process APC and wait for async in one function call. ntdll: Don't interrupt sock_recv with an I/O synchronous completion APC. ntdll: Don't call try_recv before server call in sock_recv. server: Replace redundant recv_socket status fields with force_async boolean field. dlls/ntdll/unix/server.c | 16 ++++++---- dlls/ntdll/unix/socket.c | 33 ++++++++------------- dlls/ntdll/unix/sync.c | 29 ++++++++++++++---- dlls/ntdll/unix/thread.c | 4 +-- dlls/ntdll/unix/unix_private.h | 6 ++-- dlls/ws2_32/tests/sock.c | 8 ++--- include/wine/afd.h | 17 +++++++++++ include/wine/async.h | 46 +++++++++++++++++++++++++++++ server/async.c | 32 +++++++++++++++++++- server/file.h | 1 + server/protocol.def | 11 +++++-- server/request.h | 4 +-- server/sock.c | 54 ++++++++++++++++++++++++++-------- server/thread.c | 44 +++++++++++++++++++++++++++ server/thread.h | 3 ++ server/trace.c | 19 ++++++++++++ tools/make_requests | 1 + 17 files changed, 273 insertions(+), 55 deletions(-) create mode 100644 include/wine/async.h -- 2.31.1

1 12

[PATCH v9 1/3] ntdll: sock_recv keeps message ordered
by Dongwan Kim 22 Jan '22

22 Jan '22

Calling try_recv could make messages misordered. Suppose that a server program calls a overlapped WSARecv and its operation is pending. Another program sends a message and wineserver is busy. The server program calls another overlapped WSARecv and it intercepts the message for the pending WSARecv. The problem already had been discussed here https://www.winehq.org/pipermail/wine-devel/2021-May/186612.html To avoid this situation, this kind of approach can be applied. The server program needs to know if there are pending asyncs before calling try_recv. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/ntdll/unix/socket.c | 20 +++++++++++++++++++- include/wine/server_protocol.h | 16 ++++++++++++++++ server/request.h | 7 +++++++ server/sock.c | 26 ++++++++++++++++++++++++++ server/trace.c | 13 +++++++++++++ 5 files changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f82c7ae1ddf..8823e99901b 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -673,6 +673,21 @@ static BOOL async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) release_fileio( &async->io ); return TRUE; } +static int query_asyncs_queued( HANDLE sock, int type ) +{ + int result=0; + + SERVER_START_REQ( query_async_waiting ) + { + req->handle = wine_server_obj_handle( sock ); + req->type = type; + wine_server_call(req); + result = reply->state; + } + SERVER_END_REQ; + return result; + +} static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, int fd, const void *buffers_ptr, unsigned int count, WSABUF *control, @@ -735,7 +750,10 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi } } - status = try_recv( fd, async, &information ); + if( force_async && query_asyncs_queued( handle , ASYNC_TYPE_READ )) + status = STATUS_DEVICE_NOT_READY; + else + status = try_recv( fd, async, &information ); if (status != STATUS_SUCCESS && status != STATUS_BUFFER_OVERFLOW && status != STATUS_DEVICE_NOT_READY) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1d17a40530f..104e3b4cd3c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5404,7 +5404,20 @@ struct get_next_thread_reply obj_handle_t handle; char __pad_12[4]; }; +struct query_async_waiting_request +{ + struct request_header __header; + obj_handle_t handle; + int type; + char __pad_20[4]; +}; +struct query_async_waiting_reply +{ + struct reply_header __header; + int state; + char __pad_12[4]; +}; enum request { @@ -5682,6 +5695,7 @@ enum request REQ_suspend_process, REQ_resume_process, REQ_get_next_thread, + REQ_query_async_waiting, REQ_NB_REQUESTS }; @@ -5963,6 +5977,7 @@ union generic_request struct suspend_process_request suspend_process_request; struct resume_process_request resume_process_request; struct get_next_thread_request get_next_thread_request; + struct query_async_waiting_request query_async_waiting_request; }; union generic_reply { @@ -6242,6 +6257,7 @@ union generic_reply struct suspend_process_reply suspend_process_reply; struct resume_process_reply resume_process_reply; struct get_next_thread_reply get_next_thread_reply; + struct query_async_waiting_reply query_async_waiting_reply; }; /* ### protocol_version begin ### */ diff --git a/server/request.h b/server/request.h index 3c455799d54..e26dbaae0f3 100644 --- a/server/request.h +++ b/server/request.h @@ -393,6 +393,7 @@ DECL_HANDLER(terminate_job); DECL_HANDLER(suspend_process); DECL_HANDLER(resume_process); DECL_HANDLER(get_next_thread); +DECL_HANDLER(query_async_waiting); #ifdef WANT_REQUEST_HANDLERS @@ -673,6 +674,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_suspend_process, (req_handler)req_resume_process, (req_handler)req_get_next_thread, + (req_handler)req_query_async_waiting, }; C_ASSERT( sizeof(abstime_t) == 8 ); @@ -2244,6 +2246,11 @@ C_ASSERT( FIELD_OFFSET(struct get_next_thread_request, flags) == 28 ); C_ASSERT( sizeof(struct get_next_thread_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_next_thread_reply, handle) == 8 ); C_ASSERT( sizeof(struct get_next_thread_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_request, type) == 16 ); +C_ASSERT( sizeof(struct query_async_waiting_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_reply, state) == 8 ); +C_ASSERT( sizeof(struct query_async_waiting_reply) == 16 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/sock.c b/server/sock.c index 2df4f3d3056..d3e3b4cd847 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3520,3 +3520,29 @@ DECL_HANDLER(send_socket) } release_object( sock ); } + +DECL_HANDLER( query_async_waiting ) +{ + struct sock *sock; + struct async *async; + reply->state = 0; + + if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle, + FILE_READ_ATTRIBUTES, &sock_ops))) return; + if (get_unix_fd( sock->fd ) == -1) return; + + if (is_fd_overlapped( sock->fd )) + { + if(req->type == ASYNC_TYPE_READ && ( async = find_pending_async(&sock->read_q) )) { + reply->state = 1; + release_object(async); + } + if(req->type == ASYNC_TYPE_WRITE && ( async = find_pending_async(&sock->write_q )) ) + { + reply->state = 1; + release_object(async); + } + } + release_object( &sock->obj ); + +} diff --git a/server/trace.c b/server/trace.c index a48f00258fe..32f236b2b5a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4516,6 +4516,16 @@ static void dump_get_next_thread_reply( const struct get_next_thread_reply *req { fprintf( stderr, " handle=%04x", req->handle ); } +static void dump_query_async_waiting_request( const struct query_async_waiting_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", type=%d", req->type ); +} +static void dump_query_async_waiting_reply( const struct query_async_waiting_reply *req ) +{ + fprintf( stderr, " state=%d", req->state ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, @@ -4792,6 +4802,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_suspend_process_request, (dump_func)dump_resume_process_request, (dump_func)dump_get_next_thread_request, + (dump_func)dump_query_async_waiting_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -5069,6 +5080,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, (dump_func)dump_get_next_thread_reply, + (dump_func)dump_query_async_waiting_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -5346,6 +5358,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "suspend_process", "resume_process", "get_next_thread", + "query_async_waiting", }; static const struct -- 2.30.2

2 3

[PATCH] wdscore: Implement CurrentIP.
by Mohamad Al-Jaf 22 Jan '22

22 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51850 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- Based on this: https://bugs.winehq.org/show_bug.cgi?id=51850#c6 --- dlls/wdscore/Makefile.in | 3 +++ dlls/wdscore/main.c | 45 +++++++++++++++++++++++++++++++++++++++ dlls/wdscore/wdscore.spec | 2 +- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 dlls/wdscore/main.c diff --git a/dlls/wdscore/Makefile.in b/dlls/wdscore/Makefile.in index 20ba1d3b1c9..2020e72c7bb 100644 --- a/dlls/wdscore/Makefile.in +++ b/dlls/wdscore/Makefile.in @@ -1,3 +1,6 @@ MODULE = wdscore.dll EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + main.c diff --git a/dlls/wdscore/main.c b/dlls/wdscore/main.c new file mode 100644 index 00000000000..78309ac561d --- /dev/null +++ b/dlls/wdscore/main.c @@ -0,0 +1,45 @@ +/* + * Copyright 2021 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdint.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/asm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wdscore); + +uint32_t get_ip(); +__ASM_GLOBAL_FUNC( get_ip, + "mov 0(%esp), %eax\n\t" + "ret\n\t" ) + + +/*********************************************************************** + * CurrentIP (wdscore.@) + */ +int WINAPI CurrentIP() +{ + uint32_t ip; + + ip = get_ip(); + return ip; +} \ No newline at end of file diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec index 15958b86aba..8b6febe6b3b 100644 --- a/dlls/wdscore/wdscore.spec +++ b/dlls/wdscore/wdscore.spec @@ -71,7 +71,7 @@ @ stub ConstructPartialMsgIfW @ stub ConstructPartialMsgVA @ stub ConstructPartialMsgVW -@ stub CurrentIP +@ stdcall CurrentIP() @ stub EndMajorTask @ stub EndMinorTask @ stub GetMajorTask -- 2.34.1

10 25

[PATCH] widl: Allow optional interface parameter on the [activatable] attribute.
by Rémi Bernon 22 Jan '22

22 Jan '22

From: Bernhard Kölbl <besentv(a)gmail.com> As per MIDL 3.0. Needed for some WinRT runtime classes. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/parser.y | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index fa863921c92..a945d0f2fca 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -278,6 +278,7 @@ static typelib_t *current_typelib; %type <expr_list> m_exprs /* exprs expr_list */ expr_list_int_const %type <expr> contract_req %type <expr> static_attr +%type <expr> activatable_attr %type <type> delegatedef %type <stgclass> storage_cls_spec %type <type_qualifier> type_qualifier m_type_qual_list @@ -580,8 +581,14 @@ static_attr: decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTER $$ = make_exprt(EXPR_MEMBER, declare_var(NULL, $1, make_declarator(NULL), 0), $3); } +activatable_attr: + decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTERFACE) + error_loc("type %s is not an interface\n", $1->type->name); + $$ = make_exprt(EXPR_MEMBER, declare_var(NULL, $1, make_declarator(NULL), 0), $3); + | contract_req { $$ = $1; } /* activatable on the default activation factory */ + attribute: { $$ = NULL; } - | tACTIVATABLE '(' contract_req ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } + | tACTIVATABLE '(' activatable_attr ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } | tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); } -- 2.34.1

2 1

[PATCH v2] widl: Allow optional interface parameter on the [activatable] attribute.
by Rémi Bernon 22 Jan '22

22 Jan '22

From: Bernhard Kölbl <besentv(a)gmail.com> As per MIDL 3.0. Needed for some WinRT runtime classes. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Borked the v1 while fixing up the tabs, oops... tools/widl/parser.y | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index fa863921c92..6ee527da926 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -278,6 +278,7 @@ static typelib_t *current_typelib; %type <expr_list> m_exprs /* exprs expr_list */ expr_list_int_const %type <expr> contract_req %type <expr> static_attr +%type <expr> activatable_attr %type <type> delegatedef %type <stgclass> storage_cls_spec %type <type_qualifier> type_qualifier m_type_qual_list @@ -580,8 +581,15 @@ static_attr: decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTER $$ = make_exprt(EXPR_MEMBER, declare_var(NULL, $1, make_declarator(NULL), 0), $3); } +activatable_attr: + decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTERFACE) + error_loc("type %s is not an interface\n", $1->type->name); + $$ = make_exprt(EXPR_MEMBER, declare_var(NULL, $1, make_declarator(NULL), 0), $3); + } + | contract_req { $$ = $1; } /* activatable on the default activation factory */ + attribute: { $$ = NULL; } - | tACTIVATABLE '(' contract_req ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } + | tACTIVATABLE '(' activatable_attr ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } | tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); } -- 2.34.1

1 0

[PATCH 3/3] msdasql/tests: Test for ITransaction* interfaces on a session
by Alistair Leslie-Hughes 21 Jan '22

21 Jan '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/tests/provider.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index dfe3e3af886..ce3573fbfd7 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -409,6 +409,9 @@ static void test_sessions(void) IGetDataSource *datasource = NULL; ISessionProperties *session_props = NULL; IUnknown *unimplemented = NULL; + ITransaction *transaction = NULL; + ITransactionLocal *local = NULL; + ITransactionObject *object = NULL; ITransactionJoin *join = NULL; IUnknown *cmd = NULL; HRESULT hr; @@ -463,6 +466,19 @@ static void test_sessions(void) IDBProperties_Release(dsource); IGetDataSource_Release(datasource); + hr = IUnknown_QueryInterface(session, &IID_ITransaction, (void**)&transaction); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) + ITransaction_Release(transaction); + + hr = IUnknown_QueryInterface(session, &IID_ITransactionLocal, (void**)&local); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) + ITransactionLocal_Release(local); + + hr = IUnknown_QueryInterface(session, &IID_ITransactionObject, (void**)&object); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if(hr == S_OK) -- 2.34.1

1 0

[PATCH 2/3] include: Add trnobj.idl
by Alistair Leslie-Hughes 21 Jan '22

21 Jan '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 14 ++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/trnobj.idl | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 include/trnobj.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index e6ddf9b4885..6ce50209940 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1796,3 +1796,17 @@ HRESULT __RPC_STUB ITransactionLocal_StartTransaction_Stub(ITransactionLocal* Th FIXME("(%p)->(%d, 0x%08x, %p, %p, %p): stub\n", This, level, flags, options, trans_level, info); return E_NOTIMPL; } + +HRESULT CALLBACK ITransactionObject_GetTransactionObject_Proxy(ITransactionObject* This, + ULONG level, ITransaction **transaction) +{ + FIXME("(%p)->(%d, 0x%08x, %p): stub\n", This, level, transaction); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ITransactionObject_GetTransactionObject_Stub(ITransactionObject* This, + ULONG level, ITransaction **transaction, IErrorInfo **info) +{ + FIXME("(%p)->(%d, 0x%08x, %p, %p): stub\n", This, level, transaction, info); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index b965bdb9917..7fcf5f0ba7b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -718,6 +718,7 @@ SOURCES = \ transact.idl \ trnjoi.idl \ trnlcl.idl \ + trnobj.idl \ twain.h \ txcoord.idl \ txdtc.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index d7e56f222e6..ce8aa74138a 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -82,6 +82,7 @@ typedef LONG_PTR DB_LRESERVE; #include "transact.idl" #include "trnjoi.idl" #include "trnlcl.idl" +#include "trnobj.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/trnobj.idl b/include/trnobj.idl new file mode 100644 index 00000000000..f33aaaf384e --- /dev/null +++ b/include/trnobj.idl @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2022 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a60-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ITransactionObject : IUnknown { + + [local] + HRESULT GetTransactionObject([in] ULONG level, [out] ITransaction **transaction); + + [call_as(GetTransactionObject)] + HRESULT RemoteGetTransactionObject([in] ULONG level, [out] ITransaction **transaction, [out] IErrorInfo **info); +} -- 2.34.1

1 0

[PATCH 1/3] include: Add trnlcl.idl
by Alistair Leslie-Hughes 21 Jan '22

21 Jan '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 27 ++++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/trnlcl.idl | 41 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 include/trnlcl.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index dc0f2261096..e6ddf9b4885 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1769,3 +1769,30 @@ HRESULT CALLBACK ITransactionJoin_JoinTransaction_Proxy(ITransactionJoin* This, FIXME("(%p)->(%p, %d, 0x%08x, %p): stub\n", This, unk, level, flags, options); return E_NOTIMPL; } + +HRESULT __RPC_STUB ITransactionLocal_GetOptionsObject_Stub(ITransactionLocal* This, + ITransactionOptions **options, IErrorInfo **info) +{ + FIXME("(%p)->(%p, %p): stub\n", This, options, info); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionLocal_GetOptionsObject_Proxy(ITransactionLocal* This, ITransactionOptions **options) +{ + FIXME("(%p)->(%p): stub\n", This, options); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionLocal_StartTransaction_Proxy(ITransactionLocal* This, ISOLEVEL level, + ULONG flags, ITransactionOptions *options, ULONG *trans_level) +{ + FIXME("(%p)->(%d, 0x%08x, %p, %p): stub\n", This, level, flags, options, trans_level); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ITransactionLocal_StartTransaction_Stub(ITransactionLocal* This, ISOLEVEL level, + ULONG flags, ITransactionOptions *options, ULONG *trans_level, IErrorInfo **info) +{ + FIXME("(%p)->(%d, 0x%08x, %p, %p, %p): stub\n", This, level, flags, options, trans_level, info); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index e5ae8429ed0..b965bdb9917 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -717,6 +717,7 @@ SOURCES = \ traffic.h \ transact.idl \ trnjoi.idl \ + trnlcl.idl \ twain.h \ txcoord.idl \ txdtc.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index abd4d55069c..d7e56f222e6 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -81,6 +81,7 @@ typedef LONG_PTR DB_LRESERVE; #include "mulres.idl" #include "transact.idl" #include "trnjoi.idl" +#include "trnlcl.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/trnlcl.idl b/include/trnlcl.idl new file mode 100644 index 00000000000..5224997b38f --- /dev/null +++ b/include/trnlcl.idl @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2022 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a5f-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ITransactionLocal : ITransaction +{ + [local] + HRESULT GetOptionsObject([out] ITransactionOptions **options); + + [call_as(GetOptionsObject)] + HRESULT RemoteGetOptionsObject([out] ITransactionOptions **options, [out] IErrorInfo **info); + + [local] + HRESULT StartTransaction([in] ISOLEVEL level, [in] ULONG flags, [in] ITransactionOptions *options, [out] ULONG *trans_level); + + [call_as(StartTransaction)] + HRESULT RemoteStartTransaction([in] ISOLEVEL level, [in] ULONG flags, [in] ITransactionOptions *options, + [in, out] ULONG *trans_level, [out] IErrorInfo **info); +} -- 2.34.1

1 0

[PATCH 0/5] winemac.drv: New ClipCursor implementation
by Tim Clem 21 Jan '22

21 Jan '22

The Mac driver has historically used session-wide CGEventTaps to implement ClipCursor. In macOS Mojave, such event taps started requiring Accessibility permission from the user. That's problematic on two levels: First, it's a hassle. Unlike, say, microphone permissions, the user can't just click "Approve" on a dialog box. Instead they have to go to the System Preferences app, enter their password, and click a checkbox (which will have the name of the preloader). This is especially bad because ClipCursor is frequently called by fullscreen games, which means the permission prompt will be hidden. Second, many apps misbehave if ClipCursor fails. For instance, some Unity games (e.g. Raft, The Forest) exhibit erratic mouse movement in that case. But apps are likely to end up in that state since Accessibility permission is deny-by-default and there is no blocking call to check for the permission. The attempt to install an event tap immediately fails until the permission is granted. As of 10.13, there is an undocumented NSWindow method -setMouseConfinementRect: that is in many ways a better option. It does not support certain uncommon scenarios (clipping to regions outside of a window), but it is far simpler and requires fewer workarounds than the event tap. It also does not require permission from the user. This series of patches factors the existing clipping code out of cocoa_app.m into its own class. It then adds a second implementation of that interface that uses -setMouseConfinementRect:. Finally it enables that approach by default in 10.13+, adding a registry key to enable the old behavior if needed. I'd welcome any feedback or suggestions. If you know of any apps that clip the cursor to a region outside of a single frontmost window, I'd also love to hear about those. Tim Clem (5): winemac.drv: Factor out cursor clipping code to its own class. winemac.drv: Create a protocol to represent a cursor clipping handler. winemac.drv: Factor common cursor clipping methods into functions. winemac.drv: Add a cursor clipping implementation using -setMouseConfinementRect:. winemac.drv: Use -setMouseConfinementRect: for cursor clipping by default. dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/cocoa_app.h | 11 +- dlls/winemac.drv/cocoa_app.m | 333 ++-------------- dlls/winemac.drv/cocoa_cursorclipping.h | 73 ++++ dlls/winemac.drv/cocoa_cursorclipping.m | 510 ++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 + 7 files changed, 626 insertions(+), 307 deletions(-) create mode 100644 dlls/winemac.drv/cocoa_cursorclipping.h create mode 100644 dlls/winemac.drv/cocoa_cursorclipping.m -- 2.34.1

2 6

[PATCH 4/4] dmsynth: Implement SetMasterClock() for the sink
by Michael Stefaniuc 21 Jan '22

21 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/dmsynth_private.h | 7 +++---- dlls/dmsynth/synthsink.c | 12 +++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 22d020992b8..2a2e88c8e88 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -72,13 +72,12 @@ struct IDirectMusicSynth8Impl { * IDirectMusicSynthSinkImpl implementation structure */ struct IDirectMusicSynthSinkImpl { - /* IUnknown fields */ IDirectMusicSynthSink IDirectMusicSynthSink_iface; IKsControl IKsControl_iface; LONG ref; - - /* IDirectMusicSynthSinkImpl fields */ - IReferenceClock* latency_clock; + IReferenceClock *latency_clock; + IReferenceClock *master_clock; + BOOL active; }; /********************************************************************** diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 46011eae27a..72fd671a415 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -81,6 +81,8 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(IDirectMusicSynthSink *ifa if (!ref) { if (This->latency_clock) IReferenceClock_Release(This->latency_clock); + if (This->master_clock) + IReferenceClock_Release(This->master_clock); HeapFree(GetProcessHeap(), 0, This); DMSYNTH_UnlockModule(); } @@ -104,7 +106,15 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(IDirectMusicSynth { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); - FIXME("(%p)->(%p): stub\n", This, clock); + TRACE("(%p)->(%p)\n", This, clock); + + if (!clock) + return E_POINTER; + if (This->active) + return E_FAIL; + + IReferenceClock_AddRef(clock); + This->master_clock = clock; return S_OK; } -- 2.31.1

1 0