June 2024 - Wine-commits - list.winehq.org

Alexandre Julliard : kernel32/tests: Add test for FPU control words on ARM64EC.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 5ae8bf3d93d7a7bc2134bee3c0e743b17e818399 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ae8bf3d93d7a7bc2134bee3c0e743… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 11:09:31 2024 +0200 kernel32/tests: Add test for FPU control words on ARM64EC. --- dlls/kernel32/tests/thread.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 9925da32222..34a8f84d92c 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1889,7 +1889,13 @@ struct fpu_thread_ctx static inline unsigned long get_fpu_cw(void) { -#if defined(__i386__) || defined(__x86_64__) +#ifdef __arm64ec__ + extern NTSTATUS (*__os_arm64x_get_x64_information)(ULONG,void*,void*); + unsigned int cw, sse; + __os_arm64x_get_x64_information( 0, &sse, NULL ); + __os_arm64x_get_x64_information( 2, &cw, NULL ); + return MAKELONG( cw, sse ); +#elif defined(__i386__) || defined(__x86_64__) WORD cw = 0; unsigned int sse = 0; #ifdef _MSC_VER

1 0

Elizabeth Figura : wined3d: Default diffuse to 1.0 in the vertex shader.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 95999accf6c1ece887788bf6f827a34288744fba URL: https://gitlab.winehq.org/wine/wine/-/commit/95999accf6c1ece887788bf6f827a3… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sat May 4 13:35:04 2024 -0500 wined3d: Default diffuse to 1.0 in the vertex shader. --- dlls/d3d9/tests/visual.c | 10 ++++------ dlls/wined3d/context_gl.c | 19 ++----------------- dlls/wined3d/glsl_shader.c | 5 ++++- dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_gl.h | 3 +-- dlls/wined3d/wined3d_private.h | 3 ++- 6 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b74836d79c4..e924588630e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26083,10 +26083,9 @@ static void test_color_vertex(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr); colour = getPixelColor(device, 320, 240); - todo_wine_if (i == 13 || i == 14 || i == 19) - ok(color_match(colour, tests[i].result, 1), - "Expected colour 0x%08x for test %u, got 0x%08x.\n", - tests[i].result, i, colour); + ok(color_match(colour, tests[i].result, 1), + "Expected colour 0x%08x for test %u, got 0x%08x.\n", + tests[i].result, i, colour); } refcount = IDirect3DDevice9_Release(device); @@ -28516,8 +28515,7 @@ static void test_default_diffuse(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); colour = getPixelColor(device, 320, 240); - todo_wine_if (j == 2) - ok(colour == vs_tests[j].expect_colour, "Got unexpected colour %08x.\n", colour); + ok(colour == vs_tests[j].expect_colour, "Got unexpected colour %08x.\n", colour); winetest_pop_context(); } diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 49d54d49e33..75f94678e14 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4938,23 +4938,8 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c { if (context->numbered_array_mask & (1u << i)) wined3d_context_gl_unload_numbered_array(context_gl, i); - if (!use_vs(state) && i == WINED3D_FFP_DIFFUSE) - { - if (!(context_gl->default_attrib_value_set & (1u << i)) || !context_gl->diffuse_attrib_to_1) - { - GL_EXTCALL(glVertexAttrib4f(i, 1.0f, 1.0f, 1.0f, 1.0f)); - context_gl->diffuse_attrib_to_1 = 1; - } - } - else - { - if (!(context_gl->default_attrib_value_set & (1u << i))) - { - GL_EXTCALL(glVertexAttrib4f(i, 0.0f, 0.0f, 0.0f, 0.0f)); - if (i == WINED3D_FFP_DIFFUSE) - context_gl->diffuse_attrib_to_1 = 0; - } - } + if (!(context_gl->default_attrib_value_set & (1u << i))) + GL_EXTCALL(glVertexAttrib4f(i, 0.0f, 0.0f, 0.0f, 0.0f)); context_gl->default_attrib_value_set |= 1u << i; continue; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4e7655186bf..b4bfbe1c55b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8937,7 +8937,10 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer if (!settings->lighting) { - shader_addline(buffer, "ffp_varying_diffuse = ffp_attrib_diffuse;\n"); + if (settings->diffuse) + shader_addline(buffer, "ffp_varying_diffuse = ffp_attrib_diffuse;\n"); + else + shader_addline(buffer, "ffp_varying_diffuse = vec4(1.0);\n"); shader_addline(buffer, "ffp_varying_specular = ffp_attrib_specular;\n"); return; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e0519942e1a..8c90908ec76 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6577,6 +6577,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->transformed = 1; settings->point_size = state->primitive_type == WINED3D_PT_POINTLIST; settings->per_vertex_point_size = vdecl->point_size; + settings->diffuse = vdecl->diffuse; if (!state->render_states[WINED3D_RS_FOGENABLE]) settings->fog_mode = WINED3D_FFP_VS_FOG_OFF; else if (state->render_states[WINED3D_RS_FOGTABLEMODE] != WINED3D_FOG_NONE) @@ -6619,6 +6620,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->clipping = state->render_states[WINED3D_RS_CLIPPING] && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; + settings->diffuse = vdecl->diffuse; settings->normal = vdecl->normal; settings->normalize = settings->normal && state->render_states[WINED3D_RS_NORMALIZENORMALS]; settings->lighting = !!state->render_states[WINED3D_RS_LIGHTING]; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 561de235379..ac875ce1fe7 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -608,12 +608,11 @@ struct wined3d_context_gl uint32_t dc_is_private : 1; uint32_t dc_has_format : 1; /* Only meaningful for private DCs. */ uint32_t fog_enabled : 1; - uint32_t diffuse_attrib_to_1 : 1; uint32_t rebind_fbo : 1; uint32_t needs_set : 1; uint32_t internal_format_set : 1; uint32_t valid : 1; - uint32_t padding : 24; + uint32_t padding : 25; uint32_t default_attrib_value_set; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 63e05239ac0..abdb97f9d9f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2725,7 +2725,8 @@ struct wined3d_ffp_vs_settings DWORD ortho_fog : 1; DWORD flatshading : 1; DWORD specular_enable : 1; - DWORD padding : 17; + DWORD diffuse : 1; + DWORD padding : 16; DWORD swizzle_map; /* MAX_ATTRIBS, 32 */

1 0

Rémi Bernon : wineandroid: Always clear UpdateLayeredWindow target rectangle.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: b2f2aaa4911545e4eb6225f8ad472eecefca589f URL: https://gitlab.winehq.org/wine/wine/-/commit/b2f2aaa4911545e4eb6225f8ad472e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 2 12:32:07 2024 +0200 wineandroid: Always clear UpdateLayeredWindow target rectangle. --- dlls/wineandroid.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 19900c7e509..1512934dfa7 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1444,8 +1444,8 @@ BOOL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info { intersect_rect( &rect, &rect, info->prcDirty ); memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); - NtGdiPatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); } + NtGdiPatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); src_rect = rect; if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); NtGdiTransformPoints( info->hdcSrc, (POINT *)&src_rect, (POINT *)&src_rect, 2, NtGdiDPtoLP );

1 0

Rémi Bernon : wineandroid: Use the surface bitmap directly in UpdateLayeredWindow.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 0b7b9adf33c976c558e120c5c27480c0cdc25545 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b7b9adf33c976c558e120c5c27480… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 31 10:28:03 2024 +0200 wineandroid: Use the surface bitmap directly in UpdateLayeredWindow. --- dlls/wineandroid.drv/window.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 1512934dfa7..235663af52e 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1392,12 +1392,8 @@ BOOL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info struct android_win_data *data; BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, 0 }; COLORREF color_key = (info->dwFlags & ULW_COLORKEY) ? info->crKey : CLR_INVALID; - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *bmi = (BITMAPINFO *)buffer; - void *src_bits, *dst_bits; RECT rect, src_rect; - HDC hdc = 0; - HBITMAP dib; + HDC hdc; BOOL ret = FALSE; if (!(data = get_win_data( hwnd ))) return FALSE; @@ -1430,21 +1426,11 @@ BOOL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info return TRUE; } - dst_bits = surface->funcs->get_info( surface, bmi ); - - if (!(dib = NtGdiCreateDIBSection( info->hdcDst, NULL, 0, bmi, DIB_RGB_COLORS, 0, 0, 0, &src_bits ))) - goto done; if (!(hdc = NtGdiCreateCompatibleDC( 0 ))) goto done; - - NtGdiSelectBitmap( hdc, dib ); - window_surface_lock( surface ); + NtGdiSelectBitmap( hdc, surface->color_bitmap ); - if (info->prcDirty) - { - intersect_rect( &rect, &rect, info->prcDirty ); - memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); - } + if (info->prcDirty) intersect_rect( &rect, &rect, info->prcDirty ); NtGdiPatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); src_rect = rect; if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); @@ -1455,19 +1441,14 @@ BOOL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info info->hdcSrc, src_rect.left, src_rect.top, src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, *(DWORD *)&blend, 0 ); - if (ret) - { - memcpy( dst_bits, src_bits, bmi->bmiHeader.biSizeImage ); - add_bounds_rect( &surface->bounds, &rect ); - } + if (ret) add_bounds_rect( &surface->bounds, &rect ); + NtGdiDeleteObjectApp( hdc ); window_surface_unlock( surface ); window_surface_flush( surface ); done: window_surface_release( surface ); - if (hdc) NtGdiDeleteObjectApp( hdc ); - if (dib) NtGdiDeleteObjectApp( dib ); return ret; }

1 0

Rémi Bernon : winemac: Always clear UpdateLayeredWindow target rectangle.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 521cb41c6a310adb41cff86840ef348bdf34745a URL: https://gitlab.winehq.org/wine/wine/-/commit/521cb41c6a310adb41cff86840ef34… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 2 12:32:18 2024 +0200 winemac: Always clear UpdateLayeredWindow target rectangle. --- dlls/winemac.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 0bc3bf62add..98fbc075237 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1941,8 +1941,8 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, window_surface_lock(surface); memcpy(src_bits, dst_bits, bmi->bmiHeader.biSizeImage); window_surface_unlock(surface); - NtGdiPatBlt(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS); } + NtGdiPatBlt(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS); src_rect = rect; if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); NtGdiTransformPoints(info->hdcSrc, (POINT *)&src_rect, (POINT *)&src_rect, 2, NtGdiDPtoLP);

1 0

Rémi Bernon : winemac: Use the surface bitmap directly in UpdateLayeredWindow.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: f545d424955ccdb189f0d21091b119ac78069a79 URL: https://gitlab.winehq.org/wine/wine/-/commit/f545d424955ccdb189f0d21091b119… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 31 10:28:23 2024 +0200 winemac: Use the surface bitmap directly in UpdateLayeredWindow. --- dlls/winemac.drv/window.c | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 98fbc075237..4a6ea1585ac 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1872,12 +1872,8 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, struct macdrv_win_data *data; BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, 0 }; BYTE alpha; - char buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; - BITMAPINFO *bmi = (BITMAPINFO *)buffer; - void *src_bits, *dst_bits; RECT rect, src_rect; - HDC hdc = 0; - HBITMAP dib; + HDC hdc; BOOL ret = FALSE; if (!(data = get_win_data(hwnd))) return FALSE; @@ -1928,20 +1924,11 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, else alpha = 0xff; - dst_bits = surface->funcs->get_info(surface, bmi); - - if (!(dib = NtGdiCreateDIBSection(info->hdcDst, NULL, 0, bmi, DIB_RGB_COLORS, - 0, 0, 0, &src_bits))) goto done; if (!(hdc = NtGdiCreateCompatibleDC(0))) goto done; + window_surface_lock(surface); + NtGdiSelectBitmap(hdc, surface->color_bitmap); - NtGdiSelectBitmap(hdc, dib); - if (info->prcDirty) - { - intersect_rect(&rect, &rect, info->prcDirty); - window_surface_lock(surface); - memcpy(src_bits, dst_bits, bmi->bmiHeader.biSizeImage); - window_surface_unlock(surface); - } + if (info->prcDirty) intersect_rect(&rect, &rect, info->prcDirty); NtGdiPatBlt(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS); src_rect = rect; if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); @@ -1952,28 +1939,21 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, *(DWORD *)&blend, 0))) goto done; + if (ret) add_bounds_rect( &surface->bounds, &rect ); + + NtGdiDeleteObjectApp( hdc ); + window_surface_unlock( surface ); + window_surface_flush( surface ); if ((data = get_win_data(hwnd))) { - if (surface == data->surface) - { - window_surface_lock(surface); - memcpy(dst_bits, src_bits, bmi->bmiHeader.biSizeImage); - add_bounds_rect(&surface->bounds, &rect); - window_surface_unlock(surface); - window_surface_flush(surface); - } - /* The ULW flags are a superset of the LWA flags. */ sync_window_opacity(data, info->crKey, alpha, TRUE, info->dwFlags); - release_win_data(data); } done: window_surface_release(surface); - if (hdc) NtGdiDeleteObjectApp(hdc); - if (dib) NtGdiDeleteObjectApp(dib); return ret; }

1 0

Rémi Bernon : winemac: Blend alpha with NtGdiAlphaBlend instead of window opacity.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 3581a96052957ae68fb8827ca651c00845762e3a URL: https://gitlab.winehq.org/wine/wine/-/commit/3581a96052957ae68fb8827ca651c0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 28 19:19:30 2024 +0200 winemac: Blend alpha with NtGdiAlphaBlend instead of window opacity. This seems equivalent but makes the code similar to other drivers. --- dlls/winemac.drv/window.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 4a6ea1585ac..882c3f743bf 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1871,7 +1871,6 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, struct window_surface *surface; struct macdrv_win_data *data; BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, 0 }; - BYTE alpha; RECT rect, src_rect; HDC hdc; BOOL ret = FALSE; @@ -1914,16 +1913,6 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, return TRUE; } - if (info->dwFlags & ULW_ALPHA) - { - /* Apply SourceConstantAlpha via window alpha, not blend. */ - alpha = info->pblend->SourceConstantAlpha; - blend = *info->pblend; - blend.SourceConstantAlpha = 0xff; - } - else - alpha = 0xff; - if (!(hdc = NtGdiCreateCompatibleDC(0))) goto done; window_surface_lock(surface); NtGdiSelectBitmap(hdc, surface->color_bitmap); @@ -1934,6 +1923,7 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); NtGdiTransformPoints(info->hdcSrc, (POINT *)&src_rect, (POINT *)&src_rect, 2, NtGdiDPtoLP); + if (info->dwFlags & ULW_ALPHA) blend = *info->pblend; if (!(ret = NtGdiAlphaBlend(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, info->hdcSrc, src_rect.left, src_rect.top, src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, @@ -1948,7 +1938,7 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, if ((data = get_win_data(hwnd))) { /* The ULW flags are a superset of the LWA flags. */ - sync_window_opacity(data, info->crKey, alpha, TRUE, info->dwFlags); + sync_window_opacity(data, info->crKey, 255, TRUE, info->dwFlags); release_win_data(data); }

1 0

Rémi Bernon : winex11: Always clear UpdateLayeredWindow target rectangle.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 18282e2bfb30dad4800038e3a9cd03058cfabc0c URL: https://gitlab.winehq.org/wine/wine/-/commit/18282e2bfb30dad4800038e3a9cd03… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 2 12:32:27 2024 +0200 winex11: Always clear UpdateLayeredWindow target rectangle. --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f2ffbebcc7c..9287e73bca0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -3029,8 +3029,8 @@ BOOL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, { intersect_rect( &rect, &rect, info->prcDirty ); memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); - NtGdiPatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); } + NtGdiPatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); src_rect = rect; if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); NtGdiTransformPoints( info->hdcSrc, (POINT *)&src_rect, (POINT *)&src_rect, 2, NtGdiDPtoLP );

1 0

Rémi Bernon : winex11: Use the surface bitmap directly in UpdateLayeredWindow.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 8a39b62db63e3b3f6f12a23590753430ab3bbafb URL: https://gitlab.winehq.org/wine/wine/-/commit/8a39b62db63e3b3f6f12a235907534… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 31 10:28:29 2024 +0200 winex11: Use the surface bitmap directly in UpdateLayeredWindow. --- dlls/winex11.drv/window.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 9287e73bca0..063d223df52 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2969,12 +2969,8 @@ BOOL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, struct x11drv_win_data *data; BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, 0 }; COLORREF color_key = (info->dwFlags & ULW_COLORKEY) ? info->crKey : CLR_INVALID; - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *bmi = (BITMAPINFO *)buffer; - void *src_bits, *dst_bits; RECT rect, src_rect; - HDC hdc = 0; - HBITMAP dib; + HDC hdc; BOOL mapped, ret = FALSE; if (!(data = get_win_data( hwnd ))) return FALSE; @@ -3015,21 +3011,11 @@ BOOL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, return TRUE; } - dst_bits = surface->funcs->get_info( surface, bmi ); - - if (!(dib = NtGdiCreateDIBSection( info->hdcDst, NULL, 0, bmi, DIB_RGB_COLORS, 0, 0, 0, &src_bits ))) - goto done; if (!(hdc = NtGdiCreateCompatibleDC( 0 ))) goto done; - - NtGdiSelectBitmap( hdc, dib ); - window_surface_lock( surface ); + NtGdiSelectBitmap( hdc, surface->color_bitmap ); - if (info->prcDirty) - { - intersect_rect( &rect, &rect, info->prcDirty ); - memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); - } + if (info->prcDirty) intersect_rect( &rect, &rect, info->prcDirty ); NtGdiPatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); src_rect = rect; if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); @@ -3040,19 +3026,14 @@ BOOL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, info->hdcSrc, src_rect.left, src_rect.top, src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, *(DWORD *)&blend, 0 ); - if (ret) - { - memcpy( dst_bits, src_bits, bmi->bmiHeader.biSizeImage ); - add_bounds_rect( &surface->bounds, &rect ); - } + if (ret) add_bounds_rect( &surface->bounds, &rect ); + NtGdiDeleteObjectApp( hdc ); window_surface_unlock( surface ); window_surface_flush( surface ); done: window_surface_release( surface ); - if (hdc) NtGdiDeleteObjectApp( hdc ); - if (dib) NtGdiDeleteObjectApp( dib ); return ret; }

1 0

Rémi Bernon : win32u: Introduce a new CreateLayeredWindow driver entry.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 091883d4b6b32cfa9e9cc0c0c3a4c104babdc815 URL: https://gitlab.winehq.org/wine/wine/-/commit/091883d4b6b32cfa9e9cc0c0c3a4c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 2 12:33:27 2024 +0200 win32u: Introduce a new CreateLayeredWindow driver entry. --- dlls/win32u/driver.c | 21 ++++++++++++++++++--- dlls/win32u/window.c | 10 +++++++++- dlls/wineandroid.drv/android.h | 4 +++- dlls/wineandroid.drv/init.c | 1 + dlls/wineandroid.drv/window.c | 42 +++++++++++++++++++++++------------------ dlls/winemac.drv/gdi.c | 1 + dlls/winemac.drv/macdrv.h | 4 +++- dlls/winemac.drv/window.c | 41 ++++++++++++++++++++++++---------------- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/window.c | 43 ++++++++++++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 4 +++- include/wine/gdi_driver.h | 3 ++- 12 files changed, 115 insertions(+), 60 deletions(-)

1 0