March 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_context_emit_set_depth_stencil_view().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: 4a5d3206096c7181d37558cce1f41f27909a1530 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a5d3206096c7181d37558cc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 23:16:34 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_context_emit_set_depth_stencil_view(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 4dbf95cc9f7..1611a9efd27 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1252,15 +1252,16 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const device_invalidate_state(device, STATE_FRAMEBUFFER); } -void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view) +void wined3d_device_context_emit_set_depth_stencil_view(struct wined3d_device_context *context, + struct wined3d_rendertarget_view *view) { struct wined3d_cs_set_depth_stencil_view *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW; op->view = view; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_vertex_declaration(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e7b57a34595..de4f38578a0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1877,7 +1877,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_device_context_emit_set_rendertarget_view(context, i, state->fb.render_targets[i]); } - wined3d_cs_emit_set_depth_stencil_view(device->cs, state->fb.depth_stencil); + wined3d_device_context_emit_set_depth_stencil_view(context, state->fb.depth_stencil); wined3d_cs_emit_set_vertex_declaration(device->cs, state->vertex_declaration); for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i) @@ -5293,7 +5293,7 @@ HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *devic if ((fb->depth_stencil = view)) wined3d_rendertarget_view_incref(view); - wined3d_cs_emit_set_depth_stencil_view(device->cs, view); + wined3d_device_context_emit_set_depth_stencil_view(&device->cs->c, view); if (prev) wined3d_rendertarget_view_decref(prev); wined3d_device_context_unbind_srv_for_rtv(&device->cs->c, view, TRUE); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 34fcf8f9fac..2541ca10c1e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4749,8 +4749,6 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, - struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_feature_level(struct wined3d_cs *cs, enum wined3d_feature_level level) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN; @@ -4805,6 +4803,8 @@ void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_conte enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_depth_stencil_view(struct wined3d_device_context *context, + struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_rendertarget_view(struct wined3d_device_context *context, unsigned int view_idx,

1 0

Alexandre Julliard : ntdll: Move the builtin image checks to virtual_map_builtin_module().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: cb14be78ffdba9273af1cb3441d38295900a2490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb14be78ffdba9273af1cb34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 09:57:03 2021 +0100 ntdll: Move the builtin image checks to virtual_map_builtin_module(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 69 ++++++++++-------------------------------- dlls/ntdll/unix/unix_private.h | 5 ++- dlls/ntdll/unix/virtual.c | 28 +++++++++++++++-- 3 files changed, 45 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb14be78ffdba9273af1…

1 0

Alexandre Julliard : ntdll: Load the Unix library only when __wine_init_unix_lib() is called.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: 89340bb762300c76a40cb4b62ba0f0d779306125 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89340bb762300c76a40cb4b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 16:03:22 2021 +0100 ntdll: Load the Unix library only when __wine_init_unix_lib() is called. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 40 ++++++++++++++++++++++++---------------- dlls/ntdll/unix/unix_private.h | 4 ++-- dlls/ntdll/unix/virtual.c | 36 +++++++++++++++++++++--------------- 3 files changed, 47 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 9e43358a26d..1c95b84e965 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1111,30 +1111,38 @@ already_loaded: /*********************************************************************** - * dlopen_unix_dll + * init_unix_lib */ -static NTSTATUS dlopen_unix_dll( void *module, const char *name ) +static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr_in, void *ptr_out ) { - void *unix_module, *handle, *entry; + NTSTATUS (CDECL *init_func)( HMODULE, DWORD, const void *, void * ); const IMAGE_NT_HEADERS *nt; - NTSTATUS status = STATUS_INVALID_IMAGE_FORMAT; + const char *name; + void *handle, *entry, *unix_module; + NTSTATUS status; - handle = dlopen( name, RTLD_NOW ); - if (!handle) return STATUS_DLL_NOT_FOUND; - if (!(nt = dlsym( handle, "__wine_spec_nt_header" ))) goto done; - if (!(entry = dlsym( handle, "__wine_init_unix_lib" ))) goto done; + if ((status = get_builtin_unix_info( module, &name, &handle, &entry ))) return status; - unix_module = (HMODULE)((nt->OptionalHeader.ImageBase + 0xffff) & ~0xffff); - status = set_builtin_unix_handle( module, handle, entry ); - if (!status) + if (!entry) { + if (!name) return STATUS_DLL_NOT_FOUND; + if (!(handle = dlopen( name, RTLD_NOW ))) return STATUS_DLL_NOT_FOUND; + + if (!(nt = dlsym( handle, "__wine_spec_nt_header" )) || + !(entry = dlsym( handle, "__wine_init_unix_lib" ))) + { + dlclose( handle ); + set_builtin_unix_info( module, NULL, NULL, NULL ); + return STATUS_INVALID_IMAGE_FORMAT; + } + TRACE( "loaded %s for %p\n", debugstr_a(name), module ); + unix_module = (void *)((nt->OptionalHeader.ImageBase + 0xffff) & ~0xffff); map_so_dll( nt, unix_module ); fixup_ntdll_imports( name, unix_module ); - return status; + set_builtin_unix_info( module, NULL, handle, entry ); } -done: - dlclose( handle ); - return status; + init_func = entry; + return init_func( module, reason, ptr_in, ptr_out ); } @@ -1393,7 +1401,7 @@ done: if (!status && ext) { strcpy( ext, ".so" ); - dlopen_unix_dll( *module, ptr ); + set_builtin_unix_info( *module, ptr, NULL, NULL ); } free( file ); return status; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c00a6ee6aa8..5877a00bac8 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -203,8 +203,8 @@ extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; extern void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; extern void *get_builtin_so_handle( void *module ) DECLSPEC_HIDDEN; -extern NTSTATUS set_builtin_unix_handle( void *module, void *handle, void *entry ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr_in, void *ptr_out ) DECLSPEC_HIDDEN; +extern NTSTATUS get_builtin_unix_info( void *module, const char **name, void **handle, void **entry ) DECLSPEC_HIDDEN; +extern NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, void *entry ) DECLSPEC_HIDDEN; extern NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_len ) DECLSPEC_HIDDEN; extern BOOL get_thread_times( int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index bff4569b615..4edc7d0261e 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -90,6 +90,7 @@ struct builtin_module ino_t ino; void *handle; void *module; + char *unix_name; void *unix_handle; void *unix_entry; }; @@ -570,6 +571,7 @@ static void add_builtin_module( void *module, void *handle, const struct stat *s if (!(builtin = malloc( sizeof(*builtin) ))) return; builtin->handle = handle; builtin->module = module; + builtin->unix_name = NULL; builtin->unix_handle = NULL; builtin->unix_entry = NULL; if (st) @@ -641,9 +643,9 @@ void *get_builtin_so_handle( void *module ) /*********************************************************************** - * set_builtin_unix_handle + * get_builtin_unix_info */ -NTSTATUS set_builtin_unix_handle( void *module, void *handle, void *entry ) +NTSTATUS get_builtin_unix_info( void *module, const char **name, void **handle, void **entry ) { sigset_t sigset; NTSTATUS status = STATUS_DLL_NOT_FOUND; @@ -653,13 +655,10 @@ NTSTATUS set_builtin_unix_handle( void *module, void *handle, void *entry ) LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) { if (builtin->module != module) continue; - if (!builtin->unix_handle) - { - builtin->unix_handle = handle; - builtin->unix_entry = entry; - status = STATUS_SUCCESS; - } - else status = STATUS_IMAGE_ALREADY_LOADED; + *name = builtin->unix_name; + *handle = builtin->unix_handle; + *entry = builtin->unix_entry; + status = STATUS_SUCCESS; break; } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); @@ -668,24 +667,31 @@ NTSTATUS set_builtin_unix_handle( void *module, void *handle, void *entry ) /*********************************************************************** - * init_unix_lib + * set_builtin_unix_info */ -NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr_in, void *ptr_out ) +NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, void *entry ) { sigset_t sigset; - NTSTATUS (CDECL *init_func)( HMODULE, DWORD, const void *, void * ) = NULL; + NTSTATUS status = STATUS_DLL_NOT_FOUND; struct builtin_module *builtin; server_enter_uninterrupted_section( &virtual_mutex, &sigset ); LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) { if (builtin->module != module) continue; - init_func = builtin->unix_entry; + if (!builtin->unix_handle) + { + free( builtin->unix_name ); + builtin->unix_name = name ? strdup( name ) : NULL; + builtin->unix_handle = handle; + builtin->unix_entry = entry; + status = STATUS_SUCCESS; + } + else status = STATUS_IMAGE_ALREADY_LOADED; break; } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); - if (!init_func) return STATUS_DLL_NOT_FOUND; - return init_func( module, reason, ptr_in, ptr_out ); + return status; }

1 0

Nikolay Sivov : gdiplus/metafile: Implement DrawRectangles() recording.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: 81bbc4872e8f5fb88916cd79bc6ef8b2c15dff83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81bbc4872e8f5fb88916cd79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 18 15:18:03 2021 +0300 gdiplus/metafile: Implement DrawRectangles() recording. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 3 +++ dlls/gdiplus/metafile.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 9b608035909..a617ca4803e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -112,6 +112,7 @@ extern GpStatus METAFILE_FillRegion(GpMetafile* metafile, GpBrush* brush, extern void METAFILE_Free(GpMetafile *metafile) DECLSPEC_HIDDEN; extern GpStatus METAFILE_DrawEllipse(GpMetafile *metafile, GpPen *pen, GpRectF *rect) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillEllipse(GpMetafile *metafile, GpBrush *brush, GpRectF *rect) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_DrawRectangles(GpMetafile *metafile, GpPen *pen, const GpRectF *rects, INT count) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c2c116acf94..2c18ced3e92 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4132,6 +4132,9 @@ GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen, if(graphics->busy) return ObjectBusy; + if (is_metafile_graphics(graphics)) + return METAFILE_DrawRectangles((GpMetafile *)graphics->image, pen, rects, count); + status = GdipCreatePath(FillModeAlternate, &path); if (status != Ok) return status; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index c285dc58f40..eafcdaee963 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -5102,3 +5102,59 @@ GpStatus METAFILE_FillRegion(GpMetafile* metafile, GpBrush* brush, GpRegion* reg return Ok; } + +GpStatus METAFILE_DrawRectangles(GpMetafile *metafile, GpPen *pen, const GpRectF *rects, INT count) +{ + EmfPlusDrawRects *record; + GpStatus stat; + BOOL integer_rects = TRUE; + DWORD pen_id; + int i; + + if (metafile->metafile_type == MetafileTypeEmf) + { + FIXME("stub!\n"); + return NotImplemented; + } + + stat = METAFILE_AddPenObject(metafile, pen, &pen_id); + if (stat != Ok) return stat; + + for (i = 0; i < count; i++) + { + if (!is_integer_rect(&rects[i])) + { + integer_rects = FALSE; + break; + } + } + + stat = METAFILE_AllocateRecord(metafile, FIELD_OFFSET(EmfPlusDrawRects, RectData) + + count * (integer_rects ? sizeof(record->RectData.rect) : sizeof(record->RectData.rectF)), + (void **)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeDrawRects; + record->Header.Flags = pen_id; + if (integer_rects) + record->Header.Flags |= 0x4000; + record->Count = count; + + if (integer_rects) + { + for (i = 0; i < count; i++) + { + record->RectData.rect[i].X = (SHORT)rects[i].X; + record->RectData.rect[i].Y = (SHORT)rects[i].Y; + record->RectData.rect[i].Width = (SHORT)rects[i].Width; + record->RectData.rect[i].Height = (SHORT)rects[i].Height; + } + } + else + memcpy(record->RectData.rectF, rects, sizeof(*rects) * count); + + METAFILE_WriteRecords(metafile); + + return Ok; +}

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_unordered_access_view() in CSSetUnorderedAccessViews().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: ff5bacbba21cf69a3ec309569998efb0c3182a55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff5bacbba21cf69a3ec30956… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 23:16:33 2021 -0500 d3d11: Use wined3d_device_context_set_unordered_access_view() in CSSetUnorderedAccessViews(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index cab5ebefcc2..4840c014b6c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1575,7 +1575,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11UnorderedAccessView *const *views, const UINT *initial_counts) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p, initial_counts %p.\n", @@ -1586,8 +1586,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews( { struct d3d11_unordered_access_view *view = unsafe_impl_from_ID3D11UnorderedAccessView(views[i]); - wined3d_device_set_cs_uav(device->wined3d_device, start_slot + i, - view ? view->wined3d_view : NULL, initial_counts ? initial_counts[i] : ~0u); + wined3d_device_context_set_unordered_access_view(context->wined3d_context, WINED3D_PIPELINE_COMPUTE, + start_slot + i, view ? view->wined3d_view : NULL, initial_counts ? initial_counts[i] : ~0u); } wined3d_mutex_unlock(); }

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_predication().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: 8f32fbee9b17ba5d577eb1242e65dd1b50300dd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f32fbee9b17ba5d577eb124… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 23:16:38 2021 -0500 wined3d: Introduce wined3d_device_context_set_predication(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 36 ++++++++++++++++++++++-------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4c914f6adc1..5ff11f15b13 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2404,6 +2404,27 @@ HRESULT CDECL wined3d_device_context_set_depth_stencil_view(struct wined3d_devic return WINED3D_OK; } +void CDECL wined3d_device_context_set_predication(struct wined3d_device_context *context, + struct wined3d_query *predicate, BOOL value) +{ + struct wined3d_state *state = context->state; + struct wined3d_query *prev; + + TRACE("context %p, predicate %p, value %#x.\n", context, predicate, value); + + prev = state->predicate; + if (predicate) + { + FIXME("Predicated rendering not implemented.\n"); + wined3d_query_incref(predicate); + } + state->predicate = predicate; + state->predicate_value = value; + wined3d_device_context_emit_set_predication(context, predicate, value); + if (prev) + wined3d_query_decref(prev); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); @@ -4386,22 +4407,9 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou void CDECL wined3d_device_set_predication(struct wined3d_device *device, struct wined3d_query *predicate, BOOL value) { - struct wined3d_state *state = device->cs->c.state; - struct wined3d_query *prev; - TRACE("device %p, predicate %p, value %#x.\n", device, predicate, value); - prev = state->predicate; - if (predicate) - { - FIXME("Predicated rendering not implemented.\n"); - wined3d_query_incref(predicate); - } - state->predicate = predicate; - state->predicate_value = value; - wined3d_device_context_emit_set_predication(&device->cs->c, predicate, value); - if (prev) - wined3d_query_decref(prev); + wined3d_device_context_set_predication(&device->cs->c, predicate, value); } struct wined3d_query * CDECL wined3d_device_get_predication(struct wined3d_device *device, BOOL *value) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ae4244bcbfd..762cbd97f7c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -170,6 +170,7 @@ @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) @ cdecl wined3d_device_context_set_depth_stencil_view(ptr ptr) +@ cdecl wined3d_device_context_set_predication(ptr ptr long) @ cdecl wined3d_device_context_set_rasterizer_state(ptr ptr) @ cdecl wined3d_device_context_set_rendertarget_view(ptr long ptr long) @ cdecl wined3d_device_context_set_sampler(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 60625eda5c5..82cce3d0251 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2563,6 +2563,8 @@ void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_devic struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref); HRESULT __cdecl wined3d_device_context_set_depth_stencil_view(struct wined3d_device_context *context, struct wined3d_rendertarget_view *view); +void __cdecl wined3d_device_context_set_predication(struct wined3d_device_context *context, + struct wined3d_query *predicate, BOOL value); void __cdecl wined3d_device_context_set_rasterizer_state(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state); HRESULT __cdecl wined3d_device_context_set_rendertarget_view(struct wined3d_device_context *context,

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_depth_stencil_view().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: 0acd15dec8e6b35ae461ca40c514439465ed1606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0acd15dec8e6b35ae461ca40… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 23:16:35 2021 -0500 wined3d: Introduce wined3d_device_context_set_depth_stencil_view(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 58 +++++++++++++++++++++++++++-------------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index de4f38578a0..267a8cae17d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2372,6 +2372,38 @@ HRESULT CDECL wined3d_device_context_set_rendertarget_view(struct wined3d_device return WINED3D_OK; } +HRESULT CDECL wined3d_device_context_set_depth_stencil_view(struct wined3d_device_context *context, + struct wined3d_rendertarget_view *view) +{ + struct wined3d_fb_state *fb = &context->state->fb; + struct wined3d_rendertarget_view *prev; + + TRACE("context %p, view %p.\n", context, view); + + if (view && !(view->resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL)) + { + WARN("View resource %p has incompatible %s bind flags.\n", + view->resource, wined3d_debug_bind_flags(view->resource->bind_flags)); + return WINED3DERR_INVALIDCALL; + } + + prev = fb->depth_stencil; + if (prev == view) + { + TRACE("Trying to do a NOP SetRenderTarget operation.\n"); + return WINED3D_OK; + } + + if ((fb->depth_stencil = view)) + wined3d_rendertarget_view_incref(view); + wined3d_device_context_emit_set_depth_stencil_view(context, view); + if (prev) + wined3d_rendertarget_view_decref(prev); + wined3d_device_context_unbind_srv_for_rtv(context, view, TRUE); + + return WINED3D_OK; +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); @@ -5272,33 +5304,9 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view) { - struct wined3d_fb_state *fb = &device->cs->c.state->fb; - struct wined3d_rendertarget_view *prev; - TRACE("device %p, view %p.\n", device, view); - if (view && !(view->resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL)) - { - WARN("View resource %p has incompatible %s bind flags.\n", - view->resource, wined3d_debug_bind_flags(view->resource->bind_flags)); - return WINED3DERR_INVALIDCALL; - } - - prev = fb->depth_stencil; - if (prev == view) - { - TRACE("Trying to do a NOP SetRenderTarget operation.\n"); - return WINED3D_OK; - } - - if ((fb->depth_stencil = view)) - wined3d_rendertarget_view_incref(view); - wined3d_device_context_emit_set_depth_stencil_view(&device->cs->c, view); - if (prev) - wined3d_rendertarget_view_decref(prev); - wined3d_device_context_unbind_srv_for_rtv(&device->cs->c, view, TRUE); - - return WINED3D_OK; + return wined3d_device_context_set_depth_stencil_view(&device->cs->c, view); } static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ad66cef0f9c..ae4244bcbfd 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -169,6 +169,7 @@ @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) +@ cdecl wined3d_device_context_set_depth_stencil_view(ptr ptr) @ cdecl wined3d_device_context_set_rasterizer_state(ptr ptr) @ cdecl wined3d_device_context_set_rendertarget_view(ptr long ptr long) @ cdecl wined3d_device_context_set_sampler(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e066e688125..60625eda5c5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2561,6 +2561,8 @@ void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_co enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref); +HRESULT __cdecl wined3d_device_context_set_depth_stencil_view(struct wined3d_device_context *context, + struct wined3d_rendertarget_view *view); void __cdecl wined3d_device_context_set_rasterizer_state(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state); HRESULT __cdecl wined3d_device_context_set_rendertarget_view(struct wined3d_device_context *context,

1 0

Alexandre Julliard : ntdll: Load builtin dlls through NtMapViewOfSection().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: ab8f0c3e214e2605b83c6fcf8e508c31f3bcf7d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab8f0c3e214e2605b83c6fcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 16:28:35 2021 +0100 ntdll: Load builtin dlls through NtMapViewOfSection(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 1 - dlls/ntdll/loader.c | 58 +++++++++++-------------------------------- 2 files changed, 14 insertions(+), 45 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 854d3e04e19..e6d9e8621a9 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1331,7 +1331,6 @@ static void test_NtAreMappedFilesTheSame(void) ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); status = pNtAreMappedFilesTheSame( ptr, GetModuleHandleA("kernel32.dll") ); - todo_wine ok( status == STATUS_SUCCESS, "NtAreMappedFilesTheSame returned %x\n", status ); file2 = CreateFileA( path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c7e7c86e88f..eddceb60623 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2316,8 +2316,19 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam ViewShare, 0, PAGE_EXECUTE_READ ); if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; + if (status) return status; + + if ((*pwm = find_existing_module( module ))) /* already loaded */ + { + if ((*pwm)->ldr.LoadCount != -1) (*pwm)->ldr.LoadCount++; + TRACE( "found %s for %s at %p, count=%d\n", + debugstr_us(&(*pwm)->ldr.FullDllName), debugstr_us(nt_name), + (*pwm)->ldr.DllBase, (*pwm)->ldr.LoadCount); + if (module != (*pwm)->ldr.DllBase) NtUnmapViewOfSection( NtCurrentProcess(), module ); + return STATUS_SUCCESS; + } #ifdef _WIN64 - if (!status && !convert_to_pe64( module, image_info )) status = STATUS_INVALID_IMAGE_FORMAT; + if (!convert_to_pe64( module, image_info )) status = STATUS_INVALID_IMAGE_FORMAT; #endif if (!status) status = build_module( load_path, nt_name, &module, image_info, id, flags, pwm ); if (status && module) NtUnmapViewOfSection( NtCurrentProcess(), module ); @@ -2683,49 +2694,8 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC break; case STATUS_SUCCESS: /* valid PE file */ - if (image_info.u.s.WineBuiltin) - { - switch (loadorder) - { - case LO_NATIVE_BUILTIN: - case LO_BUILTIN: - case LO_BUILTIN_NATIVE: - case LO_DEFAULT: - nts = load_builtin_dll( load_path, &nt_name, flags, pwm, FALSE ); - if (nts == STATUS_DLL_NOT_FOUND) - nts = load_native_dll( load_path, &nt_name, mapping, &image_info, &id, flags, pwm ); - break; - default: - nts = STATUS_DLL_NOT_FOUND; - break; - } - break; - } - if (!(image_info.u.s.WineFakeDll)) - { - switch (loadorder) - { - case LO_NATIVE: - case LO_NATIVE_BUILTIN: - nts = load_native_dll( load_path, &nt_name, mapping, &image_info, &id, flags, pwm ); - break; - case LO_BUILTIN: - nts = load_builtin_dll( load_path, &nt_name, flags, pwm, FALSE ); - break; - case LO_BUILTIN_NATIVE: - case LO_DEFAULT: - nts = load_builtin_dll( load_path, &nt_name, flags, pwm, loadorder == LO_DEFAULT ); - if (nts == STATUS_DLL_NOT_FOUND || nts == STATUS_IMAGE_ALREADY_LOADED) - nts = load_native_dll( load_path, &nt_name, mapping, &image_info, &id, flags, pwm ); - break; - default: - nts = STATUS_DLL_NOT_FOUND; - break; - } - break; - } - TRACE( "%s is a fake Wine dll\n", debugstr_us(&nt_name) ); - /* fall through */ + nts = load_native_dll( load_path, &nt_name, mapping, &image_info, &id, flags, pwm ); + break; case STATUS_DLL_NOT_FOUND: /* no file found, try builtin */ switch (loadorder)

1 0

Alexandre Julliard : ntdll: Replace image mapping by the builtin module directly in NtMapViewOfSection().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: 24a5a101426e16aa3f9ab9981af67c2edc72adcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=24a5a101426e16aa3f9ab998… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 09:56:57 2021 +0100 ntdll: Replace image mapping by the builtin module directly in NtMapViewOfSection(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 68 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 2 ++ dlls/ntdll/unix/virtual.c | 7 +++-- 3 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 25be205c696..fd30c5ac939 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1421,6 +1421,74 @@ static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, } +/*********************************************************************** + * load_builtin + * + * Load the builtin dll if specified by load order configuration. + * Return STATUS_IMAGE_ALREADY_LOADED if we should keep the native one that we have found. + */ +NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *filename, + void **module, SIZE_T *size ) +{ + NTSTATUS status; + UNICODE_STRING nt_name; + SECTION_IMAGE_INFORMATION info; + enum loadorder loadorder; + const WCHAR *app_name = NULL; + + if (NtCurrentTeb()->Peb->ImageBaseAddress) + app_name = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + + init_unicode_string( &nt_name, filename ); + loadorder = get_load_order( app_name, &nt_name ); + + if (image_info->image_flags & IMAGE_FLAGS_WineBuiltin) + { + switch (loadorder) + { + case LO_NATIVE_BUILTIN: + case LO_BUILTIN: + case LO_BUILTIN_NATIVE: + case LO_DEFAULT: + status = find_builtin_dll( &nt_name, module, size, &info, FALSE ); + if (status == STATUS_DLL_NOT_FOUND) return STATUS_IMAGE_ALREADY_LOADED; + return status; + default: + return STATUS_DLL_NOT_FOUND; + } + } + if (image_info->image_flags & IMAGE_FLAGS_WineFakeDll) + { + TRACE( "%s is a fake Wine dll\n", debugstr_us(&nt_name) ); + switch (loadorder) + { + case LO_NATIVE_BUILTIN: + case LO_BUILTIN: + case LO_BUILTIN_NATIVE: + case LO_DEFAULT: + return find_builtin_dll( &nt_name, module, size, &info, FALSE ); + default: + return STATUS_DLL_NOT_FOUND; + } + } + switch (loadorder) + { + case LO_NATIVE: + case LO_NATIVE_BUILTIN: + return STATUS_IMAGE_ALREADY_LOADED; + case LO_BUILTIN: + return find_builtin_dll( &nt_name, module, size, &info, FALSE ); + case LO_BUILTIN_NATIVE: + case LO_DEFAULT: + status = find_builtin_dll( &nt_name, module, size, &info, (loadorder == LO_DEFAULT) ); + if (status == STATUS_DLL_NOT_FOUND) return STATUS_IMAGE_ALREADY_LOADED; + return status; + default: + return STATUS_DLL_NOT_FOUND; + } +} + + #ifdef __FreeBSD__ /* The PT_LOAD segments are sorted in increasing order, and the first * starts at the beginning of the ELF file. By parsing the file, we can diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index e527f5f799b..5e9eacb3bf8 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -141,6 +141,8 @@ extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD d extern int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) DECLSPEC_HIDDEN; extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; extern NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ) DECLSPEC_HIDDEN; +extern NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *filename, + void **addr_ptr, SIZE_T *size_ptr ) DECLSPEC_HIDDEN; extern void start_server( BOOL debug ) DECLSPEC_HIDDEN; extern ULONG_PTR get_image_address(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index a38b8478371..69592892840 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2531,8 +2531,11 @@ static NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, unsigned sh if (image_info) { filename = (WCHAR *)(image_info + 1); - res = virtual_map_image( handle, access, addr_ptr, size_ptr, zero_bits_64, shared_file, - alloc_type, image_info, filename, FALSE ); + /* check if we can replace that mapping with the builtin */ + res = load_builtin( image_info, filename, addr_ptr, size_ptr ); + if (res == STATUS_IMAGE_ALREADY_LOADED) + res = virtual_map_image( handle, access, addr_ptr, size_ptr, zero_bits_64, shared_file, + alloc_type, image_info, filename, FALSE ); if (shared_file) NtClose( shared_file ); free( image_info ); return res;

1 0

Alexandre Julliard : ntdll: Return the mapping size in virtual_map_builtin_module().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: 5dcd3c1dd97de2f20a4ed886ffe3e72be2ab8da0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dcd3c1dd97de2f20a4ed886… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 09:56:48 2021 +0100 ntdll: Return the mapping size in virtual_map_builtin_module(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 42 ++++++++++++++++++++++++++++-------------- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 6 +++--- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f7bdb055871..25be205c696 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1234,7 +1234,7 @@ static inline char *prepend( char *buffer, const char *str, size_t len ) * Open a file for a new dll. Helper for open_builtin_file. */ static NTSTATUS open_dll_file( const char *name, OBJECT_ATTRIBUTES *attr, void **module, - SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) + SIZE_T *size_ptr, SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) { LARGE_INTEGER size; NTSTATUS status; @@ -1281,7 +1281,7 @@ static NTSTATUS open_dll_file( const char *name, OBJECT_ATTRIBUTES *attr, void * NtClose( mapping ); return STATUS_IMAGE_ALREADY_LOADED; } - status = virtual_map_builtin_module( mapping, module ); + status = virtual_map_builtin_module( mapping, module, size_ptr ); NtClose( mapping ); return status; } @@ -1290,14 +1290,14 @@ static NTSTATUS open_dll_file( const char *name, OBJECT_ATTRIBUTES *attr, void * /*********************************************************************** * open_builtin_file */ -static NTSTATUS open_builtin_file( char *name, OBJECT_ATTRIBUTES *attr, void **module, +static NTSTATUS open_builtin_file( char *name, OBJECT_ATTRIBUTES *attr, void **module, SIZE_T *size, SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) { NTSTATUS status; int fd; *module = NULL; - status = open_dll_file( name, attr, module, image_info, prefer_native ); + status = open_dll_file( name, attr, module, size, image_info, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) return status; /* try .so file */ @@ -1325,10 +1325,10 @@ static NTSTATUS open_builtin_file( char *name, OBJECT_ATTRIBUTES *attr, void **m /*********************************************************************** - * load_builtin_dll + * find_builtin_dll */ -static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, - SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) +static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T *size_ptr, + SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) { unsigned int i, pos, namepos, namelen, maxlen = 0; unsigned int len = nt_name->Length / sizeof(WCHAR); @@ -1369,7 +1369,7 @@ static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/dlls", sizeof("/dlls") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - status = open_builtin_file( ptr, &attr, module, image_info, prefer_native ); + status = open_builtin_file( ptr, &attr, module, size_ptr, image_info, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; /* now as a program */ @@ -1380,7 +1380,7 @@ static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/programs", sizeof("/programs") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - status = open_builtin_file( ptr, &attr, module, image_info, prefer_native ); + status = open_builtin_file( ptr, &attr, module, size_ptr, image_info, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; } @@ -1388,17 +1388,15 @@ static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, { file[pos + len + 1] = 0; ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); - status = open_builtin_file( ptr, &attr, module, image_info, prefer_native ); + status = open_builtin_file( ptr, &attr, module, size_ptr, image_info, prefer_native ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; else if (status != STATUS_DLL_NOT_FOUND) goto done; } if (found_image) status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; WARN( "cannot find builtin library for %s\n", debugstr_us(nt_name) ); - done: - if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; - if (!status && ext) + if (status >= 0 && ext) { strcpy( ext, ".so" ); set_builtin_unix_info( *module, ptr, NULL, NULL ); @@ -1408,6 +1406,21 @@ done: } +/*********************************************************************** + * load_builtin_dll + */ +static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, + SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) +{ + SIZE_T size; + NTSTATUS status; + + status = find_builtin_dll( nt_name, module, &size, image_info, prefer_native ); + if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; + return status; +} + + #ifdef __FreeBSD__ /* The PT_LOAD segments are sorted in increasing order, and the first * starts at the beginning of the ELF file. By parsing the file, we can @@ -1500,12 +1513,13 @@ static void load_ntdll(void) OBJECT_ATTRIBUTES attr; UNICODE_STRING str; void *module; + SIZE_T size = 0; char *name = build_path( dll_dir, "ntdll.dll.so" ); init_unicode_string( &str, path ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); name[strlen(name) - 3] = 0; /* remove .so */ - status = open_builtin_file( name, &attr, &module, &info, FALSE ); + status = open_builtin_file( name, &attr, &module, &size, &info, FALSE ); if (status == STATUS_IMAGE_NOT_AT_BASE) relocate_ntdll( module ); else if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 1307364d5d3..e527f5f799b 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -178,7 +178,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_map_builtin_module( HANDLE mapping, void **module ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module, SIZE_T *size ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_create_builtin_view( void *module, const UNICODE_STRING *nt_name, pe_image_info_t *info, void *so_handle ) DECLSPEC_HIDDEN; extern TEB *virtual_alloc_first_teb(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index d00178d6261..a38b8478371 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2732,14 +2732,13 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) /*********************************************************************** * virtual_map_builtin_module */ -NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module ) +NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module, SIZE_T *size ) { mem_size_t full_size; unsigned int sec_flags; HANDLE shared_file; pe_image_info_t *image_info = NULL; ACCESS_MASK access = SECTION_MAP_READ | SECTION_MAP_EXECUTE; - SIZE_T size = 0; NTSTATUS status; WCHAR *filename; @@ -2749,9 +2748,10 @@ NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module ) if (!image_info) return STATUS_INVALID_PARAMETER; *module = NULL; + *size = 0; filename = (WCHAR *)(image_info + 1); status = virtual_map_image( mapping, SECTION_MAP_READ | SECTION_MAP_EXECUTE, - module, &size, 0, shared_file, 0, image_info, filename, TRUE ); + module, size, 0, shared_file, 0, image_info, filename, TRUE ); if (shared_file) NtClose( shared_file ); free( image_info ); return status;

1 0