January 2021 - Wine-commits

Zebediah Figura : winegstreamer: Don't force event_src() onto a Wine thread.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 1655dd4593d8be39d9f4058d157c6c682903a33a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1655dd4593d8be39d9f4058d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 25 23:29:05 2021 -0600 winegstreamer: Don't force event_src() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 13 ------------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 8 +------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index ce7c0de4e1a..4b22c445798 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -190,19 +190,6 @@ GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 return cbdata.u.getrange_data.ret; } -gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) -{ - struct cb_data cbdata = { EVENT_SRC }; - - cbdata.u.event_src_data.pad = pad; - cbdata.u.event_src_data.parent = parent; - cbdata.u.event_src_data.event = event; - - call_cb(&cbdata); - - return cbdata.u.event_src_data.ret; -} - void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) { struct cb_data cbdata = { REMOVED_DECODED_PAD }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 29aa2bd662c..c7c559c664c 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -34,7 +34,6 @@ enum CB_TYPE { QUERY_FUNCTION, ACTIVATE_MODE, REQUEST_BUFFER_SRC, - EVENT_SRC, REMOVED_DECODED_PAD, QUERY_SINK, GSTDEMUX_MAX, @@ -121,7 +120,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLS gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; -gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3efec0f5295..b6c92e4807c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1518,7 +1518,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) gst_pad_set_getrange_function(This->my_src, request_buffer_src_wrapper); gst_pad_set_query_function(This->my_src, query_function_wrapper); gst_pad_set_activatemode_function(This->my_src, activate_mode_wrapper); - gst_pad_set_event_function(This->my_src, event_src_wrapper); + gst_pad_set_event_function(This->my_src, event_src); gst_pad_set_element_private (This->my_src, This); This->start = This->nextofs = This->nextpullofs = This->stop = 0; @@ -2453,12 +2453,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) data->ofs, data->len, data->buf); break; } - case EVENT_SRC: - { - struct event_src_data *data = &cbdata->u.event_src_data; - cbdata->u.event_src_data.ret = event_src(data->pad, data->parent, data->event); - break; - } case REMOVED_DECODED_PAD: { struct pad_removed_data *data = &cbdata->u.pad_removed_data;

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debugging functions in query_function().
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: e9a1366028ef4aff3899884aa7b0f391eb808c97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9a1366028ef4aff3899884a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 25 23:29:06 2021 -0600 winegstreamer: Avoid using Wine debugging functions in query_function(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b6c92e4807c..a6ecaafd81b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1321,7 +1321,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) struct parser *This = gst_pad_get_element_private(pad); GstFormat format; - TRACE("filter %p, type %s.\n", This, GST_QUERY_TYPE_NAME(query)); + GST_LOG("filter %p, type %s.", This, GST_QUERY_TYPE_NAME(query)); switch (GST_QUERY_TYPE(query)) { case GST_QUERY_DURATION: @@ -1341,7 +1341,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_seeking (query, &format, NULL, NULL, NULL); if (format != GST_FORMAT_BYTES) { - WARN("Cannot seek using format \"%s\".\n", gst_format_get_name(format)); + GST_WARNING("Cannot seek using format \"%s\".", gst_format_get_name(format)); return FALSE; } gst_query_set_seeking(query, GST_FORMAT_BYTES, 1, 0, This->filesize); @@ -1352,7 +1352,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_add_scheduling_mode(query, GST_PAD_MODE_PULL); return TRUE; default: - WARN("Unhandled query type %s.\n", GST_QUERY_TYPE_NAME(query)); + GST_WARNING("Unhandled query type %s.", GST_QUERY_TYPE_NAME(query)); return FALSE; } }

1 0

Zebediah Figura : winegstreamer: Don't force query_function() onto a Wine thread.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 6e21a8cc31fb0ccffad004d0b2cd721e5aa41c8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e21a8cc31fb0ccffad004d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 25 23:29:07 2021 -0600 winegstreamer: Don't force query_function() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 13 ------------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 8 +------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 4b22c445798..6c5877ce785 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -147,19 +147,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) call_cb(&cbdata); } -gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) -{ - struct cb_data cbdata = { QUERY_FUNCTION }; - - cbdata.u.query_function_data.pad = pad; - cbdata.u.query_function_data.parent = parent; - cbdata.u.query_function_data.query = query; - - call_cb(&cbdata); - - return cbdata.u.query_function_data.ret; -} - gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) { struct cb_data cbdata = { ACTIVATE_MODE }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index c7c559c664c..f063a0a2a7b 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -31,7 +31,6 @@ typedef enum { enum CB_TYPE { EXISTING_NEW_PAD, - QUERY_FUNCTION, ACTIVATE_MODE, REQUEST_BUFFER_SRC, REMOVED_DECODED_PAD, @@ -117,7 +116,6 @@ void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN; void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; -gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a6ecaafd81b..5181d0951d5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1516,7 +1516,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); gst_pad_set_getrange_function(This->my_src, request_buffer_src_wrapper); - gst_pad_set_query_function(This->my_src, query_function_wrapper); + gst_pad_set_query_function(This->my_src, query_function); gst_pad_set_activatemode_function(This->my_src, activate_mode_wrapper); gst_pad_set_event_function(This->my_src, event_src); gst_pad_set_element_private (This->my_src, This); @@ -2434,12 +2434,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) existing_new_pad(data->element, data->pad, data->user); break; } - case QUERY_FUNCTION: - { - struct query_function_data *data = &cbdata->u.query_function_data; - cbdata->u.query_function_data.ret = query_function(data->pad, data->parent, data->query); - break; - } case ACTIVATE_MODE: { struct activate_mode_data *data = &cbdata->u.activate_mode_data;

1 0

Jacek Caban : winebuild: Make mingw a separated platform from msvc.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: ea5e89a545c1a846911e02c73d629246d040e1e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea5e89a545c1a846911e02c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 25 15:24:23 2021 +0100 winebuild: Make mingw a separated platform from msvc. Based on winegcc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 6 ++++++ tools/winebuild/import.c | 6 +++--- tools/winebuild/main.c | 21 +++++++++++---------- tools/winebuild/relay.c | 2 +- tools/winebuild/res32.c | 2 +- tools/winebuild/spec32.c | 14 +++++++------- tools/winebuild/utils.c | 15 ++++++++++++--- 7 files changed, 41 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea5e89a545c1a846911e…

1 0

Alexandre Julliard : ntdll: Set the environment size in the process parameters.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: dc90fe9a947cb04d2ea80acd0770514845e93989 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc90fe9a947cb04d2ea80acd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 13 15:23:28 2021 +0100 ntdll: Set the environment size in the process parameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50405 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 25 +++++++++++++------- dlls/ntdll/tests/env.c | 64 +++++++++++++++++++++++++++++++++++++++----------- include/winternl.h | 5 ++++ 3 files changed, 71 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc90fe9a947cb04d2ea8…

1 0

Alexandre Julliard : ntdll: Fill the image information data also for .so builtins.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 6b90b96e2181385d7ff01b408eb95d246e5a0bde URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b90b96e2181385d7ff01b40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 11:55:02 2021 +0100 ntdll: Fill the image information data also for .so builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 955b1817ac3..5e2d5aeff7c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -945,10 +945,43 @@ static void load_libwine(void) } +/*********************************************************************** + * fill_builtin_image_info + */ +static void fill_builtin_image_info( void *module, pe_image_info_t *info ) +{ + const IMAGE_DOS_HEADER *dos = (const IMAGE_DOS_HEADER *)module; + const IMAGE_NT_HEADERS *nt = (IMAGE_NT_HEADERS *)((const BYTE *)dos + dos->e_lfanew); + + info->base = nt->OptionalHeader.ImageBase; + info->entry_point = info->base + nt->OptionalHeader.AddressOfEntryPoint; + info->map_size = nt->OptionalHeader.SizeOfImage; + info->stack_size = nt->OptionalHeader.SizeOfStackReserve; + info->stack_commit = nt->OptionalHeader.SizeOfStackCommit; + info->zerobits = 0; + info->subsystem = nt->OptionalHeader.Subsystem; + info->subsystem_minor = nt->OptionalHeader.MinorSubsystemVersion; + info->subsystem_major = nt->OptionalHeader.MajorSubsystemVersion; + info->osversion_major = nt->OptionalHeader.MajorOperatingSystemVersion; + info->osversion_minor = nt->OptionalHeader.MinorOperatingSystemVersion; + info->image_charact = nt->FileHeader.Characteristics; + info->dll_charact = nt->OptionalHeader.DllCharacteristics; + info->machine = nt->FileHeader.Machine; + info->contains_code = TRUE; + info->image_flags = IMAGE_FLAGS_WineBuiltin; + info->loader_flags = 0; + info->header_size = nt->OptionalHeader.SizeOfHeaders; + info->file_size = nt->OptionalHeader.SizeOfImage; + info->checksum = nt->OptionalHeader.CheckSum; + info->cpu = client_cpu; + info->__pad = 0; +} + + /*********************************************************************** * dlopen_dll */ -static NTSTATUS dlopen_dll( const char *so_name, void **ret_module ) +static NTSTATUS dlopen_dll( const char *so_name, void **ret_module, pe_image_info_t *image_info ) { struct builtin_module *builtin; void *module, *handle; @@ -988,6 +1021,8 @@ static NTSTATUS dlopen_dll( const char *so_name, void **ret_module ) return STATUS_INVALID_IMAGE_FORMAT; } + fill_builtin_image_info( module, image_info ); + if (add_builtin_module( module, handle, NULL )) { dlclose( handle ); @@ -998,6 +1033,7 @@ static NTSTATUS dlopen_dll( const char *so_name, void **ret_module ) return STATUS_SUCCESS; already_loaded: + fill_builtin_image_info( builtin->module, image_info ); *ret_module = builtin->module; dlclose( handle ); return STATUS_SUCCESS; @@ -1060,6 +1096,7 @@ done: static NTSTATUS CDECL load_so_dll( UNICODE_STRING *nt_name, void **module ) { static const WCHAR soW[] = {'.','s','o',0}; + pe_image_info_t info; char *unix_name; NTSTATUS status; DWORD len; @@ -1070,7 +1107,7 @@ static NTSTATUS CDECL load_so_dll( UNICODE_STRING *nt_name, void **module ) len = nt_name->Length / sizeof(WCHAR); if (len > 3 && !wcsicmp( nt_name->Buffer + len - 3, soW )) nt_name->Length -= 3 * sizeof(WCHAR); - status = dlopen_dll( unix_name, module ); + status = dlopen_dll( unix_name, module, &info ); free( unix_name ); return status; } @@ -1223,10 +1260,11 @@ static NTSTATUS open_builtin_file( char *name, HANDLE *mapping, void **module, { if (check_library_arch( fd )) { - if (!dlopen_dll( name, module )) + pe_image_info_t info; + + if (!dlopen_dll( name, module, &info )) { - memset( image_info, 0, sizeof(*image_info) ); - image_info->u.ImageFlags = IMAGE_FLAGS_WineBuiltin; + virtual_fill_image_information( &info, image_info ); status = STATUS_SUCCESS; } else

1 0

Alexandre Julliard : ntdll: Create a SEC_IMAGE view also for .so builtins.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: ced3892c65b33149a490b2c2191098c0c6aa1eeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ced3892c65b33149a490b2c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 11:55:37 2021 +0100 ntdll: Create a SEC_IMAGE view also for .so builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 47 +++++++++++++++++++++++------------------- include/wine/server_protocol.h | 3 ++- server/mapping.c | 30 ++++++++++++++++++++++++++- server/protocol.def | 3 ++- server/trace.c | 1 + 7 files changed, 62 insertions(+), 26 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5e2d5aeff7c..8caddb19abf 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1028,7 +1028,7 @@ static NTSTATUS dlopen_dll( const char *so_name, void **ret_module, pe_image_inf dlclose( handle ); return STATUS_NO_MEMORY; } - virtual_create_builtin_view( module ); + virtual_create_builtin_view( module, image_info ); *ret_module = module; return STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index f8f50d0ab27..1d6ba95d2a1 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -179,7 +179,7 @@ extern void *anon_mmap_alloc( size_t size, int prot ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_create_builtin_view( void *module ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_create_builtin_view( void *module, pe_image_info_t *info ) DECLSPEC_HIDDEN; extern TEB *virtual_alloc_first_teb(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_teb( TEB **ret_teb ) DECLSPEC_HIDDEN; extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index e96bda722f6..c1e79a210f4 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2483,20 +2483,18 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) /*********************************************************************** * virtual_create_builtin_view */ -NTSTATUS virtual_create_builtin_view( void *module ) +NTSTATUS virtual_create_builtin_view( void *module, pe_image_info_t *info ) { NTSTATUS status; sigset_t sigset; IMAGE_DOS_HEADER *dos = module; IMAGE_NT_HEADERS *nt = (IMAGE_NT_HEADERS *)((char *)dos + dos->e_lfanew); - SIZE_T size = nt->OptionalHeader.SizeOfImage; + SIZE_T size = info->map_size; IMAGE_SECTION_HEADER *sec; struct file_view *view; - void *base; + void *base = wine_server_get_ptr( info->base ); int i; - size = ROUND_SIZE( module, size ); - base = ROUND_ADDR( module, page_mask ); server_enter_uninterrupted_section( &virtual_mutex, &sigset ); status = create_view( &view, base, size, SEC_IMAGE | SEC_FILE | VPROT_SYSTEM | VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY | VPROT_EXEC ); @@ -2517,10 +2515,25 @@ NTSTATUS virtual_create_builtin_view( void *module ) if (sec[i].Characteristics & IMAGE_SCN_MEM_WRITE) flags |= VPROT_WRITE; set_page_vprot( (char *)base + sec[i].VirtualAddress, sec[i].Misc.VirtualSize, flags ); } - VIRTUAL_DEBUG_DUMP_VIEW( view ); - if (is_beyond_limit( base, size, working_set_limit )) working_set_limit = address_space_limit; + + SERVER_START_REQ( map_view ) + { + req->base = wine_server_client_ptr( view->base ); + req->size = size; + wine_server_add_data( req, info, sizeof(*info) ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + + if (status >= 0) + { + VIRTUAL_DEBUG_DUMP_VIEW( view ); + if (is_beyond_limit( base, size, working_set_limit )) working_set_limit = address_space_limit; + } + else delete_view( view ); } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); + return status; } @@ -4065,22 +4078,14 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) server_enter_uninterrupted_section( &virtual_mutex, &sigset ); if ((view = find_view( addr, 0 )) && !is_view_valloc( view )) { - if (!(view->protect & VPROT_SYSTEM)) + SERVER_START_REQ( unmap_view ) { - SERVER_START_REQ( unmap_view ) - { - req->base = wine_server_client_ptr( view->base ); - status = wine_server_call( req ); - } - SERVER_END_REQ; - if (!status) delete_view( view ); - else FIXME( "failed to unmap %p %x\n", view->base, status ); - } - else - { - delete_view( view ); - status = STATUS_SUCCESS; + req->base = wine_server_client_ptr( view->base ); + status = wine_server_call( req ); } + SERVER_END_REQ; + if (!status) delete_view( view ); + else FIXME( "failed to unmap %p %x\n", view->base, status ); } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); return status; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0dd5803a79e..f070c604fdd 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1903,6 +1903,7 @@ struct map_view_request client_ptr_t base; mem_size_t size; file_pos_t start; + /* VARARG(image,pe_image_info); */ }; struct map_view_reply { @@ -6190,7 +6191,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 653 +#define SERVER_PROTOCOL_VERSION 654 /* ### protocol_version end ### */ diff --git a/server/mapping.c b/server/mapping.c index 4e38e8e40da..9c51aa3bec7 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -316,6 +316,21 @@ static struct memory_view *find_mapped_view( struct process *process, client_ptr return NULL; } +/* add a view to the process list */ +static void add_process_view( struct process *process, struct memory_view *view ) +{ + if (view->flags & SEC_IMAGE) + { + if (!is_process_init_done( process ) && !(view->image.image_charact & IMAGE_FILE_DLL)) + { + /* main exe */ + list_add_head( &process->views, &view->entry ); + return; + } + } + list_add_tail( &process->views, &view->entry ); +} + static void free_memory_view( struct memory_view *view ) { if (view->fd) release_object( view->fd ); @@ -1097,6 +1112,19 @@ DECL_HANDLER(map_view) return; } + if (!req->mapping) /* image mapping for a .so dll */ + { + if (!(view = mem_alloc( sizeof(*view) ))) return; + memset( view, 0, sizeof(*view) ); + view->base = req->base; + view->size = req->size; + view->start = req->start; + view->flags = SEC_IMAGE; + memcpy( &view->image, get_req_data(), min( sizeof(view->image), get_req_data_size() )); + add_process_view( current->process, view ); + return; + } + if (!(mapping = get_mapping_obj( current->process, req->mapping, req->access ))) return; if (mapping->flags & SEC_IMAGE) @@ -1129,7 +1157,7 @@ DECL_HANDLER(map_view) view->image = mapping->image; if (view->base != mapping->image.base) set_error( STATUS_IMAGE_NOT_AT_BASE ); } - list_add_tail( &current->process->views, &view->entry ); + add_process_view( current->process, view ); } done: diff --git a/server/protocol.def b/server/protocol.def index e6c23aa77b0..bac6b58e215 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1515,11 +1515,12 @@ enum server_fd_type /* Add a memory view in the current process */ @REQ(map_view) - obj_handle_t mapping; /* file mapping handle */ + obj_handle_t mapping; /* file mapping handle, or 0 for .so builtin */ unsigned int access; /* wanted access rights */ client_ptr_t base; /* view base address (page-aligned) */ mem_size_t size; /* view size */ file_pos_t start; /* start offset in mapping */ + VARARG(image,pe_image_info);/* image info for .so builtins */ @END diff --git a/server/trace.c b/server/trace.c index 4c1ff57186b..750b83281c8 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2107,6 +2107,7 @@ static void dump_map_view_request( const struct map_view_request *req ) dump_uint64( ", base=", &req->base ); dump_uint64( ", size=", &req->size ); dump_uint64( ", start=", &req->start ); + dump_varargs_pe_image_info( ", image=", cur_size ); } static void dump_unmap_view_request( const struct unmap_view_request *req )

1 0

Alexandre Julliard : server: Get rid of the exe_file parameter in the new_process request.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 5ff2b7d98fc7fc892ca1a4171a0caab0f65a4e34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ff2b7d98fc7fc892ca1a417… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 16:38:38 2021 +0100 server: Get rid of the exe_file parameter in the new_process request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 1 - include/wine/server_protocol.h | 4 +--- server/process.c | 10 ---------- server/process.h | 1 - server/protocol.def | 1 - server/request.h | 11 +++++------ server/trace.c | 1 - 7 files changed, 6 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 57bb8002dfa..b8bbdaadbce 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -946,7 +946,6 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ req->inherit_all = !!(process_flags & PROCESS_CREATE_FLAGS_INHERIT_HANDLES); req->create_flags = params->DebugFlags; /* hack: creation flags stored in DebugFlags for now */ req->socket_fd = socketfd[1]; - req->exe_file = wine_server_obj_handle( file_handle ); req->access = process_access; req->cpu = pe_info.cpu; req->info_size = startup_info_size; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f070c604fdd..5201be51172 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -794,7 +794,6 @@ struct new_process_request int inherit_all; unsigned int create_flags; int socket_fd; - obj_handle_t exe_file; unsigned int access; client_cpu_t cpu; data_size_t info_size; @@ -803,7 +802,6 @@ struct new_process_request /* VARARG(handles,uints,handles_size); */ /* VARARG(info,startup_info,info_size); */ /* VARARG(env,unicode_str); */ - char __pad_52[4]; }; struct new_process_reply { @@ -6191,7 +6189,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 654 +#define SERVER_PROTOCOL_VERSION 655 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index 4a366b4d3b0..3dabe0e6cfa 100644 --- a/server/process.c +++ b/server/process.c @@ -532,7 +532,6 @@ struct process *create_process( int fd, struct process *parent, int inherit_all, process->startup_state = STARTUP_IN_PROGRESS; process->startup_info = NULL; process->idle_event = NULL; - process->exe_file = NULL; process->peb = 0; process->ldt_copy = 0; process->dir_cache = NULL; @@ -642,7 +641,6 @@ static void process_destroy( struct object *obj ) if (process->msg_fd) release_object( process->msg_fd ); list_remove( &process->entry ); if (process->idle_event) release_object( process->idle_event ); - if (process->exe_file) release_object( process->exe_file ); if (process->id) free_ptid( process->id ); if (process->token) release_object( process->token ); free( process->dir_cache ); @@ -912,9 +910,7 @@ static void process_killed( struct process *process ) close_process_handles( process ); cancel_process_asyncs( process ); if (process->idle_event) release_object( process->idle_event ); - if (process->exe_file) release_object( process->exe_file ); process->idle_event = NULL; - process->exe_file = NULL; assert( !process->console ); while ((ptr = list_head( &process->rawinput_devices ))) @@ -1237,10 +1233,6 @@ DECL_HANDLER(new_process) process->startup_info = (struct startup_info *)grab_object( info ); - if (req->exe_file && - !(process->exe_file = get_file_obj( current->process, req->exe_file, FILE_READ_DATA ))) - goto done; - if (parent->job && !(req->create_flags & CREATE_BREAKAWAY_FROM_JOB) && !(parent->job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK)) @@ -1384,8 +1376,6 @@ DECL_HANDLER(init_process_done) process->ldt_copy = req->ldt_copy; process->start_time = current_time; current->entry_point = req->entry; - if (process->exe_file) release_object( process->exe_file ); - process->exe_file = NULL; init_process_tracing( process ); generate_startup_debug_events( process, req->entry ); diff --git a/server/process.h b/server/process.h index 374eda65b6b..9e765e16010 100644 --- a/server/process.h +++ b/server/process.h @@ -84,7 +84,6 @@ struct process enum startup_state startup_state; /* startup state */ struct startup_info *startup_info; /* startup info while init is in progress */ struct event *idle_event; /* event for input idle */ - struct file *exe_file; /* file handle for main exe (during startup only) */ obj_handle_t winstation; /* main handle to process window station */ obj_handle_t desktop; /* handle to desktop to use for new threads */ struct token *token; /* security token associated with this process */ diff --git a/server/protocol.def b/server/protocol.def index bac6b58e215..668da523690 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -808,7 +808,6 @@ typedef struct int inherit_all; /* inherit all handles from parent */ unsigned int create_flags; /* creation flags */ int socket_fd; /* file descriptor for process socket */ - obj_handle_t exe_file; /* file handle for main exe */ unsigned int access; /* access rights for process object */ client_cpu_t cpu; /* CPU that the new process will use */ data_size_t info_size; /* size of startup info */ diff --git a/server/request.h b/server/request.h index 972db53a889..e913615238b 100644 --- a/server/request.h +++ b/server/request.h @@ -710,12 +710,11 @@ C_ASSERT( FIELD_OFFSET(struct new_process_request, parent_process) == 16 ); C_ASSERT( FIELD_OFFSET(struct new_process_request, inherit_all) == 20 ); C_ASSERT( FIELD_OFFSET(struct new_process_request, create_flags) == 24 ); C_ASSERT( FIELD_OFFSET(struct new_process_request, socket_fd) == 28 ); -C_ASSERT( FIELD_OFFSET(struct new_process_request, exe_file) == 32 ); -C_ASSERT( FIELD_OFFSET(struct new_process_request, access) == 36 ); -C_ASSERT( FIELD_OFFSET(struct new_process_request, cpu) == 40 ); -C_ASSERT( FIELD_OFFSET(struct new_process_request, info_size) == 44 ); -C_ASSERT( FIELD_OFFSET(struct new_process_request, handles_size) == 48 ); -C_ASSERT( sizeof(struct new_process_request) == 56 ); +C_ASSERT( FIELD_OFFSET(struct new_process_request, access) == 32 ); +C_ASSERT( FIELD_OFFSET(struct new_process_request, cpu) == 36 ); +C_ASSERT( FIELD_OFFSET(struct new_process_request, info_size) == 40 ); +C_ASSERT( FIELD_OFFSET(struct new_process_request, handles_size) == 44 ); +C_ASSERT( sizeof(struct new_process_request) == 48 ); C_ASSERT( FIELD_OFFSET(struct new_process_reply, info) == 8 ); C_ASSERT( FIELD_OFFSET(struct new_process_reply, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct new_process_reply, handle) == 16 ); diff --git a/server/trace.c b/server/trace.c index 750b83281c8..f1f47f9ea31 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1314,7 +1314,6 @@ static void dump_new_process_request( const struct new_process_request *req ) fprintf( stderr, ", inherit_all=%d", req->inherit_all ); fprintf( stderr, ", create_flags=%08x", req->create_flags ); fprintf( stderr, ", socket_fd=%d", req->socket_fd ); - fprintf( stderr, ", exe_file=%04x", req->exe_file ); fprintf( stderr, ", access=%08x", req->access ); dump_client_cpu( ", cpu=", &req->cpu ); fprintf( stderr, ", info_size=%u", req->info_size );

1 0

Rémi Bernon : d3d11: Add initial implementation of CreateDeviceContextState.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 846276f3caf5325297eeeb722c592c5311b86bba URL: https://source.winehq.org/git/wine.git/?a=commit;h=846276f3caf5325297eeeb72… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 26 12:14:25 2021 +0100 d3d11: Add initial implementation of CreateDeviceContextState. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 12 ++++ dlls/d3d11/device.c | 142 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d3d11/tests/d3d11.c | 74 ++++++++++++++++------- 3 files changed, 206 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=846276f3caf5325297ee…

1 0

Rémi Bernon : d3d11: Add initial implementation of SwapDeviceContextState.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: b85af44374eac736ad91331ee50a3697f8c1b20a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b85af44374eac736ad91331e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 26 12:14:26 2021 +0100 d3d11: Add initial implementation of SwapDeviceContextState. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 1 + dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 31 +++++++++++++- dlls/d3d11/tests/d3d11.c | 102 +++++++++++++++++++++++++++++++++++++-------- 4 files changed, 116 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b85af44374eac736ad91…

1 0