wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Matteo Bruni : d3d9/tests: Test creating shaders with wrong type or version .
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: f87483c307a66804a7aa43f748920518f4b1357f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87483c307a66804a7aa43f74… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 23 17:03:22 2011 +0200 d3d9/tests: Test creating shaders with wrong type or version. --- dlls/d3d9/tests/shader.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 3795943..f5a2bcb 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -209,6 +209,73 @@ static void test_pixel_shader_constant(IDirect3DDevice9 *device_ptr) ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_SetPixelShaderConstantF returned 0x%08x\n", hr); } +static void test_wrong_shader(IDirect3DDevice9 *device_ptr) +{ + static const DWORD simple_vs[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff /* END */ + }; + + static const DWORD simple_ps[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000051, 0xa00f0001, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, /* def c1 = 1.0, 0.0, 0.0, 0.0 */ + 0x00000042, 0xb00f0000, /* tex t0 */ + 0x00000008, 0x800f0000, 0xa0e40001, 0xa0e40000, /* dp3 r0, c1, c0 */ + 0x00000005, 0x800f0000, 0x90e40000, 0x80e40000, /* mul r0, v0, r0 */ + 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ + 0x0000ffff /* END */ + }; + +#if 0 +float4 main(const float4 color : COLOR) : SV_TARGET +{ + float4 o; + + o = color; + + return o; +} +#endif + static const DWORD ps_4_0[] = + { + 0x43425844, 0x4da9446f, 0xfbe1f259, 0x3fdb3009, 0x517521fa, 0x00000001, 0x000001ac, + 0x00000005, 0x00000034, 0x0000008c, 0x000000bc, 0x000000f0, 0x00000130, 0x46454452, + 0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0xffff0400, 0x00000100, + 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, + 0x6f432072, 0x6c69706d, 0x39207265, 0x2e39322e, 0x2e323539, 0x31313133, 0xababab00, + 0x4e475349, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x00000f0f, 0x4f4c4f43, 0xabab0052, 0x4e47534f, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x54415453, + 0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, + }; + + IDirect3DVertexShader9 *vs; + IDirect3DPixelShader9 *ps; + HRESULT hret; + + hret = IDirect3DDevice9_CreateVertexShader(device_ptr, simple_ps, &vs); + ok(hret == D3DERR_INVALIDCALL, "CreateVertexShader returned: hret 0x%x, shader_ptr %p.\n", hret, vs); + hret = IDirect3DDevice9_CreatePixelShader(device_ptr, simple_vs, &ps); + ok(hret == D3DERR_INVALIDCALL, "CreatePixelShader returned: hret 0x%x, shader_ptr %p.\n", hret, ps); + + hret = IDirect3DDevice9_CreatePixelShader(device_ptr, ps_4_0, &ps); + ok(hret == D3DERR_INVALIDCALL, "CreatePixelShader returned: hret 0x%x, shader_ptr %p.\n", hret, ps); +} + START_TEST(shader) { D3DCAPS9 caps; @@ -239,6 +306,8 @@ START_TEST(shader) test_get_set_pixel_shader(device_ptr); /* No max pixel shader constant value??? */ test_pixel_shader_constant(device_ptr); + if (caps.VertexShaderVersion & 0xffff) + test_wrong_shader(device_ptr); } else skip("No pixel shader support\n");

1 0

Matteo Bruni : d3d8/tests: Test creating shaders with wrong type or version .
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: dffce5c01a32b83cea49c9b2fc41bbf58eb18667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dffce5c01a32b83cea49c9b2f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 23 17:03:21 2011 +0200 d3d8/tests: Test creating shaders with wrong type or version. --- dlls/d3d8/tests/device.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 524ce2b..42726aa 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2701,6 +2701,88 @@ done: DestroyWindow(focus_window); } +static void test_wrong_shader(void) +{ + HRESULT hr; + HWND hwnd = NULL; + IDirect3D8 *d3d = NULL; + IDirect3DDevice8 *device = NULL; + D3DPRESENT_PARAMETERS d3dpp; + D3DDISPLAYMODE d3ddm; + DWORD vs, ps; + + static const DWORD vs_2_0[] = + { + 0xfffe0200, /* vs_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x02000001, 0x800f0001, 0xa0e40001, /* mov r1, c1 */ + 0x03000002, 0xd00f0000, 0x80e40001, 0xa0e40002, /* add oD0, r1, c2 */ + 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x0000ffff /* end */ + }; + static const DWORD ps_2_0[] = + { + 0xffff0200, /* ps_2_0 */ + 0x02000001, 0x800f0001, 0xa0e40001, /* mov r1, c1 */ + 0x03000002, 0x800f0000, 0x80e40001, 0xa0e40002, /* add r0, r1, c2 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff /* end */ + }; + + static const DWORD decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), + D3DVSD_END() + }; + + d3d = pDirect3DCreate8(D3D_SDK_VERSION); + ok(d3d != NULL, "Failed to create IDirect3D8 object\n"); + hwnd = CreateWindow("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "Failed to create window\n"); + if (!d3d || !hwnd) + goto cleanup; + + IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &d3ddm); + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferWidth = 800; + d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferFormat = d3ddm.Format; + + hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL || broken(hr == D3DERR_NOTAVAILABLE), "IDirect3D8_CreateDevice failed with %#08x\n", hr); + if (!device) + { + skip("could not create device, IDirect3D8_CreateDevice returned %#08x\n", hr); + goto cleanup; + } + + hr = IDirect3DDevice8_CreateVertexShader(device, decl, simple_ps, &vs, 0); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_CreateVertexShader returned %#08x\n", hr); + + hr = IDirect3DDevice8_CreatePixelShader(device, simple_vs, &ps); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_CreatePixelShader returned %#08x\n", hr); + + hr = IDirect3DDevice8_CreateVertexShader(device, decl, vs_2_0, &vs, 0); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_CreateVertexShader returned %#08x\n", hr); + + hr = IDirect3DDevice8_CreatePixelShader(device, ps_2_0, &ps); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_CreatePixelShader returned %#08x\n", hr); + +cleanup: + if (device) + { + UINT refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (d3d) + IDirect3D8_Release(d3d); + DestroyWindow(hwnd); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -2751,6 +2833,7 @@ START_TEST(device) test_wndproc_windowed(); test_depth_stencil_size(); test_window_style(); + test_wrong_shader(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Matteo Bruni : d3d10core: Fixup HRESULT in a bunch of error cases.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: d9c9b5c365daac4ad33d77da89eb7f10be03914e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c9b5c365daac4ad33d77da8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 23 17:03:20 2011 +0200 d3d10core: Fixup HRESULT in a bunch of error cases. --- dlls/d3d10core/shader.c | 7 +++++-- dlls/d3d10core/utils.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 357cda3..82ddadc 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -57,7 +57,7 @@ static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, st memset(shader_info->output_signature, 0, sizeof(*shader_info->output_signature)); hr = parse_dxbc(dxbc, dxbc_length, shdr_handler, shader_info); - if (!shader_info->shader_code) hr = E_FAIL; + if (!shader_info->shader_code) hr = E_INVALIDARG; if (FAILED(hr)) { @@ -267,6 +267,7 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 { WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); shader_free_signature(&shader->output_signature); + hr = E_INVALIDARG; return hr; } @@ -411,8 +412,9 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct &shader->output_signature, shader, &d3d10_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader, 4); if (FAILED(hr)) { - WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); + WARN("Failed to create wined3d geometry shader, hr %#x.\n", hr); shader_free_signature(&shader->output_signature); + hr = E_INVALIDARG; return hr; } @@ -553,6 +555,7 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ { WARN("Failed to create wined3d pixel shader, hr %#x.\n", hr); shader_free_signature(&shader->output_signature); + hr = E_INVALIDARG; return hr; } diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index 97c0347..813cae6 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -374,7 +374,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, if (tag != TAG_DXBC) { WARN("Wrong tag.\n"); - return E_FAIL; + return E_INVALIDARG; } /* checksum? */

1 0

Matteo Bruni : wined3d: When creating a new shader, check shader type and version.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 2a146448f40686ff75f808557b15e95ff646601a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a146448f40686ff75f808557… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 23 17:03:19 2011 +0200 wined3d: When creating a new shader, check shader type and version. --- dlls/d3d10core/shader.c | 6 +++--- dlls/d3d8/shader.c | 4 ++-- dlls/d3d9/shader.c | 4 ++-- dlls/wined3d/shader.c | 41 ++++++++++++++++++++++++++++------------- include/wine/wined3d.h | 6 +++--- 5 files changed, 38 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a146448f40686ff75f80…

1 0

Alexandre Julliard : winex11: Pre-compute the color shifts for the supported XRender formats.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: f5307025fc0cb82da8fa4cbbd843b09b5edbf414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5307025fc0cb82da8fa4cbbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 16:56:55 2011 +0200 winex11: Pre-compute the color shifts for the supported XRender formats. --- dlls/winex11.drv/x11drv.h | 4 ++-- dlls/winex11.drv/xrender.c | 37 ++++++++++++++++++++++++------------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3a381cf..98b1ab1 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -108,8 +108,8 @@ typedef struct { typedef struct { - ChannelShift physicalRed, physicalBlue, physicalGreen; - ChannelShift logicalRed, logicalBlue, logicalGreen; + ChannelShift physicalRed, physicalGreen, physicalBlue; + ChannelShift logicalRed, logicalGreen, logicalBlue; } ColorShifts; /* X physical bitmap */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 2dee204..a51543b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -104,6 +104,23 @@ static const WineXRenderFormatTemplate wxr_formats_template[WXR_NB_FORMATS] = /* WXR_FORMAT_B8G8R8X8 */ { 32, 0, 0, 8, 0xff, 16, 0xff, 24, 0xff }, }; +static const ColorShifts wxr_color_shifts[WXR_NB_FORMATS] = +{ + /* format phys red phys green phys blue log red log green log blue */ +/* WXR_FORMAT_MONO */ { { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 } }, +/* WXR_FORMAT_GRAY */ { { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 } }, +/* WXR_FORMAT_X1R5G5B5 */ { {10,5,31}, { 5,5,31}, { 0,5,31}, {10,5,31}, { 5,5,31}, { 0,5,31} }, +/* WXR_FORMAT_X1B5G5R5 */ { { 0,5,31}, { 5,5,31}, {10,5,31}, { 0,5,31}, { 5,5,31}, {10,5,31} }, +/* WXR_FORMAT_R5G6B5 */ { {11,5,31}, { 5,6,63}, { 0,5,31}, {11,5,31}, { 5,6,63}, { 0,5,31} }, +/* WXR_FORMAT_B5G6R5 */ { { 0,5,31}, { 5,6,63}, {11,5,31}, { 0,5,31}, { 5,6,63}, {11,5,31} }, +/* WXR_FORMAT_R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, +/* WXR_FORMAT_B8G8R8 */ { { 0,8,255}, { 8,8,255}, {16,8,255}, { 0,8,255}, { 8,8,255}, {16,8,255} }, +/* WXR_FORMAT_A8R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, +/* WXR_FORMAT_B8G8R8A8 */ { { 8,8,255}, {16,8,255}, {24,8,255}, { 8,8,255}, {16,8,255}, {24,8,255} }, +/* WXR_FORMAT_X8R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, +/* WXR_FORMAT_B8G8R8X8 */ { { 8,8,255}, {16,8,255}, {24,8,255}, { 8,8,255}, {16,8,255}, {24,8,255} }, +}; + static enum wxr_format default_format = WXR_INVALID_FORMAT; static XRenderPictFormat *pict_formats[WXR_NB_FORMATS + 1 /* invalid format */]; @@ -1230,8 +1247,7 @@ static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID */ static BOOL xrenderdrv_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) { - XRenderPictFormat *pict_format = NULL; - ColorShifts shifts; + enum wxr_format format = WXR_INVALID_FORMAT; BITMAP bitmap; if (!GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return FALSE; @@ -1240,20 +1256,15 @@ static BOOL xrenderdrv_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) { switch (bitmap.bmBitsPixel) { - case 16: pict_format = pict_formats[WXR_FORMAT_R5G6B5]; break; - case 24: pict_format = pict_formats[WXR_FORMAT_R8G8B8]; break; - case 32: pict_format = pict_formats[WXR_FORMAT_A8R8G8B8]; break; + case 16: format = WXR_FORMAT_R5G6B5; break; + case 24: format = WXR_FORMAT_R8G8B8; break; + case 32: format = WXR_FORMAT_A8R8G8B8; break; } } - if (pict_format) - { - X11DRV_PALETTE_ComputeColorShifts( &shifts, - pict_format->direct.redMask << pict_format->direct.red, - pict_format->direct.greenMask << pict_format->direct.green, - pict_format->direct.blueMask << pict_format->direct.blue ); - return X11DRV_create_phys_bitmap( hbitmap, &bitmap, pict_format->depth, TRUE, &shifts ); - } + if (pict_formats[format]) + return X11DRV_create_phys_bitmap( hbitmap, &bitmap, pict_formats[format]->depth, + TRUE, &wxr_color_shifts[format] ); dev = GET_NEXT_PHYSDEV( dev, pCreateBitmap ); return dev->funcs->pCreateBitmap( dev, hbitmap );

1 0

Alexandre Julliard : winex11: Remove redundant pixmap prefix in X_PHYSBITMAP field names.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 46f1d2a48af04eefc700dcb7b262601fa271ed9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f1d2a48af04eefc700dcb7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 15:29:28 2011 +0200 winex11: Remove redundant pixmap prefix in X_PHYSBITMAP field names. --- dlls/winex11.drv/bitblt.c | 8 ++++---- dlls/winex11.drv/bitmap.c | 14 +++++++------- dlls/winex11.drv/brush.c | 4 ++-- dlls/winex11.drv/dib.c | 22 +++++++++++----------- dlls/winex11.drv/opengl.c | 2 +- dlls/winex11.drv/x11drv.h | 4 ++-- dlls/winex11.drv/xrender.c | 15 +++++++-------- 7 files changed, 34 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46f1d2a48af04eefc700d…

1 0

Alexandre Julliard : winex11: Avoid recomputing the DC format when it hasn' t changed.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: f3f315ed6153692e87b8f9efae402589ee5204c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3f315ed6153692e87b8f9efa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 15:25:35 2011 +0200 winex11: Avoid recomputing the DC format when it hasn't changed. --- dlls/winex11.drv/xrender.c | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index c8322ce..65e56c2 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -104,7 +104,7 @@ static const WineXRenderFormatTemplate wxr_formats_template[WXR_NB_FORMATS] = /* WXR_FORMAT_B8G8R8X8 */ { 32, 0, 0, 8, 0xff, 16, 0xff, 24, 0xff }, }; -static enum wxr_format default_format; +static enum wxr_format default_format = WXR_INVALID_FORMAT; static XRenderPictFormat *pict_formats[WXR_NB_FORMATS + 1 /* invalid format */]; typedef struct @@ -487,7 +487,7 @@ static enum wxr_format get_xrender_format_from_color_shifts(int depth, ColorShif } /* This should not happen because when we reach 'shifts' must have been set and we only allows shifts which are backed by X */ - ERR("No XRender format found!\n"); + ERR("No XRender format found for %u %08x/%08x/%08x\n", depth, redMask, greenMask, blueMask); return WXR_INVALID_FORMAT; } @@ -639,14 +639,6 @@ static void free_xrender_picture( struct xrender_physdev *dev ) } wine_tsx11_unlock(); } - dev->pict_format = NULL; -} - -static void update_xrender_drawable( struct xrender_physdev *dev ) -{ - free_xrender_picture( dev ); - dev->format = get_xrender_format_from_color_shifts( dev->x11dev->depth, dev->x11dev->color_shifts ); - dev->pict_format = pict_formats[dev->format]; } /* return a mask picture used to force alpha to 0 */ @@ -1127,7 +1119,7 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) return 0; } -static BOOL create_xrender_dc( PHYSDEV *pdev ) +static BOOL create_xrender_dc( PHYSDEV *pdev, enum wxr_format format ) { X11DRV_PDEVICE *x11dev = get_x11drv_dev( *pdev ); struct xrender_physdev *physdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physdev) ); @@ -1135,8 +1127,8 @@ static BOOL create_xrender_dc( PHYSDEV *pdev ) if (!physdev) return FALSE; physdev->x11dev = x11dev; physdev->cache_index = -1; - physdev->format = get_xrender_format_from_color_shifts( x11dev->depth, x11dev->color_shifts ); - physdev->pict_format = pict_formats[physdev->format]; + physdev->format = format; + physdev->pict_format = pict_formats[format]; push_dc_driver( pdev, &physdev->dev, &xrender_funcs ); return TRUE; } @@ -1176,7 +1168,7 @@ static void set_color_info( XRenderPictFormat *format, BITMAPINFO *info ) static BOOL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW* initData ) { - return create_xrender_dc( pdev ); + return create_xrender_dc( pdev, default_format ); } /********************************************************************** @@ -1191,7 +1183,7 @@ static BOOL xrenderdrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) } /* otherwise we have been called by x11drv */ - return create_xrender_dc( pdev ); + return create_xrender_dc( pdev, WXR_FORMAT_MONO ); } /********************************************************************** @@ -1226,7 +1218,7 @@ static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID if (*(const enum x11drv_escape_codes *)in_data == X11DRV_SET_DRAWABLE) { BOOL ret = dev->funcs->pExtEscape( dev, escape, in_count, in_data, out_count, out_data ); - if (ret) update_xrender_drawable( physdev ); + if (ret) free_xrender_picture( physdev ); /* pict format doesn't change, only drawable */ return ret; } } @@ -1285,7 +1277,13 @@ static HBITMAP xrenderdrv_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) dev = GET_NEXT_PHYSDEV( dev, pSelectBitmap ); ret = dev->funcs->pSelectBitmap( dev, hbitmap ); - if (ret) update_xrender_drawable( physdev ); + if (ret) + { + free_xrender_picture( physdev ); + physdev->format = get_xrender_format_from_color_shifts( physdev->x11dev->depth, + physdev->x11dev->color_shifts ); + physdev->pict_format = pict_formats[physdev->format]; + } return ret; }

1 0

Alexandre Julliard : winex11: Force the alpha channel to zero for mono-> color blits.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 922d9f5cf7520c7e4e9abd457da27e69f6d40138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=922d9f5cf7520c7e4e9abd457… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 15:25:05 2011 +0200 winex11: Force the alpha channel to zero for mono->color blits. --- dlls/gdi32/tests/bitmap.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrender.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 78c79c0..ccca315 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2761,6 +2761,7 @@ static void test_StretchBlt(void) HBRUSH hBrush, hOldBrush; BITMAPINFO biDst, biSrc; UINT32 expected[256]; + RGBQUAD colors[2]; memset(&biDst, 0, sizeof(BITMAPINFO)); biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -3007,6 +3008,48 @@ todo_wine SelectObject(hdcSrc, oldSrc); DeleteObject(bmpSrc); + + biSrc.bmiHeader.biBitCount = 1; + bmpSrc = CreateDIBSection(hdcScreen, &biSrc, DIB_RGB_COLORS, (void**)&srcBuffer, NULL, 0); + oldSrc = SelectObject(hdcSrc, bmpSrc); + *((DWORD *)colors + 0) = 0x123456; + *((DWORD *)colors + 1) = 0x335577; + SetDIBColorTable( hdcSrc, 0, 2, colors ); + srcBuffer[0] = 0x55555555; + memset(dstBuffer, 0xcc, 4 * sizeof(*dstBuffer)); + SetTextColor( hdcDst, 0 ); + SetBkColor( hdcDst, 0 ); + StretchBlt(hdcDst, 0, 0, 4, 1, hdcSrc, 0, 0, 4, 1, SRCCOPY ); + expected[0] = expected[2] = 0x00123456; + expected[1] = expected[3] = 0x00335577; + ok(!memcmp(dstBuffer, expected, 16), + "StretchBlt expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X }\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3] ); + + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + + bmpSrc = CreateBitmap( 16, 16, 1, 1, 0 ); + oldSrc = SelectObject(hdcSrc, bmpSrc); + SetPixel( hdcSrc, 0, 0, 0 ); + SetPixel( hdcSrc, 1, 0, 0xffffff ); + SetPixel( hdcSrc, 2, 0, 0xffffff ); + SetPixel( hdcSrc, 3, 0, 0 ); + memset(dstBuffer, 0xcc, 4 * sizeof(*dstBuffer)); + SetTextColor( hdcDst, RGB(0x22,0x44,0x66) ); + SetBkColor( hdcDst, RGB(0x65,0x43,0x21) ); + StretchBlt(hdcDst, 0, 0, 4, 1, hdcSrc, 0, 0, 4, 1, SRCCOPY ); + expected[0] = expected[3] = 0x00224466; + expected[1] = expected[2] = 0x00654321; + ok(!memcmp(dstBuffer, expected, 16), + "StretchBlt expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X }\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3] ); + + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + DeleteDC(hdcSrc); SelectObject(hdcDst, oldDst); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e3fa09a..c8322ce 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2278,6 +2278,35 @@ done_unlock: return retv; } +/* multiply the alpha channel of a picture */ +static void multiply_alpha( Picture pict, XRenderPictFormat *format, int alpha, + int x, int y, int width, int height ) +{ + XRenderPictureAttributes pa; + Pixmap src_pixmap, mask_pixmap; + Picture src_pict, mask_pict; + XRenderColor color; + + wine_tsx11_lock(); + src_pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, format->depth ); + mask_pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, format->depth ); + pa.repeat = RepeatNormal; + src_pict = pXRenderCreatePicture( gdi_display, src_pixmap, format, CPRepeat, &pa ); + pa.component_alpha = True; + mask_pict = pXRenderCreatePicture( gdi_display, mask_pixmap, format, CPRepeat|CPComponentAlpha, &pa ); + color.red = color.green = color.blue = color.alpha = 0xffff; + pXRenderFillRectangle( gdi_display, PictOpSrc, src_pict, &color, 0, 0, 1, 1 ); + color.alpha = alpha; + pXRenderFillRectangle( gdi_display, PictOpSrc, mask_pict, &color, 0, 0, 1, 1 ); + pXRenderComposite( gdi_display, PictOpInReverse, src_pict, mask_pict, pict, + 0, 0, 0, 0, x, y, width, height ); + pXRenderFreePicture( gdi_display, src_pict ); + pXRenderFreePicture( gdi_display, mask_pict ); + XFreePixmap( gdi_display, src_pixmap ); + XFreePixmap( gdi_display, mask_pixmap ); + wine_tsx11_unlock(); +} + /* Helper function for (stretched) blitting using xrender */ static void xrender_blit( int op, Picture src_pict, Picture mask_pict, Picture dst_pict, int x_src, int y_src, int x_dst, int y_dst, @@ -2317,13 +2346,16 @@ static void xrender_mono_blit( Picture src_pict, Picture dst_pict, { Picture tile_pict; int x_offset, y_offset; + XRenderColor color; /* When doing a mono->color blit, the source data is used as mask, and the source picture * contains a 1x1 picture for tiling. The source data effectively acts as an alpha channel to * the tile data. */ EnterCriticalSection( &xrender_cs ); - tile_pict = get_tile_pict( dst_format, bg ); + color = *bg; + color.alpha = 0xffff; /* tile pict needs 100% alpha */ + tile_pict = get_tile_pict( dst_format, &color ); wine_tsx11_lock(); pXRenderFillRectangle( gdi_display, PictOpSrc, dst_pict, fg, x_dst, y_dst, width, height ); @@ -2347,6 +2379,10 @@ static void xrender_mono_blit( Picture src_pict, Picture dst_pict, 0, 0, x_offset, y_offset, x_dst, y_dst, width, height ); wine_tsx11_unlock(); LeaveCriticalSection( &xrender_cs ); + + /* force the alpha channel for background pixels, it has been set to 100% by the tile */ + if (bg->alpha != 0xffff && (dst_format == WXR_FORMAT_A8R8G8B8 || dst_format == WXR_FORMAT_B8G8R8A8)) + multiply_alpha( dst_pict, pict_formats[dst_format], bg->alpha, x_dst, y_dst, width, height ); } static void get_colors( struct xrender_physdev *physdev_src, struct xrender_physdev *physdev_dst,

1 0

Francois Gouget : wordpad: Use a lowercase extension in a file filter.
by Alexandre Julliard 26 Sep '11

26 Sep '11

1 0

Francois Gouget : winecfg: Separate the file filters with a semi-colon and a space.
by Alexandre Julliard 26 Sep '11

26 Sep '11

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
100
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011