November 2014 - Wine-Commits

Bruno Jesus : comctl32/tests: Remove a dead assignment in misc.c (Cppcheck ).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: a2818db03b9c74ac1ca5f0f0cd2df13dcd7501c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2818db03b9c74ac1ca5f0f0c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 23:43:57 2014 -0200 comctl32/tests: Remove a dead assignment in misc.c (Cppcheck). --- dlls/comctl32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 69a7db4..280b46c 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -75,7 +75,7 @@ static void test_GetPtrAW(void) static char dest[MAX_PATH]; int sourcelen; int destsize = MAX_PATH; - int count = -1; + int count; sourcelen = strlen(source) + 1;

1 0

Michael Stefaniuc : d3d8/tests: Remove an always false condition ( PVS-Studio).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 4a67e66a3dd5473dbddf37a535673b95451801d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a67e66a3dd5473dbddf37a53… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 22:29:55 2014 +0100 d3d8/tests: Remove an always false condition (PVS-Studio). --- dlls/d3d8/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ba73bb6..163110c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -66,7 +66,7 @@ static DWORD getPixelColor(IDirect3DDevice8 *device, UINT x, UINT y) return 0xdeadbeef; } hr = IDirect3DTexture8_GetSurfaceLevel(tex, 0, &surf); - if(FAILED(hr) || !tex ) /* This is not a test */ + if (FAILED(hr)) /* This is not a test */ { trace("Can't get surface from texture, hr=%#08x\n", hr); ret = 0xdeadbeee;

1 0

Henri Verbeet : d2d1: Pass the correct vtbl in d2d_linear_gradient_brush_init().
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 56a0e32317dd711f50bdcdc0e19e4418fe404ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a0e32317dd711f50bdcdc0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:36 2014 +0100 d2d1: Pass the correct vtbl in d2d_linear_gradient_brush_init(). --- dlls/d2d1/brush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index ed92d60..6e46036 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -412,5 +412,5 @@ void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget * { FIXME("Ignoring brush properties.\n"); - d2d_brush_init(brush, render_target, brush_desc, (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl); + d2d_brush_init(brush, render_target, brush_desc, (ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl); }

1 0

Sebastian Lackner : user32: Fix invalid argument passed to ExtCreateRegion.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: b43f13f8926b3610db4effeba7f531a8ecc0c2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43f13f8926b3610db4effeba… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 3 06:54:16 2014 +0100 user32: Fix invalid argument passed to ExtCreateRegion. --- dlls/user32/painting.c | 4 ++-- dlls/user32/winpos.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 63e09c5..5c1dc69 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -139,7 +139,7 @@ static void update_visible_region( struct dce *dce ) data->rdh.iType = RDH_RECTANGLES; data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nRgnSize = reply_size; - vis_rgn = ExtCreateRegion( NULL, size, data ); + vis_rgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); top_win = wine_server_ptr_handle( reply->top_win ); win_rect.left = reply->win_rect.left; @@ -557,7 +557,7 @@ static HRGN get_update_region( HWND hwnd, UINT *flags, HWND *child ) data->rdh.iType = RDH_RECTANGLES; data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nRgnSize = reply_size; - hrgn = ExtCreateRegion( NULL, size, data ); + hrgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); if (child) *child = wine_server_ptr_handle( reply->child ); *flags = reply->flags; } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 0a70942..5373733 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -131,7 +131,7 @@ int WINAPI GetWindowRgn ( HWND hwnd, HRGN hrgn ) data->rdh.iType = RDH_RECTANGLES; data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nRgnSize = reply_size; - win_rgn = ExtCreateRegion( NULL, size, data ); + win_rgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); } } else size = reply->total_size; @@ -532,7 +532,7 @@ void map_window_region( HWND from, HWND to, HRGN hrgn ) rect[i].top += offset.y; rect[i].bottom += offset.y; } - if ((new_rgn = ExtCreateRegion( NULL, data->rdh.nCount, data ))) + if ((new_rgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ))) { CombineRgn( hrgn, new_rgn, 0, RGN_COPY ); DeleteObject( new_rgn ); @@ -2018,7 +2018,7 @@ static void update_surface_region( HWND hwnd ) data->rdh.iType = RDH_RECTANGLES; data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nRgnSize = reply_size; - region = ExtCreateRegion( NULL, size, data ); + region = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); OffsetRgn( region, -reply->visible_rect.left, -reply->visible_rect.top ); } }

1 0

Michael Stefaniuc : gdi32: Remove a basically unused variable (PVS-Studio) .
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: b5a405af2f8034811bc120698fb0cbd0b9fa3dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a405af2f8034811bc120698… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 22:31:29 2014 +0100 gdi32: Remove a basically unused variable (PVS-Studio). --- dlls/gdi32/freetype.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d49a3f8..924f5f3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6937,7 +6937,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, INT x, src_pitch, src_width, src_height, rgb_interval, hmul, vmul; INT x_shift, y_shift; BOOL rgb; - FT_LcdFilter lcdfilter = FT_LCD_FILTER_DEFAULT; FT_Render_Mode render_mode = (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_HBGR_BITMAP)? FT_RENDER_MODE_LCD: FT_RENDER_MODE_LCD_V; @@ -6948,20 +6947,17 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, return GDI_ERROR; } - if ( lcdfilter == FT_LCD_FILTER_DEFAULT || lcdfilter == FT_LCD_FILTER_LIGHT ) + if ( render_mode == FT_RENDER_MODE_LCD) { - if ( render_mode == FT_RENDER_MODE_LCD) - { - gm.gmBlackBoxX += 2; - gm.gmptGlyphOrigin.x -= 1; - left -= (1 << 6); - } - else - { - gm.gmBlackBoxY += 2; - gm.gmptGlyphOrigin.y += 1; - top += (1 << 6); - } + gm.gmBlackBoxX += 2; + gm.gmptGlyphOrigin.x -= 1; + left -= (1 << 6); + } + else + { + gm.gmBlackBoxY += 2; + gm.gmptGlyphOrigin.y += 1; + top += (1 << 6); } width = gm.gmBlackBoxX; @@ -6981,7 +6977,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki); if ( pFT_Library_SetLcdFilter ) - pFT_Library_SetLcdFilter( library, lcdfilter ); + pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT ); pFT_Render_Glyph (ft_face->glyph, render_mode); src = ft_face->glyph->bitmap.buffer;

1 0

Bruno Jesus : mciavi32: Initialize a variable (Cppcheck).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 47554b8c6363fbd300496db25e947c74c1303910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47554b8c6363fbd300496db25… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 23:44:23 2014 -0200 mciavi32: Initialize a variable (Cppcheck). --- dlls/mciavi32/info.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index 668464c..f679778 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -74,7 +74,7 @@ DWORD MCIAVI_ConvertTimeFormatToFrame(WINE_MCIAVI* wma, DWORD val) DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) { WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); - DWORD ret; + DWORD ret = MCIERR_UNSUPPORTED_FUNCTION; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -175,7 +175,6 @@ DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS l /* w2k does not know MAX_WINDOWS or MAX/MINIMUM_RATE */ default: FIXME("Unknown capability (%08x) !\n", lpParms->dwItem); - ret = MCIERR_UNSUPPORTED_FUNCTION; break; } }

1 0

Marcus Meissner : dwrite: Fixed memory leak on error (Coverity).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: a423cbdd5e18552df2da73a1c6bcf6511796bc23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a423cbdd5e18552df2da73a1c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 2 11:10:22 2014 +0100 dwrite: Fixed memory leak on error (Coverity). --- dlls/dwrite/font.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8420fdc..ed0a760 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1476,8 +1476,10 @@ HRESULT create_font_collection(IDWriteFactory* factory, IDWriteFontFileEnumerato init_font_data(factory, file, i, face_type, font_data); hr = get_filestream_from_file(file, &stream); - if (FAILED(hr)) + if (FAILED(hr)) { + heap_free (font_data); return hr; + } /* get family name from font file */ name_table = NULL;

1 0

Jacek Caban : mshtml: Wine Gecko 2.34 release.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: f5e3281a807092b4f166a72d9e9965ad24f0a101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e3281a807092b4f166a72d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 3 12:39:59 2014 +0100 mshtml: Wine Gecko 2.34 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/binding.h | 1 + dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmldoc.c | 18 +- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlnode.c | 41 ++-- dlls/mshtml/mshtml_private.h | 16 +- dlls/mshtml/mutation.c | 4 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/nsembed.c | 1 - dlls/mshtml/nsiface.idl | 571 ++++++++++++++++++++++++------------------- dlls/mshtml/nsio.c | 54 ++++ dlls/mshtml/oleobj.c | 10 +- dlls/mshtml/script.c | 2 +- 14 files changed, 412 insertions(+), 318 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5e3281a807092b4f166a…

1 0

Henri Verbeet : d2d1: Implement d2d_gradient_GetGradientStops().
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 8db1df50973abc79cfe91517354f08d8a4b95e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db1df50973abc79cfe915173… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:38 2014 +0100 d2d1: Implement d2d_gradient_GetGradientStops(). --- dlls/d2d1/brush.c | 18 ++++++++++++++++-- dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/render_target.c | 8 +++++++- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 4d7a5ad..99b111f 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -66,7 +66,10 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + HeapFree(GetProcessHeap(), 0, gradient->stops); HeapFree(GetProcessHeap(), 0, gradient); + } return refcount; } @@ -90,7 +93,13 @@ static UINT32 STDMETHODCALLTYPE d2d_gradient_GetGradientStopCount(ID2D1GradientS static void STDMETHODCALLTYPE d2d_gradient_GetGradientStops(ID2D1GradientStopCollection *iface, D2D1_GRADIENT_STOP *stops, UINT32 stop_count) { - FIXME("iface %p, stops %p, stop_count %u stub!\n", iface, stops, stop_count); + struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface); + + TRACE("iface %p, stops %p, stop_count %u.\n", iface, stops, stop_count); + + memcpy(stops, gradient->stops, min(gradient->stop_count, stop_count) * sizeof(*stops)); + if (stop_count > gradient->stop_count) + memset(stops, 0, (stop_count - gradient->stop_count) * sizeof(*stops)); } static D2D1_GAMMA STDMETHODCALLTYPE d2d_gradient_GetColorInterpolationGamma(ID2D1GradientStopCollection *iface) @@ -119,7 +128,7 @@ static const struct ID2D1GradientStopCollectionVtbl d2d_gradient_vtbl = d2d_gradient_GetExtendMode, }; -void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, +HRESULT d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode) { FIXME("Ignoring gradient properties.\n"); @@ -128,6 +137,11 @@ void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_ gradient->refcount = 1; gradient->stop_count = stop_count; + if (!(gradient->stops = HeapAlloc(GetProcessHeap(), 0, stop_count * sizeof(*stops)))) + return E_OUTOFMEMORY; + memcpy(gradient->stops, stops, stop_count * sizeof(*stops)); + + return S_OK; } static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 3fd3cdd..294c765 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -86,10 +86,11 @@ struct d2d_gradient ID2D1GradientStopCollection ID2D1GradientStopCollection_iface; LONG refcount; + D2D1_GRADIENT_STOP *stops; UINT32 stop_count; }; -void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, +HRESULT d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index a50f473..035df2b 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -335,6 +335,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollect ID2D1GradientStopCollection **gradient) { struct d2d_gradient *object; + HRESULT hr; TRACE("iface %p, stops %p, stop_count %u, gamma %#x, extend_mode %#x, gradient %p.\n", iface, stops, stop_count, gamma, extend_mode, gradient); @@ -342,7 +343,12 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollect if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_gradient_init(object, iface, stops, stop_count, gamma, extend_mode); + if (FAILED(hr = d2d_gradient_init(object, iface, stops, stop_count, gamma, extend_mode))) + { + WARN("Failed to initialize gradient, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } TRACE("Created gradient %p.\n", object); *gradient = &object->ID2D1GradientStopCollection_iface;

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_ClearState().
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: a0c6cdd5c936154b29f8d2b86976356c626613a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c6cdd5c936154b29f8d2b86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:34 2014 +0100 d3d10core: Implement d3d10_device_ClearState(). --- dlls/d3d10core/device.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index aac53dd..05639b9 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1260,7 +1260,73 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Devi static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface) { - FIXME("iface %p stub!\n", iface); + static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p.\n", iface); + + wined3d_device_set_vertex_shader(device->wined3d_device, NULL); + for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) + { + wined3d_device_set_vs_sampler(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + wined3d_device_set_vs_resource_view(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) + { + wined3d_device_set_vs_cb(device->wined3d_device, i, NULL); + } + wined3d_device_set_geometry_shader(device->wined3d_device, NULL); + for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) + { + wined3d_device_set_gs_sampler(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + wined3d_device_set_gs_resource_view(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) + { + wined3d_device_set_gs_cb(device->wined3d_device, i, NULL); + } + wined3d_device_set_pixel_shader(device->wined3d_device, NULL); + for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) + { + wined3d_device_set_ps_sampler(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + wined3d_device_set_ps_resource_view(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) + { + wined3d_device_set_ps_cb(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + wined3d_device_set_stream_source(device->wined3d_device, i, NULL, 0, 0); + } + wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN); + wined3d_device_set_vertex_declaration(device->wined3d_device, NULL); + wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_UNDEFINED); + for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + wined3d_device_set_rendertarget_view(device->wined3d_device, i, NULL, FALSE); + } + wined3d_device_set_depth_stencil_view(device->wined3d_device, NULL); + ID3D10Device1_OMSetDepthStencilState(iface, NULL, 0); + ID3D10Device1_OMSetBlendState(iface, NULL, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device1_RSSetViewports(iface, 0, NULL); + ID3D10Device1_RSSetScissorRects(iface, 0, NULL); + ID3D10Device1_RSSetState(iface, NULL); + for (i = 0; i < D3D10_SO_BUFFER_SLOT_COUNT; ++i) + { + wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + } + wined3d_device_set_predication(device->wined3d_device, NULL, FALSE); } static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device1 *iface)

1 0