July 2016 - Wine-Commits - list.winehq.org

Michael Stefaniuc : explorerframe/tests: Use SetRect() instead of open coding it.
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: 6eb70eea1b2d4a8cfcacaf7c6eb4e8bda3a23ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb70eea1b2d4a8cfcacaf7c6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 9 13:57:20 2016 +0200 explorerframe/tests: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/nstc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index f8c44b6..83ee892 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -862,7 +862,7 @@ static void test_basics(void) process_msgs(); /* Initialize the control */ - rc.top = rc.left = 0; rc.right = rc.bottom = 200; + SetRect(&rc, 0, 0, 200, 200); hr = INameSpaceTreeControl_Initialize(pnstc, hwnd, &rc, 0); ok(hr == S_OK, "Got (0x%08x)\n", hr); @@ -1563,7 +1563,7 @@ static void test_basics(void) ok(hr == S_OK, "Got (0x%08x)\n", hr); /* GetItemRect */ - rc.top = rc.left = rc.bottom = rc.right = 0; + SetRectEmpty(&rc); if(0) { /* Crashes under win 7 */

1 0

Henri Verbeet : d3d10: Validate offsets in parse_shader() (AFL).
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: 7f6520a2bb662d9e3caac2f4dc08880951269c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6520a2bb662d9e3caac2f4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 10 15:09:19 2016 +0200 d3d10: Validate offsets in parse_shader() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ff00aa1..4736fa9 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -475,12 +475,11 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag return S_OK; } -static HRESULT parse_shader(ID3D10EffectVariable *variable, const char *data) +static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_variable *v) { - struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable(variable); ID3D10Device *device = v->effect->device; - const char *ptr = data; DWORD dxbc_size; + const char *ptr; HRESULT hr; if (v->effect->used_shader_current >= v->effect->used_shader_count) @@ -492,11 +491,22 @@ static HRESULT parse_shader(ID3D10EffectVariable *variable, const char *data) v->effect->used_shaders[v->effect->used_shader_current] = v; ++v->effect->used_shader_current; - if (!ptr) return S_OK; + if (offset >= data_size || !require_space(offset, 1, sizeof(dxbc_size), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return E_FAIL; + } + ptr = data + offset; read_dword(&ptr, &dxbc_size); TRACE("dxbc size: %#x\n", dxbc_size); + if (!require_space(ptr - data, 1, dxbc_size, data_size)) + { + WARN("Invalid dxbc size %#x (data size %#lx, offset %#x).\n", offset, (long)data_size, offset); + return E_FAIL; + } + /* We got a shader VertexShader vs = NULL, so it is fine to skip this. */ if (!dxbc_size) return S_OK; @@ -1304,6 +1314,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, HRESULT hr; struct d3d10_effect *effect = o->pass->technique->effect; ID3D10Effect *e = &effect->ID3D10Effect_iface; + struct d3d10_effect_variable *v; DWORD tmp, variable_idx = 0; const char *name; size_t name_len; @@ -1431,12 +1442,12 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, read_dword(&data_ptr, &offset); TRACE("Effect object starts at offset %#x.\n", offset); - data_ptr = data + offset; - - hr = parse_fx10_anonymous_shader(effect, &effect->anonymous_shaders[effect->anonymous_shader_current], o->type); - if (FAILED(hr)) return hr; + if (FAILED(hr = parse_fx10_anonymous_shader(effect, + &effect->anonymous_shaders[effect->anonymous_shader_current], o->type))) + return hr; - variable = &effect->anonymous_shaders[effect->anonymous_shader_current].shader.ID3D10EffectVariable_iface; + v = &effect->anonymous_shaders[effect->anonymous_shader_current].shader; + variable = &v->ID3D10EffectVariable_iface; ++effect->anonymous_shader_current; switch (o->type) @@ -1444,7 +1455,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, case D3D10_EOT_VERTEXSHADER: case D3D10_EOT_PIXELSHADER: case D3D10_EOT_GEOMETRYSHADER: - if (FAILED(hr = parse_shader(variable, data_ptr))) + if (FAILED(hr = parse_fx10_shader(data, data_size, offset, v))) return hr; break; @@ -1800,8 +1811,8 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, read_dword(ptr, &shader_offset); TRACE("Shader offset: %#x.\n", shader_offset); - hr = parse_shader(&var->ID3D10EffectVariable_iface, data + shader_offset); - if (FAILED(hr)) return hr; + if (FAILED(hr = parse_fx10_shader(data, data_size, shader_offset, var))) + return hr; } break;

1 0

Henri Verbeet : wined3d: Synchronise WINED3D_CS_OP_DRAW resource access.
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: c4ccdb248440d2e1dfb2083511d043245cb84b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ccdb248440d2e1dfb208351… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 10 15:09:18 2016 +0200 wined3d: Synchronise WINED3D_CS_OP_DRAW resource access. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c456b5b..8ed049e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -361,7 +361,11 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { struct wined3d_state *state = &cs->device->state; + struct wined3d_shader_sampler_map_entry *entry; + struct wined3d_shader_resource_view *view; const struct wined3d_cs_draw *op = data; + struct wined3d_shader *shader; + unsigned int i, j; if (!cs->device->adapter->gl_info.supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && state->load_base_vertex_index != op->base_vertex_idx) @@ -372,12 +376,58 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) draw_primitive(cs->device, state, op->base_vertex_idx, op->start_idx, op->index_count, op->start_instance, op->instance_count, op->indexed); + + if (op->indexed) + wined3d_resource_release(&state->index_buffer->resource); + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (state->streams[i].buffer) + wined3d_resource_release(&state->streams[i].buffer->resource); + } + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + { + if (state->textures[i]) + wined3d_resource_release(&state->textures[i]->resource); + } + for (i = 0; i < cs->device->adapter->gl_info.limits.buffers; ++i) + { + if (state->fb->render_targets[i]) + wined3d_resource_release(state->fb->render_targets[i]->resource); + } + if (state->fb->depth_stencil) + wined3d_resource_release(state->fb->depth_stencil->resource); + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + if (!(shader = state->shader[i])) + continue; + + for (j = 0; j < WINED3D_MAX_CBS; ++j) + { + if (state->cb[i][j]) + wined3d_resource_release(&state->cb[i][j]->resource); + } + + for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) + { + entry = &shader->reg_maps.sampler_map.entries[j]; + + if (!(view = state->shader_resource_view[i][entry->resource_idx])) + continue; + + wined3d_resource_release(view->resource); + } + } } void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { + const struct wined3d_state *state = &cs->device->state; + struct wined3d_shader_sampler_map_entry *entry; + struct wined3d_shader_resource_view *view; + struct wined3d_shader *shader; struct wined3d_cs_draw *op; + unsigned int i, j; op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_DRAW; @@ -388,6 +438,47 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i op->instance_count = instance_count; op->indexed = indexed; + if (indexed) + wined3d_resource_acquire(&state->index_buffer->resource); + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (state->streams[i].buffer) + wined3d_resource_acquire(&state->streams[i].buffer->resource); + } + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + { + if (state->textures[i]) + wined3d_resource_acquire(&state->textures[i]->resource); + } + for (i = 0; i < cs->device->adapter->gl_info.limits.buffers; ++i) + { + if (state->fb->render_targets[i]) + wined3d_resource_acquire(state->fb->render_targets[i]->resource); + } + if (state->fb->depth_stencil) + wined3d_resource_acquire(state->fb->depth_stencil->resource); + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + if (!(shader = state->shader[i])) + continue; + + for (j = 0; j < WINED3D_MAX_CBS; ++j) + { + if (state->cb[i][j]) + wined3d_resource_acquire(&state->cb[i][j]->resource); + } + + for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) + { + entry = &shader->reg_maps.sampler_map.entries[j]; + + if (!(view = state->shader_resource_view[i][entry->resource_idx])) + continue; + + wined3d_resource_acquire(view->resource); + } + } + cs->ops->submit(cs); }

1 0

Kirill Smirnov : winex11.drv: Avoid passing NULL to memcpy (clang).
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: 1b4e193473153dc9f4d4f4237b9a67564ada95d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4e193473153dc9f4d4f4237… Author: Kirill Smirnov <kirill.k.smirnov(a)gmail.com> Date: Fri Jul 8 01:50:27 2016 +0300 winex11.drv: Avoid passing NULL to memcpy (clang). Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index e0548b8..e51169d 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -92,7 +92,7 @@ static void X11DRV_ImmSetInternalString(DWORD dwOffset, ptr_new = CompositionString + byte_offset; memmove(ptr_new + byte_length, ptr_new + byte_selection, dwCompStringLength - byte_offset - byte_selection); - memcpy(ptr_new, lpComp, byte_length); + if (lpComp) memcpy(ptr_new, lpComp, byte_length); dwCompStringLength += byte_expansion; IME_SetCompositionString(SCS_SETSTR, CompositionString,

1 0

Michael Stefaniuc : winepulse: Remove a redundant NULL check before HeapFree().
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: cd9aa35f680ac11be96ecc955be0c14e59877c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9aa35f680ac11be96ecc955… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:06:30 2016 +0200 winepulse: Remove a redundant NULL check before HeapFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 1c38e58..5bf534e 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1443,8 +1443,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, exit: if (FAILED(hr)) { - if(This->local_buffer) - HeapFree(GetProcessHeap(), 0, This->local_buffer); + HeapFree(GetProcessHeap(), 0, This->local_buffer); This->local_buffer = NULL; if (This->stream) { pa_stream_disconnect(This->stream);

1 0

Michael Stefaniuc : windowscodecs: Remove a redundant NULL check before HeapFree().
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: da5dfe7e80989c4dbdeb2fc3a933b8cc8fe66609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5dfe7e80989c4dbdeb2fc3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:06:02 2016 +0200 windowscodecs: Remove a redundant NULL check before HeapFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/icnsformat.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index d4c5004..552fa39 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -175,8 +175,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) This->encoder->outstanding_commits--; LeaveCriticalSection(&This->encoder->lock); } - if (This->icns_image != NULL) - HeapFree(GetProcessHeap(), 0, This->icns_image); + HeapFree(GetProcessHeap(), 0, This->icns_image); IWICBitmapEncoder_Release(&This->encoder->IWICBitmapEncoder_iface); HeapFree(GetProcessHeap(), 0, This);

1 0

Michael Stefaniuc : comctl32: Use InflateRect() too when expanding in just one axis.
by Alexandre Julliard July 10, 2016

July 10, 2016

Module: wine Branch: master Commit: 8258d900ca5f1404ff49d3b26de0ac81663da4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8258d900ca5f1404ff49d3b26… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:18:39 2016 +0200 comctl32: Use InflateRect() too when expanding in just one axis. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/rebar.c | 6 ++---- dlls/comctl32/tab.c | 11 +++-------- dlls/comctl32/theme_button.c | 3 +-- dlls/comctl32/toolbar.c | 3 +-- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 3089378..a6243a9 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -730,8 +730,7 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) lpBand->fDraw |= DRAW_GRIPPER; lpBand->rcGripper.left += REBAR_PRE_GRIPPER; lpBand->rcGripper.right = lpBand->rcGripper.left + GRIPPER_WIDTH; - lpBand->rcGripper.top += 2; - lpBand->rcGripper.bottom -= 2; + InflateRect(&lpBand->rcGripper, 0, -2); SetRect (&lpBand->rcCapImage, lpBand->rcGripper.right+REBAR_ALWAYS_SPACE, lpBand->rcBand.top, @@ -859,8 +858,7 @@ REBAR_CalcVertBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) } else { /* horizontal gripper */ - lpBand->rcGripper.left += 2; - lpBand->rcGripper.right -= 2; + InflateRect(&lpBand->rcGripper, -2, 0); lpBand->rcGripper.top += REBAR_PRE_GRIPPER; lpBand->rcGripper.bottom = lpBand->rcGripper.top + GRIPPER_WIDTH; diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index d228c07..9806783 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1618,8 +1618,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect if (iItem != infoPtr->iSelected) { drawRect->left += 2; - drawRect->top += 2; - drawRect->bottom -= 2; + InflateRect(drawRect, 0, -2); } } else if (infoPtr->dwStyle & TCS_VERTICAL) @@ -1630,9 +1629,8 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect } else { - drawRect->top += 2; drawRect->right -= 2; - drawRect->bottom -= 2; + InflateRect(drawRect, 0, -2); } } else if (infoPtr->dwStyle & TCS_BOTTOM) @@ -1715,10 +1713,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect drawRect->top += 2; drawRect->right -= 1; if ( iItem == infoPtr->iSelected ) - { - drawRect->right -= 1; - drawRect->left += 1; - } + InflateRect(drawRect, -1, 0); id = (UINT)GetWindowLongPtrW( infoPtr->hwnd, GWLP_ID ); diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index edb31e6..f136b5d 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -278,8 +278,7 @@ static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN if (text) { - textRect.left += 2; - textRect.right -= 2; + InflateRect(&textRect, -2, 0); DrawThemeText(theme, hDC, BP_GROUPBOX, state, text, lstrlenW(text), 0, 0, &textRect); HeapFree(GetProcessHeap(), 0, text); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 3b32e91..422845c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -957,8 +957,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, /* calculate text position */ if (lpText) { - rcText.left += GetSystemMetrics(SM_CXEDGE); - rcText.right -= GetSystemMetrics(SM_CXEDGE); + InflateRect(&rcText, -GetSystemMetrics(SM_CXEDGE), 0); if (dwStyle & TBSTYLE_LIST) { rcText.left += infoPtr->nBitmapWidth + infoPtr->iListGap + 2;

1 0

Alexandre Julliard : Wine release 1.9.14
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: website Branch: master Commit: 1362bf1abc83a65ea2075d69a5565f495d0d6c10 URL: http://source.winehq.org/git/website.git/?a=commit;h=1362bf1abc83a65ea2075d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 9 00:02:16 2016 +0900 Wine release 1.9.14 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016070901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016070901.xml b/news/en/2016070901.xml new file mode 100644 index 0000000..9a91dcb --- /dev/null +++ b/news/en/2016070901.xml @@ -0,0 +1,16 @@ +<news> +<date>July 9, 2016</date> +<title>Wine 1.9.14 Released</title> +<body> + The Wine development release 1.9.14 is now available. + <a href="{$root}/announce/1.9.14">What's new</a> in this release: +<ul> + <li>More Shader Model 5 support in Direct3D.</li> + <li>Some more write support in WebServices.</li> + <li>Performance improvements in GDI.</li> + <li>Some more progress towards the Direct3D command stream.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.14.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Piotr Caban : msvcrt: Return error when previously parsed type is accessed while demangling simple data type.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: 42c2799589ae7f805e5f67a2b04f24e4aa3e0b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c2799589ae7f805e5f67a2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 8 15:34:44 2016 +0200 msvcrt: Return error when previously parsed type is accessed while demangling simple data type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/undname.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 7d06188..df3e4e8 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -945,6 +945,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case '5': case '6': case '7': case '8': case '9': /* Referring back to previously parsed type */ /* left and right are pushed as two separate strings */ + if (!pmt_ref) goto done; ct->left = str_array_get_ref(pmt_ref, (dt - '0') * 2); ct->right = str_array_get_ref(pmt_ref, (dt - '0') * 2 + 1); if (!ct->left) goto done;

1 0

Józef Kucia : d3d10core/tests: Add test for vertex formats.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: c06c1023df2787fb2ebb8f8081bed045152f9f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c06c1023df2787fb2ebb8f808… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 8 12:12:31 2016 +0200 d3d10core/tests: Add test for vertex formats. 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 | 67 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4ef1b49..1071552 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -7969,6 +7969,72 @@ static void test_sm4_breakc_instruction(void) release_test_context(&test_context); } +static void test_create_input_layout(void) +{ + D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_UNKNOWN, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + ID3D10InputLayout *input_layout; + ID3D10Device *device; + ULONG refcount; + unsigned int i; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + float4 main(float4 position : POSITION) : SV_POSITION + { + return position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const DXGI_FORMAT vertex_formats[] = + { + DXGI_FORMAT_R32G32_FLOAT, + DXGI_FORMAT_R32G32_UINT, + DXGI_FORMAT_R32G32_SINT, + DXGI_FORMAT_R16G16_FLOAT, + DXGI_FORMAT_R16G16_UINT, + DXGI_FORMAT_R16G16_SINT, + DXGI_FORMAT_R32_FLOAT, + DXGI_FORMAT_R32_UINT, + DXGI_FORMAT_R32_SINT, + DXGI_FORMAT_R16_UINT, + DXGI_FORMAT_R16_SINT, + DXGI_FORMAT_R8_UINT, + DXGI_FORMAT_R8_SINT, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + for (i = 0; i < sizeof(vertex_formats) / sizeof(*vertex_formats); ++i) + { + layout_desc->Format = vertex_formats[i]; + hr = ID3D10Device_CreateInputLayout(device, layout_desc, + sizeof(layout_desc) / sizeof(*layout_desc), vs_code, sizeof(vs_code), + &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", + vertex_formats[i], hr); + ID3D10InputLayout_Release(input_layout); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_input_assembler(void) { enum layout_id @@ -8433,6 +8499,7 @@ START_TEST(device) test_shader_stage_input_output_matching(); test_sm4_if_instruction(); test_sm4_breakc_instruction(); + test_create_input_layout(); test_input_assembler(); test_null_sampler(); }

1 0