- Wine-Devel - list.winehq.org

[PATCH v2 2/4] winmm: Get rid of TIME_MS format support in waveOutGetPosition().
by Akihiro Sagawa Jan. 19, 2021

Jan. 19, 2021

SofTalk (Japanese text-to-speech software) depends on this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50515 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/wave.c | 2 +- dlls/winmm/waveform.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-)

2 1

[PATCH 3/5] ddraw: Use BitBlt() for exclusive mode frontbuffer updates if the swapchain window is not in the foreground.
by Henri Verbeet Jan. 19, 2021

Jan. 19, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/surface.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fd788a96ac0..0ca19d4f8a5 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -39,6 +39,16 @@ static BOOL ddraw_surface_is_lost(const struct ddraw_surface *surface) && (surface->ddraw->device_state != DDRAW_DEVICE_STATE_OK || surface->is_lost); } +static BOOL ddraw_gdi_is_front(struct ddraw *ddraw) +{ + struct ddraw_surface *surface; + + if (!ddraw->gdi_surface || !(surface = wined3d_texture_get_sub_resource_parent(ddraw->gdi_surface, 0))) + return FALSE; + + return surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER; +} + /* This is slow, of course. Also, in case of locks, we can't prevent other * applications from drawing to the screen while we've locked the frontbuffer. * We'd like to do this in wined3d instead, but for that to work wined3d needs @@ -46,6 +56,7 @@ static BOOL ddraw_surface_is_lost(const struct ddraw_surface *surface) HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read, unsigned int swap_interval) { + struct ddraw *ddraw = surface->ddraw; struct wined3d_texture *dst_texture; HDC surface_dc, screen_dc; int x, y, w, h; @@ -53,9 +64,9 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, BOOL ret; RECT r; - if (surface->ddraw->flags & DDRAW_SWAPPED && !read) + if (ddraw->flags & DDRAW_SWAPPED && !read) { - surface->ddraw->flags &= ~DDRAW_SWAPPED; + ddraw->flags &= ~DDRAW_SWAPPED; rect = NULL; } @@ -73,7 +84,23 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, if (w <= 0 || h <= 0) return DD_OK; - if (surface->ddraw->swapchain_window) + /* The interaction between ddraw and GDI drawing is not all that well + * documented, and somewhat arcane. In ddraw exclusive mode, GDI draws + * seemingly go to the *original* frontbuffer/primary surface, while ddraw + * draws/flips go to the *current* frontbuffer surface. The bottom line is + * that if the current frontbuffer is not the GDI frontbuffer, and there's + * e.g. a popup window in front of the ddraw swapchain window, we can't + * use wined3d_swapchain_present() to get the ddraw contents to the screen + * while in exclusive mode, since it would get obscured by the popup + * window. On the other hand, if the current frontbuffer *is* the GDI + * frontbuffer, that's what's supposed to happen; the popup should obscure + * (oart of) the ddraw swapchain window. + * + * This affects the "Deer Hunter" demo, which uses a popup window and GDI + * draws to draw part of the user interface. See also the "fswindow" + * sample is the DirectX 7 SDK. */ + if (ddraw->swapchain_window && (!(ddraw->cooperative_level & DDSCL_EXCLUSIVE) + || ddraw->swapchain_window == GetForegroundWindow() || ddraw_gdi_is_front(ddraw))) { /* Nothing to do, we control the frontbuffer, or at least the parts we * care about. */ @@ -81,15 +108,15 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, return DD_OK; if (swap_interval) - dst_texture = wined3d_swapchain_get_back_buffer(surface->ddraw->wined3d_swapchain, 0); + dst_texture = wined3d_swapchain_get_back_buffer(ddraw->wined3d_swapchain, 0); else - dst_texture = surface->ddraw->wined3d_frontbuffer; + dst_texture = ddraw->wined3d_frontbuffer; if (SUCCEEDED(hr = wined3d_texture_blt(dst_texture, 0, rect, surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT)) && swap_interval) { - hr = wined3d_swapchain_present(surface->ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); - surface->ddraw->flags |= DDRAW_SWAPPED; + hr = wined3d_swapchain_present(ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); + ddraw->flags |= DDRAW_SWAPPED; } return hr; } -- 2.20.1

1 0

[PATCH 2/5] wined3d: Get rid of the "UseGLSL" setting.
by Henri Verbeet Jan. 19, 2021

Jan. 19, 2021

This was deprecated in Wine 5.0, use the "shader_backend" setting instead. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 7118d4b4b71..5ad390d9f56 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -294,10 +294,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_NONE; } } - else if (!get_config_key(hkey, appkey, "UseGLSL", buffer, size) && !strcmp(buffer, "disabled")) - { - wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_ARB; - } if (wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_ARB || wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_NONE) { -- 2.20.1

1 0

[PATCH 1/5] wined3d: Implement the "precise" flag in the GLSL shader backend.
by Henri Verbeet Jan. 19, 2021

Jan. 19, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Like the SPIR-V equivalent, I'm unable to reproduce the issue myself, but the patch is reported as working by Matteo. dlls/wined3d/glsl_shader.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1fea6f92be0..6ce9178c561 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2540,6 +2540,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c /* Temporary variables for matrix operations */ shader_addline(buffer, "vec4 tmp0;\n"); shader_addline(buffer, "vec4 tmp1;\n"); + if (gl_info->supported[ARB_GPU_SHADER5]) + shader_addline(buffer, "precise vec4 tmp_precise;\n"); + else + shader_addline(buffer, "/* precise */ vec4 tmp_precise;\n"); if (!shader->load_local_constsF) { @@ -3273,6 +3277,9 @@ static DWORD shader_glsl_append_dst_ext(struct wined3d_string_buffer *buffer, if ((mask = shader_glsl_add_dst_param(ins, dst, &glsl_dst))) { + if (ins->flags & WINED3DSI_PRECISE_XYZW) + sprintf(glsl_dst.reg_name, "tmp_precise"); + switch (data_type) { case WINED3D_DATA_FLOAT: @@ -3316,6 +3323,13 @@ static void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_in if (!ins->dst_count) return; + if (ins->flags & WINED3DSI_PRECISE_XYZW) + { + shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); + shader_addline(ins->ctx->buffer, "%s%s = tmp_precise%s;\n", + dst_param.reg_name, dst_param.mask_str, dst_param.mask_str); + } + modifiers = ins->dst[0].modifiers; if (!modifiers) return; -- 2.20.1

1 0

[PATCH 5/5] jscript: Support VARIANT type in jsval_strict_equal.
by Jacek Caban Jan. 19, 2021

Jan. 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 5 +++-- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[PATCH 4/5] jscript: Support VT_DATE to string conversion.
by Jacek Caban Jan. 19, 2021

Jan. 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/date.c | 25 +++++++++++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 14 +++++++++++--- dlls/jscript/tests/lang.js | 3 +++ 4 files changed, 40 insertions(+), 3 deletions(-)

1 0

[PATCH 3/5] jscript: Support VT_DATE to number conversion.
by Jacek Caban Jan. 19, 2021

Jan. 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/date.c | 21 +++++++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 13 ++++++++++--- dlls/jscript/tests/lang.js | 11 +++++++++++ 4 files changed, 43 insertions(+), 3 deletions(-)

1 0

[PATCH 2/5] jscript/tests: Add VT_DATE handling tests.
by Jacek Caban Jan. 19, 2021

Jan. 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/lang.js | 9 +++++++++ dlls/jscript/tests/run.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+)

1 0

[PATCH 1/5] jscript: Return DateInstance from create_date.
by Jacek Caban Jan. 19, 2021

Jan. 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/date.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)

1 0

[PATCH] ntdll: Set EnvironmentSize field for process parameters.
by Nikolay Sivov Jan. 19, 2021

Jan. 19, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50405 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/env.c | 17 ++++++++++++++--- dlls/ntdll/tests/env.c | 12 ++++++++++++ include/winternl.h | 1 + 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 5d1b6de5bba..7ccdb281b89 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -715,6 +715,7 @@ void WINAPI RtlSetCurrentEnvironment(PWSTR new_env, PWSTR* old_env) prev = NtCurrentTeb()->Peb->ProcessParameters->Environment; NtCurrentTeb()->Peb->ProcessParameters->Environment = new_env; + NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize = new_env ? get_env_length(new_env) * sizeof(*new_env) : 0; RtlReleasePebLock(); @@ -1041,7 +1042,11 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu append_unicode_string( &ptr, Desktop, &params->Desktop ); append_unicode_string( &ptr, ShellInfo, &params->ShellInfo ); append_unicode_string( &ptr, RuntimeInfo, &params->RuntimeInfo ); - if (Environment) params->Environment = memcpy( ptr, Environment, env_size ); + if (Environment) + { + params->Environment = memcpy( ptr, Environment, env_size ); + params->EnvironmentSize = env_size; + } *result = params; if (!(flags & PROCESS_PARAMS_FLAG_NORMALIZED)) RtlDeNormalizeProcessParams( params ); } @@ -1194,8 +1199,10 @@ void init_user_process_params(void) PROCESS_PARAMS_FLAG_NORMALIZED )) return; - params->Environment = env; NtCurrentTeb()->Peb->ProcessParameters = params; + NtCurrentTeb()->Peb->ProcessParameters->Environment = env; + NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize = env ? get_env_length( env ) * sizeof(*env) : 0; + RtlFreeUnicodeString( &initial_params.ImagePathName ); RtlFreeUnicodeString( &cmdline ); RtlReleasePath( load_path ); @@ -1249,7 +1256,11 @@ void init_user_process_params(void) env_size = data_size - info_size; if ((params->Environment = RtlAllocateHeap( GetProcessHeap(), 0, max( env_size, sizeof(WCHAR) )))) { - if (env_size) memcpy( params->Environment, (char *)info + info_size, env_size ); + if (env_size) + { + memcpy( params->Environment, (char *)info + info_size, env_size ); + NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize = env_size; + } else params->Environment[0] = 0; } diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 4865a0a8e51..2cbbcbb34e1 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -58,6 +58,13 @@ static WCHAR small_env[] = {'f','o','o','=','t','o','t','o',0, 'n','u','l','=',0, 0}; +static SIZE_T get_env_size( const WCHAR *env ) +{ + const WCHAR *end = env; + while (*end) end += lstrlenW(end) + 1; + return (end + 1 - env) * sizeof( *env ); +} + static void testQuery(void) { struct test @@ -439,6 +446,9 @@ static void test_process_params(void) pos += (str - params->Environment) * sizeof(WCHAR); ok( ((pos + sizeof(void *) - 1) & ~(sizeof(void *) - 1)) == size || broken( ((pos + 3) & ~3) == size ), "wrong size %lx/%lx\n", pos, size ); + /* Win8+ uses pointer-sized alignment. */ + ok( params->EnvironmentSize >= get_env_size( params->Environment ), + "Unexpected environment size.\n"); } else ok( broken(TRUE), "environment not inside block\n" ); /* <= win2k3 */ pRtlDestroyProcessParameters( params ); @@ -601,6 +611,8 @@ static void test_RtlSetCurrentEnvironment(void) RtlSetCurrentEnvironment(env, &prev); ok(prev == old_env, "got wrong previous env %p\n", prev); ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == env, "got wrong current env\n"); + ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == get_env_size(env), + "Unexpected environment size.\n"); check_env_var("testenv1", "unus"); check_env_var("testenv2", NULL); diff --git a/include/winternl.h b/include/winternl.h index a7b0e04aade..5eca36a12b8 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -199,6 +199,7 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS UNICODE_STRING ShellInfo; UNICODE_STRING RuntimeInfo; RTL_DRIVE_LETTER_CURDIR DLCurrentDirectory[0x20]; + ULONG EnvironmentSize; } RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS; /* value for Flags field (FIXME: not the correct name) */ -- 2.29.2

1 0