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

Henri Verbeet : wined3d: Trace wined3d_swapchain_vk_blit() failures.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 46c50c03ce1adfe7e77e06a9a95fc1122b2e6a01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46c50c03ce1adfe7e77e06a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 16:46:41 2021 +0100 wined3d: Trace wined3d_swapchain_vk_blit() failures. These are expected failures in some circumstances, but we'd still like to know about them when they happen. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8f365c88c15..95db586c697 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1063,7 +1063,10 @@ static VkResult wined3d_swapchain_vk_blit(struct wined3d_swapchain_vk *swapchain wined3d_context_vk_wait_command_buffer(context_vk, swapchain_vk->vk_semaphores[present_idx].command_buffer_id); if ((vr = VK_CALL(vkAcquireNextImageKHR(device_vk->vk_device, swapchain_vk->vk_swapchain, UINT64_MAX, swapchain_vk->vk_semaphores[present_idx].available, VK_NULL_HANDLE, &image_idx))) < 0) + { + WARN("Failed to acquire image, vr %s.\n", wined3d_debug_vkresult(vr)); return vr; + } if (dst_rect->right > swapchain_vk->width || dst_rect->bottom > swapchain_vk->height) { @@ -1154,7 +1157,9 @@ static VkResult wined3d_swapchain_vk_blit(struct wined3d_swapchain_vk *swapchain present_desc.pSwapchains = &swapchain_vk->vk_swapchain; present_desc.pImageIndices = &image_idx; present_desc.pResults = NULL; - return VK_CALL(vkQueuePresentKHR(device_vk->vk_queue, &present_desc)); + if ((vr = VK_CALL(vkQueuePresentKHR(device_vk->vk_queue, &present_desc)))) + WARN("Present returned vr %s.\n", wined3d_debug_vkresult(vr)); + return vr; } static void wined3d_swapchain_vk_rotate(struct wined3d_swapchain *swapchain, struct wined3d_context_vk *context_vk)

1 0

Henri Verbeet : wined3d: Invalidate sRGB write state in wined3d_cs_exec_set_rendertarget_view() if needed.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: b1c84499544354e75505cc366352c72c010d735e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1c84499544354e75505cc36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 16:46:42 2021 +0100 wined3d: Invalidate sRGB write state in wined3d_cs_exec_set_rendertarget_view() if needed. Instead of in wined3d_context_gl_setup_target(). If the render-target view uses an sRGB format, but the underlying resource has a typeless format, we'd potentially miss an invalidation in wined3d_context_gl_setup_target() where we only have access to the underlying resource. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/context_gl.c | 5 ----- dlls/wined3d/cs.c | 18 +++++++++++++++--- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3e8cbfb18b4..38a0afc3fee 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15184,7 +15184,7 @@ static void test_swapchain_views(void) ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); draw_color_quad(&test_context, &color); - todo_wine check_texture_color(test_context.backbuffer, 0xffbc957c, 1); + check_texture_color(test_context.backbuffer, 0xffbc957c, 1); srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index fa61b70f525..123214afd5d 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4122,11 +4122,6 @@ static void wined3d_context_gl_setup_target(struct wined3d_context_gl *context_g if ((old->alpha_size && !new->alpha_size) || (!old->alpha_size && new->alpha_size) || !(texture->resource.format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) context_invalidate_state(&context_gl->c, STATE_BLEND); - - /* Update sRGB writing when switching between formats that do/do not support sRGB writing */ - if ((context_gl->c.current_rt.texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) - != (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) - context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); } /* When switching away from an offscreen render target, and we're not diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c9bc9443e5d..6bf9827d3e1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1191,17 +1191,29 @@ void wined3d_device_context_emit_set_scissor_rects(struct wined3d_device_context static void wined3d_cs_exec_set_rendertarget_view(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_rendertarget_view *op = data; - BOOL prev_alpha_swizzle, curr_alpha_swizzle; + bool prev_alpha_swizzle, curr_alpha_swizzle; struct wined3d_rendertarget_view *prev; + bool prev_srgb_write, curr_srgb_write; + struct wined3d_device *device; + device = cs->c.device; prev = cs->state.fb.render_targets[op->view_idx]; cs->state.fb.render_targets[op->view_idx] = op->view; - device_invalidate_state(cs->c.device, STATE_FRAMEBUFFER); + device_invalidate_state(device, STATE_FRAMEBUFFER); prev_alpha_swizzle = prev && prev->format->id == WINED3DFMT_A8_UNORM; curr_alpha_swizzle = op->view && op->view->format->id == WINED3DFMT_A8_UNORM; if (prev_alpha_swizzle != curr_alpha_swizzle) - device_invalidate_state(cs->c.device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); + device_invalidate_state(device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); + + if (!(device->adapter->d3d_info.wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) + || cs->state.render_states[WINED3D_RS_SRGBWRITEENABLE]) + { + prev_srgb_write = prev && prev->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; + curr_srgb_write = op->view && op->view->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; + if (prev_srgb_write != curr_srgb_write) + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); + } } void wined3d_device_context_emit_set_rendertarget_view(struct wined3d_device_context *context, unsigned int view_idx,

1 0

Henri Verbeet : dxgi: Implement dxgi_output_SetGammaControl().
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: e27ea1e03af5adcb63134c2bd7fc15ffe6a9d2af URL: https://source.winehq.org/git/wine.git/?a=commit;h=e27ea1e03af5adcb63134c2b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 16:46:43 2021 +0100 dxgi: Implement dxgi_output_SetGammaControl(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/directx.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 3ffa5d16408..632b44526c1 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -420,10 +420,45 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOu return S_OK; } +static WORD uint16_from_float(float f) +{ + f *= 65535.0f; + if (f < 0.0f) + f = 0.0f; + else if (f > 65535.0f) + f = 65535.0f; + + return f + 0.5f; +} + static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput6 *iface, const DXGI_GAMMA_CONTROL *gamma_control) { - FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); + struct wined3d_gamma_ramp ramp; + const DXGI_RGB *p; + unsigned int i; + + TRACE("iface %p, gamma_control %p.\n", iface, gamma_control); + + if (gamma_control->Scale.Red != 1.0f || gamma_control->Scale.Green != 1.0f || gamma_control->Scale.Blue != 1.0f) + FIXME("Ignoring unhandled scale {%.8e, %.8e, %.8e}.\n", gamma_control->Scale.Red, + gamma_control->Scale.Green, gamma_control->Scale.Blue); + if (gamma_control->Offset.Red != 0.0f || gamma_control->Offset.Green != 0.0f || gamma_control->Offset.Blue != 0.0f) + FIXME("Ignoring unhandled offset {%.8e, %.8e, %.8e}.\n", gamma_control->Offset.Red, + gamma_control->Offset.Green, gamma_control->Offset.Blue); + + for (i = 0; i < 256; ++i) + { + p = &gamma_control->GammaCurve[i]; + ramp.red[i] = uint16_from_float(p->Red); + ramp.green[i] = uint16_from_float(p->Green); + ramp.blue[i] = uint16_from_float(p->Blue); + } + + wined3d_mutex_lock(); + wined3d_output_set_gamma_ramp(output->wined3d_output, &ramp); + wined3d_mutex_unlock(); return S_OK; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c673f61e429..95fa744d64d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1496,6 +1496,19 @@ HRESULT CDECL wined3d_output_set_display_mode(struct wined3d_output *output, return WINED3D_OK; } +HRESULT CDECL wined3d_output_set_gamma_ramp(struct wined3d_output *output, const struct wined3d_gamma_ramp *ramp) +{ + HDC dc; + + TRACE("output %p, ramp %p.\n", output, ramp); + + dc = CreateDCW(output->device_name, NULL, NULL, NULL); + SetDeviceGammaRamp(dc, (void *)ramp); + DeleteDC(dc); + + return WINED3D_OK; +} + HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapter, DWORD flags, struct wined3d_adapter_identifier *identifier) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4f0d1e8e0b3..fb9973354a0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -192,6 +192,7 @@ @ cdecl wined3d_output_get_raster_status(ptr ptr) @ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_output_set_display_mode(ptr ptr) +@ cdecl wined3d_output_set_gamma_ramp(ptr ptr) @ cdecl wined3d_output_take_ownership(ptr long) @ cdecl wined3d_palette_create(ptr long long ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e8f5e824bc3..1f8b4a89648 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2606,6 +2606,7 @@ HRESULT __cdecl wined3d_output_get_raster_status(const struct wined3d_output *ou void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); HRESULT __cdecl wined3d_output_set_display_mode(struct wined3d_output *output, const struct wined3d_display_mode *mode); +HRESULT __cdecl wined3d_output_set_gamma_ramp(struct wined3d_output *output, const struct wined3d_gamma_ramp *ramp); HRESULT __cdecl wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive); HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flags,

1 0

Henri Verbeet : wined3d: Implement wined3d_swapchain_set_gamma_ramp() on top of wined3d_output_set_gamma_ramp().
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: bd9aca2cc8066c4a2abeeda458ce43c044f4c5ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd9aca2cc8066c4a2abeeda4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 16:46:44 2021 +0100 wined3d: Implement wined3d_swapchain_set_gamma_ramp() on top of wined3d_output_set_gamma_ramp(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 13 +++++++++++++ dlls/wined3d/swapchain.c | 24 ++++++++++++++---------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 95fa744d64d..7287b333f97 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1509,6 +1509,19 @@ HRESULT CDECL wined3d_output_set_gamma_ramp(struct wined3d_output *output, const return WINED3D_OK; } +HRESULT wined3d_output_get_gamma_ramp(struct wined3d_output *output, struct wined3d_gamma_ramp *ramp) +{ + HDC dc; + + TRACE("output %p, ramp %p.\n", output, ramp); + + dc = CreateDCW(output->device_name, NULL, NULL, NULL); + GetDeviceGammaRamp(dc, ramp); + DeleteDC(dc); + + return WINED3D_OK; +} + HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapter, DWORD flags, struct wined3d_adapter_identifier *identifier) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 95db586c697..b575baa19ef 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -363,18 +363,20 @@ void CDECL wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, DWORD flags, const struct wined3d_gamma_ramp *ramp) { - HDC dc; + struct wined3d_output *output; TRACE("swapchain %p, flags %#x, ramp %p.\n", swapchain, flags, ramp); if (flags) FIXME("Ignoring flags %#x.\n", flags); - dc = GetDCEx(swapchain->state.device_window, 0, DCX_USESTYLE | DCX_CACHE); - SetDeviceGammaRamp(dc, (void *)ramp); - ReleaseDC(swapchain->state.device_window, dc); + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } - return WINED3D_OK; + return wined3d_output_set_gamma_ramp(output, ramp); } void CDECL wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, struct wined3d_palette *palette) @@ -389,15 +391,17 @@ void CDECL wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, st HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain, struct wined3d_gamma_ramp *ramp) { - HDC dc; + struct wined3d_output *output; TRACE("swapchain %p, ramp %p.\n", swapchain, ramp); - dc = GetDCEx(swapchain->state.device_window, 0, DCX_USESTYLE | DCX_CACHE); - GetDeviceGammaRamp(dc, ramp); - ReleaseDC(swapchain->state.device_window, dc); + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } - return WINED3D_OK; + return wined3d_output_get_gamma_ramp(output, ramp); } /* The is a fallback for cases where we e.g. can't create a GL context or diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c15765af0e8..4c15f6ab178 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3367,6 +3367,8 @@ struct wined3d_output D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; }; +HRESULT wined3d_output_get_gamma_ramp(struct wined3d_output *output, struct wined3d_gamma_ramp *ramp) DECLSPEC_HIDDEN; + /* The adapter structure */ struct wined3d_adapter {

1 0

Alexandre Julliard : start: Add a private /exec option to replicate the Wine command-line usage.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 15a6ee944049bc15110b2219721a49b1afc268f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15a6ee944049bc15110b2219… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:27:56 2021 +0100 start: Add a private /exec option to replicate the Wine command-line usage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 92 +++++++++++++++++++++++++++++++++++++++++++-- po/ast.po | 38 +++++++++++++++++-- po/bg.po | 38 +++++++++++++++++-- po/ca.po | 98 ++++++++++++++++++++++++++++++++++++++++++++++-- po/cs.po | 38 +++++++++++++++++-- po/da.po | 38 +++++++++++++++++-- po/de.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/el.po | 38 +++++++++++++++++-- po/en.po | 66 +++++++++++++++++++++++++++++++-- po/en_US.po | 66 +++++++++++++++++++++++++++++++-- po/eo.po | 38 +++++++++++++++++-- po/es.po | 38 +++++++++++++++++-- po/fa.po | 38 +++++++++++++++++-- po/fi.po | 95 +++++++++++++++++++++++++++++++++++++++++++++-- po/fr.po | 99 +++++++++++++++++++++++++++++++++++++++++++++++-- po/he.po | 38 +++++++++++++++++-- po/hi.po | 38 +++++++++++++++++-- po/hr.po | 38 +++++++++++++++++-- po/hu.po | 38 +++++++++++++++++-- po/it.po | 38 +++++++++++++++++-- po/ja.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/ko.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/lt.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/ml.po | 38 +++++++++++++++++-- po/nb_NO.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/nl.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/or.po | 38 +++++++++++++++++-- po/pa.po | 38 +++++++++++++++++-- po/pl.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/pt_BR.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/pt_PT.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/rm.po | 38 +++++++++++++++++-- po/ro.po | 38 +++++++++++++++++-- po/ru.po | 95 +++++++++++++++++++++++++++++++++++++++++++++-- po/si.po | 66 +++++++++++++++++++++++++++++++-- po/sk.po | 38 +++++++++++++++++-- po/sl.po | 38 +++++++++++++++++-- po/sr_RS(a)cyrillic.po | 38 +++++++++++++++++-- po/sr_RS(a)latin.po | 38 +++++++++++++++++-- po/sv.po | 97 ++++++++++++++++++++++++++++++++++++++++++++++-- po/ta.po | 38 +++++++++++++++++-- po/te.po | 38 +++++++++++++++++-- po/th.po | 38 +++++++++++++++++-- po/tr.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/uk.po | 38 +++++++++++++++++-- po/wa.po | 38 +++++++++++++++++-- po/wine.pot | 38 +++++++++++++++++-- po/zh_CN.po | 93 ++++++++++++++++++++++++++++++++++++++++++++-- po/zh_TW.po | 91 +++++++++++++++++++++++++++++++++++++++++++-- programs/start/start.c | 25 +++++++------ programs/start/start.rc | 1 + 51 files changed, 2849 insertions(+), 159 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=15a6ee944049bc15110b…

1 0

Alexandre Julliard : ntdll: Check the main image for Unix path only the first time around.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 967100258fb1da850668e620c1c5095630576840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=967100258fb1da850668e620… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:24:35 2021 +0100 ntdll: Check the main image for Unix path only the first time around. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50858 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 6 +++--- dlls/ntdll/unix/loader.c | 8 ++++---- dlls/ntdll/unix/unix_private.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index e4932473fcc..07b9f0fc384 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1871,7 +1871,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) add_registry_environment( &env, &env_pos, &env_size ); env[env_pos++] = 0; - status = load_main_exe( main_wargv[0], curdir, &image, &module, &image_info ); + status = load_main_exe( main_wargv[0], main_argv[0], curdir, &image, &module, &image_info ); if (!status && image_info.Machine != current_machine) /* need to restart for Wow64 */ { NtUnmapViewOfSection( GetCurrentProcess(), module ); @@ -1888,7 +1888,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) free( image ); prepend_main_wargv( args, 3 ); - if ((status = load_main_exe( startW, curdir, &image, &module, &image_info ))) + if ((status = load_main_exe( startW, NULL, curdir, &image, &module, &image_info ))) { MESSAGE( "wine: failed to start %s\n", debugstr_w(main_wargv[2]) ); NtTerminateProcess( GetCurrentProcess(), status ); @@ -2042,7 +2042,7 @@ void init_startup_info(void) free( info ); NtCurrentTeb()->Peb->ProcessParameters = params; - status = load_main_exe( params->ImagePathName.Buffer, params->CommandLine.Buffer, + status = load_main_exe( params->ImagePathName.Buffer, NULL, params->CommandLine.Buffer, &image, &module, &image_info ); if (status) { diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a8b06d690a6..24cc546c300 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1500,8 +1500,8 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO /*********************************************************************** * load_main_exe */ -NTSTATUS load_main_exe( const WCHAR *name, const WCHAR *curdir, WCHAR **image, void **module, - SECTION_IMAGE_INFORMATION *image_info ) +NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, + WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) { UNICODE_STRING nt_name; NTSTATUS status; @@ -1510,9 +1510,9 @@ NTSTATUS load_main_exe( const WCHAR *name, const WCHAR *curdir, WCHAR **image, v const WCHAR *p; /* special case for Unix file name */ - if (main_argv[0][0] == '/' && !stat( main_argv[0], &st )) + if (unix_name && unix_name[0] == '/' && !stat( unix_name, &st )) { - if ((status = unix_to_nt_file_name( main_argv[0], image ))) goto failed; + if ((status = unix_to_nt_file_name( unix_name, image ))) goto failed; status = open_main_image( *image, module, image_info ); if (status != STATUS_DLL_NOT_FOUND) return status; free( *image ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 8e491a3f2a4..a486a2ff0f4 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -143,8 +143,8 @@ 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 NTSTATUS load_main_exe( const WCHAR *name, const WCHAR *curdir, WCHAR **image, void **module, - SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; +extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, WCHAR **image, + void **module, SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; extern void start_server( BOOL debug ) DECLSPEC_HIDDEN; extern ULONG_PTR get_image_address(void) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Add a helper to launch start.exe always as builtin.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: aef821ccbd9f2b7c8980c289316696eb4a3bca3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aef821ccbd9f2b7c8980c289… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:29:37 2021 +0100 ntdll: Add a helper to launch start.exe always as builtin. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 12 +++--------- dlls/ntdll/unix/loader.c | 26 ++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 07b9f0fc384..f7ba8ce8ab5 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1880,23 +1880,17 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) if (status) /* try launching it through start.exe */ { - static const WCHAR startW[] = {'C',':','\\','w','i','n','d','o','w','s','\\', - 's','y','s','t','e','m','3','2','\\','s','t','a','r','t','.','e','x','e',0}; static const WCHAR slashwW[] = {'/','w',0}; static const WCHAR slashbW[] = {'/','b',0}; - const WCHAR *args[] = { startW, slashwW, slashbW }; + const WCHAR *args[] = { NULL, slashwW, slashbW }; free( image ); prepend_main_wargv( args, 3 ); - if ((status = load_main_exe( startW, NULL, curdir, &image, &module, &image_info ))) - { - MESSAGE( "wine: failed to start %s\n", debugstr_w(main_wargv[2]) ); - NtTerminateProcess( GetCurrentProcess(), status ); - } + load_start_exe( &image, &module, &image_info ); } - else main_wargv[0] = get_dos_path( image ); NtCurrentTeb()->Peb->ImageBaseAddress = module; + main_wargv[0] = get_dos_path( image ); cmdline = build_command_line( main_wargv ); TRACE( "image %s cmdline %s dir %s\n", diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 24cc546c300..2467b640a79 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1544,6 +1544,32 @@ failed: } +/*********************************************************************** + * load_start_exe + * + * Load start.exe as main image. + */ +NTSTATUS load_start_exe( WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) +{ + static const WCHAR startW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\','s','t','a','r','t','.','e','x','e',0}; + UNICODE_STRING nt_name; + NTSTATUS status; + SIZE_T size; + + init_unicode_string( &nt_name, startW ); + status = find_builtin_dll( &nt_name, module, &size, image_info, current_machine, FALSE ); + if (status) + { + MESSAGE( "wine: failed to load start.exe: %x\n", status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } + *image = malloc( sizeof(startW) ); + memcpy( *image, startW, sizeof(startW) ); + 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 diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a486a2ff0f4..3f84fa9c065 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -145,6 +145,7 @@ extern NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *fi void **addr_ptr, SIZE_T *size_ptr ) DECLSPEC_HIDDEN; extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; +extern NTSTATUS load_start_exe( WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; extern void start_server( BOOL debug ) DECLSPEC_HIDDEN; extern ULONG_PTR get_image_address(void) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Use start /exec to support absolute Unix paths.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 50e33a213d7382906594e565b5813a41d87117fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=50e33a213d7382906594e565… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:31:46 2021 +0100 ntdll: Use start /exec to support absolute Unix paths. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50858 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index f7ba8ce8ab5..256ea40cc87 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1880,12 +1880,11 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) if (status) /* try launching it through start.exe */ { - static const WCHAR slashwW[] = {'/','w',0}; - static const WCHAR slashbW[] = {'/','b',0}; - const WCHAR *args[] = { NULL, slashwW, slashbW }; + static const WCHAR execW[] = {'/','e','x','e','c',0}; + const WCHAR *args[] = { NULL, execW }; free( image ); - prepend_main_wargv( args, 3 ); + prepend_main_wargv( args, 2 ); load_start_exe( &image, &module, &image_info ); }

1 0

Alexandre Julliard : ntdll: Set the initial DllPath to null if it's empty.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 9bdfb1f34a4f512488c198555249a49f4e7c1172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bdfb1f34a4f512488c19855… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 12:05:41 2021 +0100 ntdll: Set the initial DllPath to null if it's empty. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 256ea40cc87..2f4d988d709 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2011,7 +2011,7 @@ void init_startup_info(void) params->CurrentDirectory.DosPath.MaximumLength = MAX_PATH * sizeof(WCHAR); dst = params->CurrentDirectory.DosPath.Buffer + MAX_PATH; - copy_unicode_string( &src, &dst, &params->DllPath, info->dllpath_len ); + if (info->dllpath_len) copy_unicode_string( &src, &dst, &params->DllPath, info->dllpath_len ); copy_unicode_string( &src, &dst, &params->ImagePathName, info->imagepath_len ); copy_unicode_string( &src, &dst, &params->CommandLine, info->cmdline_len ); copy_unicode_string( &src, &dst, &params->WindowTitle, info->title_len );

1 0

Alexandre Julliard : wine.inf: Fix 64-bit driver installation.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 36cec2c7df5a3c7742ae55f578d7b1399c1f7528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36cec2c7df5a3c7742ae55f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 12:48:35 2021 +0100 wine.inf: Fix 64-bit driver installation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index aaed4cf6824..52c2297fb2f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2710,7 +2710,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,msdaps.dll 16427,System\ADO,msado15.dll 66000,3,wineps.drv -12,,*.sys,- +12,,*.sys 11,,* [SystemIni]

1 0