July 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : kernel32/tests: Repeat test for SignalObjectAndWait multiple times to test wineserver wakeup cookie management.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 4ccdc0c03681dbdf4dd5239a923764f7555e2da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccdc0c03681dbdf4dd5239a9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 15 06:20:08 2015 +0200 kernel32/tests: Repeat test for SignalObjectAndWait multiple times to test wineserver wakeup cookie management. --- dlls/kernel32/tests/sync.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index cbe0acb..a9d2377 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -64,6 +64,7 @@ static void test_signalandwait(void) HMODULE kernel32; DWORD r; HANDLE event[2], semaphore[2], file; + int i; kernel32 = GetModuleHandleA("kernel32.dll"); pSignalObjectAndWait = (void*) GetProcAddress(kernel32, "SignalObjectAndWait"); @@ -96,9 +97,13 @@ static void test_signalandwait(void) r = pSignalObjectAndWait(event[0], event[1], 0, FALSE); ok( r == WAIT_OBJECT_0, "should succeed\n"); - /* event[0] is now signalled */ - r = pSignalObjectAndWait(event[0], event[0], 0, FALSE); - ok( r == WAIT_OBJECT_0, "should succeed\n"); + /* event[0] is now signalled - we repeat this test multiple times + * to ensure that the wineserver handles this situation properly. */ + for (i = 0; i < 10000; i++) + { + r = pSignalObjectAndWait(event[0], event[0], 0, FALSE); + ok(r == WAIT_OBJECT_0, "should succeed\n"); + } /* event[0] is not signalled */ r = WaitForSingleObject(event[0], 0);

1 0

Nikolay Sivov : dwrite: Fix transform matrix usage for pixel snapping.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: f46aa66ca7c2874577edda6278c34c8c91b1da56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46aa66ca7c2874577edda627… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 15 10:44:15 2015 +0300 dwrite: Fix transform matrix usage for pixel snapping. --- dlls/dwrite/layout.c | 13 +++++++------ dlls/dwrite/tests/layout.c | 30 +++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 1f7beb4..99ec7b4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2735,17 +2735,18 @@ static inline FLOAT renderer_apply_snapping(FLOAT coord, BOOL skiptransform, FLO if (!skiptransform) { /* apply transform */ vec[0] = 0.0; - vec[1] = coord; + vec[1] = coord * ppdip; - vec2[0] = m->m11 * vec[0] + m->m12 * vec[1] + m->dx; - vec2[1] = m->m21 * vec[0] + m->m22 * vec[1] + m->dy; + vec2[0] = m->m11 * vec[0] + m->m21 * vec[1] + m->dx; + vec2[1] = m->m12 * vec[0] + m->m22 * vec[1] + m->dy; /* snap */ - vec2[0] = floorf(vec2[0] * ppdip + 0.5f) / ppdip; - vec2[1] = floorf(vec2[1] * ppdip + 0.5f) / ppdip; + vec2[0] = floorf(vec2[0] + 0.5f); + vec2[1] = floorf(vec2[1] + 0.5f); /* apply inverted transform, we don't care about X component at this point */ - vec[1] = (-m->m21 * vec2[0] + m->m11 * vec2[1] - (m->m11 * m->dy - m->m12 * m->dx)) / det; + vec[1] = (-m->m12 * vec2[0] + m->m11 * vec2[1] - (m->m11 * m->dy - m->m12 * m->dx)) / det; + vec[1] /= ppdip; } else vec[1] = floorf(coord * ppdip + 0.5f) / ppdip; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 2423f8b..950b021 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -22,6 +22,7 @@ #include <assert.h> #include <math.h> +#include <limits.h> #include "windows.h" #include "dwrite.h" @@ -3271,17 +3272,18 @@ static FLOAT snap_coord(const DWRITE_MATRIX *m, FLOAT ppdip, FLOAT coord) if (transform) { /* apply transform */ vec[0] = 0.0; - vec[1] = coord; + vec[1] = coord * ppdip; - vec2[0] = m->m11 * vec[0] + m->m12 * vec[1] + m->dx; - vec2[1] = m->m21 * vec[0] + m->m22 * vec[1] + m->dy; + vec2[0] = m->m11 * vec[0] + m->m21 * vec[1] + m->dx; + vec2[1] = m->m12 * vec[0] + m->m22 * vec[1] + m->dy; /* snap */ - vec2[0] = floorf(vec2[0] * ppdip + 0.5f) / ppdip; - vec2[1] = floorf(vec2[1] * ppdip + 0.5f) / ppdip; + vec2[0] = floorf(vec2[0] + 0.5f); + vec2[1] = floorf(vec2[1] + 0.5f); /* apply inverted transform */ - vec[1] = (-m->m21 * vec2[0] + m->m11 * vec2[1] - (m->m11 * m->dy - m->m12 * m->dx)) / det; + vec[1] = (-m->m12 * vec2[0] + m->m11 * vec2[1] - (m->m11 * m->dy - m->m12 * m->dx)) / det; + vec[1] /= ppdip; } else vec[1] = floorf(coord * ppdip + 0.5f) / ppdip; @@ -3290,7 +3292,15 @@ static FLOAT snap_coord(const DWRITE_MATRIX *m, FLOAT ppdip, FLOAT coord) static inline BOOL float_eq(FLOAT left, FLOAT right) { - return fabsf(left - right) < 1e-6f; + int x = *(int *)&left; + int y = *(int *)&right; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + return abs(x - y) <= 16; } struct snapping_test { @@ -3319,8 +3329,14 @@ static struct snapping_test snapping_tests[] = { { { 0.0, 1.0, -1.0, 0.0, 0.2, 0.6 }, 1.0 }, /* 90 degrees rotation */ { { -1.0, 0.0, 0.0, -1.0, 0.2, 0.6 }, 1.0 }, /* 180 degrees rotation */ { { 0.0, -1.0, 1.0, 0.0, 0.2, 0.6 }, 1.0 }, /* 270 degrees rotation */ + { { 1.0, 0.0, 0.0, 1.0,-0.1, 0.2 }, 1.0 }, + { { 0.0, 1.0, -1.0, 0.0,-0.2,-0.3 }, 1.0 }, /* 90 degrees rotation */ + { { -1.0, 0.0, 0.0, -1.0,-0.3,-1.6 }, 1.0 }, /* 180 degrees rotation */ + { { 0.0, -1.0, 1.0, 0.0,-0.7, 0.6 }, 10.0 }, /* 270 degrees rotation */ { { 0.0, 2.0, 1.0, 0.0, 0.2, 0.6 }, 1.0 }, { { 0.0, 0.0, 1.0, 0.0, 0.0, 0.0 }, 1.0 }, + { { 3.0, 0.0, 0.0, 5.0, 0.2,-0.3 }, 10.0 }, + { { 0.0, -3.0, 5.0, 0.0,-0.1, 0.7 }, 10.0 }, }; static DWRITE_MATRIX compattransforms[] = {

1 0

Alasdair Sinclair : ntdll: Add missing WINAPI to RtlDecompressFragment.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 241b3928b114ad7be99f9a8808172c7e4b0d6928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=241b3928b114ad7be99f9a880… Author: Alasdair Sinclair <alasdairsinc(a)gmail.com> Date: Tue Jul 14 01:40:15 2015 +0000 ntdll: Add missing WINAPI to RtlDecompressFragment. --- dlls/ntdll/rtl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 4aef1ee..d20a098 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1489,7 +1489,7 @@ out: /****************************************************************************** * RtlDecompressFragment [NTDLL.@] */ -NTSTATUS RtlDecompressFragment(USHORT format, PUCHAR uncompressed, ULONG uncompressed_size, +NTSTATUS WINAPI RtlDecompressFragment(USHORT format, PUCHAR uncompressed, ULONG uncompressed_size, PUCHAR compressed, ULONG compressed_size, ULONG offset, PULONG final_size, PVOID workspace) {

1 0

Jarkko Korpi : widl: Increase buffer size in typegen.c.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: abf4d5910fc69fe193e541aa0163dc76eb5a9def URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf4d5910fc69fe193e541aa0… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Fri Jul 10 18:49:44 2015 +0300 widl: Increase buffer size in typegen.c. --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4bb4cc4..045a5b7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1142,7 +1142,7 @@ static unsigned char get_func_oi2_flags( const var_t *func ) static unsigned int write_new_procformatstring_type(FILE *file, int indent, const var_t *var, int is_return, unsigned int *stack_offset) { - char buffer[64]; + char buffer[128]; unsigned int stack_size, typestring_offset; unsigned short flags; unsigned char fc = get_parameter_fc( var, is_return, &flags, &stack_size, &typestring_offset );

1 0

Erich E. Hoover : ntdll: Only set the security cookie if it has not already been set.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: e9d7cf99ada80ea8345c301481c63a24780f2b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d7cf99ada80ea8345c30148… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Fri Jul 10 14:52:33 2015 -0600 ntdll: Only set the security cookie if it has not already been set. --- dlls/ntdll/virtual.c | 49 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 410e060..ff947da 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -61,6 +61,12 @@ WINE_DECLARE_DEBUG_CHANNEL(module); #define MAP_NORESERVE 0 #endif +#ifdef _WIN64 +#define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232) +#endif +#define DEFAULT_SECURITY_COOKIE_32 0xbb40e64e +#define DEFAULT_SECURITY_COOKIE_16 (DEFAULT_SECURITY_COOKIE_32 >> 16) + /* File view */ struct file_view { @@ -1053,6 +1059,36 @@ static NTSTATUS stat_mapping_file( struct file_view *view, struct stat *st ) return status; } +/*********************************************************************** + * set_security_cookie + * + * Create a random security cookie for buffer overflow protection. Make + * sure it does not accidentally match the default cookie value. + */ +static void set_security_cookie(ULONG_PTR *cookie) +{ + static ULONG seed; + + if (!cookie) return; + if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId(); + while (1) + { + if (*cookie == DEFAULT_SECURITY_COOKIE_16) + *cookie = RtlRandom( &seed ) >> 16; /* leave the high word clear */ + else if (*cookie == DEFAULT_SECURITY_COOKIE_32) + *cookie = RtlRandom( &seed ); +#ifdef DEFAULT_SECURITY_COOKIE_64 + else if (*cookie == DEFAULT_SECURITY_COOKIE_64) + { + *cookie = RtlRandom( &seed ); + /* fill up, but keep the highest word clear */ + *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16; + } +#endif + else + break; + } +} /*********************************************************************** * map_image @@ -1285,18 +1321,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); if (loadcfg && loadcfg_size >= sizeof(*loadcfg)) - { - static ULONG seed; - ULONG_PTR *cookie = (ULONG_PTR *)loadcfg->SecurityCookie; - - if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId(); - if (cookie) - { - *cookie = RtlRandom( &seed ); - if (sizeof(ULONG_PTR) > sizeof(ULONG)) /* fill up, but keep the highest word clear */ - *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16; - } - } + set_security_cookie((ULONG_PTR *)loadcfg->SecurityCookie); /* set the image protections */

1 0

Nikolay Sivov : dwrite: Make sure explicit levels are always initialized ( Valgrind).
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 0b64f24030531f5f56115c77d4da273bd365fb24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b64f24030531f5f56115c77d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 14 10:55:23 2015 +0300 dwrite: Make sure explicit levels are always initialized (Valgrind). --- dlls/dwrite/bidi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 69eae5a..273d100 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -445,8 +445,9 @@ static void bidi_resolve_explicit(UINT8 baselevel, UINT8 *classes, UINT8 *levels pop_stack(); break; - /* X8: Nothing */ + /* X8 */ default: + levels[i] = baselevel; break; } }

1 0

Nikolay Sivov : dwrite/tests: Fix trimming sign instance leak (Valgrind).
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: a32168bc499e154642a0093755367b5bfb742cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32168bc499e154642a009375… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 14 11:03:30 2015 +0300 dwrite/tests: Fix trimming sign instance leak (Valgrind). --- dlls/dwrite/tests/layout.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a2150d9..2423f8b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1482,6 +1482,7 @@ static void test_Draw(void) ok_sequence(sequences, RENDERER_ID, draw_single_run_seq, "draw test 10", FALSE); IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(inlineobj); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 35ec7abe3248bdf766c2305c74ed62c5543a1a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ec7abe3248bdf766c2305c7… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Jul 14 16:37:14 2015 +0300 po: Update Lithuanian translation. --- po/lt.po | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/po/lt.po b/po/lt.po index 38ae021..6a2e351 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-05-21 20:22+0300\n" +"PO-Revision-Date: 2015-07-14 16:31+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -13512,16 +13512,12 @@ msgid "Command history" msgstr "Komandų istorija" #: wineconsole.rc:69 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Buferio dydis" +msgstr "&Buferio dydis:" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "&Šalinti vienodas" +msgstr "&Šalinti dublikatus" #: wineconsole.rc:74 msgid "Popup menu" @@ -13536,22 +13532,16 @@ msgid "S&hift" msgstr "S&hift" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "Už&daryti pultą" +msgstr "Pultas" #: wineconsole.rc:79 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "Greitas redagavimas" +msgstr "&Greitas redagavimas" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "&Eksperto režimas" +msgstr "Į&terpimo režimas" #: wineconsole.rc:88 msgid "&Font"

1 0

Henri Verbeet : d2d1: Implement d2d_factory_CreateRectangleGeometry().
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 391fda7599fb803048104165a54e35d8e781f07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=391fda7599fb803048104165a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:39 2015 +0200 d2d1: Implement d2d_factory_CreateRectangleGeometry(). --- dlls/d2d1/d2d1_private.h | 29 ++++- dlls/d2d1/factory.c | 20 ++- dlls/d2d1/geometry.c | 324 +++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 332 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=391fda7599fb803048104…

1 0

Henri Verbeet : d2d1: Also bind the pixel shader and blend state in d2d_brush_bind_resources().
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 1f4e37659c5d7e713d605696d8bb64a25c97aea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4e37659c5d7e713d605696d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:40 2015 +0200 d2d1: Also bind the pixel shader and blend state in d2d_brush_bind_resources(). --- dlls/d2d1/brush.c | 16 ++++++++++++++-- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/render_target.c | 20 ++++++-------------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index cd5476a..edce7a2 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -709,12 +709,20 @@ static D3D10_TEXTURE_ADDRESS_MODE texture_addres_mode_from_extend_mode(D2D1_EXTE } } -void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) +void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target) { + static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; + ID3D10Device *device = render_target->device; HRESULT hr; - if (brush->type == D2D_BRUSH_TYPE_BITMAP) + ID3D10Device_OMSetBlendState(device, render_target->bs, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + if (brush->type == D2D_BRUSH_TYPE_SOLID) { + ID3D10Device_PSSetShader(device, render_target->rect_solid_ps); + } + else if (brush->type == D2D_BRUSH_TYPE_BITMAP) + { + ID3D10Device_PSSetShader(device, render_target->rect_bitmap_ps); ID3D10Device_PSSetShaderResources(device, 0, 1, &brush->u.bitmap.bitmap->view); if (!brush->u.bitmap.sampler_state) { @@ -743,4 +751,8 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) } ID3D10Device_PSSetSamplers(device, 0, 1, &brush->u.bitmap.sampler_state); } + else + { + FIXME("Unhandled brush type %#x.\n", brush->type); + } } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 8ddee9e..91ebd9f 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -141,7 +141,7 @@ void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget * HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) DECLSPEC_HIDDEN; -void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) DECLSPEC_HIDDEN; +void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target) DECLSPEC_HIDDEN; struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN; struct d2d_stroke_style diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index b7ca78c..fa98b5b 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -140,13 +140,12 @@ static void d2d_clip_stack_pop(struct d2d_clip_stack *stack) } static void d2d_draw(struct d2d_d3d_render_target *render_target, ID3D10Buffer *vs_cb, - ID3D10PixelShader *ps, ID3D10Buffer *ps_cb, struct d2d_brush *brush) + ID3D10Buffer *ps_cb, struct d2d_brush *brush) { ID3D10Device *device = render_target->device; unsigned int offset; D3D10_VIEWPORT vp; HRESULT hr; - static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; vp.TopLeftX = 0; vp.TopLeftY = 0; @@ -171,7 +170,6 @@ static void d2d_draw(struct d2d_d3d_render_target *render_target, ID3D10Buffer * ID3D10Device_VSSetConstantBuffers(device, 0, 1, &vs_cb); ID3D10Device_VSSetShader(device, render_target->vs); ID3D10Device_PSSetConstantBuffers(device, 0, 1, &ps_cb); - ID3D10Device_PSSetShader(device, ps); ID3D10Device_RSSetViewports(device, 1, &vp); if (render_target->clip_stack.count) { @@ -188,10 +186,9 @@ static void d2d_draw(struct d2d_d3d_render_target *render_target, ID3D10Buffer * } ID3D10Device_OMSetRenderTargets(device, 1, &render_target->view, NULL); if (brush) - { - ID3D10Device_OMSetBlendState(device, render_target->bs, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); - d2d_brush_bind_resources(brush, device); - } + d2d_brush_bind_resources(brush, render_target); + else + ID3D10Device_PSSetShader(device, render_target->rect_solid_ps); ID3D10Device_Draw(device, 4, 0); @@ -553,7 +550,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar D3D10_SUBRESOURCE_DATA buffer_data; D3D10_BUFFER_DESC buffer_desc; ID3D10Buffer *vs_cb, *ps_cb; - ID3D10PixelShader *ps; D2D1_COLOR_F color; float tmp_x, tmp_y; HRESULT hr; @@ -619,8 +615,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar D2D_MATRIX_3X2_F w, b; float dpi_scale, d; - ps = render_target->rect_bitmap_ps; - /* Scale for dpi. */ w = render_target->drawing_state.transform; dpi_scale = render_target->dpi_x / 96.0f; @@ -663,8 +657,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar } else { - ps = render_target->rect_solid_ps; - color = brush_impl->u.solid.color; color.a *= brush_impl->opacity; @@ -679,7 +671,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar return; } - d2d_draw(render_target, vs_cb, ps, ps_cb, brush_impl); + d2d_draw(render_target, vs_cb, ps_cb, brush_impl); ID3D10Buffer_Release(ps_cb); ID3D10Buffer_Release(vs_cb); @@ -1145,7 +1137,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa return; } - d2d_draw(render_target, vs_cb, render_target->rect_solid_ps, ps_cb, NULL); + d2d_draw(render_target, vs_cb, ps_cb, NULL); ID3D10Buffer_Release(ps_cb); ID3D10Buffer_Release(vs_cb);

1 0