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

Nikolay Sivov : tests: Add a test for SV_IsFrontFace.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: vkd3d Branch: master Commit: e4503ad80f9353dad7218495520c4f6899e1d3a8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e4503ad80f9353dad7218495520c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 10 20:46:25 2023 +0200 tests: Add a test for SV_IsFrontFace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + tests/hlsl-is-front-face.shader_test | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/Makefile.am b/Makefile.am index a7abd56a..c7369398 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,6 +94,7 @@ vkd3d_shader_tests = \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ + tests/hlsl-is-front-face.shader_test \ tests/hlsl-ldexp.shader_test \ tests/hlsl-length.shader_test \ tests/hlsl-lerp.shader_test \ diff --git a/tests/hlsl-is-front-face.shader_test b/tests/hlsl-is-front-face.shader_test new file mode 100644 index 00000000..11447d26 --- /dev/null +++ b/tests/hlsl-is-front-face.shader_test @@ -0,0 +1,36 @@ +[require] +shader model >= 4.0 + +[input layout] +0 r32g32 float sv_position + +[vertex buffer 0] +-2.0 -2.0 + 2.0 -2.0 +-2.0 2.0 + 2.0 2.0 + +[vertex shader] +void main(inout float4 pos : sv_position) +{ +} + +[pixel shader] +float4 main(bool face : sv_isfrontface) : sv_target +{ + return face ? float4(1.0f, 2.0f, 1.0f, 2.0f) : float4(0.0f, 1.0f, 0.0f, 1.0f); +} + +[test] +draw triangle strip 4 +probe all rgba (0.0, 1.0, 0.0, 1.0) + +[vertex buffer 0] +-2.0 -2.0 +-2.0 2.0 + 2.0 -2.0 + 2.0 2.0 + +[test] +draw triangle strip 4 +probe all rgba (1.0, 2.0, 1.0, 2.0)

1 0

Zebediah Figura : tests: Test side effects on indexes.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: vkd3d Branch: master Commit: 526b025c88d01b68866290c41085b0477ea01886 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/526b025c88d01b68866290c41085b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 23 15:47:55 2023 -0300 tests: Test side effects on indexes. Co-authored-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 + tests/side-effects.shader_test | 47 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/Makefile.am b/Makefile.am index 36282921..46057965 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,6 +149,7 @@ vkd3d_shader_tests = \ tests/sampler-offset.shader_test \ tests/saturate.shader_test \ tests/shader-interstage-interface.shader_test \ + tests/side-effects.shader_test \ tests/sqrt.shader_test \ tests/step.shader_test \ tests/swizzle-constant-prop.shader_test \ diff --git a/tests/side-effects.shader_test b/tests/side-effects.shader_test new file mode 100644 index 00000000..b64a9dd4 --- /dev/null +++ b/tests/side-effects.shader_test @@ -0,0 +1,47 @@ +[pixel shader] +float4 main() : sv_target +{ + float x[3] = {0, 2, 3}; + + return x[x[1] = 1]; +} + +[test] +draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) + + +[pixel shader] +uint4 func(uint t) +{ + return uint4(t + 0, t + 1, t + 2, t + 3); +} + +float4 main() : sv_target +{ + return func(10)[func(0).y]; +} + +[test] +draw quad +todo probe all rgba (11.0, 11.0, 11.0, 11.0) + + +[pixel shader] +float4 func(void) +{ + static uint i; + + i += 1; + + return float4(0.1, 0.2, 0.3, 0.4) + i; +} + +float4 main() : sv_target +{ + return func()[func().x]; +} + +[test] +draw quad +todo probe all rgba (2.2, 2.2, 2.2, 2.2)

1 0

Francisco Casas : tests: Test matrix indexing on the lhs.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: vkd3d Branch: master Commit: 1b1978f684ed6777b5c215b28ee3312c8fddc098 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1b1978f684ed6777b5c215b28ee33… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Mar 7 11:51:04 2023 -0300 tests: Test matrix indexing on the lhs. --- tests/hlsl-matrix-indexing.shader_test | 62 ++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl-matrix-indexing.shader_test index 716b43d4..74152d17 100644 --- a/tests/hlsl-matrix-indexing.shader_test +++ b/tests/hlsl-matrix-indexing.shader_test @@ -76,3 +76,65 @@ float4 main() : SV_TARGET [test] draw quad probe all rgba (1.0, 5.0, 7.0, 12.0) + + +[pixel shader] +float4 main() : SV_TARGET +{ + float3x2 m = {1, 2, 3, 4, 5, 6}; + + m[1] = float2(30, 40); + + return float4(m[1], m[2]); +} + +[test] +draw quad +todo probe all rgba (30.0, 40.0, 5.0, 6.0) + + +[pixel shader] +float4 main() : SV_TARGET +{ + row_major float3x2 m = {1, 2, 3, 4, 5, 6}; + + m[2] = float2(50, 60); + + return float4(m[1], m[2]); +} + +[test] +draw quad +probe all rgba (3.0, 4.0, 50.0, 60.0) + + +[pixel shader todo] +uniform float i; + +float4 main() : sv_target +{ + float4x4 mat = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; + + return mat[i]; +} + +[test] +uniform 0 float 2 +todo draw quad +todo probe all rgba (8, 9, 10, 11) + + +[pixel shader todo] +uniform float i; + +float4 main() : sv_target +{ + row_major float4x4 mat = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; + + return mat[i]; +} + +[test] +uniform 0 float 3 +todo draw quad +todo probe all rgba (12, 13, 14, 15)

1 0

Francisco Casas : vkd3d-shader/hlsl: Fix numeric offset of object fields.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: vkd3d Branch: master Commit: 0ceecd1225248082a690ed13af9188a52e1809d8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0ceecd1225248082a690ed13af918… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 11 12:01:02 2023 -0400 vkd3d-shader/hlsl: Fix numeric offset of object fields. --- libs/vkd3d-shader/hlsl.c | 3 ++- tests/object-field-offsets.shader_test | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 54f3292b..85b6ba8c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -216,7 +216,8 @@ unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int * (b) the type would cross a vec4 boundary; i.e. a vec3 and a * vec1 can be packed together, but not a vec3 and a vec2. */ - if (type->class > HLSL_CLASS_LAST_NUMERIC || (offset & 3) + type->reg_size[HLSL_REGSET_NUMERIC] > 4) + if (type->class == HLSL_CLASS_STRUCT || type->class == HLSL_CLASS_ARRAY + || (offset & 3) + type->reg_size[HLSL_REGSET_NUMERIC] > 4) return align(offset, 4); return offset; } diff --git a/tests/object-field-offsets.shader_test b/tests/object-field-offsets.shader_test index ec03cf2e..8afd9af7 100644 --- a/tests/object-field-offsets.shader_test +++ b/tests/object-field-offsets.shader_test @@ -20,7 +20,7 @@ float4 main() : sv_target uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 draw quad -todo probe all rgba (1.0, 2.0, 3.0, 0.0) +probe all rgba (1.0, 2.0, 3.0, 0.0) [pixel shader]

1 0

Francisco Casas : tests: Test numeric offsets with object fields.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: vkd3d Branch: master Commit: 86893bc7f407492d786eaad21948c9aabd45fc4e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/86893bc7f407492d786eaad21948c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 11 11:58:34 2023 -0400 tests: Test numeric offsets with object fields. --- Makefile.am | 1 + tests/object-field-offsets.shader_test | 70 ++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/Makefile.am b/Makefile.am index c7369398..36282921 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,6 +132,7 @@ vkd3d_shader_tests = \ tests/minimum-precision.shader_test \ tests/multiple-rt.shader_test \ tests/nointerpolation.shader_test \ + tests/object-field-offsets.shader_test \ tests/object-references.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ diff --git a/tests/object-field-offsets.shader_test b/tests/object-field-offsets.shader_test new file mode 100644 index 00000000..ec03cf2e --- /dev/null +++ b/tests/object-field-offsets.shader_test @@ -0,0 +1,70 @@ +[require] +shader model >= 5.0 + +[pixel shader] +struct apple { + float2 a; + Texture2D tex; + sampler sam; + float b; +}; + +uniform apple ap; + +float4 main() : sv_target +{ + return float4(ap.a, ap.b, 0); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +draw quad +todo probe all rgba (1.0, 2.0, 3.0, 0.0) + + +[pixel shader] +struct apple { + Texture2D tex; + sampler sam; +}; + +struct banana { + float2 a; + apple ap; + float b; +}; + +uniform banana ba; + +float4 main() : sv_target +{ + return float4(ba.a, ba.b, 0); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +draw quad +probe all rgba (1.0, 2.0, 5.0, 0.0) + + +[pixel shader] +struct apple { + float2 a; + Texture2D tex[2]; + float b; +}; + +uniform apple ap; + +float4 main() : sv_target +{ + return float4(ap.a, ap.b, 0); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +draw quad +probe all rgba (1.0, 2.0, 5.0, 0.0)

1 0

Nikolay Sivov : tests: Disable culling in shader runners.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: vkd3d Branch: master Commit: a496e3a8ba98ece0219ed3630afbb0df2c9ce09c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a496e3a8ba98ece0219ed3630afbb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 10 20:45:15 2023 +0200 tests: Disable culling in shader runners. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/shader_runner_d3d11.c | 18 ++++++++++++++++++ tests/shader_runner_d3d12.c | 2 +- tests/shader_runner_d3d9.c | 2 ++ tests/shader_runner_vulkan.c | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 965b8b18..2954cab8 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -63,6 +63,7 @@ struct d3d11_shader_runner HWND window; IDXGISwapChain *swapchain; ID3D11DeviceContext *immediate_context; + ID3D11RasterizerState *rasterizer_state; }; static struct d3d11_shader_runner *d3d11_shader_runner(struct shader_runner *r) @@ -250,7 +251,9 @@ static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window) static BOOL init_test_context(struct d3d11_shader_runner *runner) { unsigned int rt_width, rt_height; + D3D11_RASTERIZER_DESC rs_desc; D3D11_VIEWPORT vp; + HRESULT hr; RECT rect; memset(runner, 0, sizeof(*runner)); @@ -279,6 +282,19 @@ static BOOL init_test_context(struct d3d11_shader_runner *runner) vp.MaxDepth = 1.0f; ID3D11DeviceContext_RSSetViewports(runner->immediate_context, 1, &vp); + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_NONE; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = TRUE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D11Device_CreateRasterizerState(runner->device, &rs_desc, &runner->rasterizer_state); + ok(hr == S_OK, "Failed to create rasterizer state.\n"); + return TRUE; } @@ -286,6 +302,7 @@ static void destroy_test_context(struct d3d11_shader_runner *runner) { ULONG ref; + ID3D11RasterizerState_Release(runner->rasterizer_state); ID3D11DeviceContext_Release(runner->immediate_context); IDXGISwapChain_Release(runner->swapchain); DestroyWindow(runner->window); @@ -594,6 +611,7 @@ static bool d3d11_runner_draw(struct shader_runner *r, ID3D11DeviceContext_IASetPrimitiveTopology(context, primitive_topology); ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + ID3D11DeviceContext_RSSetState(context, runner->rasterizer_state); ID3D11DeviceContext_Draw(context, vertex_count, 0); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 87e5d130..54d1c51a 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -380,7 +380,7 @@ static bool d3d12_runner_draw(struct shader_runner *r, pso_desc.PS.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps_code); pso_desc.PS.BytecodeLength = ID3D10Blob_GetBufferSize(ps_code); pso_desc.RasterizerState.FillMode = D3D12_FILL_MODE_SOLID; - pso_desc.RasterizerState.CullMode = D3D12_CULL_MODE_BACK; + pso_desc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE; pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE; pso_desc.SampleDesc.Count = 1; pso_desc.SampleMask = ~(UINT)0; diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c index 51cd6dc9..b983dc08 100644 --- a/tests/shader_runner_d3d9.c +++ b/tests/shader_runner_d3d9.c @@ -418,6 +418,8 @@ static bool d3d9_runner_draw(struct shader_runner *r, ok(hr == D3D_OK, "Failed to set vertex shader, hr %#lx.\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, ps); ok(hr == D3D_OK, "Failed to set pixel shader, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(hr == D3D_OK, "Failed to set cull mode, hr %#lx.\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "Failed to draw, hr %#lx.\n", hr); diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index c7b1dee0..aca17a1a 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -619,7 +619,7 @@ static VkPipeline create_graphics_pipeline(const struct vulkan_shader_runner *ru vp_desc.scissorCount = 1; vp_desc.pScissors = &rt_rect; - rs_desc.frontFace = VK_FRONT_FACE_CLOCKWISE; + rs_desc.cullMode = VK_CULL_MODE_NONE; rs_desc.lineWidth = 1.0f; ms_desc.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Handle SV_IsFrontFace semantic.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: vkd3d Branch: master Commit: ca59a3c35bea55184177cf3afdc34da4905df3fc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ca59a3c35bea55184177cf3afdc34… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 3 23:16:20 2023 +0200 vkd3d-shader/hlsl: Handle SV_IsFrontFace semantic. --- libs/vkd3d-shader/hlsl_sm4.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 5bd4f2d6..8be848c5 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -115,6 +115,7 @@ bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semant {"position", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_POSITION}, {"sv_position", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_POSITION}, + {"sv_isfrontface", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_IS_FRONT_FACE}, {"color", true, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_TARGET}, {"depth", true, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_DEPTH},

1 0

Piotr Caban : include: Add EMRTRANSPARENTBLT definition.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: wine Branch: master Commit: 8b48ee987f3e70fc252f29d7064344c814fd7bec URL: https://gitlab.winehq.org/wine/wine/-/commit/8b48ee987f3e70fc252f29d7064344… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 17:07:46 2023 +0200 include: Add EMRTRANSPARENTBLT definition. --- include/wingdi.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/wingdi.h b/include/wingdi.h index 046009c0e98..6ae9409803c 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -2717,6 +2717,27 @@ typedef struct { LONG cySrc; } EMRALPHABLEND, *PEMRALPHABLEND; +typedef struct { + EMR emr; + RECTL rclBounds; + LONG xDest; + LONG yDest; + LONG cxDest; + LONG cyDest; + DWORD dwRop; + LONG xSrc; + LONG ySrc; + XFORM xformSrc; + COLORREF crBkColorSrc; + DWORD iUsageSrc; + DWORD offBmiSrc; + DWORD cbBmiSrc; + DWORD offBitsSrc; + DWORD cbBitsSrc; + LONG cxSrc; + LONG cySrc; +} EMRTRANSPARENTBLT, *PEMRTRANSPARENTBLT; + typedef struct { EMR emr; RECTL rclBounds;

1 0

Francois Gouget : user32/tests: Windows 11's notepad has four icons.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: wine Branch: master Commit: 9a3c0082836ae8bc552ed28c0ac3c12a46cda743 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a3c0082836ae8bc552ed28c0ac3c1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 13 13:53:40 2023 +0200 user32/tests: Windows 11's notepad has four icons. There's the regular application icon and three different styles of close window icons. While there is nothing wrong with that this case is marked as broken() because Wine's notepad only has one icon so only 1 is a valid PrivateExtractIconsA() result in Wine. --- dlls/user32/tests/resource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index fff962b955c..472d65df186 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -348,7 +348,8 @@ static void test_PrivateExtractIcons(void) { ok(cIcons == ~0u, "got %u\n", cIcons); cIcons = pPrivateExtractIconsA("notepad.exe", 0, 16, 16, NULL, NULL, 1, 0); - ok(cIcons == 1 || broken(cIcons == 2) /* win2k */, "got %u\n", cIcons); + ok(cIcons == 1 || broken(cIcons == 4) /* win11 */ || + broken(cIcons == 2) /* win2k */, "got %u\n", cIcons); ahIcon[0] = (HICON)0xdeadbeef; cIcons = pPrivateExtractIconsA("notepad.exe", 0, 16, 16, ahIcon, NULL, 1, 0);

1 0

Piotr Caban : gdi32: Handle EMR_TRANSPARENTBLT record in PlayEnhMetaFileRecord.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: wine Branch: master Commit: 747fa33bbb423c191d8af53aef6ef3ab1ea1590a URL: https://gitlab.winehq.org/wine/wine/-/commit/747fa33bbb423c191d8af53aef6ef3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 17:26:19 2023 +0200 gdi32: Handle EMR_TRANSPARENTBLT record in PlayEnhMetaFileRecord. --- dlls/gdi32/enhmetafile.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index bab0d5739cc..b6b51e3483a 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2238,6 +2238,53 @@ BOOL WINAPI PlayEnhMetaFileRecord( break; } + case EMR_TRANSPARENTBLT: + { + const EMRTRANSPARENTBLT *pTransparentBlt = (const EMRTRANSPARENTBLT *)mr; + + TRACE("EMR_TRANSPARENTBLT: %ld, %ld %ldx%ld -> %ld, %ld %ldx%ld color %08lx offBitsSrc %ld\n", + pTransparentBlt->xSrc, pTransparentBlt->ySrc, pTransparentBlt->cxSrc, + pTransparentBlt->cySrc, pTransparentBlt->xDest, pTransparentBlt->yDest, + pTransparentBlt->cxDest, pTransparentBlt->cyDest, + pTransparentBlt->dwRop, pTransparentBlt->offBitsSrc); + + if(pTransparentBlt->offBmiSrc == 0) { + FIXME("EMR_TRANSPARENTBLT: offBmiSrc == 0\n"); + } else { + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); + HBRUSH hBrush, hBrushOld; + HBITMAP hBmp = 0, hBmpOld = 0; + const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pTransparentBlt->offBmiSrc); + + SetGraphicsMode(hdcSrc, GM_ADVANCED); + SetWorldTransform(hdcSrc, &pTransparentBlt->xformSrc); + + hBrush = CreateSolidBrush(pTransparentBlt->crBkColorSrc); + hBrushOld = SelectObject(hdcSrc, hBrush); + PatBlt(hdcSrc, pTransparentBlt->rclBounds.left, pTransparentBlt->rclBounds.top, + pTransparentBlt->rclBounds.right - pTransparentBlt->rclBounds.left, + pTransparentBlt->rclBounds.bottom - pTransparentBlt->rclBounds.top, PATCOPY); + SelectObject(hdcSrc, hBrushOld); + DeleteObject(hBrush); + + hBmp = CreateDIBitmap(hdc, (const BITMAPINFOHEADER *)pbi, CBM_INIT, + (const BYTE *)mr + pTransparentBlt->offBitsSrc, + pbi, pTransparentBlt->iUsageSrc); + hBmpOld = SelectObject(hdcSrc, hBmp); + + GdiTransparentBlt(hdc, pTransparentBlt->xDest, pTransparentBlt->yDest, + pTransparentBlt->cxDest, pTransparentBlt->cyDest, + hdcSrc, pTransparentBlt->xSrc, pTransparentBlt->ySrc, + pTransparentBlt->cxSrc, pTransparentBlt->cySrc, + pTransparentBlt->dwRop); + + SelectObject(hdcSrc, hBmpOld); + DeleteObject(hBmp); + DeleteDC(hdcSrc); + } + break; + } + case EMR_GRADIENTFILL: { EMRGRADIENTFILL *grad = (EMRGRADIENTFILL *)mr; @@ -2257,7 +2304,6 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_COLORCORRECTPALETTE: case EMR_SETICMPROFILEA: case EMR_SETICMPROFILEW: - case EMR_TRANSPARENTBLT: case EMR_SETLINKEDUFI: case EMR_COLORMATCHTOTARGETW: case EMR_CREATECOLORSPACEW:

1 0