wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Henri Verbeet : d2d1: Take scaling into account for the source offset in d2d_d3d_render_target_DrawBitmap ().
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: b313680ab4d723fb6fc45581e3dfca9958bfe526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b313680ab4d723fb6fc45581e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:25 2015 +0200 d2d1: Take scaling into account for the source offset in d2d_d3d_render_target_DrawBitmap(). --- dlls/d2d1/render_target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index f8bdf95..757cdac 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -779,10 +779,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget brush_desc.opacity = opacity; brush_desc.transform._11 = fabsf((d.right - d.left) / (s.right - s.left)); brush_desc.transform._21 = 0.0f; - brush_desc.transform._31 = min(d.left, d.right) - min(s.left, s.right); + brush_desc.transform._31 = min(d.left, d.right) - min(s.left, s.right) * brush_desc.transform._11; brush_desc.transform._12 = 0.0f; brush_desc.transform._22 = fabsf((d.bottom - d.top) / (s.bottom - s.top)); - brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom); + brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom) * brush_desc.transform._22; if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) {

1 0

Henri Verbeet : d2d1: Do not flip/ mirror the bitmap in d2d_d3d_render_target_DrawBitmap().
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 4b3ca58fe969bd8b20358ed90dfe438e9bc03013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b3ca58fe969bd8b20358ed90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:24 2015 +0200 d2d1: Do not flip/mirror the bitmap in d2d_d3d_render_target_DrawBitmap(). --- dlls/d2d1/render_target.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index cdf82bf..f8bdf95 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -777,12 +777,12 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget bitmap_brush_desc.interpolationMode = interpolation_mode; brush_desc.opacity = opacity; - brush_desc.transform._11 = (d.right - d.left) / (s.right - s.left); + brush_desc.transform._11 = fabsf((d.right - d.left) / (s.right - s.left)); brush_desc.transform._21 = 0.0f; - brush_desc.transform._31 = d.left - s.left; + brush_desc.transform._31 = min(d.left, d.right) - min(s.left, s.right); brush_desc.transform._12 = 0.0f; - brush_desc.transform._22 = (d.bottom - d.top) / (s.bottom - s.top); - brush_desc.transform._32 = d.top - s.top; + brush_desc.transform._22 = fabsf((d.bottom - d.top) / (s.bottom - s.top)); + brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom); if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) {

1 0

Henri Verbeet : wined3d: Get rid of the tracing code in shader_vaddline().
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: cfd280fd66b3824d6a9cec4c214e91c900d167ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd280fd66b3824d6a9cec4c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:23 2015 +0200 wined3d: Get rid of the tracing code in shader_vaddline(). --- dlls/wined3d/arb_program_shader.c | 6 +++++ dlls/wined3d/glsl_shader.c | 9 +++++++ dlls/wined3d/shader.c | 50 +++++++++++---------------------------- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 29 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 39800f2..7a497d2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3262,6 +3262,12 @@ static BOOL shader_arb_compile(const struct wined3d_gl_info *gl_info, GLenum tar const char *ptr, *line; GLint native, pos; + if (TRACE_ON(d3d_shader)) + { + ptr = src; + while ((line = get_line(&ptr))) TRACE_(d3d_shader)(" %.*s", (int)(ptr - line), line); + } + GL_EXTCALL(glProgramStringARB(target, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(src), src)); checkGLcall("glProgramStringARB()"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f1bf0a3..0f18019 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -344,7 +344,16 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id /* Context activation is done by the caller. */ static void shader_glsl_compile(const struct wined3d_gl_info *gl_info, GLuint shader, const char *src) { + const char *ptr, *line; + TRACE("Compiling shader object %u.\n", shader); + + if (TRACE_ON(d3d_shader)) + { + ptr = src; + while ((line = get_info_log_line(&ptr))) TRACE_(d3d_shader)(" %.*s", (int)(ptr - line), line); + } + GL_EXTCALL(glShaderSource(shader, 1, &src, NULL)); checkGLcall("glShaderSource"); GL_EXTCALL(glCompileShader(shader)); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c249c9a..7d0c47b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -249,8 +249,6 @@ void shader_buffer_clear(struct wined3d_shader_buffer *buffer) { buffer->buffer[0] = '\0'; buffer->content_size = 0; - buffer->lineNo = 0; - buffer->newline = TRUE; } BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) @@ -273,48 +271,28 @@ void shader_buffer_free(struct wined3d_shader_buffer *buffer) int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va_list args) { - char *base = buffer->buffer + buffer->content_size; + unsigned int rem; int rc; char *new_buffer; - while(1) + for (;;) { - rc = vsnprintf(base, buffer->buffer_size - buffer->content_size, format, args); - if (rc < 0 /* C89 */ || (unsigned int)rc >= buffer->buffer_size - buffer->content_size /* C99 */) - { - new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2); - if (!new_buffer) - { - ERR("The buffer allocated for the shader program string is too small at %d bytes.\n", buffer->buffer_size); - buffer->content_size = buffer->buffer_size - 1; - return -1; - } - buffer->buffer = new_buffer; - buffer->buffer_size = buffer->buffer_size * 2; - base = buffer->buffer + buffer->content_size; - } - else - { + rem = buffer->buffer_size - buffer->content_size; + rc = vsnprintf(&buffer->buffer[buffer->content_size], rem, format, args); + + if (rc >= 0 /* C89 */ && (unsigned int)rc < rem /* C99 */) break; - } - } - if (buffer->newline) - { - TRACE("GL HW (%u, %u) : %s", buffer->lineNo + 1, buffer->content_size, base); - buffer->newline = FALSE; - } - else - { - TRACE("%s", base); + if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2))) + { + ERR("Failed to grow buffer.\n"); + buffer->buffer[buffer->content_size] = '\0'; + return -1; + } + buffer->buffer = new_buffer; + buffer->buffer_size = buffer->buffer_size * 2; } - buffer->content_size += rc; - if (buffer->buffer[buffer->content_size-1] == '\n') - { - ++buffer->lineNo; - buffer->newline = TRUE; - } return 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd2a85a..ecbec5b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -440,8 +440,6 @@ struct wined3d_shader_buffer char *buffer; unsigned int buffer_size; unsigned int content_size; - unsigned int lineNo; - BOOL newline; }; enum WINED3D_SHADER_INSTRUCTION_HANDLER

1 0

Henri Verbeet : wined3d: Simplify shader_arb_dump_program_source().
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: dd2398297c17acb2ee9fcb026e70b313ea433edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2398297c17acb2ee9fcb026… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:22 2015 +0200 wined3d: Simplify shader_arb_dump_program_source(). --- dlls/wined3d/arb_program_shader.c | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 96d2f74..39800f2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -50,10 +50,9 @@ static BOOL shader_is_vshader_version(enum wined3d_shader_type type) return type == WINED3D_SHADER_TYPE_VERTEX; } -/* Extract a line. Note that this modifies the source string. */ -static char *get_line(char **ptr) +static const char *get_line(const char **ptr) { - char *p, *q; + const char *p, *q; p = *ptr; if (!(q = strstr(p, "\n"))) @@ -62,33 +61,11 @@ static char *get_line(char **ptr) *ptr += strlen(p); return p; } - *q = '\0'; *ptr = q + 1; return p; } -static void shader_arb_dump_program_source(const char *source) -{ - ULONG source_size; - char *ptr, *line, *tmp; - - source_size = strlen(source) + 1; - tmp = HeapAlloc(GetProcessHeap(), 0, source_size); - if (!tmp) - { - ERR("Failed to allocate %u bytes for shader source.\n", source_size); - return; - } - memcpy(tmp, source, source_size); - - ptr = tmp; - while ((line = get_line(&ptr))) FIXME(" %s\n", line); - FIXME("\n"); - - HeapFree(GetProcessHeap(), 0, tmp); -} - enum arb_helper_value { ARB_ZERO, @@ -3282,6 +3259,7 @@ static void shader_hw_call(const struct wined3d_shader_instruction *ins) static BOOL shader_arb_compile(const struct wined3d_gl_info *gl_info, GLenum target, const char *src) { + const char *ptr, *line; GLint native, pos; GL_EXTCALL(glProgramStringARB(target, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(src), src)); @@ -3294,7 +3272,10 @@ static BOOL shader_arb_compile(const struct wined3d_gl_info *gl_info, GLenum tar { FIXME_(d3d_shader)("Program error at position %d: %s\n\n", pos, debugstr_a((const char *)gl_info->gl_ops.gl.p_glGetString(GL_PROGRAM_ERROR_STRING_ARB))); - shader_arb_dump_program_source(src); + ptr = src; + while ((line = get_line(&ptr))) FIXME_(d3d_shader)(" %.*s", (int)(ptr - line), line); + FIXME_(d3d_shader)("\n"); + return FALSE; } }

1 0

Huw Davies : rpcrt4/tests: Fix some tests on Win 8.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 9f2c668c99cba9f4dc905810f4c290a587162c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2c668c99cba9f4dc905810f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 23 13:17:32 2015 +0100 rpcrt4/tests: Fix some tests on Win 8. --- dlls/rpcrt4/tests/cstub.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index de0c224..d098d60 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -397,6 +397,8 @@ static BOOL check_address(void *actual, void *expected) { static void *ole32_start = NULL; static void *ole32_end = NULL; + static void *combase_start = NULL; + static void *combase_end = NULL; if (actual == expected) return TRUE; @@ -412,7 +414,21 @@ static BOOL check_address(void *actual, void *expected) ole32_end = (void *)((char *) ole32_start + nt_headers->OptionalHeader.SizeOfImage); } - return ole32_start <= actual && actual < ole32_end; + if (ole32_start <= actual && actual < ole32_end) + return TRUE; + + /* On Win8, actual can be located inside combase.dll */ + if (combase_start == NULL || combase_end == NULL) + { + PIMAGE_NT_HEADERS nt_headers; + combase_start = (void *) GetModuleHandleA("combase.dll"); + if (combase_start == NULL) + return FALSE; + nt_headers = (PIMAGE_NT_HEADERS)((char *) combase_start + ((PIMAGE_DOS_HEADER) combase_start)->e_lfanew); + combase_end = (void *)((char *) combase_start + nt_headers->OptionalHeader.SizeOfImage); + } + + return (combase_start <= actual && actual < combase_end); } static const ExtendedProxyFileInfo my_proxy_file_info =

1 0

Stefan Dösinger : wined3d: Shadow format flags in wined3d_rendertarget_view.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: 4fbaab20201b73b074abefd36b808a63571579ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbaab20201b73b074abefd36… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 23 11:28:15 2015 +0200 wined3d: Shadow format flags in wined3d_rendertarget_view. --- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/view.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d5a90c0..c249c9a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2344,8 +2344,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && state->render_states[WINED3D_RS_SRGBWRITEENABLE]) { - const struct wined3d_format *rt_format = state->fb->render_targets[0]->format; - if (rt_format->flags & WINED3DFMT_FLAG_SRGB_WRITE) + unsigned int rt_fmt_flags = state->fb->render_targets[0]->format_flags; + if (rt_fmt_flags & WINED3DFMT_FLAG_SRGB_WRITE) { static unsigned int warned = 0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 91f3485..b025dff 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -368,6 +368,7 @@ static GLenum gl_blend_factor(enum wined3d_blend factor, const struct wined3d_fo static void state_blend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_format *rt_format = state->fb->render_targets[0]->format; + unsigned int rt_fmt_flags = state->fb->render_targets[0]->format_flags; const struct wined3d_gl_info *gl_info = context->gl_info; GLenum srcBlend, dstBlend; enum wined3d_blend d3d_blend; @@ -381,7 +382,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st /* Disable blending in all cases even without pixelshaders. * With blending on we could face a big performance penalty. * The d3d9 visual test confirms the behavior. */ - if (context->render_offscreen && !(rt_format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + if (context->render_offscreen && !(rt_fmt_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) { gl_info->gl_ops.gl.p_glDisable(GL_BLEND); checkGLcall("glDisable GL_BLEND"); @@ -4899,13 +4900,12 @@ static void psorigin(struct wined3d_context *context, const struct wined3d_state void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_format *rt_format = state->fb->render_targets[0]->format; + unsigned int rt_fmt_flags = state->fb->render_targets[0]->format_flags; const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - if (state->render_states[WINED3D_RS_SRGBWRITEENABLE] - && rt_format->flags & WINED3DFMT_FLAG_SRGB_WRITE) + if (state->render_states[WINED3D_RS_SRGBWRITEENABLE] && rt_fmt_flags & WINED3DFMT_FLAG_SRGB_WRITE) gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); else gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1686e30..5596375 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3686,7 +3686,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d unsigned int i; DWORD ttff; DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2; - const struct wined3d_format *rt_format = state->fb->render_targets[0]->format; + unsigned int rt_fmt_flags = state->fb->render_targets[0]->format_flags; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; @@ -3902,7 +3902,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d } if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && state->render_states[WINED3D_RS_SRGBWRITEENABLE] - && rt_format->flags & WINED3DFMT_FLAG_SRGB_WRITE) + && rt_fmt_flags & WINED3DFMT_FLAG_SRGB_WRITE) { settings->sRGB_write = 1; } else { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 9cda64d..83cd772 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -101,6 +101,7 @@ static void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *vie view->parent_ops = parent_ops; view->format = wined3d_get_format(gl_info, desc->format_id); + view->format_flags = view->format->flags; if (resource->type == WINED3D_RTYPE_BUFFER) { view->sub_resource_idx = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 782f54f..dd2a85a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2692,6 +2692,7 @@ struct wined3d_rendertarget_view const struct wined3d_parent_ops *parent_ops; const struct wined3d_format *format; + unsigned int format_flags; unsigned int sub_resource_idx; unsigned int buffer_offset;

1 0

Nikolay Sivov : dwrite: Trace text strings up to specified length.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: a457b5e069021911972352be19761ef5e2f37c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a457b5e069021911972352be1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 13:13:51 2015 +0300 dwrite: Trace text strings up to specified length. --- dlls/dwrite/analyzer.c | 7 +++---- dlls/dwrite/main.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 85681b2..b8bd5a8 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -663,7 +663,6 @@ static HRESULT WINAPI dwritetextanalyzer_QueryInterface(IDWriteTextAnalyzer2 *if *obj = NULL; return E_NOINTERFACE; - } static ULONG WINAPI dwritetextanalyzer_AddRef(IDWriteTextAnalyzer2 *iface) @@ -1032,7 +1031,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 HRESULT hr; UINT32 i; - TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %p %s %p %p %u %p %p)\n", debugstr_w(text), + TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %p %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, is_sideways, is_rtl, analysis, debugstr_w(locale), features, feature_range_len, feature_ranges, advances, offsets); @@ -1070,7 +1069,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite DWRITE_SCRIPT_ANALYSIS const* analysis, WCHAR const* locale, DWRITE_TYPOGRAPHIC_FEATURES const** features, UINT32 const* feature_range_lengths, UINT32 feature_ranges, FLOAT* glyph_advances, DWRITE_GLYPH_OFFSET* glyph_offsets) { - FIXME("(%s %p %p %u %p %p %u %p %f %f %p %d %d %d %p %s %p %p %u %p %p): stub\n", debugstr_w(text), + FIXME("(%s %p %p %u %p %p %u %p %f %f %p %d %d %d %p %s %p %p %u %p %p): stub\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyph_indices, glyph_props, glyph_count, font_face, fontEmSize, pixels_per_dip, transform, use_gdi_natural, is_sideways, is_rtl, analysis, debugstr_w(locale), features, feature_range_lengths, feature_ranges, glyph_advances, glyph_offsets); @@ -1184,7 +1183,7 @@ static HRESULT WINAPI dwritetextanalyzer1_GetJustificationOpportunities(IDWriteT const WCHAR *text, const UINT16 *clustermap, const DWRITE_SHAPING_GLYPH_PROPERTIES *prop, DWRITE_JUSTIFICATION_OPPORTUNITY *jo) { FIXME("(%p %.2f %u %u %u %s %p %p %p): stub\n", face, font_em_size, sa.script, length, glyph_count, - debugstr_w(text), clustermap, prop, jo); + debugstr_wn(text, length), clustermap, prop, jo); return E_NOTIMPL; } diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 6a4ed91..3285f2d 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1027,7 +1027,7 @@ static HRESULT WINAPI dwritefactory_CreateTextLayout(IDWriteFactory2 *iface, WCH UINT32 len, IDWriteTextFormat *format, FLOAT max_width, FLOAT max_height, IDWriteTextLayout **layout) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - TRACE("(%p)->(%s %u %p %f %f %p)\n", This, debugstr_w(string), len, format, max_width, max_height, layout); + TRACE("(%p)->(%s:%u %p %f %f %p)\n", This, debugstr_wn(string, len), len, format, max_width, max_height, layout); if (!format) return E_INVALIDARG; return create_textlayout(string, len, format, max_width, max_height, layout);

1 0

Nikolay Sivov : dwrite: Track a run this cluster came from.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: d7a40fd2984ed55f5c618827aa5e22fe8c02ed47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a40fd2984ed55f5c618827a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 13:02:43 2015 +0300 dwrite: Track a run this cluster came from. --- dlls/dwrite/layout.c | 55 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index f4aa1b6..22fbbd3 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -139,6 +139,11 @@ struct layout_run { } u; }; +struct layout_cluster { + const struct layout_run *run; /* link to run this cluster belongs to */ + UINT32 position; /* relative to run, first cluster has 0 position */ +}; + enum layout_recompute_mask { RECOMPUTE_NOMINAL_RUNS = 1 << 0, RECOMPUTE_MINIMAL_WIDTH = 1 << 1, @@ -164,7 +169,8 @@ struct dwrite_textlayout { DWRITE_LINE_BREAKPOINT *nominal_breakpoints; DWRITE_LINE_BREAKPOINT *actual_breakpoints; - DWRITE_CLUSTER_METRICS *clusters; + struct layout_cluster *clusters; + DWRITE_CLUSTER_METRICS *clustermetrics; UINT32 clusters_count; FLOAT minwidth; @@ -420,9 +426,11 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, codepoint initially. */ -static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const struct regular_layout_run *run, UINT32 *cluster) +static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const struct layout_run *r, UINT32 *cluster) { - DWRITE_CLUSTER_METRICS *metrics = &layout->clusters[*cluster]; + DWRITE_CLUSTER_METRICS *metrics = &layout->clustermetrics[*cluster]; + struct layout_cluster *c = &layout->clusters[*cluster]; + const struct regular_layout_run *run = &r->u.regular; UINT32 i, start = 0; for (i = 0; i < run->descr.stringLength; i++) { @@ -431,15 +439,20 @@ static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const s if (run->descr.clusterMap[start] != run->descr.clusterMap[i]) { init_cluster_metrics(layout, run, run->descr.clusterMap[start], run->descr.clusterMap[i], i, metrics); metrics->length = i - start; + c->position = start; + c->run = r; *cluster += 1; metrics++; + c++; start = i; } if (end) { init_cluster_metrics(layout, run, run->descr.clusterMap[start], run->run.glyphCount, i, metrics); metrics->length = i - start + 1; + c->position = start; + c->run = r; *cluster += 1; return; @@ -456,11 +469,18 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) HRESULT hr; free_layout_runs(layout); - heap_free(layout->clusters); + + /* Cluster data arrays are allocated once, assuming one text position per cluster. */ + if (!layout->clustermetrics) { + layout->clustermetrics = heap_alloc(layout->len*sizeof(*layout->clustermetrics)); + layout->clusters = heap_alloc(layout->len*sizeof(*layout->clusters)); + if (!layout->clustermetrics || !layout->clusters) { + heap_free(layout->clustermetrics); + heap_free(layout->clusters); + return E_OUTOFMEMORY; + } + } layout->clusters_count = 0; - layout->clusters = heap_alloc(layout->len*sizeof(DWRITE_CLUSTER_METRICS)); - if (!layout->clusters) - return E_OUTOFMEMORY; hr = get_textanalyzer(&analyzer); if (FAILED(hr)) @@ -508,7 +528,8 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) /* we need to do very little in case of inline objects */ if (r->kind == LAYOUT_RUN_INLINE) { - DWRITE_CLUSTER_METRICS *metrics = &layout->clusters[cluster]; + DWRITE_CLUSTER_METRICS *metrics = &layout->clustermetrics[cluster]; + struct layout_cluster *c = &layout->clusters[cluster]; DWRITE_INLINE_OBJECT_METRICS inlinemetrics; metrics->width = 0.0; @@ -519,6 +540,8 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) metrics->isSoftHyphen = FALSE; metrics->isRightToLeft = FALSE; metrics->padding = 0; + c->run = r; + c->position = 0; /* there's always one cluster per inline object, so 0 is valid value */ cluster++; /* TODO: is it fatal if GetMetrics() fails? */ @@ -630,7 +653,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) run->run.glyphAdvances = run->advances; run->run.glyphOffsets = run->offsets; - layout_set_cluster_metrics(layout, run, &cluster); + layout_set_cluster_metrics(layout, r, &cluster); continue; @@ -1203,6 +1226,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout2 *iface) release_format_data(&This->format); heap_free(This->nominal_breakpoints); heap_free(This->actual_breakpoints); + heap_free(This->clustermetrics); heap_free(This->clusters); heap_free(This->str); heap_free(This); @@ -1817,7 +1841,7 @@ static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout2 *ifa return hr; if (metrics) - memcpy(metrics, This->clusters, sizeof(DWRITE_CLUSTER_METRICS)*min(max_count, This->clusters_count)); + memcpy(metrics, This->clustermetrics, sizeof(DWRITE_CLUSTER_METRICS)*min(max_count, This->clusters_count)); *count = This->clusters_count; return max_count >= This->clusters_count ? S_OK : E_NOT_SUFFICIENT_BUFFER; @@ -1827,11 +1851,11 @@ static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout2 *ifa too hard to break. */ static inline BOOL is_terminal_cluster(struct dwrite_textlayout *layout, UINT32 index) { - if (layout->clusters[index].isWhitespace || layout->clusters[index].isNewline || + if (layout->clustermetrics[index].isWhitespace || layout->clustermetrics[index].isNewline || (index == layout->clusters_count - 1)) return TRUE; /* check next one */ - return (index < layout->clusters_count - 1) && layout->clusters[index+1].isWhitespace; + return (index < layout->clusters_count - 1) && layout->clustermetrics[index+1].isWhitespace; } static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *iface, FLOAT* min_width) @@ -1856,17 +1880,17 @@ static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *ifa for (i = 0; i < This->clusters_count;) { if (is_terminal_cluster(This, i)) { - width = This->clusters[i].width; + width = This->clustermetrics[i].width; i++; } else { width = 0.0; while (!is_terminal_cluster(This, i)) { - width += This->clusters[i].width; + width += This->clustermetrics[i].width; i++; } /* count last one too */ - width += This->clusters[i].width; + width += This->clustermetrics[i].width; } if (width > This->minwidth) @@ -2716,6 +2740,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * layout->nominal_breakpoints = NULL; layout->actual_breakpoints = NULL; layout->clusters_count = 0; + layout->clustermetrics = NULL; layout->clusters = NULL; layout->minwidth = 0.0; list_init(&layout->runs);

1 0

Nikolay Sivov : dwrite: Set some more cluster properties.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: 68edc995c541666cfeb6dc900275436a718a8004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68edc995c541666cfeb6dc900… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 13:01:18 2015 +0300 dwrite: Set some more cluster properties. --- dlls/dwrite/layout.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9999e6e..f4aa1b6 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -377,6 +377,7 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, UINT16 start_glyph, UINT16 stop_glyph, UINT32 stop_position, DWRITE_CLUSTER_METRICS *metrics) { UINT8 breakcondition; + UINT32 position; UINT16 j; metrics->width = 0.0; @@ -384,16 +385,29 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, metrics->width += run->run.glyphAdvances[j]; metrics->length = 0; + position = stop_position; if (stop_glyph == run->run.glyphCount) breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionAfter; - else + else { breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionBefore; + if (stop_position) position = stop_position - 1; + } metrics->canWrapLineAfter = breakcondition == DWRITE_BREAK_CONDITION_CAN_BREAK || breakcondition == DWRITE_BREAK_CONDITION_MUST_BREAK; - metrics->isWhitespace = FALSE; /* FIXME */ - metrics->isNewline = FALSE; /* FIXME */ - metrics->isSoftHyphen = FALSE; /* FIXME */ + if (metrics->length == 1) { + WORD type; + + GetStringTypeW(CT_CTYPE1, &layout->str[position], 1, &type); + metrics->isWhitespace = type == C1_SPACE; + metrics->isNewline = FALSE /* FIXME */; + metrics->isSoftHyphen = layout->str[position] == 0x00ad /* Unicode Soft Hyphen */; + } + else { + metrics->isWhitespace = FALSE; + metrics->isNewline = FALSE; + metrics->isSoftHyphen = FALSE; + } metrics->isRightToLeft = run->run.bidiLevel & 1; metrics->padding = 0; }

1 0

Jianqiu Zhang : ntdll/tests: Add test for FileFsFullSizeInformation.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: 4c41f2bb52b848135ceee6631702d721a082f19e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c41f2bb52b848135ceee6631… Author: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Date: Tue Apr 7 18:35:56 2015 +0800 ntdll/tests: Add test for FileFsFullSizeInformation. --- dlls/ntdll/tests/file.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d70ed6b..c02c926 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -84,6 +84,16 @@ static inline BOOL is_signaled( HANDLE obj ) return WaitForSingleObject( obj, 0 ) == WAIT_OBJECT_0; } +static const char* debugstr_longlong(ULONGLONG ll) +{ + static char str[17]; + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf(str, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); + else + sprintf(str, "%lx", (unsigned long)ll); + return str; +} + #define PIPENAME "\\\\.\\pipe\\ntdll_tests_file.c" #define TEST_BUF_LEN 3 @@ -1205,6 +1215,68 @@ static void test_iocp_fileio(HANDLE h) CloseHandle( hPipeClt ); } +static void test_file_full_size_information(void) +{ + IO_STATUS_BLOCK io; + FILE_FS_FULL_SIZE_INFORMATION ffsi; + FILE_FS_SIZE_INFORMATION fsi; + HANDLE h; + NTSTATUS res; + + if(!(h = create_temp_file(0))) return ; + + memset(&ffsi,0,sizeof(ffsi)); + memset(&fsi,0,sizeof(fsi)); + + /* Assume No Quota Settings configured on Wine Testbot */ + res = pNtQueryVolumeInformationFile(h, &io, &ffsi, sizeof ffsi, FileFsFullSizeInformation); + todo_wine ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); + res = pNtQueryVolumeInformationFile(h, &io, &fsi, sizeof fsi, FileFsSizeInformation); + ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); + + /* Test for FileFsSizeInformation */ + ok(fsi.TotalAllocationUnits.QuadPart > 0, + "[fsi] TotalAllocationUnits expected positive, got 0x%s\n", + debugstr_longlong(fsi.TotalAllocationUnits.QuadPart)); + ok(fsi.AvailableAllocationUnits.QuadPart > 0, + "[fsi] AvailableAllocationUnits expected positive, got 0x%s\n", + debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart)); + + /* Assume file system is NTFS */ + ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %d\n",fsi.BytesPerSector); + ok(fsi.SectorsPerAllocationUnit == 8, "[fsi] SectorsPerAllocationUnit expected 8, got %d\n",fsi.SectorsPerAllocationUnit); + + todo_wine + { + ok(ffsi.TotalAllocationUnits.QuadPart > 0, + "[ffsi] TotalAllocationUnits expected positive, got negative value 0x%s\n", + debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); + ok(ffsi.CallerAvailableAllocationUnits.QuadPart > 0, + "[ffsi] CallerAvailableAllocationUnits expected positive, got negative value 0x%s\n", + debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); + ok(ffsi.ActualAvailableAllocationUnits.QuadPart > 0, + "[ffsi] ActualAvailableAllocationUnits expected positive, got negative value 0x%s\n", + debugstr_longlong(ffsi.ActualAvailableAllocationUnits.QuadPart)); + ok(ffsi.TotalAllocationUnits.QuadPart == fsi.TotalAllocationUnits.QuadPart, + "[ffsi] TotalAllocationUnits error fsi:0x%s, ffsi:0x%s\n", + debugstr_longlong(fsi.TotalAllocationUnits.QuadPart), + debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); + ok(ffsi.CallerAvailableAllocationUnits.QuadPart == fsi.AvailableAllocationUnits.QuadPart, + "[ffsi] CallerAvailableAllocationUnits error fsi:0x%s, ffsi: 0x%s\n", + debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart), + debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); + } + + /* Assume file system is NTFS */ + todo_wine + { + ok(ffsi.BytesPerSector == 512, "[ffsi] BytesPerSector expected 512, got %d\n",ffsi.BytesPerSector); + ok(ffsi.SectorsPerAllocationUnit == 8, "[ffsi] SectorsPerAllocationUnit expected 8, got %d\n",ffsi.SectorsPerAllocationUnit); + } + + CloseHandle( h ); +} + static void test_file_basic_information(void) { IO_STATUS_BLOCK io; @@ -2732,6 +2804,7 @@ START_TEST(file) test_file_all_information(); test_file_both_information(); test_file_name_information(); + test_file_full_size_information(); test_file_all_name_information(); test_file_disposition_information(); test_query_volume_information_file();

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2015