April 2016 - Wine-commits - list.winehq.org

Hans Leidekker : webservices: Reset the read position if an opening bracket is not followed by a valid name character.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: a73701aec2ef222afc04e9e7f573dd744694f951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73701aec2ef222afc04e9e7f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 15:55:53 2016 +0200 webservices: Reset the read position if an opening bracket is not followed by a valid name character. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index f12c118..eb16427 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -919,6 +919,11 @@ static inline void read_skip( struct reader *reader, unsigned int count ) reader->read_pos += count; } +static inline void read_rewind( struct reader *reader, unsigned int count ) +{ + reader->read_pos -= count; +} + static inline BOOL read_isnamechar( unsigned int ch ) { /* FIXME: incomplete */ @@ -1179,6 +1184,11 @@ static HRESULT read_element( struct reader *reader ) if (read_cmp( reader, "<", 1 )) goto error; read_skip( reader, 1 ); + if (!read_isnamechar( read_utf8_char( reader, &skip ))) + { + read_rewind( reader, 1 ); + goto error; + } start = read_current_ptr( reader ); for (;;)

1 0

Hans Leidekker : webservices: Always skip comment and empty text nodes in WsReadType.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 54a6db3d9b7ae4965ad427ceee14689bf634ed12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a6db3d9b7ae4965ad427cee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 15:55:54 2016 +0200 webservices: Always skip comment and empty text nodes in WsReadType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 122 ++++++++++++++++++++++------------------ dlls/webservices/tests/reader.c | 2 +- 2 files changed, 67 insertions(+), 57 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index eb16427..8191aa5 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2541,6 +2541,57 @@ static HRESULT read_type_wsz( struct reader *reader, WS_TYPE_MAPPING mapping, return S_OK; } +static BOOL is_empty_text_node( const struct node *node ) +{ + const WS_XML_TEXT_NODE *text = (const WS_XML_TEXT_NODE *)node; + const WS_XML_UTF8_TEXT *utf8; + ULONG i; + + if (node_type( node ) != WS_XML_NODE_TYPE_TEXT) return FALSE; + if (text->text->textType != WS_XML_TEXT_TYPE_UTF8) + { + ERR( "unhandled text type %u\n", text->text->textType ); + return FALSE; + } + utf8 = (const WS_XML_UTF8_TEXT *)text->text; + for (i = 0; i < utf8->value.length; i++) if (!read_isspace( utf8->value.bytes[i] )) return FALSE; + return TRUE; +} + +/* skips comment and empty text nodes */ +static HRESULT read_type_next_node( struct reader *reader ) +{ + for (;;) + { + HRESULT hr; + WS_XML_NODE_TYPE type; + + if ((hr = read_node( reader )) != S_OK) return hr; + type = node_type( reader->current ); + if (type == WS_XML_NODE_TYPE_COMMENT || + (type == WS_XML_NODE_TYPE_TEXT && is_empty_text_node( reader->current ))) continue; + return S_OK; + } +} + +static HRESULT read_type_next_element_node( struct reader *reader, const WS_XML_STRING *localname, + const WS_XML_STRING *ns ) +{ + const WS_XML_ELEMENT_NODE *elem; + HRESULT hr; + BOOL found; + + if (!localname) return S_OK; /* assume reader is already correctly positioned */ + if ((hr = read_to_startelement( reader, &found )) != S_OK) return hr; + if (!found) return WS_E_INVALID_FORMAT; + + elem = &reader->current->hdr; + if (WsXmlStringEquals( localname, elem->localName, NULL ) == S_OK && + WsXmlStringEquals( ns, elem->ns, NULL ) == S_OK) return S_OK; + + return read_type_next_node( reader ); +} + static ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) { switch (type) @@ -2589,7 +2640,8 @@ static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIEL if (size != sizeof(void *)) return E_INVALIDARG; /* wrapper element */ - if (desc->localName && ((hr = read_node( reader )) != S_OK)) return hr; + if (desc->localName && ((hr = read_type_next_element_node( reader, desc->localName, desc->ns )) != S_OK)) + return hr; item_size = get_type_size( desc->type, desc->typeDescription ); if (!(buf = ws_alloc_zero( heap, item_size ))) return WS_E_QUOTA_EXCEEDED; @@ -2609,16 +2661,11 @@ static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIEL ws_free( heap, buf ); return hr; } - if ((hr = read_node( reader )) != S_OK) - { - ws_free( heap, buf ); - return hr; - } offset += item_size; nb_items++; } - if (desc->localName && ((hr = read_node( reader )) != S_OK)) return hr; + if (desc->localName && ((hr = read_type_next_node( reader )) != S_OK)) return hr; if (desc->itemRange && (nb_items < desc->itemRange->minItemCount || nb_items > desc->itemRange->maxItemCount)) { @@ -2722,7 +2769,6 @@ static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DES return E_NOTIMPL; } - if (hr == WS_E_INVALID_FORMAT && desc->options & WS_FIELD_OPTIONAL) { switch (option) @@ -2815,51 +2861,6 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, } } -static BOOL is_empty_text_node( const struct node *node ) -{ - const WS_XML_TEXT_NODE *text = (const WS_XML_TEXT_NODE *)node; - const WS_XML_UTF8_TEXT *utf8; - ULONG i; - - if (node_type( node ) != WS_XML_NODE_TYPE_TEXT) return FALSE; - if (text->text->textType != WS_XML_TEXT_TYPE_UTF8) - { - ERR( "unhandled text type %u\n", text->text->textType ); - return FALSE; - } - utf8 = (const WS_XML_UTF8_TEXT *)text->text; - for (i = 0; i < utf8->value.length; i++) if (!read_isspace( utf8->value.bytes[i] )) return FALSE; - return TRUE; -} - -static HRESULT read_type_next_node( struct reader *reader, const WS_XML_STRING *localname, - const WS_XML_STRING *ns ) -{ - const WS_XML_ELEMENT_NODE *elem; - WS_XML_NODE_TYPE type; - HRESULT hr; - BOOL found; - - if (!localname) return S_OK; /* assume reader is already correctly positioned */ - if ((hr = read_to_startelement( reader, &found ) != S_OK)) return hr; - if (!found) return WS_E_INVALID_FORMAT; - - elem = &reader->current->hdr; - if (WsXmlStringEquals( localname, elem->localName, NULL ) == S_OK && - WsXmlStringEquals( ns, elem->ns, NULL ) == S_OK) return S_OK; - - for (;;) - { - if ((hr = read_node( reader ) != S_OK)) return hr; - type = node_type( reader->current ); - if (type == WS_XML_NODE_TYPE_COMMENT || - (type == WS_XML_NODE_TYPE_TEXT && is_empty_text_node( reader->current ))) continue; - break; - } - - return S_OK; -} - static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYPE type, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const void *desc, WS_READ_OPTION option, WS_HEAP *heap, @@ -2871,7 +2872,7 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP { case WS_ELEMENT_TYPE_MAPPING: case WS_ELEMENT_CONTENT_TYPE_MAPPING: - if ((hr = read_type_next_node( reader, localname, ns )) != S_OK) return hr; + if ((hr = read_type_next_element_node( reader, localname, ns )) != S_OK) return hr; break; case WS_ATTRIBUTE_TYPE_MAPPING: @@ -2948,7 +2949,7 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP { case WS_ELEMENT_TYPE_MAPPING: case WS_ELEMENT_CONTENT_TYPE_MAPPING: - return read_node( reader ); + return read_type_next_node( reader ); case WS_ATTRIBUTE_TYPE_MAPPING: default: @@ -2975,7 +2976,16 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY if ((hr = read_type( reader, mapping, type, NULL, NULL, desc, option, heap, value, size )) != S_OK) return hr; - if ((hr = read_node( reader )) != S_OK) return hr; + switch (mapping) + { + case WS_ELEMENT_TYPE_MAPPING: + if ((hr = read_node( reader )) != S_OK) return hr; + break; + + default: + break; + } + if (!read_end_of_data( reader )) return WS_E_INVALID_FORMAT; return S_OK; } diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index b7ef0ca..7384cba 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -2644,7 +2644,7 @@ static void test_complex_struct_type(void) hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); WsFreeReader( reader ); WsFreeHeap( heap );

1 0

Alistair Leslie-Hughes : d3dx10: Add D3DX10UnsetAllDeviceObjects stub.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: e2da1a4ee1b6d6a1ae01dc8c8b98f44d5d87722a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2da1a4ee1b6d6a1ae01dc8c8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 1 17:44:54 2016 +1100 d3dx10: Add D3DX10UnsetAllDeviceObjects stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 7 +++++++ include/d3dx10core.idl | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 9edcf54..0673f6a 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -64,7 +64,7 @@ @ stub D3DX10SaveTextureToFileA(ptr ptr str) @ stub D3DX10SaveTextureToFileW(ptr ptr wstr) @ stub D3DX10SaveTextureToMemory(ptr ptr ptr long) -@ stub D3DX10UnsetAllDeviceObjects(ptr) +@ stdcall D3DX10UnsetAllDeviceObjects(ptr) @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXColorAdjustContrast(ptr ptr float) d3dx9_36.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr float) d3dx9_36.D3DXColorAdjustSaturation diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 6637af3..fa4fa79 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -116,3 +116,10 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasiz return E_NOTIMPL; } + +HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device) +{ + FIXME("device %p stub.\n", device); + + return E_NOTIMPL; +} diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index f0d8ff6..0e2bf31 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -64,3 +64,5 @@ interface ID3DX10ThreadPump : IUnknown HRESULT PurgeAllItems(); HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue); }; + +cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);")

1 0

Paul Gofman : d3dx9: Implement preshader parsing.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 9b3e942ffcc71b0742df842f3d8e77d5640a2a59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b3e942ffcc71b0742df842f3… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 1 14:21:22 2016 +0300 d3dx9: Implement preshader parsing. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 54 +++- dlls/d3dx9_36/preshader.c | 587 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 635 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b3e942ffcc71b0742df8…

1 0

Paul Gofman : d3dx9: Implement preshaders disassembly dump.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: b76ee0c7f8d82aba4710981417c79581264662aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76ee0c7f8d82aba471098141… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 1 14:21:23 2016 +0300 d3dx9: Implement preshaders disassembly dump. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 3ef818b..67b4d65 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -86,6 +86,11 @@ table_info[] = {sizeof(float), 4, PRES_VT_FLOAT } /* PRES_REGTAB_TEMP */ }; +static const char *table_symbol[] = +{ + "imm", "c", "oc", "ob", "oi", "r", "(null)", +}; + static const enum pres_reg_tables pres_regset2table[] = { PRES_REGTAB_OBCONST, /* D3DXRS_BOOL */ @@ -410,6 +415,65 @@ static void update_table_sizes_consts(unsigned int *table_sizes, struct d3dx_con } } +static void dump_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *arg, int component_count) +{ + static const char *xyzw_str = "xyzw"; + unsigned int i, table; + + table = arg->table; + if (table == PRES_REGTAB_IMMED) + { + TRACE("("); + for (i = 0; i < component_count; ++i) + TRACE(i < component_count - 1 ? "%.16e, " : "%.16e", + ((double *)rs->tables[PRES_REGTAB_IMMED])[arg->offset + i]); + TRACE(")"); + } + else + { + TRACE("%s%u.", table_symbol[table], get_reg_offset(table, arg->offset)); + for (i = 0; i < component_count; ++i) + TRACE("%c", xyzw_str[(arg->offset + i) % 4]); + } +} + +static void dump_registers(struct d3dx_const_tab *ctab) +{ + unsigned int table, i; + + for (i = 0; i < ctab->input_count; ++i) + { + table = ctab->regset2table[ctab->inputs[i].RegisterSet]; + TRACE("// %-12s %s%-4u %u\n", ctab->inputs_param[i] ? ctab->inputs_param[i]->name : "(nil)", + table_symbol[table], ctab->inputs[i].RegisterIndex, ctab->inputs[i].RegisterCount); + } +} + +static void dump_ins(struct d3dx_regstore *rs, const struct d3dx_pres_ins *ins) +{ + unsigned int i; + + TRACE(" %s ", pres_op_info[ins->op].mnem); + dump_arg(rs, &ins->output, pres_op_info[ins->op].func_all_comps ? 1 : ins->component_count); + for (i = 0; i < pres_op_info[ins->op].input_count; ++i) + { + TRACE(", "); + dump_arg(rs, &ins->inputs[i], ins->scalar_op && !i ? 1 : ins->component_count); + } + TRACE("\n"); +} + +static void dump_preshader(struct d3dx_preshader *pres) +{ + unsigned int i; + + TRACE("// Preshader registers:\n"); + dump_registers(&pres->inputs); + TRACE(" preshader\n"); + for (i = 0; i < pres->ins_count; ++i) + dump_ins(&pres->regs, &pres->ins[i]); +} + static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, unsigned int count, struct d3dx9_base_effect *base) { unsigned int *p; @@ -579,8 +643,15 @@ void d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_co } if (TRACE_ON(d3dx)) + { dump_bytecode(byte_code, byte_code_size); - + dump_preshader(&peval->pres); + if (shader) + { + TRACE("// Shader registers:\n"); + dump_registers(&peval->shader_inputs); + } + } *peval_out = peval; TRACE("Created parameter evaluator %p.\n", *peval_out); return;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_download_data().
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 7d3f493d55dabb32a692f26b7893710b1cd1da15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3f493d55dabb32a692f26b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 5 18:24:20 2016 +0200 wined3d: Use the texture dimension helpers in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 16d03e8..0055e62 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1054,8 +1054,8 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { const BYTE *src_data; + unsigned int h, y; BYTE *dst_data; - UINT y; /* * Some games (e.g. warhammer 40k) don't work properly with the odd pitches, preventing * the surface pitch from being used to box non-power2 textures. Instead we have to use a hack to @@ -1104,7 +1104,8 @@ static void surface_download_data(struct wined3d_surface *surface, const struct src_data = mem; dst_data = data.addr; TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_row_pitch); - for (y = 0; y < surface->resource.height; ++y) + h = wined3d_texture_get_level_height(texture, surface->texture_level); + for (y = 0; y < h; ++y) { memcpy(dst_data, src_data, dst_row_pitch); src_data += src_row_pitch;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_upload_from_surface().
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 4ef9f113c9d168521fe046db2ff84f8217b394df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef9f113c9d168521fe046db2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 5 18:24:21 2016 +0200 wined3d: Use the texture dimension helpers in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0055e62..b6e8f99 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1287,7 +1287,8 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P if (!src_rect) { - SetRect(&r, 0, 0, src_surface->resource.width, src_surface->resource.height); + SetRect(&r, 0, 0, wined3d_texture_get_level_width(src_texture, src_surface->texture_level), + wined3d_texture_get_level_height(src_texture, src_surface->texture_level)); src_rect = &r; } else if (src_rect->left < 0 || src_rect->left >= src_rect->right @@ -1297,8 +1298,8 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P return WINED3DERR_INVALIDCALL; } - dst_w = dst_surface->resource.width; - dst_h = dst_surface->resource.height; + dst_w = wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level); + dst_h = wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level); update_w = src_rect->right - src_rect->left; update_h = src_rect->bottom - src_rect->top;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in read_from_framebuffer().
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: d5dd78a4bade8d9e091ac8dab5c95429a0f248c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5dd78a4bade8d9e091ac8dab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 5 18:24:22 2016 +0200 wined3d: Use the texture dimension helpers in read_from_framebuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b6e8f99..681caa9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1858,6 +1858,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; unsigned int row_pitch, slice_pitch; + unsigned int width, height; BYTE *mem; BYTE *row, *top, *bottom; int i; @@ -1909,8 +1910,9 @@ static void read_from_framebuffer(struct wined3d_surface *surface, gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, row_pitch / texture->resource.format->byte_count); checkGLcall("glPixelStorei"); - gl_info->gl_ops.gl.p_glReadPixels(0, 0, - surface->resource.width, surface->resource.height, + width = wined3d_texture_get_level_width(texture, surface->texture_level); + height = wined3d_texture_get_level_height(texture, surface->texture_level); + gl_info->gl_ops.gl.p_glReadPixels(0, 0, width, height, texture->resource.format->glFormat, texture->resource.format->glType, data.addr); checkGLcall("glReadPixels"); @@ -1936,8 +1938,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, mem = data.addr; top = mem; - bottom = mem + row_pitch * (surface->resource.height - 1); - for (i = 0; i < surface->resource.height / 2; i++) + bottom = mem + row_pitch * (height - 1); + for (i = 0; i < height / 2; i++) { memcpy(row, top, row_pitch); memcpy(top, bottom, row_pitch);

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_load_fb_texture().
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: f05febcb14e6e34bd25094fb4690bb5b9e9dfeb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f05febcb14e6e34bd25094fb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 5 18:24:23 2016 +0200 wined3d: Use the texture dimension helpers in surface_load_fb_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 681caa9..67ec03f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1999,7 +1999,8 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct checkGLcall("glReadBuffer"); gl_info->gl_ops.gl.p_glCopyTexSubImage2D(surface->texture_target, surface->texture_level, - 0, 0, 0, 0, surface->resource.width, surface->resource.height); + 0, 0, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), + wined3d_texture_get_level_height(texture, surface->texture_level)); checkGLcall("glCopyTexSubImage2D"); if (restore_rt)

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in fb_copy_to_texture_direct().
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: e5102126260dc7fc3c9855fbc3c938ab19f68beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5102126260dc7fc3c9855fbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 5 18:24:24 2016 +0200 wined3d: Use the texture dimension helpers in fb_copy_to_texture_direct(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 67ec03f..8d898bc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2082,6 +2082,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc struct wined3d_context *context; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; + unsigned int src_height; /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag * glCopyTexSubImage is a bit picky about the parameters we pass to it @@ -2128,6 +2129,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc ERR("Texture filtering not supported in direct blit\n"); } + src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); if (upsidedown && !((xrel - 1.0f < -eps) || (xrel - 1.0f > eps)) && !((yrel - 1.0f < -eps) || (yrel - 1.0f > eps))) @@ -2135,13 +2137,13 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc /* Upside down copy without stretching is nice, one glCopyTexSubImage call will do. */ gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_surface->texture_target, dst_surface->texture_level, dst_rect.left /*xoffset */, dst_rect.top /* y offset */, - src_rect->left, src_surface->resource.height - src_rect->bottom, + src_rect->left, src_height - src_rect->bottom, dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top); } else { LONG row; - UINT yoffset = src_surface->resource.height - src_rect->top + dst_rect.top - 1; + UINT yoffset = src_height - src_rect->top + dst_rect.top - 1; /* I have to process this row by row to swap the image, * otherwise it would be upside down, so stretching in y direction * doesn't cost extra time

1 0