March 2017 - Wine-commits - list.winehq.org

Huw Davies : user32: Simplify the use of rectangles.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 21c5545a97da2b15dec2e6e02830597fee39b1d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c5545a97da2b15dec2e6e02… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 31 09:52:39 2017 +0100 user32: Simplify the use of rectangles. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 09fcae1..6c6888a 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1395,11 +1395,10 @@ static void draw_popup_arrow( HDC hdc, RECT rect, UINT arrow_bitmap_width, static void MENU_DrawMenuItem( HWND hwnd, POPUPMENU *menu, HWND hwndOwner, HDC hdc, MENUITEM *lpitem, BOOL menuBar, UINT odaction ) { - RECT rect; + RECT rect, bmprc; BOOL flat_menu = FALSE; int bkgnd; UINT arrow_bitmap_width = 0, arrow_bitmap_height = 0; - RECT bmprc; HRGN old_clip = NULL, clip; debug_print_menuitem("MENU_DrawMenuItem: ", lpitem, ""); @@ -1551,8 +1550,7 @@ static void MENU_DrawMenuItem( HWND hwnd, POPUPMENU *menu, HWND hwndOwner, HDC h HPEN oldPen; RECT rc = rect; - rc.left++; - rc.right--; + InflateRect( &rc, -1, 0 ); rc.top = ( rc.top + rc.bottom) / 2; if (flat_menu) { @@ -1601,7 +1599,6 @@ static void MENU_DrawMenuItem( HWND hwnd, POPUPMENU *menu, HWND hwndOwner, HDC h { HBITMAP bm; INT y = rect.top + rect.bottom; - RECT rc = rect; BOOL checked = FALSE; UINT check_bitmap_width = GetSystemMetrics( SM_CXMENUCHECK ); UINT check_bitmap_height = GetSystemMetrics( SM_CYMENUCHECK ); @@ -1619,7 +1616,7 @@ static void MENU_DrawMenuItem( HWND hwnd, POPUPMENU *menu, HWND hwndOwner, HDC h HDC hdcMem = CreateCompatibleDC( hdc ); SelectObject( hdcMem, bm ); - BitBlt( hdc, rc.left, (y - check_bitmap_height) / 2, + BitBlt( hdc, rect.left, (y - check_bitmap_height) / 2, check_bitmap_width, check_bitmap_height, hdcMem, 0, 0, SRCCOPY ); DeleteDC( hdcMem ); @@ -1637,7 +1634,7 @@ static void MENU_DrawMenuItem( HWND hwnd, POPUPMENU *menu, HWND hwndOwner, HDC h DrawFrameControl( hdcMem, &r, DFC_MENU, (lpitem->fType & MFT_RADIOCHECK) ? DFCS_MENUBULLET : DFCS_MENUCHECK ); - BitBlt( hdc, rc.left, (y - r.bottom) / 2, r.right, r.bottom, + BitBlt( hdc, rect.left, (y - r.bottom) / 2, r.right, r.bottom, hdcMem, 0, 0, SRCCOPY ); DeleteDC( hdcMem ); DeleteObject( bm );

1 0

Huw Davies : user32: Don't bother drawing an item if it' s outside the items_rect.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 962d5e6469730afb7614c0a8d65a168d7c200e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=962d5e6469730afb7614c0a8d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 31 09:52:40 2017 +0100 user32: Don't bother drawing an item if it's outside the items_rect. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 6c6888a..a65f01e 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1417,6 +1417,12 @@ static void MENU_DrawMenuItem( HWND hwnd, POPUPMENU *menu, HWND hwndOwner, HDC h return; } + TRACE( "rect=%s\n", wine_dbgstr_rect( &lpitem->rect ) ); + rect = lpitem->rect; + MENU_AdjustMenuItemRect( menu, &rect ); + if (!IntersectRect( &bmprc, &rect, &menu->items_rect )) /* bmprc is used as a dummy */ + return; + SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); bkgnd = (menuBar && flat_menu) ? COLOR_MENUBAR : COLOR_MENU; @@ -1444,10 +1450,6 @@ static void MENU_DrawMenuItem( HWND hwnd, POPUPMENU *menu, HWND hwndOwner, HDC h SetBkColor( hdc, GetSysColor( bkgnd ) ); } - TRACE("rect=%s\n", wine_dbgstr_rect( &lpitem->rect)); - rect = lpitem->rect; - MENU_AdjustMenuItemRect(menu, &rect); - old_clip = CreateRectRgn( 0, 0, 0, 0 ); if (GetClipRgn( hdc, old_clip ) <= 0) {

1 0

Hugh McMaster : regedit: Remove unused #define.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 9ea9874abfe1afc574f76cec435708a4e74b36d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea9874abfe1afc574f76cec4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 31 08:35:46 2017 +0000 regedit: Remove unused #define. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 131149f..5610c87 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -52,7 +52,6 @@ static HKEY reg_class_keys[] = { /* return values */ #define NOT_ENOUGH_MEMORY 1 -#define IO_ERROR 2 /* processing macros */

1 0

Józef Kucia : wined3d: Support simple stream output descriptions when ARB_TRANSFORM_FEEDBACK3 is not available.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: a0ed4bdb1fcfe657cb3b67436bb38861c7ff60d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ed4bdb1fcfe657cb3b67436… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 31 13:11:49 2017 +0200 wined3d: Support simple stream output descriptions when ARB_TRANSFORM_FEEDBACK3 is not available. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 59 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b3cd500..20a2208 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -766,7 +766,7 @@ static void append_transform_feedback_skip_components(const char **varyings, static void shader_glsl_generate_transform_feedback_varyings(const struct wined3d_stream_output_desc *so_desc, struct wined3d_string_buffer *buffer, const char **varyings, unsigned int *varying_count, - char *strings, unsigned int *strings_length) + char *strings, unsigned int *strings_length, GLenum buffer_mode) { unsigned int i, buffer_idx, count, length, highest_output_slot, stride; @@ -820,8 +820,11 @@ static void shader_glsl_generate_transform_feedback_varyings(const struct wined3 if (highest_output_slot <= buffer_idx) break; - string_buffer_sprintf(buffer, "gl_NextBuffer"); - append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); + if (buffer_mode == GL_INTERLEAVED_ATTRIBS) + { + string_buffer_sprintf(buffer, "gl_NextBuffer"); + append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); + } } if (varying_count) @@ -836,22 +839,58 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context *co const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_string_buffer *buffer; - unsigned int count, length; + unsigned int i, count, length; const char **varyings; char *strings; + GLenum mode; if (!so_desc->element_count) return; - if (!gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) + if (gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) { - FIXME("ARB_transform_feedback3 not supported by OpenGL implementation.\n"); - return; + mode = GL_INTERLEAVED_ATTRIBS; + } + else + { + unsigned int element_count[WINED3D_MAX_STREAM_OUTPUT_BUFFERS] = {0}; + + for (i = 0; i < so_desc->element_count; ++i) + { + if (so_desc->elements[i].register_idx == WINED3D_STREAM_OUTPUT_GAP) + { + FIXME("ARB_transform_feedback3 is needed for stream output gaps.\n"); + return; + } + ++element_count[so_desc->elements[i].output_slot]; + } + + if (element_count[0] == so_desc->element_count) + { + mode = GL_INTERLEAVED_ATTRIBS; + } + else + { + mode = GL_SEPARATE_ATTRIBS; + for (i = 0; i < ARRAY_SIZE(element_count); ++i) + { + if (element_count[i] != 1) + break; + } + for (; i < ARRAY_SIZE(element_count); ++i) + { + if (element_count[i]) + { + FIXME("Only single element per buffer is allowed in separate mode.\n"); + return; + } + } + } } buffer = string_buffer_get(&priv->string_buffers); - shader_glsl_generate_transform_feedback_varyings(so_desc, buffer, NULL, &count, NULL, &length); + shader_glsl_generate_transform_feedback_varyings(so_desc, buffer, NULL, &count, NULL, &length, mode); if (!(varyings = wined3d_calloc(count, sizeof(*varyings)))) { @@ -867,8 +906,8 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context *co return; } - shader_glsl_generate_transform_feedback_varyings(so_desc, buffer, varyings, NULL, strings, NULL); - GL_EXTCALL(glTransformFeedbackVaryings(program_id, count, varyings, GL_INTERLEAVED_ATTRIBS)); + shader_glsl_generate_transform_feedback_varyings(so_desc, buffer, varyings, NULL, strings, NULL, mode); + GL_EXTCALL(glTransformFeedbackVaryings(program_id, count, varyings, mode)); checkGLcall("glTransformFeedbackVaryings"); HeapFree(GetProcessHeap(), 0, varyings);

1 0

Józef Kucia : d3d11: Implement d3d10_device_CreateGeometryShaderWithStreamOutput().
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: acb337492db739b6bac59a2e776c676dd5f69811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb337492db739b6bac59a2e7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 31 13:11:50 2017 +0200 d3d11: Implement d3d10_device_CreateGeometryShaderWithStreamOutput(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 4 +--- dlls/d3d11/device.c | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 3e8a1e8..baa7792 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9946,8 +9946,7 @@ static void test_index_buffer_offset(void) hr = ID3D10Device_CreateGeometryShaderWithStreamOutput(device, gs_code, sizeof(gs_code), so_declaration, sizeof(so_declaration) / sizeof(*so_declaration), stride, &gs); - todo_wine ok(SUCCEEDED(hr), "Failed to create geometry shader with stream output, hr %#x.\n", hr); - if (FAILED(hr)) goto cleanup; + ok(SUCCEEDED(hr), "Failed to create geometry shader with stream output, hr %#x.\n", hr); hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); @@ -9992,7 +9991,6 @@ static void test_index_buffer_offset(void) ID3D10Buffer_Release(vb); ID3D10VertexShader_Release(vs); ID3D10GeometryShader_Release(gs); -cleanup: ID3D10InputLayout_Release(input_layout); release_test_context(&test_context); } diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5ae305d..13bfda4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4927,12 +4927,45 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp const void *byte_code, SIZE_T byte_code_length, const D3D10_SO_DECLARATION_ENTRY *output_stream_decls, UINT output_stream_decl_count, UINT output_stream_stride, ID3D10GeometryShader **shader) { - FIXME("iface %p, byte_code %p, byte_code_length %lu, output_stream_decls %p, " - "output_stream_decl_count %u, output_stream_stride %u, shader %p stub!\n", + struct d3d_device *device = impl_from_ID3D10Device(iface); + D3D11_SO_DECLARATION_ENTRY *so_entries; + struct d3d_geometry_shader *object; + unsigned int i, stride_count = 1; + HRESULT hr; + + TRACE("iface %p, byte_code %p, byte_code_length %lu, output_stream_decls %p, " + "output_stream_decl_count %u, output_stream_stride %u, shader %p.\n", iface, byte_code, byte_code_length, output_stream_decls, output_stream_decl_count, output_stream_stride, shader); - return E_NOTIMPL; + if (!(so_entries = d3d11_calloc(output_stream_decl_count, sizeof(*so_entries)))) + { + ERR("Failed to allocate D3D11 SO declaration array memory.\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < output_stream_decl_count; ++i) + { + so_entries[i].Stream = 0; + so_entries[i].SemanticName = output_stream_decls[i].SemanticName; + so_entries[i].SemanticIndex = output_stream_decls[i].SemanticIndex; + so_entries[i].StartComponent = output_stream_decls[i].StartComponent; + so_entries[i].ComponentCount = output_stream_decls[i].ComponentCount; + so_entries[i].OutputSlot = output_stream_decls[i].OutputSlot; + + if (output_stream_decls[i].OutputSlot) + stride_count = 0; + } + + hr = d3d_geometry_shader_create(device, byte_code, byte_code_length, + so_entries, output_stream_decl_count, &output_stream_stride, stride_count, 0, &object); + HeapFree(GetProcessHeap(), 0, so_entries); + if (FAILED(hr)) + return hr; + + *shader = &object->ID3D10GeometryShader_iface; + + return hr; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device1 *iface,

1 0

Józef Kucia : wined3d: Fix transform feedback primitive mode.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 6f5a2f58477cc64e06183196a6caafac55fece20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5a2f58477cc64e06183196a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 31 13:11:51 2017 +0200 wined3d: Fix transform feedback primitive mode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/drawprim.c | 30 ++++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1e4011c..3b50e48 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -57,7 +57,7 @@ const struct wined3d_light WINED3D_default_light = * actually have the same values in GL and D3D. */ GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) { - switch(primitive_type) + switch (primitive_type) { case WINED3D_PT_POINTLIST: return GL_POINTS; @@ -90,7 +90,7 @@ GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) return GL_TRIANGLE_STRIP_ADJACENCY_ARB; default: - FIXME("Unhandled primitive type %s\n", debug_d3dprimitivetype(primitive_type)); + FIXME("Unhandled primitive type %s.\n", debug_d3dprimitivetype(primitive_type)); case WINED3D_PT_UNDEFINED: return ~0u; } @@ -98,7 +98,7 @@ GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) static enum wined3d_primitive_type d3d_primitive_type_from_gl(GLenum primitive_type) { - switch(primitive_type) + switch (primitive_type) { case GL_POINTS: return WINED3D_PT_POINTLIST; @@ -131,7 +131,7 @@ static enum wined3d_primitive_type d3d_primitive_type_from_gl(GLenum primitive_t return WINED3D_PT_TRIANGLESTRIP_ADJ; default: - FIXME("Unhandled primitive type %s\n", debug_d3dprimitivetype(primitive_type)); + FIXME("Unhandled primitive type %s.\n", debug_d3dprimitivetype(primitive_type)); case ~0u: return WINED3D_PT_UNDEFINED; } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 1335707..c6d3450 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -435,6 +435,32 @@ static void context_pause_transform_feedback(struct wined3d_context *context, BO context_end_transform_feedback(context); } +static GLenum gl_tfb_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) +{ + GLenum gl_primitive_type = gl_primitive_type_from_d3d(primitive_type); + switch (gl_primitive_type) + { + case GL_POINTS: + return GL_POINTS; + + case GL_LINE_STRIP: + case GL_LINE_STRIP_ADJACENCY: + case GL_LINES_ADJACENCY: + case GL_LINES: + return GL_LINES; + + case GL_TRIANGLE_FAN: + case GL_TRIANGLE_STRIP: + case GL_TRIANGLE_STRIP_ADJACENCY: + case GL_TRIANGLES_ADJACENCY: + case GL_TRIANGLES: + return GL_TRIANGLES; + + default: + return gl_primitive_type; + } +} + /* Routine common to the draw primitive and draw indexed primitive routines */ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, @@ -584,7 +610,6 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (use_transform_feedback(state)) { const struct wined3d_shader *shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; - GLenum primitive_mode = gl_primitive_type_from_d3d(shader->u.gs.output_type); if (shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) { @@ -601,7 +626,8 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s } else if (!context->transform_feedback_active) { - GL_EXTCALL(glBeginTransformFeedback(primitive_mode)); + GLenum mode = gl_tfb_primitive_type_from_d3d(shader->u.gs.output_type); + GL_EXTCALL(glBeginTransformFeedback(mode)); checkGLcall("glBeginTransformFeedback"); context->transform_feedback_active = 1; }

1 0

Józef Kucia : d3d10core/tests: Add test for resuming stream output.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: b29b0124901833eafa28c9678c47d55532ace24e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29b0124901833eafa28c9678… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 31 13:11:52 2017 +0200 d3d10core/tests: Add test for resuming stream output. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 150 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 147 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index baa7792..abc8163 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -23,6 +23,10 @@ #include "wine/test.h" #include <limits.h> +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif + #define BITS_NNAN 0xffc00000 #define BITS_NAN 0x7fc00000 #define BITS_NINF 0xff800000 @@ -9942,10 +9946,8 @@ static void test_index_buffer_offset(void) vs_code, sizeof(vs_code), &input_layout); ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); - stride = 32; hr = ID3D10Device_CreateGeometryShaderWithStreamOutput(device, gs_code, sizeof(gs_code), - so_declaration, sizeof(so_declaration) / sizeof(*so_declaration), - stride, &gs); + so_declaration, sizeof(so_declaration) / sizeof(*so_declaration), 32, &gs); ok(SUCCEEDED(hr), "Failed to create geometry shader with stream output, hr %#x.\n", hr); hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); @@ -11761,6 +11763,147 @@ float4 main(struct ps_data ps_input) : SV_Target release_test_context(&test_context); } +static void test_stream_output_resume(void) +{ + struct d3d10core_test_context test_context; + ID3D10Buffer *cb, *so_buffer, *buffer; + unsigned int i, j, idx, offset; + struct resource_readback rb; + ID3D10GeometryShader *gs; + const struct vec4 *data; + ID3D10Device *device; + HRESULT hr; + + static const DWORD gs_code[] = + { +#if 0 + float4 constant; + + struct vertex + { + float4 position : SV_POSITION; + }; + + struct element + { + float4 position : SV_POSITION; + float4 so_output : so_output; + }; + + [maxvertexcount(3)] + void main(triangle vertex input[3], inout TriangleStream<element> output) + { + element o; + o.so_output = constant; + o.position = input[0].position; + output.Append(o); + o.position = input[1].position; + output.Append(o); + o.position = input[2].position; + output.Append(o); + } +#endif + 0x43425844, 0x76f5793f, 0x08760f12, 0xb730b512, 0x3728e75c, 0x00000001, 0x000001b8, 0x00000003, + 0x0000002c, 0x00000060, 0x000000b8, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x00000050, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x6f5f6f73, 0x75707475, 0xabab0074, 0x52444853, 0x000000f8, + 0x00020040, 0x0000003e, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x05000061, 0x002010f2, + 0x00000003, 0x00000000, 0x00000001, 0x0100185d, 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x0200005e, 0x00000003, 0x06000036, 0x001020f2, + 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x06000036, 0x001020f2, 0x00000001, 0x00208e46, + 0x00000000, 0x00000000, 0x01000013, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000001, + 0x00000000, 0x06000036, 0x001020f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000000, 0x01000013, + 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000002, 0x00000000, 0x06000036, 0x001020f2, + 0x00000001, 0x00208e46, 0x00000000, 0x00000000, 0x01000013, 0x0100003e, + }; + static const D3D10_SO_DECLARATION_ENTRY so_declaration[] = + { + {"so_output", 0, 0, 4, 0}, + }; + static const struct vec4 constants[] = + { + {0.5f, 0.250f, 0.0f, 0.0f}, + {0.0f, 0.125f, 0.0f, 1.0f}, + {1.0f, 1.000f, 1.0f, 0.0f} + }; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 white = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreateGeometryShaderWithStreamOutput(device, gs_code, sizeof(gs_code), + so_declaration, ARRAY_SIZE(so_declaration), 16, &gs); + ok(SUCCEEDED(hr), "Failed to create geometry shader with stream output, hr %#x.\n", hr); + + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(constants[0]), &constants[0]); + so_buffer = create_buffer(device, D3D10_BIND_STREAM_OUTPUT, 1024, NULL); + + ID3D10Device_GSSetShader(device, gs); + ID3D10Device_GSSetConstantBuffers(device, 0, 1, &cb); + + offset = 0; + ID3D10Device_SOSetTargets(device, 1, &so_buffer, &offset); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); + + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xff0000ff, 0); + + ID3D10Device_GSSetShader(device, NULL); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constants[1], 0, 0); + ID3D10Device_GSSetShader(device, gs); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xff0000ff, 0); + + ID3D10Device_GSSetShader(device, NULL); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xff0000ff, 0); + + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constants[2], 0, 0); + ID3D10Device_GSSetShader(device, gs); + draw_color_quad(&test_context, &white); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); + + ID3D10Device_GSSetShader(device, NULL); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + buffer = NULL; + ID3D10Device_SOSetTargets(device, 1, &buffer, &offset); + ID3D10Device_GSSetShader(device, NULL); + draw_color_quad(&test_context, &white); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); + + idx = 0; + get_buffer_readback(so_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(constants); ++i) + { + for (j = 0; j < 6; ++j) /* 2 triangles */ + { + data = get_readback_vec4(&rb, idx++, 0); + ok(compare_vec4(data, &constants[i], 0), + "Got unexpected result {%.8e, %.8e, %.8e, %.8e} at %u (%u, %u).\n", + data->x, data->y, data->z, data->w, idx, i, j); + } + } + release_resource_readback(&rb); + + ID3D10Buffer_Release(cb); + ID3D10Buffer_Release(so_buffer); + ID3D10GeometryShader_Release(gs); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -11826,4 +11969,5 @@ START_TEST(device) test_render_target_device_mismatch(); test_buffer_srv(); test_geometry_shader(); + test_stream_output_resume(); }

1 0

Józef Kucia : d3d10core/tests: Use ARRAY_SIZE() macro.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: a8389a2b58d55fac2df0bb3939a02b92565fd15a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8389a2b58d55fac2df0bb393… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 31 13:11:53 2017 +0200 d3d10core/tests: Use ARRAY_SIZE() macro. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 108 ++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8389a2b58d55fac2df0b…

1 0

Piotr Caban : msvcrt: Fix handling of unsigned chars in scanf format.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 32bb8d9068ae5282b6b10734579aaa2d5195a5af URL: http://source.winehq.org/git/wine.git/?a=commit;h=32bb8d9068ae5282b6b107345… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 31 15:02:48 2017 +0200 msvcrt: Fix handling of unsigned chars in scanf format. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/tests/scanf.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index b2e6bd7..0fa1e6f 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -699,7 +699,7 @@ _FUNCTION_ { * a matching non-white-space character. */ else { /* check for character match */ - if (nch == *format) { + if (nch == (unsigned char)*format) { nch = _GETC_(file); } else break; } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 6cb85fa..ecb270b 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -251,6 +251,10 @@ static void test_sscanf( void ) ok(ret == 2, "got %d\n", ret); ok(!strcmp(buffer, "test"), "buf %s\n", buffer); ok(!strcmp(buffer1, "value\xda"), "buf %s\n", buffer1); + + ret = sscanf("\x81test", "\x81%s", buffer); + ok(ret == 1, "got %d\n", ret); + ok(!strcmp(buffer, "test"), "buf = %s\n", buffer); } static void test_sscanf_s(void)

1 0

Piotr Caban : msvcr120: Add fesetround implementation.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 92651b9850a4d030a675e7c5b6809235f831f9d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92651b9850a4d030a675e7c5b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 31 16:05:35 2017 +0200 msvcr120: Add fesetround implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/math.c | 19 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 6cea910..57c5ecf 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -90,11 +90,11 @@ @ stub feclearexcept @ cdecl fegetenv(ptr) ucrtbase.fegetenv @ stub fegetexceptflag -@ stub fegetround +@ cdecl fegetround() ucrtbase.fegetround @ stub feholdexcept @ cdecl fesetenv(ptr) ucrtbase.fesetenv @ stub fesetexceptflag -@ stub fesetround +@ cdecl fesetround(long) ucrtbase.fesetround @ stub fetestexcept @ cdecl perror(str) ucrtbase.perror @ stub quick_exit diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dc2186d..3ae8098 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2146,14 +2146,14 @@ @ stub feclearexcept @ cdecl fegetenv(ptr) MSVCRT_fegetenv @ stub fegetexceptflag -@ stub fegetround +@ cdecl fegetround() MSVCRT_fegetround @ stub feholdexcept @ cdecl feof(ptr) MSVCRT_feof @ stub feraiseexcept @ cdecl ferror(ptr) MSVCRT_ferror @ cdecl fesetenv(ptr) MSVCRT_fesetenv @ stub fesetexceptflag -@ stub fesetround +@ cdecl fesetround(long) MSVCRT_fesetround @ stub fetestexcept @ stub feupdateenv @ cdecl fflush(ptr) MSVCRT_fflush diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 497cf08..6d48f74 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1812,14 +1812,14 @@ @ stub feclearexcept @ cdecl fegetenv(ptr) msvcr120.fegetenv @ stub fegetexceptflag -@ stub fegetround +@ cdecl fegetround() msvcr120.fegetround @ stub feholdexcept @ cdecl feof(ptr) msvcr120.feof @ stub feraiseexcept @ cdecl ferror(ptr) msvcr120.ferror @ cdecl fesetenv(ptr) msvcr120.fesetenv @ stub fesetexceptflag -@ stub fesetround +@ cdecl fesetround(long) msvcr120.fesetround @ stub fetestexcept @ stub feupdateenv @ cdecl fflush(ptr) msvcr120.fflush diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0bb006d..ffb83a6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1232,6 +1232,25 @@ int CDECL __fpe_flt_rounds(void) } /********************************************************************* + * fegetround (MSVCR120.@) + */ +int CDECL MSVCRT_fegetround(void) +{ + return _controlfp(0, 0) & MSVCRT__RC_CHOP; +} + +/********************************************************************* + * fesetround (MSVCR120.@) + */ +int CDECL MSVCRT_fesetround(int round_mode) +{ + if (round_mode & (~MSVCRT__RC_CHOP)) + return 1; + _controlfp(round_mode, MSVCRT__RC_CHOP); + return 0; +} + +/********************************************************************* * _copysign (MSVCRT.@) */ double CDECL MSVCRT__copysign(double num, double sign) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index fd55f93..d4f3d7e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2289,13 +2289,13 @@ @ stub feclearexcept @ cdecl fegetenv(ptr) MSVCRT_fegetenv @ stub fegetexceptflag -@ stub fegetround +@ cdecl fegetround() MSVCRT_fegetround @ stub feholdexcept @ cdecl feof(ptr) MSVCRT_feof @ cdecl ferror(ptr) MSVCRT_ferror @ cdecl fesetenv(ptr) MSVCRT_fesetenv @ stub fesetexceptflag -@ stub fesetround +@ cdecl fesetround(long) MSVCRT_fesetround @ stub fetestexcept @ cdecl fflush(ptr) MSVCRT_fflush @ cdecl fgetc(ptr) MSVCRT_fgetc

1 0