September 2018 - Wine-Commits

Henri Verbeet : wined3d: Introduce WINED3DFMT_FLAG_BLIT.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 3ad933d5e665a202d364230dedbada4aecc128ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ad933d5e665a202d364230d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 22 03:14:08 2018 +0330 wined3d: Introduce WINED3DFMT_FLAG_BLIT. To indicate whether a particular format can be used for "off-screen plain" surfaces. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 40 +++------------------------- dlls/wined3d/utils.c | 59 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 58 insertions(+), 43 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8968447..02ca3f6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1474,41 +1474,9 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, return FALSE; } -static BOOL wined3d_check_surface_capability(const struct wined3d_format *format, BOOL no3d) +static BOOL wined3d_check_surface_capability(const struct wined3d_format *format) { - if (no3d) - { - switch (format->id) - { - case WINED3DFMT_B8G8R8_UNORM: - TRACE("[FAILED] - Not enumerated on Windows.\n"); - return FALSE; - case WINED3DFMT_B8G8R8A8_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - case WINED3DFMT_B5G6R5_UNORM: - case WINED3DFMT_B5G5R5X1_UNORM: - case WINED3DFMT_B5G5R5A1_UNORM: - case WINED3DFMT_B4G4R4A4_UNORM: - case WINED3DFMT_B2G3R3_UNORM: - case WINED3DFMT_A8_UNORM: - case WINED3DFMT_B2G3R3A8_UNORM: - case WINED3DFMT_B4G4R4X4_UNORM: - case WINED3DFMT_R10G10B10A2_UNORM: - case WINED3DFMT_R8G8B8A8_UNORM: - case WINED3DFMT_R8G8B8X8_UNORM: - case WINED3DFMT_R16G16_UNORM: - case WINED3DFMT_B10G10R10A2_UNORM: - case WINED3DFMT_R16G16B16A16_UNORM: - case WINED3DFMT_P8_UINT: - TRACE("[OK]\n"); - return TRUE; - default: - TRACE("[FAILED] - Not available on GDI surfaces.\n"); - return FALSE; - } - } - - if (format->glInternal) + if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] | format->flags[WINED3D_GL_RES_TYPE_RB]) & WINED3DFMT_FLAG_BLIT) { TRACE("[OK]\n"); return TRUE; @@ -1589,7 +1557,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad allowed_usage |= WINED3DUSAGE_QUERY_SRGBWRITE; if (!(usage & WINED3DUSAGE_TEXTURE)) { - if (!wined3d_check_surface_capability(format, wined3d->flags & WINED3D_NO3D)) + if (!wined3d_check_surface_capability(format)) { TRACE("[FAILED] - Not supported for plain surfaces.\n"); return WINED3DERR_NOTAVAILABLE; @@ -2490,7 +2458,7 @@ static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); - if (!wined3d_adapter_init_format_info(adapter, sizeof(struct wined3d_format))) + if (!wined3d_adapter_no3d_init_format_info(adapter)) return FALSE; adapter->vertex_pipe = &none_vertex_pipe; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8e9b6df..3669485 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3158,23 +3158,23 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->height_scale.numerator = 1; format->height_scale.denominator = 1; - format->flags[WINED3D_GL_RES_TYPE_TEX_1D] |= format_texture_info[i].flags; - format->flags[WINED3D_GL_RES_TYPE_TEX_2D] |= format_texture_info[i].flags; - format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_TEX_1D] |= format_texture_info[i].flags | WINED3DFMT_FLAG_BLIT; + format->flags[WINED3D_GL_RES_TYPE_TEX_2D] |= format_texture_info[i].flags | WINED3DFMT_FLAG_BLIT; + format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= format_texture_info[i].flags | WINED3DFMT_FLAG_BLIT; /* GL_ARB_depth_texture does not support 3D textures. It also says "cube textures are * problematic", but doesn't explicitly mandate that an error is generated. */ if (gl_info->supported[EXT_TEXTURE3D] && !(format_texture_info[i].flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) - format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= format_texture_info[i].flags | WINED3DFMT_FLAG_BLIT; if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags | WINED3DFMT_FLAG_BLIT; if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) - format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags | WINED3DFMT_FLAG_BLIT; - format->flags[WINED3D_GL_RES_TYPE_RB] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_RB] |= format_texture_info[i].flags | WINED3DFMT_FLAG_BLIT; format->flags[WINED3D_GL_RES_TYPE_RB] &= ~WINED3DFMT_FLAG_TEXTURE; if (format->glGammaInternal != format->glInternal @@ -3544,9 +3544,11 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ && (!gl_info->supported[ARB_FRAGMENT_SHADER] || !gl_info->supported[ARB_VERTEX_SHADER]))) { format = get_format_internal(adapter, WINED3DFMT_YUY2); + format_clear_flag(format, WINED3DFMT_FLAG_BLIT); format->glInternal = 0; format = get_format_internal(adapter, WINED3DFMT_UYVY); + format_clear_flag(format, WINED3DFMT_FLAG_BLIT); format->glInternal = 0; } @@ -3568,9 +3570,11 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ else { format = get_format_internal(adapter, WINED3DFMT_YV12); + format_clear_flag(format, WINED3DFMT_FLAG_BLIT); format->glInternal = 0; format = get_format_internal(adapter, WINED3DFMT_NV12); + format_clear_flag(format, WINED3DFMT_FLAG_BLIT); format->glInternal = 0; } @@ -3979,6 +3983,47 @@ fail: return FALSE; } +BOOL wined3d_adapter_no3d_init_format_info(struct wined3d_adapter *adapter) +{ + struct wined3d_format *format; + unsigned int i; + + static const enum wined3d_format_id blit_formats[] = + { + WINED3DFMT_B8G8R8A8_UNORM, + WINED3DFMT_B8G8R8X8_UNORM, + WINED3DFMT_B5G6R5_UNORM, + WINED3DFMT_B5G5R5X1_UNORM, + WINED3DFMT_B5G5R5A1_UNORM, + WINED3DFMT_B4G4R4A4_UNORM, + WINED3DFMT_B2G3R3_UNORM, + WINED3DFMT_A8_UNORM, + WINED3DFMT_B2G3R3A8_UNORM, + WINED3DFMT_B4G4R4X4_UNORM, + WINED3DFMT_R10G10B10A2_UNORM, + WINED3DFMT_R8G8B8A8_UNORM, + WINED3DFMT_R8G8B8X8_UNORM, + WINED3DFMT_R16G16_UNORM, + WINED3DFMT_B10G10R10A2_UNORM, + WINED3DFMT_R16G16B16A16_UNORM, + WINED3DFMT_P8_UINT, + }; + + if (!wined3d_adapter_init_format_info(adapter, sizeof(struct wined3d_format))) + return FALSE; + + for (i = 0; i < ARRAY_SIZE(blit_formats); ++i) + { + if (!(format = get_format_internal(adapter, blit_formats[i]))) + return FALSE; + + format->flags[WINED3D_GL_RES_TYPE_TEX_2D] |= WINED3DFMT_FLAG_BLIT; + format->flags[WINED3D_GL_RES_TYPE_RB] |= WINED3DFMT_FLAG_BLIT; + } + + return TRUE; +} + /* Context activation is done by the caller. */ BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb2f442..cec2cff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2695,6 +2695,7 @@ struct wined3d_caps_gl_ctx BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, size_t format_size) DECLSPEC_HIDDEN; BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; +BOOL wined3d_adapter_no3d_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; @@ -4299,6 +4300,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 #define WINED3DFMT_FLAG_NORMALISED 0x00800000 #define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE 0x01000000 +#define WINED3DFMT_FLAG_BLIT 0x02000000 struct wined3d_rational {

1 0

Henri Verbeet : d3d8/tests: Properly check whether creating a device succeeded in test_flip().
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 3932b2f2a75cebae7ab663d4c04f685307f527eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3932b2f2a75cebae7ab663d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 22 03:14:05 2018 +0330 d3d8/tests: Properly check whether creating a device succeeded in test_flip(). Perhaps CreateDevice() should clear the pointer on failure, but that's not documented behaviour, and Wine currently doesn't. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 24481bd..e8e6bf8 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8154,9 +8154,8 @@ static void test_flip(void) present_parameters.Windowed = TRUE; present_parameters.BackBufferCount = 3; present_parameters.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; - hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); - if (!device) + if (FAILED(hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) { skip("Failed to create a D3D device, skipping tests.\n"); IDirect3D8_Release(d3d);

1 0

Henri Verbeet : wined3d: Accept "renderer" in addition to " DirectDrawRenderer".
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 723e62ab9956288e241c9a2956eaf9d2c955161e URL: https://source.winehq.org/git/wine.git/?a=commit;h=723e62ab9956288e241c9a29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 22 03:14:07 2018 +0330 wined3d: Accept "renderer" in addition to "DirectDrawRenderer". Even though the "gdi" renderer is mainly used for ddraw, wined3d itself has no knowledge of ddraw. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index f8a84a1..3537a48 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -307,7 +307,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Limiting PS shader model to %u.\n", wined3d_settings.max_sm_ps); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) TRACE("Limiting CS shader model to %u.\n", wined3d_settings.max_sm_cs); - if (!get_config_key(hkey, appkey, "DirectDrawRenderer", buffer, size) + if ((!get_config_key(hkey, appkey, "renderer", buffer, size) + || !get_config_key(hkey, appkey, "DirectDrawRenderer", buffer, size)) && !strcmp(buffer, "gdi")) { TRACE("Disabling 3D support.\n");

1 0

Henri Verbeet : d3d9/tests: Properly check whether creating a device succeeded in test_flip().
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 70bb787872d5fc0458cf620a55ba9fb87dd609a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70bb787872d5fc0458cf620a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 22 03:14:06 2018 +0330 d3d9/tests: Properly check whether creating a device succeeded in test_flip(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9c3e83d..4f26b0d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20984,9 +20984,8 @@ static void test_flip(void) present_parameters.Windowed = TRUE; present_parameters.BackBufferCount = 3; present_parameters.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); - if (!device) + if (FAILED(hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) { skip("Failed to create a D3D device, skipping tests.\n"); IDirect3D9_Release(d3d);

1 0

Zebediah Figura : dbghelp/dwarf: Use debugstr_a() to trace external strings.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 86805c3d4b78e69e675e72f57a21254d3d580ddd URL: https://source.winehq.org/git/wine.git/?a=commit;h=86805c3d4b78e69e675e72f5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 21 17:44:23 2018 -0500 dbghelp/dwarf: Use debugstr_a() to trace external strings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 31c008a..26e2f42 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -568,7 +568,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, case DW_FORM_string: attr->u.string = (const char *)data; - TRACE("string<%s>\n", attr->u.string); + TRACE("string<%s>\n", debugstr_a(attr->u.string)); break; case DW_FORM_strp: @@ -576,7 +576,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, unsigned long offset = dwarf2_get_u4(data); attr->u.string = (const char*)ctx->sections[section_string].address + offset; } - TRACE("strp<%s>\n", attr->u.string); + TRACE("strp<%s>\n", debugstr_a(attr->u.string)); break; case DW_FORM_block: @@ -1613,7 +1613,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, struct attribute ext; TRACE("found parameter %s (kind=%d, offset=%ld, reg=%d) at %s\n", - name.u.string, loc.kind, loc.offset, loc.reg, + debugstr_a(name.u.string), loc.kind, loc.offset, loc.reg, dwarf2_debug_ctx(subpgm->ctx)); switch (loc.kind) @@ -1648,8 +1648,8 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, else if (dwarf2_find_attribute(subpgm->ctx, di, DW_AT_const_value, &value)) { VARIANT v; - if (subpgm->func) WARN("Unsupported constant %s in function\n", name.u.string); - if (is_pmt) FIXME("Unsupported constant (parameter) %s in function\n", name.u.string); + if (subpgm->func) WARN("Unsupported constant %s in function\n", debugstr_a(name.u.string)); + if (is_pmt) FIXME("Unsupported constant (parameter) %s in function\n", debugstr_a(name.u.string)); switch (value.form) { case DW_FORM_data1: @@ -1699,7 +1699,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, default: FIXME("Unsupported form for const value %s (%lx)\n", - name.u.string, value.form); + debugstr_a(name.u.string), value.form); v.n1.n2.vt = VT_EMPTY; } di->symt = &symt_new_constant(subpgm->ctx->module, subpgm->ctx->compiland, @@ -1718,7 +1718,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, } else { - WARN("dropping global variable %s which has been optimized away\n", name.u.string); + WARN("dropping global variable %s which has been optimized away\n", debugstr_a(name.u.string)); } } if (is_pmt && subpgm->func && subpgm->func->type) @@ -1933,7 +1933,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, } if (!dwarf2_read_range(ctx, di, &low_pc, &high_pc)) { - WARN("cannot get range for %s\n", name.u.string); + WARN("cannot get range for %s\n", debugstr_a(name.u.string)); return NULL; } /* As functions (defined as inline assembly) get debug info with dwarf @@ -2173,7 +2173,7 @@ static void dwarf2_set_line_number(struct module* module, unsigned long address, if (!file || !(psrc = vector_at(v, file - 1))) return; TRACE("%s %lx %s %u\n", - debugstr_w(module->module.ModuleName), address, source_get(module, *psrc), line); + debugstr_w(module->module.ModuleName), address, debugstr_a(source_get(module, *psrc)), line); if (!(symt = symt_find_nearest(module, address)) || symt->symt.tag != SymTagFunction) return; func = (struct symt_function*)symt; @@ -2234,7 +2234,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, { const char* rel = (const char*)traverse.data; unsigned rellen = strlen(rel); - TRACE("Got include %s\n", rel); + TRACE("Got include %s\n", debugstr_a(rel)); traverse.data += rellen + 1; p = vector_add(&dirs, &ctx->pool); @@ -2268,7 +2268,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, mod_time = dwarf2_leb128_as_unsigned(&traverse); length = dwarf2_leb128_as_unsigned(&traverse); dir = *(const char**)vector_at(&dirs, dir_index); - TRACE("Got file %s/%s (%u,%lu)\n", dir, name, mod_time, length); + TRACE("Got file %s/%s (%u,%lu)\n", debugstr_a(dir), debugstr_a(name), mod_time, length); psrc = vector_add(&files, &ctx->pool); *psrc = source_new(ctx->module, dir, name); } @@ -2339,7 +2339,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, address = ctx->load_offset + dwarf2_parse_addr(&traverse); break; case DW_LNE_define_file: - FIXME("not handled define file %s\n", traverse.data); + FIXME("not handled define file %s\n", debugstr_a((char *)traverse.data)); traverse.data += strlen((const char *)traverse.data) + 1; dwarf2_leb128_as_unsigned(&traverse); dwarf2_leb128_as_unsigned(&traverse); @@ -2522,7 +2522,7 @@ static enum location_error loc_compute_frame(struct process* pcs, *frame = *pframe; break; case loc_dwarf2_location_list: - WARN("Searching loclist for %s\n", func->hash_elt.name); + WARN("Searching loclist for %s\n", debugstr_a(func->hash_elt.name)); if (!dwarf2_lookup_loclist(modfmt, modfmt->u.dwarf2_info->debug_loc.address + pframe->offset, ip, &lctx)) @@ -2668,7 +2668,7 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* info->state.cfa_rule = RULE_CFA_OFFSET; end = NULL; - TRACE("\tparsing augmentation %s\n", augmentation); + TRACE("\tparsing augmentation %s\n", debugstr_a(augmentation)); if (*augmentation) do { switch (*augmentation) @@ -3325,7 +3325,7 @@ static void dwarf2_location_compute(struct process* pcs, if (!func->container || func->container->tag != SymTagCompiland) { - WARN("We'd expect function %s's container to exist and be a compiland\n", func->hash_elt.name); + WARN("We'd expect function %s's container to exist and be a compiland\n", debugstr_a(func->hash_elt.name)); err = loc_err_internal; } else @@ -3400,7 +3400,7 @@ static inline BOOL dwarf2_init_zsection(dwarf2_section_t* section, if (sz <= 12 || memcmp(sect, "ZLIB", 4)) { - ERR("invalid compressed section %s\n", zsectname); + ERR("invalid compressed section %s\n", debugstr_a(zsectname)); goto out; } @@ -3425,7 +3425,7 @@ static inline BOOL dwarf2_init_zsection(dwarf2_section_t* section, res = inflateInit(&z); if (res != Z_OK) { - FIXME("inflateInit failed with %i / %s\n", res, z.msg); + FIXME("inflateInit failed with %i / %s\n", res, debugstr_a(z.msg)); goto out_free; } @@ -3437,7 +3437,7 @@ static inline BOOL dwarf2_init_zsection(dwarf2_section_t* section, if (res != Z_STREAM_END) { - FIXME("Decompression failed with %i / %s\n", res, z.msg); + FIXME("Decompression failed with %i / %s\n", res, debugstr_a(z.msg)); goto out_end; }

1 0

Francois Gouget : testbot: Fix patchset handling in GetPatchImpacts().
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: tools Branch: master Commit: 09a1b2332d5092ec635108c6c48814707d67d52d URL: https://source.winehq.org/git/tools.git/?a=commit;h=09a1b2332d5092ec635108c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 24 12:42:22 2018 +0200 testbot: Fix patchset handling in GetPatchImpacts(). Only the last part must be taken into account to determine if a rebuild or testing is needed. But they are needed, the previous parts must be taken into account for the rebuild, including the Autoconf and MakeMakefile fields. This also means the scope of the rebuild may be different from that of the tests (we may need a full rebuild to run a single test). So introduce RebuildRoot and RebuildModules which are similar to PatchedRoot and PatchedModules but also take into account patches from previous parts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 44 ++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 2bac7be..b7307e5 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -283,24 +283,12 @@ sub GetPatchImpacts($;$) if ($PastImpacts) { - if ($PastImpacts->{PatchedRoot} or $PastImpacts->{PatchedModules} or - $PastImpacts->{PatchedTests}) - { - # Update the list of Wine files so we correctly recognize patchset parts - # that modify new Wine files. - my $WineFiles = $PastImpacts->{WineFiles} || $_WineFiles; - map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$WineFiles}; - map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$PastImpacts->{NewFiles}}; - map { delete $Impacts->{WineFiles}->{$_} } keys %{$PastImpacts->{DeletedFiles}}; - # Modules impacted by previous parts of a patchset still need to be - # rebuilt. - $Impacts->{BuildModules} = { %{$PastImpacts->{BuildModules}} }; - } - else - { - $Impacts->{NewFiles} = $PastImpacts->{NewFiles}; - $Impacts->{DeletedFiles} = $PastImpacts->{DeletedFiles}; - } + # Update the list of Wine files so we correctly recognize patchset parts + # that modify new Wine files. + my $WineFiles = $PastImpacts->{WineFiles} || $_WineFiles; + map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$WineFiles}; + map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$PastImpacts->{NewFiles}}; + map { delete $Impacts->{WineFiles}->{$_} } keys %{$PastImpacts->{DeletedFiles}}; foreach my $PastInfo (values %{$PastImpacts->{Tests}}) { @@ -403,6 +391,24 @@ sub GetPatchImpacts($;$) $Impacts->{TestUnitCount} += $TestInfo->{UnitCount}; } + if ($Impacts->{PatchedRoot} or $Impacts->{PatchedModules} or + $Impacts->{PatchedTests}) + { + # Any patched area will need to be rebuilt... + $Impacts->{RebuildRoot} = $Impacts->{PatchedRoot}; + $Impacts->{RebuildModules} = $Impacts->{PatchedModules}; + + # ... even if the patch was in previous parts + if ($PastImpacts) + { + $Impacts->{Autoconf} ||= $PastImpacts->{Autoconf}; + $Impacts->{MakeMakefiles} ||= $PastImpacts->{MakeMakefiles}; + $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; + $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; + map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}}; + } + } + return $Impacts; } @@ -419,7 +425,7 @@ sub GetBuildTimeout($$) map {$_ =~ /^exe/ ? $ExeCount++ : $WineCount++ } keys %$Builds; # Set $ModuleCount to 0 if a full rebuild is needed - my $ModuleCount = (!$Impacts or $Impacts->{PatchedRoot}) ? 0 : + my $ModuleCount = (!$Impacts or $Impacts->{RebuildRoot}) ? 0 : scalar(keys %{$Impacts->{BuildModules}}); my ($ExeTimeout, $WineTimeout) = (0, 0);

1 0

Francois Gouget : testbot: Increase the full rebuild timeouts.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: tools Branch: master Commit: 82a3c95a36e428b04a2c4142efdee85ae0cc98dc URL: https://source.winehq.org/git/tools.git/?a=commit;h=82a3c95a36e428b04a2c414… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 24 12:41:35 2018 +0200 testbot: Increase the full rebuild timeouts. The increased timeouts can be needed if the computer is otherwise busy (which should not be happening on the official TestBot unless the administrator is doing some maintenance on the side). The new timeouts should provide at least a 50% margin, thus also leaving some room for Wine to grow. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index a83085d..1576177 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -95,13 +95,13 @@ $MaxTaskTries = 3; # Exe build timeouts (in seconds) # - For a full build $ExeBuildNativeTimeout = 60; -$ExeBuildTestTimeout = 2 * 60; +$ExeBuildTestTimeout = 4 * 60; # - For a single module $ExeModuleTimeout = 30; # Wine build timeouts (in seconds) # - For a full build -$WineBuildTimeout = 20 * 60; +$WineBuildTimeout = 25 * 60; # - For a single module $WineModuleTimeout = 60;

1 0

Francois Gouget : testbot: Improve error checking when combining patchset parts.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: tools Branch: master Commit: 82d955b62775d2891ad6e1fe6bdf4cab6fce2475 URL: https://source.winehq.org/git/tools.git/?a=commit;h=82d955b62775d2891ad6e1f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 24 12:37:14 2018 +0200 testbot: Improve error checking when combining patchset parts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PendingPatchSets.pm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 4ef7a66..3ac8c53 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -106,20 +106,33 @@ sub SubmitSubset($$$) my ($CombinedFile, $CombinedFileName) = OpenNewFile("$DataDir/staging", "_patch"); return "Could not create a combined patch file: $!" if (!$CombinedFile); - my $Parts = $self->Parts; + my $ErrMessage; for (my $PartNo = 1; $PartNo <= $MaxPart; $PartNo++) { - my $Part = $Parts->GetItem($PartNo); - if (defined $Part and - open(my $PartFile, "<" , "$DataDir/patches/" . $Part->Patch->Id)) + my $Part = $self->Parts->GetItem($PartNo); + if (!defined $Part) + { + $ErrMessage = "Could not find part $PartNo / $MaxPart"; + last; + } + + if (open(my $PartFile, "<" , "$DataDir/patches/" . $Part->Patch->Id)) { print $CombinedFile $_ for (<$PartFile>); close($PartFile); } + else + { + $ErrMessage = "Could not open part $PartNo for reading: $!"; + last; + } } close($CombinedFile); - my $ErrMessage = $FinalPatch->Submit($CombinedFileName, 1); + if (!defined $ErrMessage) + { + $ErrMessage = $FinalPatch->Submit($CombinedFileName, 1); + } unlink($CombinedFileName); return $ErrMessage;

1 0

Francois Gouget : testbot: Fix the detection and reporting of timed out Wine tests.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: tools Branch: master Commit: 0d1500d714eee1e50d3639c92a65c8e6c31b21f2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0d1500d714eee1e50d3639c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 24 12:43:25 2018 +0200 testbot: Fix the detection and reporting of timed out Wine tests. Modify ParseWineTestReport() to report the number of test units and timeouts found in the report and remove the IsSuite parameter. This allows the caller to check whether the report has the expected number of test units, and to better decide whether the test as a whole timed out. The policy is to now only consider it to have timed out if all the test units timed out, which would typically only happen when running a single test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 6 +++--- testbot/bin/WineRunWineTest.pl | 6 +++--- testbot/lib/WineTestBot/LogUtils.pm | 16 +++++++++------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 5ff3fc4..077426b 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -523,13 +523,13 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) } } -my $TimedOut; Debug(Elapsed($Start), " Retrieving the report file to '$RptFileName'\n"); if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { chmod 0664, "$TaskDir/$RptFileName"; - (my $LogFailures, my $LogErrors, $TimedOut) = ParseWineTestReport("$TaskDir/$RptFileName", $IsWineTest, $Step->Type eq "suite", $TaskTimedOut); + my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", $IsWineTest, $TaskTimedOut); + $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); if (!defined $LogFailures and @$LogErrors == 1) { # Could not open the file @@ -563,4 +563,4 @@ FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError); # Wrap up # -WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut || $TimedOut); +WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index e3b8b17..90e3403 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -534,7 +534,6 @@ elsif (!defined $TAError) # Grab the test logs if any # -my $TimedOut; if ($Step->Type ne "build") { my $BuildList = $Task->CmdLineArg; @@ -547,7 +546,8 @@ if ($Step->Type ne "build") { chmod 0664, "$TaskDir/$RptFileName"; - (my $LogFailures, my $LogErrors, $TimedOut) = ParseWineTestReport("$TaskDir/$RptFileName", 1, $Step->Type eq "suite", $TaskTimedOut); + my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", 1, $TaskTimedOut); + $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); if (!defined $LogFailures and @$LogErrors == 1) { # Could not open the file @@ -595,4 +595,4 @@ FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError); # Wrap up # -WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut || $TimedOut); +WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut); diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index b0b8040..17d44a4 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -277,23 +277,23 @@ a list of extra errors, and whether the test timed out. =back =cut -sub ParseWineTestReport($$$$) +sub ParseWineTestReport($$$) { - my ($FileName, $IsWineTest, $IsSuite, $TaskTimedOut) = @_; + my ($FileName, $IsWineTest, $TaskTimedOut) = @_; my $LogFile; if (!open($LogFile, "<", $FileName)) { my $BaseName = basename($FileName); - return (undef, ["Unable to open '$BaseName' for reading: $!"], undef); + return (undef, undef, undef, ["Unable to open '$BaseName' for reading: $!"]); } my $Parser = { IsWineTest => $IsWineTest, - IsSuite => $IsSuite, TaskTimedOut => $TaskTimedOut, - TimedOut => undef, + TestUnitCount => 0, + TimeoutCount => 0, Failures => undef, Errors => [], }; @@ -309,6 +309,7 @@ sub ParseWineTestReport($$$$) # Close the previous test unit _CloseTestUnit($Parser, $Cur, 0) if ($Cur->{Dll} ne ""); $Cur = _NewCurrentUnit($Dll, $Unit); + $Parser->{TestUnitCount}++; # Recognize skipped messages in case we need to skip tests in the VMs $Cur->{Rc} = 0 if ($Type eq "skipped"); @@ -414,7 +415,7 @@ sub ParseWineTestReport($$$$) # so record the failure but don't add an error message. $Parser->{Failures}++; $Cur->{IsBroken} = 1; - $Parser->{TimedOut} = $Parser->{IsSuite}; + $Parser->{TimeoutCount}++; } elsif ((!$Pid and !%{$Cur->{Pids}}) or ($Pid and !$Cur->{Pids}->{$Pid} and !$Cur->{Pids}->{0})) @@ -445,7 +446,8 @@ sub ParseWineTestReport($$$$) _CloseTestUnit($Parser, $Cur, 1); close($LogFile); - return ($Parser->{Failures}, $Parser->{Errors}, $Parser->{TimedOut}); + return ($Parser->{TestUnitCount}, $Parser->{TimeoutCount}, + $Parser->{Failures}, $Parser->{Errors}); }

1 0

Józef Kucia : vkd3d-shader: Find innermost loops for breakc instructions.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: vkd3d Branch: master Commit: 01ef2ceced0bd39f9d6795b7770ef6f257c29fb8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=01ef2ceced0bd39f9d6795b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 24 10:25:22 2018 +0200 vkd3d-shader: Find innermost loops for breakc instructions. 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> --- libs/vkd3d-shader/spirv.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 86f8ff6..f311147 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5108,12 +5108,19 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ } case VKD3DSIH_BREAKP: - assert(compiler->control_flow_depth); - assert(cf_info->current_block == VKD3D_BLOCK_LOOP); + { + struct vkd3d_control_flow_info *loop_cf_info; + + if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) + { + ERR("Invalid 'breakc' instruction outside loop.\n"); + return; + } vkd3d_dxbc_compiler_emit_conditional_branch(compiler, - instruction, cf_info->u.loop.merge_block_id); + instruction, loop_cf_info->u.loop.merge_block_id); break; + } case VKD3DSIH_CONTINUE: {

1 0