wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Nikolay Sivov : combase: Move CoReleaseMarshalData().
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 1a6afac0e49eaf9eca7295611596e14093670144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a6afac0e49eaf9eca729561… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 1 15:16:30 2020 +0100 combase: Move CoReleaseMarshalData(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/combase_private.h | 2 + dlls/combase/marshal.c | 141 +++++++++++++++++++++++++++++++++++++++++ dlls/ole32/marshal.c | 50 --------------- dlls/ole32/ole32.spec | 2 +- 5 files changed, 145 insertions(+), 52 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 4ac93ff545..e1ffdc8253 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -146,7 +146,7 @@ @ stdcall CoRegisterPSClsid(ptr ptr) @ stdcall CoRegisterSurrogate(ptr) ole32.CoRegisterSurrogate @ stdcall CoRegisterSurrogateEx(ptr ptr) ole32.CoRegisterSurrogateEx -@ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData +@ stdcall CoReleaseMarshalData(ptr) @ stdcall CoReleaseServerProcess() @ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects @ stub CoRetireServer diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 898d42b3c7..cc1c3d3438 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -222,3 +222,5 @@ struct stub_manager * WINAPI get_stub_manager_from_object(struct apartment *apt, void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN; ULONG WINAPI stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN; ULONG WINAPI stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN; +struct stub_manager * WINAPI get_stub_manager(struct apartment *apt, OID oid); +void WINAPI stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak); diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index db5089f013..bfe31ff17d 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -29,6 +29,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +/* private flag indicating that the object was marshaled as table-weak */ +#define SORFP_TABLEWEAK SORF_OXRES1 + struct ftmarshaler { IUnknown IUnknown_inner; @@ -507,3 +510,141 @@ cleanup: return hr; } + +/* Creates an IMarshal* object according to the data marshaled to the stream. + * The function leaves the stream pointer at the start of the data written + * to the stream by the IMarshal* object. + */ +static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, IID *iid) +{ + OBJREF objref; + HRESULT hr; + ULONG res; + + /* read common OBJREF header */ + hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); + if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) + { + ERR("Failed to read common OBJREF header, 0x%08x\n", hr); + return STG_E_READFAULT; + } + + /* sanity check on header */ + if (objref.signature != OBJREF_SIGNATURE) + { + ERR("Bad OBJREF signature 0x%08x\n", objref.signature); + return RPC_E_INVALID_OBJREF; + } + + if (iid) *iid = objref.iid; + + /* FIXME: handler marshaling */ + if (objref.flags & OBJREF_STANDARD) + { + TRACE("Using standard unmarshaling\n"); + *marshal = NULL; + return S_FALSE; + } + else if (objref.flags & OBJREF_CUSTOM) + { + ULONG custom_header_size = FIELD_OFFSET(OBJREF, u_objref.u_custom.pData) - + FIELD_OFFSET(OBJREF, u_objref.u_custom); + TRACE("Using custom unmarshaling\n"); + /* read constant sized OR_CUSTOM data from stream */ + hr = IStream_Read(stream, &objref.u_objref.u_custom, + custom_header_size, &res); + if (hr != S_OK || (res != custom_header_size)) + { + ERR("Failed to read OR_CUSTOM header, 0x%08x\n", hr); + return STG_E_READFAULT; + } + /* now create the marshaler specified in the stream */ + hr = CoCreateInstance(&objref.u_objref.u_custom.clsid, NULL, + CLSCTX_INPROC_SERVER, &IID_IMarshal, + (LPVOID*)marshal); + } + else + { + FIXME("Invalid or unimplemented marshaling type specified: %x\n", + objref.flags); + return RPC_E_INVALID_OBJREF; + } + + if (hr != S_OK) + ERR("Failed to create marshal, 0x%08x\n", hr); + + return hr; +} + +static HRESULT std_release_marshal_data(IStream *stream) +{ + struct stub_manager *stubmgr; + struct OR_STANDARD obj; + struct apartment *apt; + ULONG res; + HRESULT hr; + + hr = IStream_Read(stream, &obj, FIELD_OFFSET(struct OR_STANDARD, saResAddr.aStringArray), &res); + if (hr != S_OK) return STG_E_READFAULT; + + if (obj.saResAddr.wNumEntries) + { + ERR("unsupported size of DUALSTRINGARRAY\n"); + return E_NOTIMPL; + } + + TRACE("oxid = %s, oid = %s, ipid = %s\n", wine_dbgstr_longlong(obj.std.oxid), + wine_dbgstr_longlong(obj.std.oid), wine_dbgstr_guid(&obj.std.ipid)); + + if (!(apt = apartment_findfromoxid(obj.std.oxid))) + { + WARN("Could not map OXID %s to apartment object\n", + wine_dbgstr_longlong(obj.std.oxid)); + return RPC_E_INVALID_OBJREF; + } + + if (!(stubmgr = get_stub_manager(apt, obj.std.oid))) + { + apartment_release(apt); + ERR("could not map object ID to stub manager, oxid=%s, oid=%s\n", + wine_dbgstr_longlong(obj.std.oxid), wine_dbgstr_longlong(obj.std.oid)); + return RPC_E_INVALID_OBJREF; + } + + stub_manager_release_marshal_data(stubmgr, obj.std.cPublicRefs, &obj.std.ipid, obj.std.flags & SORFP_TABLEWEAK); + + stub_manager_int_release(stubmgr); + apartment_release(apt); + + return S_OK; +} + +/*********************************************************************** + * CoReleaseMarshalData (combase.@) + */ +HRESULT WINAPI CoReleaseMarshalData(IStream *stream) +{ + IMarshal *marshal; + HRESULT hr; + + TRACE("%p\n", stream); + + hr = get_unmarshaler_from_stream(stream, &marshal, NULL); + if (hr == S_FALSE) + { + hr = std_release_marshal_data(stream); + if (hr != S_OK) + ERR("StdMarshal ReleaseMarshalData failed with error %#x\n", hr); + return hr; + } + if (hr != S_OK) + return hr; + + /* call the helper object to do the releasing of marshal data */ + hr = IMarshal_ReleaseMarshalData(marshal, stream); + if (hr != S_OK) + ERR("IMarshal::ReleaseMarshalData failed with error %#x\n", hr); + + IMarshal_Release(marshal); + return hr; +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 87017dbc92..e462c9ffd4 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1837,56 +1837,6 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *pStream, REFIID riid, LPVOID *ppv) return hr; } -/*********************************************************************** - * CoReleaseMarshalData [OLE32.@] - * - * Releases resources associated with an object that has been marshaled into - * a stream. - * - * PARAMS - * - * pStream [I] The stream that the object has been marshaled into. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT error code. - * - * NOTES - * - * Call this function to release resources associated with a normal or - * table-weak marshal that will not be unmarshaled, and all table-strong - * marshals when they are no longer needed. - * - * SEE ALSO - * CoMarshalInterface(), CoUnmarshalInterface(). - */ -HRESULT WINAPI CoReleaseMarshalData(IStream *pStream) -{ - HRESULT hr; - LPMARSHAL pMarshal; - - TRACE("(%p)\n", pStream); - - hr = get_unmarshaler_from_stream(pStream, &pMarshal, NULL); - if (hr == S_FALSE) - { - hr = std_release_marshal_data(pStream); - if (hr != S_OK) - ERR("StdMarshal ReleaseMarshalData failed with error 0x%08x\n", hr); - return hr; - } - if (hr != S_OK) - return hr; - - /* call the helper object to do the releasing of marshal data */ - hr = IMarshal_ReleaseMarshalData(pMarshal, pStream); - if (hr != S_OK) - ERR("IMarshal::ReleaseMarshalData failed with error 0x%08x\n", hr); - - IMarshal_Release(pMarshal); - return hr; -} - static HRESULT WINAPI StdMarshalCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppv) { diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 972629ecb7..2ecfcf6b51 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -72,7 +72,7 @@ @ stdcall CoRegisterPSClsid(ptr ptr) combase.CoRegisterPSClsid @ stdcall CoRegisterSurrogate(ptr) @ stdcall CoRegisterSurrogateEx(ptr ptr) -@ stdcall CoReleaseMarshalData(ptr) +@ stdcall CoReleaseMarshalData(ptr) combase.CoReleaseMarshalData @ stdcall CoReleaseServerProcess() combase.CoReleaseServerProcess @ stdcall CoResumeClassObjects() @ stdcall CoRevertToSelf() combase.CoRevertToSelf

1 0

Nikolay Sivov : combase: Move stub manager.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 6074eeda838a8dc5eb48dff9fe2540af76916e55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6074eeda838a8dc5eb48dff9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 1 15:16:29 2020 +0100 combase: Move stub manager. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 2 + dlls/combase/apartment.c | 5 +- dlls/combase/combase.c | 84 ++++++++++++++++++++++ dlls/combase/combase.spec | 17 ++++- dlls/combase/combase_private.h | 101 ++++++++++++++++++-------- dlls/combase/dcom.idl | 62 ++++++++++++++++ dlls/{ole32 => combase}/stubmanager.c | 131 ++++++++++++++++++---------------- dlls/ole32/Makefile.in | 1 - dlls/ole32/compobj.c | 121 ------------------------------- dlls/ole32/compobj_private.h | 23 +----- dlls/ole32/marshal.c | 12 +++- dlls/ole32/ole32.spec | 9 ++- dlls/ole32/rpc.c | 8 ++- 13 files changed, 330 insertions(+), 246 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6074eeda838a8dc5eb48…

1 0

Jacek Caban : conhost: Support CTRL_C_EVENT in write_console_input.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 9864f9c024ad6e45d2e4369dca7418bc9121d727 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9864f9c024ad6e45d2e4369d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 1 15:36:45 2020 +0200 conhost: Support CTRL_C_EVENT in write_console_input. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 0050f4d1ad..aef9b8e199 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -250,7 +250,14 @@ static NTSTATUS write_console_input( struct console *console, const INPUT_RECORD count--; if (records[i].Event.KeyEvent.bKeyDown) { - FIXME("CTRL C\n"); + struct condrv_ctrl_event ctrl_event; + IO_STATUS_BLOCK io; + + ctrl_event.event = CTRL_C_EVENT; + ctrl_event.group_id = 0; + NtDeviceIoControlFile( console->server, NULL, NULL, NULL, &io, IOCTL_CONDRV_CTRL_EVENT, + &ctrl_event, sizeof(ctrl_event), NULL, 0 ); + } } else i++;

1 0

Jacek Caban : server: Support IOCTL_CONDRV_CTRL_EVENT on console server handles.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: b23ef1d836bada90df71ce9730f68088e0124226 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b23ef1d836bada90df71ce97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 1 15:36:23 2020 +0200 server: Support IOCTL_CONDRV_CTRL_EVENT on console server handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index 15c764f3b5..3ea8a0fe53 100644 --- a/server/console.c +++ b/server/console.c @@ -192,6 +192,7 @@ struct console_host_ioctl struct console_server { struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd for ioctls */ struct console_input *console; /* attached console */ struct list queue; /* ioctl queue */ struct list read_queue; /* blocking read queue */ @@ -201,6 +202,7 @@ struct console_server static void console_server_dump( struct object *obj, int verbose ); static void console_server_destroy( struct object *obj ); static int console_server_signaled( struct object *obj, struct wait_queue_entry *entry ); +static struct fd *console_server_get_fd( struct object *obj ); static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static struct object *console_server_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); @@ -215,7 +217,7 @@ static const struct object_ops console_server_ops = console_server_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - no_get_fd, /* get_fd */ + console_server_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -228,6 +230,23 @@ static const struct object_ops console_server_ops = console_server_destroy /* destroy */ }; +static int console_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); + +static const struct fd_ops console_server_fd_ops = +{ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + console_get_fd_type, /* get_fd_type */ + no_fd_read, /* read */ + no_fd_write, /* write */ + no_fd_flush, /* flush */ + no_fd_get_file_info, /* get_file_info */ + no_fd_get_volume_info, /* get_volume_info */ + console_server_ioctl, /* ioctl */ + default_fd_queue_async, /* queue_async */ + default_fd_reselect_async /* reselect_async */ +}; + struct font_info { short int width; @@ -1598,6 +1617,7 @@ static void console_server_destroy( struct object *obj ) struct console_server *server = (struct console_server *)obj; assert( obj->ops == &console_server_ops ); disconnect_console_server( server ); + if (server->fd) release_object( server->fd ); } static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) @@ -1638,6 +1658,13 @@ static int console_server_signaled( struct object *obj, struct wait_queue_entry return !server->console || !list_empty( &server->queue ); } +static struct fd *console_server_get_fd( struct object* obj ) +{ + struct console_server *server = (struct console_server*)obj; + assert( obj->ops == &console_server_ops ); + return (struct fd *)grab_object( server->fd ); +} + static struct object *console_server_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ) { @@ -1653,6 +1680,13 @@ static struct object *create_console_server( void ) server->busy = 0; list_init( &server->queue ); list_init( &server->read_queue ); + server->fd = alloc_pseudo_fd( &console_server_fd_ops, &server->obj, FILE_SYNCHRONOUS_IO_NONALERT ); + if (!server->fd) + { + release_object( server ); + return NULL; + } + allow_fd_caching(server->fd); return &server->obj; } @@ -2137,6 +2171,35 @@ static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct } } +static int console_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) +{ + struct console_server *server = get_fd_user( fd ); + + switch (code) + { + case IOCTL_CONDRV_CTRL_EVENT: + { + const struct condrv_ctrl_event *event = get_req_data(); + if (get_req_data_size() != sizeof(*event)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (!server->console) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + propagate_console_signal( server->console, event->event, event->group_id ); + return !get_error(); + } + + default: + set_error( STATUS_INVALID_HANDLE ); + return 0; + } +} + static struct object_type *console_device_get_type( struct object *obj ) { static const WCHAR name[] = {'D','e','v','i','c','e'};

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_CTRL_EVENT in GenerateConsoleCtrlEvent.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 82e8fd97f6996a13ecdd0c827336e0681e2216a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82e8fd97f6996a13ecdd0c82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 1 15:36:05 2020 +0200 kernelbase: Use IOCTL_CONDRV_CTRL_EVENT in GenerateConsoleCtrlEvent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 ++++ dlls/kernelbase/console.c | 14 +++++--------- include/wine/server_protocol.h | 19 +------------------ server/console.c | 13 ------------- server/protocol.def | 7 ------- server/request.h | 5 ----- server/trace.c | 9 --------- 7 files changed, 10 insertions(+), 61 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 3d53bfe260..46816f6ac0 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3670,6 +3670,10 @@ static void test_FreeConsole(void) ok(!hwnd, "hwnd = %p\n", hwnd); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + ret = GenerateConsoleCtrlEvent(CTRL_C_EVENT, 0); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "GenerateConsoleCtrlEvent returned %x(%u)\n", + ret, GetLastError()); + SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); handle = GetConsoleInputWaitHandle(); ok(handle == (HANDLE)0xdeadbeef, "GetConsoleInputWaitHandle returned %p\n", handle); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 7589f305b5..f4dd06ae2d 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -593,7 +593,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) */ BOOL WINAPI DECLSPEC_HOTPATCH GenerateConsoleCtrlEvent( DWORD event, DWORD group ) { - BOOL ret; + struct condrv_ctrl_event ctrl_event; TRACE( "(%d, %x)\n", event, group ); @@ -603,14 +603,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH GenerateConsoleCtrlEvent( DWORD event, DWORD group return FALSE; } - SERVER_START_REQ( send_console_signal ) - { - req->signal = event; - req->group_id = group; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + ctrl_event.event = event; + ctrl_event.group_id = group; + return console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_CTRL_EVENT, &ctrl_event, sizeof(ctrl_event), NULL, 0, NULL ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 98e4825439..5259b5a60c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1924,20 +1924,6 @@ struct create_console_output_reply -struct send_console_signal_request -{ - struct request_header __header; - int signal; - process_id_t group_id; - char __pad_20[4]; -}; -struct send_console_signal_reply -{ - struct reply_header __header; -}; - - - struct get_next_console_request_request { struct request_header __header; @@ -5541,7 +5527,6 @@ enum request REQ_append_console_input_history, REQ_get_console_input_history, REQ_create_console_output, - REQ_send_console_signal, REQ_get_next_console_request, REQ_read_directory_changes, REQ_read_change, @@ -5831,7 +5816,6 @@ union generic_request struct append_console_input_history_request append_console_input_history_request; struct get_console_input_history_request get_console_input_history_request; struct create_console_output_request create_console_output_request; - struct send_console_signal_request send_console_signal_request; struct get_next_console_request_request get_next_console_request_request; struct read_directory_changes_request read_directory_changes_request; struct read_change_request read_change_request; @@ -6119,7 +6103,6 @@ union generic_reply struct append_console_input_history_reply append_console_input_history_reply; struct get_console_input_history_reply get_console_input_history_reply; struct create_console_output_reply create_console_output_reply; - struct send_console_signal_reply send_console_signal_reply; struct get_next_console_request_reply get_next_console_request_reply; struct read_directory_changes_reply read_directory_changes_reply; struct read_change_reply read_change_reply; @@ -6337,7 +6320,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 640 +#define SERVER_PROTOCOL_VERSION 641 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 8339819458..15c764f3b5 100644 --- a/server/console.c +++ b/server/console.c @@ -2394,19 +2394,6 @@ DECL_HANDLER(create_console_output) release_object( console ); } -/* sends a signal to a console (process, group...) */ -DECL_HANDLER(send_console_signal) -{ - process_id_t group; - - group = req->group_id ? req->group_id : current->process->group_id; - - if (!group) - set_error( STATUS_INVALID_PARAMETER ); - else - propagate_console_signal( current->process->console, req->signal, group ); -} - /* get console which renderer is 'current' */ static int cgwe_enum( struct process* process, void* user) { diff --git a/server/protocol.def b/server/protocol.def index 6e92f86cc0..92290af701 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1515,13 +1515,6 @@ enum server_fd_type @END -/* Sends a signal to a process group */ -@REQ(send_console_signal) - int signal; /* the signal to send */ - process_id_t group_id; /* the group to send the signal to */ -@END - - /* Retrieve the next pending console ioctl request */ @REQ(get_next_console_request) obj_handle_t handle; /* console server handle */ diff --git a/server/request.h b/server/request.h index 5a602d3d81..db7215bd43 100644 --- a/server/request.h +++ b/server/request.h @@ -188,7 +188,6 @@ DECL_HANDLER(get_console_wait_event); DECL_HANDLER(append_console_input_history); DECL_HANDLER(get_console_input_history); DECL_HANDLER(create_console_output); -DECL_HANDLER(send_console_signal); DECL_HANDLER(get_next_console_request); DECL_HANDLER(read_directory_changes); DECL_HANDLER(read_change); @@ -477,7 +476,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_append_console_input_history, (req_handler)req_get_console_input_history, (req_handler)req_create_console_output, - (req_handler)req_send_console_signal, (req_handler)req_get_next_console_request, (req_handler)req_read_directory_changes, (req_handler)req_read_change, @@ -1131,9 +1129,6 @@ C_ASSERT( FIELD_OFFSET(struct create_console_output_request, fd) == 28 ); C_ASSERT( sizeof(struct create_console_output_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_console_output_reply, handle_out) == 8 ); C_ASSERT( sizeof(struct create_console_output_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct send_console_signal_request, signal) == 12 ); -C_ASSERT( FIELD_OFFSET(struct send_console_signal_request, group_id) == 16 ); -C_ASSERT( sizeof(struct send_console_signal_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, signal) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, read) == 20 ); diff --git a/server/trace.c b/server/trace.c index ffb3d37db9..a0174a1bd6 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2089,12 +2089,6 @@ static void dump_create_console_output_reply( const struct create_console_output fprintf( stderr, " handle_out=%04x", req->handle_out ); } -static void dump_send_console_signal_request( const struct send_console_signal_request *req ) -{ - fprintf( stderr, " signal=%d", req->signal ); - fprintf( stderr, ", group_id=%04x", req->group_id ); -} - static void dump_get_next_console_request_request( const struct get_next_console_request_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4502,7 +4496,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_append_console_input_history_request, (dump_func)dump_get_console_input_history_request, (dump_func)dump_create_console_output_request, - (dump_func)dump_send_console_signal_request, (dump_func)dump_get_next_console_request_request, (dump_func)dump_read_directory_changes_request, (dump_func)dump_read_change_request, @@ -4788,7 +4781,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_get_console_input_history_reply, (dump_func)dump_create_console_output_reply, - NULL, (dump_func)dump_get_next_console_request_reply, NULL, (dump_func)dump_read_change_reply, @@ -5074,7 +5066,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "append_console_input_history", "get_console_input_history", "create_console_output", - "send_console_signal", "get_next_console_request", "read_directory_changes", "read_change",

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_CTRL_EVENT ioctl.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: f9c89932595c874cf9eb6fc8d3244d89ff55bbf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9c89932595c874cf9eb6fc8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 1 15:35:51 2020 +0200 server: Introduce IOCTL_CONDRV_CTRL_EVENT ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 8 ++++++++ server/console.c | 19 +++++++++++++++++++ server/trace.c | 1 + 3 files changed, 28 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 14177a5e19..2e6c5c689f 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -36,6 +36,7 @@ #define IOCTL_CONDRV_SET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 14, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_GET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 15, METHOD_BUFFERED, FILE_READ_PROPERTIES) #define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 16, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_CTRL_EVENT CTL_CODE(FILE_DEVICE_CONSOLE, 17, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) /* console output ioctls */ #define IOCTL_CONDRV_READ_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_READ_DATA) @@ -226,6 +227,13 @@ enum condrv_renderer_event_type CONSOLE_RENDERER_EXIT_EVENT, }; +/* IOCTL_CONDRV_CTRL_EVENT params */ +struct condrv_ctrl_event +{ + int event; /* the event to send */ + unsigned int group_id; /* the group to send the event to */ +}; + /* Wine specific values for console inheritance (params->ConsoleHandle) */ #define CONSOLE_HANDLE_ALLOC ((HANDLE)1) diff --git a/server/console.c b/server/console.c index 93ea509ae4..8339819458 100644 --- a/server/console.c +++ b/server/console.c @@ -1844,6 +1844,25 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * return 1; } + case IOCTL_CONDRV_CTRL_EVENT: + { + const struct condrv_ctrl_event *event = get_req_data(); + process_id_t group; + if (get_req_data_size() != sizeof(*event)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + group = event->group_id ? event->group_id : current->process->group_id; + if (!group) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + propagate_console_signal( console, event->event, group ); + return !get_error(); + } + default: set_error( STATUS_INVALID_HANDLE ); return 0; diff --git a/server/trace.c b/server/trace.c index 93e53d2f42..ffb3d37db9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -116,6 +116,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) #define CASE(c) case c: fprintf( stderr, "%s%s", prefix, #c ); break CASE(IOCTL_CONDRV_ACTIVATE); CASE(IOCTL_CONDRV_ATTACH_RENDERER); + CASE(IOCTL_CONDRV_CTRL_EVENT); CASE(IOCTL_CONDRV_FILL_OUTPUT); CASE(IOCTL_CONDRV_GET_INPUT_INFO); CASE(IOCTL_CONDRV_GET_MODE);

1 0

Jacek Caban : kernel32/tests: Skip more FreeConsole tests on win7.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 7d3503d83ece320ed023297e12d766e487383462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d3503d83ece320ed023297e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 1 15:35:33 2020 +0200 kernel32/tests: Skip more FreeConsole tests on win7. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a8c07dcae7..3d53bfe260 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3659,6 +3659,8 @@ static void test_FreeConsole(void) ok(title[0] == 0xc0c0, "title byffer changed\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + if (skip_nt) return; + SetLastError(0xdeadbeef); ret = SetConsoleTitleW( L"test" ); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "SetConsoleTitleW returned %x(%u)\n", ret, GetLastError()); @@ -3668,15 +3670,12 @@ static void test_FreeConsole(void) ok(!hwnd, "hwnd = %p\n", hwnd); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); - if (!skip_nt) - { - SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); - handle = GetConsoleInputWaitHandle(); - ok(handle == (HANDLE)0xdeadbeef, "GetConsoleInputWaitHandle returned %p\n", handle); - SetStdHandle( STD_INPUT_HANDLE, NULL ); - handle = GetConsoleInputWaitHandle(); - ok(!handle, "GetConsoleInputWaitHandle returned %p\n", handle); - } + SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); + handle = GetConsoleInputWaitHandle(); + ok(handle == (HANDLE)0xdeadbeef, "GetConsoleInputWaitHandle returned %p\n", handle); + SetStdHandle( STD_INPUT_HANDLE, NULL ); + handle = GetConsoleInputWaitHandle(); + ok(!handle, "GetConsoleInputWaitHandle returned %p\n", handle); } static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output)

1 0

Ziqing Hui : d3dx10: Introduce get_d3dx10_dds_format().
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: b4d273e7fee0b39fe9dbba346d11974f5039c864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4d273e7fee0b39fe9dbba34… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Aug 17 19:33:47 2020 +0800 d3dx10: Introduce get_d3dx10_dds_format(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43_main.c | 26 +++++++++++++++++++++++++- dlls/d3dx10_43/tests/d3dx10.c | 2 -- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 53781f5de6..005b234437 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -54,6 +54,18 @@ file_formats[] = { &GUID_ContainerFormatWmp, D3DX10_IFF_WMP }, }; +static const DXGI_FORMAT to_be_converted_format[] = +{ + DXGI_FORMAT_UNKNOWN, + DXGI_FORMAT_R8_UNORM, + DXGI_FORMAT_R8G8_UNORM, + DXGI_FORMAT_B5G6R5_UNORM, + DXGI_FORMAT_B4G4R4A4_UNORM, + DXGI_FORMAT_B5G5R5A1_UNORM, + DXGI_FORMAT_B8G8R8X8_UNORM, + DXGI_FORMAT_B8G8R8A8_UNORM +}; + static D3DX10_IMAGE_FILE_FORMAT wic_container_guid_to_file_format(GUID *container_format) { unsigned int i; @@ -82,6 +94,18 @@ static D3D10_RESOURCE_DIMENSION wic_dimension_to_d3dx10_dimension(WICDdsDimensio } } +static DXGI_FORMAT get_d3dx10_dds_format(DXGI_FORMAT format) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(to_be_converted_format); ++i) + { + if (format == to_be_converted_format[i]) + return DXGI_FORMAT_R8G8B8A8_UNORM; + } + return format; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch (fdwReason) @@ -339,7 +363,7 @@ HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat img_info->Depth = dds_params.Depth; img_info->MipLevels = dds_params.MipLevels; img_info->ResourceDimension = wic_dimension_to_d3dx10_dimension(dds_params.Dimension); - img_info->Format = dds_params.DxgiFormat; + img_info->Format = get_d3dx10_dds_format(dds_params.DxgiFormat); img_info->MiscFlags = 0; if (dds_params.Dimension == WICDdsTextureCube) { diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index e1d3ba0b83..e39025a930 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1346,8 +1346,6 @@ static void test_get_image_info(void) ok(image_info.MiscFlags == test_image[i].expected.MiscFlags, "Test %u: Got unexpected MiscFlags %#x, expected %#x.\n", i, image_info.MiscFlags, test_image[i].expected.MiscFlags); - todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_DDS - && test_image[i].expected.Format == DXGI_FORMAT_R8G8B8A8_UNORM) ok(image_info.Format == test_image[i].expected.Format, "Test %u: Got unexpected Format %#x, expected %#x.\n", i, image_info.Format, test_image[i].expected.Format);

1 0

Zebediah Figura : d3dcompiler: Unconditionally report special (pixel shader output) sysvals based on the semantic name.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: ae415a7df78cbcf73f39c12d347e5bdf468d1895 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae415a7df78cbcf73f39c12d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 1 10:52:41 2020 -0500 d3dcompiler: Unconditionally report special (pixel shader output) sysvals based on the semantic name. That is, do not check that the shader is a pixel shader and that the signature is an output signature. These semantic names can only be generated in such conditions; using the name for any other stage is invalid. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 39 +++------ dlls/d3dcompiler_43/tests/reflection.c | 155 ++++++++++----------------------- 2 files changed, 62 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae415a7df78cbcf73f39…

1 0

Zebediah Figura : d3dcompiler/tests: Add tests for samplers.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 172048e32bd7710c421e1640dd39797e42d9f267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=172048e32bd7710c421e1640… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 12 19:33:40 2020 -0500 d3dcompiler/tests: Add tests for samplers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 226 ++++++++++++++++++++++++++++++--- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 120 ++++++++++++++++- 2 files changed, 327 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=172048e32bd7710c421e…

1 0

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 September 2020