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

Zebediah Figura : d3d8: Use wined3d_device_context methods.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 19d5e7cae26f1f764c9b5ea4ed7cc11b87711a8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=19d5e7cae26f1f764c9b5ea4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 5 23:40:19 2021 -0500 d3d8: Use wined3d_device_context methods. 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/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index bb25be16de0..755991a64c7 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -114,6 +114,7 @@ struct d3d8_device struct wined3d_device_parent device_parent; LONG ref; struct wined3d_device *wined3d_device; + struct wined3d_device_context *immediate_context; unsigned int adapter_ordinal; struct d3d8 *d3d_parent; struct d3d8_handle_table handle_table; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f0bfab660a7..8464b99e32c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1534,17 +1534,17 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, original_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device); rtv = ds_impl ? d3d8_surface_acquire_rendertarget_view(ds_impl) : NULL; - hr = wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); + hr = wined3d_device_context_set_depth_stencil_view(device->immediate_context, rtv); d3d8_surface_release_rendertarget_view(ds_impl, rtv); if (SUCCEEDED(hr)) { rtv = render_target ? d3d8_surface_acquire_rendertarget_view(rt_impl) : NULL; if (render_target) { - if (SUCCEEDED(hr = wined3d_device_set_rendertarget_view(device->wined3d_device, 0, rtv, TRUE))) + if (SUCCEEDED(hr = wined3d_device_context_set_rendertarget_view(device->immediate_context, 0, rtv, TRUE))) device_reset_viewport_state(device); else - wined3d_device_set_depth_stencil_view(device->wined3d_device, original_dsv); + wined3d_device_context_set_depth_stencil_view(device->immediate_context, original_dsv); } d3d8_surface_release_rendertarget_view(rt_impl, rtv); } @@ -2495,7 +2495,6 @@ static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); unsigned int vertex_count; - HRESULT hr; TRACE("iface %p, primitive_type %#x, start_vertex %u, primitive_count %u.\n", iface, primitive_type, start_vertex, primitive_count); @@ -2505,10 +2504,10 @@ static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, d3d8_device_upload_sysmem_vertex_buffers(device, start_vertex, vertex_count); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); + wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 0); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, @@ -2535,7 +2534,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, d3d8_device_upload_sysmem_index_buffer(device, start_idx, index_count); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); + wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_index, start_idx, index_count, 0, 0); wined3d_mutex_unlock(); return D3D_OK; @@ -2629,7 +2628,7 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count); + wined3d_device_context_draw(device->immediate_context, vb_pos / stride, vtx_count, 0, 0); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); done: @@ -2687,6 +2686,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; struct wined3d_resource *ib, *vb; + unsigned int base_vertex_idx; UINT vb_pos, ib_pos, align; HRESULT hr; @@ -2753,11 +2753,13 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, wined3dformat_from_d3dformat(index_format)); - wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vertex_stride - min_vertex_idx); + base_vertex_idx = vb_pos / vertex_stride - min_vertex_idx; + wined3d_stateblock_set_base_vertex_index(device->state, base_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); + wined3d_device_context_draw_indexed(device->immediate_context, + base_vertex_idx, ib_pos / idx_fmt_size, idx_count, 0, 0); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); @@ -3775,6 +3777,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return hr; } + device->immediate_context = wined3d_device_get_immediate_context(device->wined3d_device); wined3d_get_device_caps(wined3d_adapter, wined3d_device_type_from_d3d(device_type), &caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst;

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_copy_uav_counter().
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: fce629235cc17d3f615aec4c067c9da6a94502da URL: https://source.winehq.org/git/wine.git/?a=commit;h=fce629235cc17d3f615aec4c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 5 23:40:21 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_copy_uav_counter(). 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 | 8 ++++---- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ef3c0c76c14..462e6d8a93b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2615,12 +2615,12 @@ static void wined3d_cs_exec_copy_uav_counter(struct wined3d_cs *cs, const void * wined3d_resource_release(&op->buffer->resource); } -void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, - unsigned int offset, struct wined3d_unordered_access_view *uav) +void wined3d_device_context_emit_copy_uav_counter(struct wined3d_device_context *context, + struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) { struct wined3d_cs_copy_uav_counter *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_COPY_UAV_COUNTER; op->buffer = dst_buffer; op->offset = offset; @@ -2628,7 +2628,7 @@ void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buff wined3d_resource_acquire(&dst_buffer->resource); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_generate_mipmaps(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3b22f7b2086..540dcfdcc9f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4818,7 +4818,7 @@ void CDECL wined3d_device_copy_uav_counter(struct wined3d_device *device, TRACE("device %p, dst_buffer %p, offset %u, uav %p.\n", device, dst_buffer, offset, uav); - wined3d_cs_emit_copy_uav_counter(device->cs, dst_buffer, offset, uav); + wined3d_device_context_emit_copy_uav_counter(&device->cs->c, dst_buffer, offset, uav); } static bool resources_format_compatible(const struct wined3d_resource *src_resource, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index db6b6488e59..957290c7ece 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4733,8 +4733,6 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; -void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, - unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_generate_mipmaps(struct wined3d_cs *cs, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -4783,6 +4781,9 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); } +void wined3d_device_context_emit_copy_uav_counter(struct wined3d_device_context *context, + struct wined3d_buffer *dst_buffer, unsigned int offset, + struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; void wined3d_device_context_emit_draw(struct wined3d_device_context *context, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count,

1 0

Nikolay Sivov : mfplay: Create presentation descriptor for the item.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: e36a6166e28250e5cd2453d0602e2722bbaa67df URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36a6166e28250e5cd2453d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 6 10:25:26 2021 +0300 mfplay: Create presentation descriptor for the item. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 0a953dde10f..cef44c8b7ce 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -50,6 +50,7 @@ struct media_item LONG refcount; IMFPMediaPlayer *player; IMFMediaSource *source; + IMFPresentationDescriptor *pd; DWORD_PTR user_data; }; @@ -124,6 +125,8 @@ static ULONG WINAPI media_item_Release(IMFPMediaItem *iface) IMFPMediaPlayer_Release(item->player); if (item->source) IMFMediaSource_Release(item->source); + if (item->pd) + IMFPresentationDescriptor_Release(item->pd); heap_free(item); } @@ -328,7 +331,24 @@ static HRESULT create_media_item(IMFPMediaPlayer *player, DWORD_PTR user_data, s static HRESULT media_item_set_source(struct media_item *item, IUnknown *object) { - return IUnknown_QueryInterface(object, &IID_IMFMediaSource, (void **)&item->source); + IMFPresentationDescriptor *pd; + IMFMediaSource *source; + HRESULT hr; + + if (FAILED(hr = IUnknown_QueryInterface(object, &IID_IMFMediaSource, (void **)&source))) + return hr; + + if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd))) + { + WARN("Failed to get presentation descriptor, hr %#x.\n", hr); + IMFMediaSource_Release(source); + return hr; + } + + item->source = source; + item->pd = pd; + + return hr; } static HRESULT WINAPI media_player_QueryInterface(IMFPMediaPlayer *iface, REFIID riid, void **obj)

1 0

Connor McAdams : winegstreamer: Add corresponding 'IYUV' type alongside 'I420'.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: aa20f3c084b964b28ecfe0d5fd3468edb29d318f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa20f3c084b964b28ecfe0d5… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Apr 2 21:00:24 2021 -0400 winegstreamer: Add corresponding 'IYUV' type alongside 'I420'. Add references the 'IYUV' mediatype wherever 'I420' is referenced, as they are identical. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 68278838458..821657f8dd8 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -521,6 +521,7 @@ video_formats[] = {&MFVideoFormat_RGB565, WG_VIDEO_FORMAT_RGB16}, {&MFVideoFormat_AYUV, WG_VIDEO_FORMAT_AYUV}, {&MFVideoFormat_I420, WG_VIDEO_FORMAT_I420}, + {&MFVideoFormat_IYUV, WG_VIDEO_FORMAT_I420}, {&MFVideoFormat_NV12, WG_VIDEO_FORMAT_NV12}, {&MFVideoFormat_UYVY, WG_VIDEO_FORMAT_UYVY}, {&MFVideoFormat_YUY2, WG_VIDEO_FORMAT_YUY2},

1 0

Alexandre Julliard : ntdll: Also fallback to native if builtin is for the wrong architecture.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 7c0d6e8067ac20a249a2aef0237faf54fe77aa01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0d6e8067ac20a249a2aef0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 12:21:40 2021 +0200 ntdll: Also fallback to native if builtin is for the wrong architecture. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c13055a5549..3d613425b68 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1372,7 +1372,8 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, return find_builtin_dll( &nt_name, module, size, &info, machine, FALSE ); default: status = find_builtin_dll( &nt_name, module, size, &info, machine, (loadorder == LO_DEFAULT) ); - if (status == STATUS_DLL_NOT_FOUND) return STATUS_IMAGE_ALREADY_LOADED; + if (status == STATUS_DLL_NOT_FOUND || status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) + return STATUS_IMAGE_ALREADY_LOADED; return status; } }

1 0

Alexandre Julliard : ntdll: Check for DLL files when creating new processes.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 89db25afda90d1d5d57787398ba80fcf4f5abb5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=89db25afda90d1d5d5778739… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 12:24:38 2021 +0200 ntdll: Check for DLL files when creating new processes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50912 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 6 +++++- dlls/ntdll/unix/process.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ab2e828dacd..5b4a2254659 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1917,7 +1917,11 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) env[env_pos++] = 0; status = load_main_exe( NULL, main_argv[1], curdir, &image, &module, &image_info ); - if (!status && image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; + if (!status) + { + if (image_info.ImageCharacteristics & IMAGE_FILE_DLL) status = STATUS_INVALID_IMAGE_FORMAT; + if (image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; + } if (status) /* try launching it through start.exe */ { diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index b020e15eaee..54410261c91 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -365,6 +365,7 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, HANDLE *handle, pe_image } SERVER_END_REQ; NtClose( mapping ); + if (info->image_charact & IMAGE_FILE_DLL) return STATUS_INVALID_IMAGE_FORMAT; } else if (status == STATUS_INVALID_IMAGE_NOT_MZ) {

1 0

Alexandre Julliard : regsvr32: Don't use GetBinaryType() on DLL files.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 44f0a67ba5ab782c7722a682e721ab8f7371dca2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44f0a67ba5ab782c7722a682… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 12:01:15 2021 +0200 regsvr32: Don't use GetBinaryType() on DLL files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index ecfd95234dd..ee915ed3e21 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -23,6 +23,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> +#include <winternl.h> #include <ole2.h> #include "regsvr32.h" #include "wine/debug.h" @@ -166,9 +167,9 @@ static void reexec_self(void) } #ifdef _WIN64 -# define ALT_BINARY_TYPE SCS_32BIT_BINARY +# define ALT_MACHINE IMAGE_FILE_MACHINE_I386 #else -# define ALT_BINARY_TYPE SCS_64BIT_BINARY +# define ALT_MACHINE IMAGE_FILE_MACHINE_AMD64 #endif /** @@ -187,12 +188,12 @@ static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHan *DllHandle = LoadLibraryExW(strDll, 0, LOAD_WITH_ALTERED_SEARCH_PATH); if(!*DllHandle) { - DWORD binary_type; + HMODULE module; if (firstDll && GetLastError() == ERROR_BAD_EXE_FORMAT && - GetBinaryTypeW(strDll, &binary_type) && - binary_type == ALT_BINARY_TYPE) + (module = LoadLibraryExW(strDll, 0, LOAD_LIBRARY_AS_IMAGE_RESOURCE))) { - reexec_self(); + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( (HMODULE)((ULONG_PTR)module & ~3) ); + if (nt->FileHeader.Machine == ALT_MACHINE) reexec_self(); } output_write(STRING_DLL_LOAD_FAILED, strDll); ExitProcess(LOADLIBRARY_FAILED);

1 0

Alexandre Julliard : ntdll: Avoid closing a handle twice.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 6d5a6c346681b57db7c5d1cddf7b40543a365b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d5a6c346681b57db7c5d1cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 12:24:22 2021 +0200 ntdll: Avoid closing a handle twice. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7a714a5aa6d..e1810bc5ab9 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2282,6 +2282,7 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, HANDL TRACE( "%s is for arch %x, continuing search\n", debugstr_us(nt_name), image_info->Machine ); status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; NtClose( *mapping ); + *mapping = NULL; } } NtClose( handle );

1 0

Alexandre Julliard : regedit: 64-bit regedit.exe is in c:\windows.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 8f2f59eee1ef872e22cd4b578cae49091f50ef9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f2f59eee1ef872e22cd4b57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 10:55:30 2021 +0200 regedit: 64-bit regedit.exe is in c:\windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50933 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 80f935027e8..df92a13ab69 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -148,15 +148,14 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) { + static const WCHAR filename[] = L"C:\\windows\\regedit.exe"; STARTUPINFOW si; PROCESS_INFORMATION pi; - WCHAR filename[MAX_PATH]; void *redir; DWORD exit_code; memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); - GetModuleFileNameW( 0, filename, MAX_PATH ); Wow64DisableWow64FsRedirection( &redir ); if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ))

1 0

Alexandre Julliard : kernel32: Return failure in GetBinaryType() for DLL files.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 1e1f110c99fba4c33ebe85bf112c9d37899d3a0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e1f110c99fba4c33ebe85bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 12:31:19 2021 +0200 kernel32: Return failure in GetBinaryType() for DLL files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 0449bedf83f..2f47423e74b 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -190,6 +190,7 @@ BOOL WINAPI GetBinaryTypeW( LPCWSTR name, LPDWORD type ) status = NtQuerySection( mapping, SectionImageInformation, &info, sizeof(info), NULL ); CloseHandle( mapping ); if (status) return FALSE; + if (!(info.ImageCharacteristics & IMAGE_FILE_DLL)) return FALSE; switch (info.Machine) { case IMAGE_FILE_MACHINE_I386:

1 0