wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Detlef Riekenberg : winemenubuilder: Show filename on failure.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 2497a91f6b1326988dd5ea56dc4052cbcc2e521d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2497a91f6b1326988dd5ea56d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jun 26 18:26:27 2011 +0200 winemenubuilder: Show filename on failure. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e196564..6d627cb 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -409,7 +409,7 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indeces, int numInd hr = SHCreateStreamOnFileW(dosOutputFileName, STGM_CREATE | STGM_WRITE, &outputFile); if (FAILED(hr)) { - WINE_ERR("error 0x%08X creating output file\n", hr); + WINE_ERR("error 0x%08X creating output file %s\n", hr, wine_dbgstr_w(dosOutputFileName)); goto end; } hr = IWICBitmapEncoder_Initialize(encoder, outputFile, GENERIC_WRITE);

1 0

Vincent Povirk : gdiplus: Add test for GdipMeasureDriverString.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: c0682a26d22bfa87a1e66ebc2afa484f25762031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0682a26d22bfa87a1e66ebc2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 27 11:23:21 2011 -0500 gdiplus: Add test for GdipMeasureDriverString. --- dlls/gdiplus/tests/graphics.c | 77 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 28414cc..49f6815 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2834,6 +2834,8 @@ static void test_string_functions(void) GpRegion *regions[4] = {0}; BOOL region_isempty[4]; int i; + PointF position; + GpMatrix *identity; ok(hdc != NULL, "Expected HDC to be initialized\n"); status = GdipCreateFromHDC(hdc, &graphics); @@ -3033,6 +3035,81 @@ static void test_string_functions(void) for (i=0; i<4; i++) GdipDeleteRegion(regions[i]); + GdipCreateMatrix(&identity); + + position.X = 0; + position.Y = 0; + + rc.X = 0; + rc.Y = 0; + rc.Width = 0; + rc.Height = 0; + status = GdipMeasureDriverString(NULL, teststring, 6, font, &position, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, + identity, &rc); + todo_wine expect(InvalidParameter, status); + + status = GdipMeasureDriverString(graphics, NULL, 6, font, &position, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, + identity, &rc); + todo_wine expect(InvalidParameter, status); + + status = GdipMeasureDriverString(graphics, teststring, 6, NULL, &position, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, + identity, &rc); + todo_wine expect(InvalidParameter, status); + + status = GdipMeasureDriverString(graphics, teststring, 6, font, NULL, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, + identity, &rc); + todo_wine expect(InvalidParameter, status); + + status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + 0x100, identity, &rc); + todo_wine expect(Ok, status); + + status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, + NULL, &rc); + todo_wine expect(Ok, status); + + status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, + identity, NULL); + todo_wine expect(InvalidParameter, status); + + rc.X = 0; + rc.Y = 0; + rc.Width = 0; + rc.Height = 0; + status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, + identity, &rc); + todo_wine expect(Ok, status); + + expectf(rc.X, 0.0); + todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); + todo_wine ok(rc.Width > 0.0, "unexpected Width %0.2f\n", rc.Width); + todo_wine ok(rc.Height > 0.0, "unexpected Y %0.2f\n", rc.Y); + + char_width = rc.Width; + char_height = rc.Height; + + rc.X = 0; + rc.Y = 0; + rc.Width = 0; + rc.Height = 0; + status = GdipMeasureDriverString(graphics, teststring, 4, font, &position, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, + identity, &rc); + todo_wine expect(Ok, status); + + expectf(rc.X, 0.0); + todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); + todo_wine ok(rc.Width < char_width, "got Width %0.2f, expecting less than %0.2f\n", rc.Width, char_width); + expectf(rc.Height, char_height); + + GdipDeleteMatrix(identity); GdipDeleteStringFormat(format); GdipDeleteBrush(brush); GdipDeleteFont(font);

1 0

Stefan Dösinger : wined3d: Separate stream sources and vertex declaration.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 5e97e2295190b7e8714fefdb2e0bdb76a2af5e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e97e2295190b7e8714fefdb2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 27 17:52:39 2011 +0200 wined3d: Separate stream sources and vertex declaration. Changing the stream sources does not require a reapplication of the vertex declaration. Even setting a NULL vertex buffer doesn't make attributes disappear - it just causes a segfault on Windows. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/state.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bdf1f37..3af69e8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2178,7 +2178,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de * updating a resource location. */ device_update_tex_unit_map(device); device_preload_textures(device); - if (isStateDirty(context, STATE_VDECL)) + if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC)) device_update_stream_info(device, context->gl_info); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 77dd1dd..b17a254 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4468,6 +4468,7 @@ static void streamsrc(DWORD state, struct wined3d_stateblock *stateblock, struct BOOL load_numbered = use_vs(&stateblock->state) && !device->useDrawStridedSlow; BOOL load_named = !use_vs(&stateblock->state) && !device->useDrawStridedSlow; + if (isStateDirty(context, STATE_VDECL)) return; if (context->numberedArraysLoaded && !load_numbered) { unloadNumberedArrays(context); @@ -4494,6 +4495,12 @@ static void streamsrc(DWORD state, struct wined3d_stateblock *stateblock, struct } } +static void vdecl_miscpart(DWORD state, struct wined3d_stateblock *stateblock, struct wined3d_context *context) +{ + if (isStateDirty(context, STATE_STREAMSRC)) return; + streamsrc(state, stateblock, context); +} + static void vertexdeclaration(DWORD state_id, struct wined3d_stateblock *stateblock, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -4884,8 +4891,8 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_DESTBLENDALPHA), { STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_DESTBLENDALPHA), { STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_BLENDOPALPHA), { STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_STREAMSRC, { STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, - { STATE_VDECL, { STATE_VDECL, streamsrc }, WINED3D_GL_EXT_NONE }, + { STATE_STREAMSRC, { STATE_STREAMSRC, streamsrc }, WINED3D_GL_EXT_NONE }, + { STATE_VDECL, { STATE_VDECL, vdecl_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_FRONTFACE, { STATE_FRONTFACE, frontface }, WINED3D_GL_EXT_NONE }, { STATE_SCISSORRECT, { STATE_SCISSORRECT, scissorrect }, WINED3D_GL_EXT_NONE }, { STATE_POINTSPRITECOORDORIGIN, { STATE_POINTSPRITECOORDORIGIN, psorigin }, WINED3D_GL_VERSION_2_0 }, @@ -5063,7 +5070,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_SAMPLER(18), /* Vertex sampler 2 */ { STATE_SAMPLER(18), sampler }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(19), /* Vertex sampler 3 */ { STATE_SAMPLER(19), sampler }, WINED3D_GL_EXT_NONE }, { STATE_BASEVERTEXINDEX, { STATE_BASEVERTEXINDEX, state_nop, }, ARB_DRAW_ELEMENTS_BASE_VERTEX }, - { STATE_BASEVERTEXINDEX, { STATE_VDECL, NULL, }, WINED3D_GL_EXT_NONE }, + { STATE_BASEVERTEXINDEX, { STATE_STREAMSRC, NULL, }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, };

1 0

Stefan Dösinger : wined3d: Don' t set FBO attachment filtering to GL_NEAREST.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 9ed6dc91443561037c7dacd3f4a08faec7ab8bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed6dc91443561037c7dacd3f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 27 13:57:34 2011 +0200 wined3d: Don't set FBO attachment filtering to GL_NEAREST. The min and mag filters should not have any effect when rendering to textures. This code was once needed to work around a bug in the Nvidia driver. Changing the texture filter states is expensive and makes it harder to apply the FBO state only when needed. --- dlls/wined3d/context.c | 113 +++++------------------------------------------- 1 files changed, 11 insertions(+), 102 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8edace0..bdf1f37 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -112,84 +112,6 @@ static void context_destroy_fbo(struct wined3d_context *context, GLuint *fbo) } /* GL locking is done by the caller */ -static void context_apply_attachment_filter_states(const struct wined3d_context *context, - struct wined3d_surface *surface, DWORD location) -{ - /* Update base texture states array */ - if (surface->container.type == WINED3D_CONTAINER_TEXTURE) - { - struct wined3d_texture *texture = surface->container.u.texture; - struct wined3d_device *device = surface->resource.device; - BOOL update_minfilter = FALSE; - BOOL update_magfilter = FALSE; - struct gl_texture *gl_tex; - - switch (location) - { - case SFLAG_INTEXTURE: - case SFLAG_INSRGBTEX: - gl_tex = wined3d_texture_get_gl_texture(texture, - context->gl_info, location == SFLAG_INSRGBTEX); - break; - - default: - ERR("Unsupported location %s (%#x).\n", debug_surflocation(location), location); - return; - } - - if (gl_tex->states[WINED3DTEXSTA_MINFILTER] != WINED3DTEXF_POINT - || gl_tex->states[WINED3DTEXSTA_MIPFILTER] != WINED3DTEXF_NONE) - { - gl_tex->states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; - gl_tex->states[WINED3DTEXSTA_MIPFILTER] = WINED3DTEXF_NONE; - update_minfilter = TRUE; - } - - if (gl_tex->states[WINED3DTEXSTA_MAGFILTER] != WINED3DTEXF_POINT) - { - gl_tex->states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; - update_magfilter = TRUE; - } - - if (texture->bind_count) - { - WARN("Render targets should not be bound to a sampler\n"); - device_invalidate_state(device, STATE_SAMPLER(texture->sampler)); - } - - if (update_minfilter || update_magfilter) - { - GLenum target, bind_target; - GLint old_binding; - - target = surface->texture_target; - if (target == GL_TEXTURE_2D) - { - bind_target = GL_TEXTURE_2D; - glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); - } - else if (target == GL_TEXTURE_RECTANGLE_ARB) - { - bind_target = GL_TEXTURE_RECTANGLE_ARB; - glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); - } - else - { - bind_target = GL_TEXTURE_CUBE_MAP_ARB; - glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); - } - - glBindTexture(bind_target, gl_tex->name); - if (update_minfilter) glTexParameteri(bind_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - if (update_magfilter) glTexParameteri(bind_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glBindTexture(bind_target, old_binding); - } - - checkGLcall("apply_attachment_filter_states()"); - } -} - -/* GL locking is done by the caller */ void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, struct wined3d_surface *depth_stencil, BOOL use_render_buffer) { @@ -220,7 +142,6 @@ void context_attach_depth_stencil_fbo(struct wined3d_context *context, else { surface_prepare_texture(depth_stencil, gl_info, FALSE); - context_apply_attachment_filter_states(context, depth_stencil, SFLAG_INTEXTURE); if (format_flags & WINED3DFMT_FLAG_DEPTH) { @@ -279,7 +200,6 @@ static void context_attach_surface_fbo(const struct wined3d_context *context, case SFLAG_INSRGBTEX: srgb = location == SFLAG_INSRGBTEX; surface_prepare_texture(surface, gl_info, srgb); - context_apply_attachment_filter_states(context, surface, location); gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_COLOR_ATTACHMENT0 + idx, surface->texture_target, surface_get_texture_name(surface, gl_info, srgb), surface->texture_level); @@ -450,31 +370,20 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ context_bind_fbo(context, target, &entry->id); - if (!entry->attached) - { - /* Apply render targets */ - for (i = 0; i < gl_info->limits.buffers; ++i) - { - context_attach_surface_fbo(context, target, i, entry->render_targets[i], entry->location); - } + if (entry->attached) return; - /* Apply depth targets */ - if (entry->depth_stencil) - surface_set_compatible_renderbuffer(entry->depth_stencil, entry->render_targets[0]); - context_attach_depth_stencil_fbo(context, target, entry->depth_stencil, TRUE); - - entry->attached = TRUE; - } - else + /* Apply render targets */ + for (i = 0; i < gl_info->limits.buffers; ++i) { - for (i = 0; i < gl_info->limits.buffers; ++i) - { - if (entry->render_targets[i]) - context_apply_attachment_filter_states(context, entry->render_targets[i], entry->location); - } - if (entry->depth_stencil) - context_apply_attachment_filter_states(context, entry->depth_stencil, SFLAG_INTEXTURE); + context_attach_surface_fbo(context, target, i, entry->render_targets[i], entry->location); } + + /* Apply depth targets */ + if (entry->depth_stencil) + surface_set_compatible_renderbuffer(entry->depth_stencil, entry->render_targets[0]); + context_attach_depth_stencil_fbo(context, target, entry->depth_stencil, TRUE); + + entry->attached = TRUE; } /* GL locking is done by the caller */

1 0

Marcus Meissner : urlmon: Fixed array size check (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 5cf0b44d06455cd2d725a5fe75b46c28cae8919e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cf0b44d06455cd2d725a5fe7… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jun 27 13:21:40 2011 +0200 urlmon: Fixed array size check (Coverity). --- dlls/urlmon/umon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index d3eb44e..3e43bb8 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -612,7 +612,7 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker if (!szURL || !ppmk) return E_INVALIDARG; - if(dwFlags > sizeof(create_flags_map)/sizeof(*create_flags_map)) { + if(dwFlags >= sizeof(create_flags_map)/sizeof(*create_flags_map)) { FIXME("Unsupported flags %x\n", dwFlags); return E_INVALIDARG; } @@ -665,7 +665,7 @@ HRESULT WINAPI CreateURLMonikerEx2(IMoniker *pmkContext, IUri *pUri, IMoniker ** if (!pUri || !ppmk) return E_INVALIDARG; - if(dwFlags > sizeof(create_flags_map)/sizeof(*create_flags_map)) { + if(dwFlags >= sizeof(create_flags_map)/sizeof(*create_flags_map)) { FIXME("Unsupported flags %x\n", dwFlags); return E_INVALIDARG; }

1 0

Detlef Riekenberg : jscript/tests: Fix copy & paste typos.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 4d1a28b299f43e0c6ecc8c3f0ba25092bc5defd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1a28b299f43e0c6ecc8c3f0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jun 26 18:28:28 2011 +0200 jscript/tests: Fix copy & paste typos. --- dlls/jscript/tests/lang.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b71d80d..b54eef2 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -251,7 +251,7 @@ ok((0 === 2 ? 1 : 2) === 2, "conditional expression true is not 2"); ok(getVT(undefined) === "VT_EMPTY", "getVT(undefined) is not VT_EMPTY"); ok(getVT(null) === "VT_NULL", "getVT(null) is not VT_NULL"); ok(getVT(0) === "VT_I4", "getVT(0) is not VT_I4"); -ok(getVT(0.5) === "VT_R8", "getVT(1.5) is not VT_R8"); +ok(getVT(0.5) === "VT_R8", "getVT(0.5) is not VT_R8"); ok(getVT("test") === "VT_BSTR", "getVT(\"test\") is not VT_BSTR"); ok(getVT(Math) === "VT_DISPATCH", "getVT(Math) is not VT_DISPATCH"); ok(getVT(false) === "VT_BOOL", "getVT(false) is not VT_BOOL"); @@ -274,7 +274,7 @@ ok(getVT(tmp) === "VT_I4", "getVT(4-2) !== VT_I4"); tmp = 4.5-2; ok(tmp === 2.5, "4.5-2 !== 2.5"); -ok(getVT(tmp) === "VT_R8", "getVT(4-2) !== VT_R8"); +ok(getVT(tmp) === "VT_R8", "getVT(4.5-2) !== VT_R8"); tmp = -2; ok(tmp === 0-2, "-2 !== 0-2");

1 0

Detlef Riekenberg : jscript: Support also VT_UI4 in debugstr_variant.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 738120efa2d45253863363a2d84e244eb3ca2bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=738120efa2d45253863363a2d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jun 26 18:28:27 2011 +0200 jscript: Support also VT_UI4 in debugstr_variant. --- dlls/jscript/jsutils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 341b928..d795e7d 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -41,6 +41,8 @@ const char *debugstr_variant(const VARIANT *v) return "{VT_NULL}"; case VT_I4: return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); + case VT_UI4: + return wine_dbg_sprintf("{VT_UI4: %u}", V_UI4(v)); case VT_R8: return wine_dbg_sprintf("{VT_R8: %lf}", V_R8(v)); case VT_BSTR:

1 0

Dylan Smith : d3dx9/tests: Fix comparison that expects NAN, since NAN != NAN.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 3d7af6a334eadc6f207e97e5eb0a4a65eb67a603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7af6a334eadc6f207e97e5e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Jun 25 14:32:16 2011 -0400 d3dx9/tests: Fix comparison that expects NAN, since NAN != NAN. --- dlls/d3dx9_36/tests/mesh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index c96b94e..98d77d9 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4809,7 +4809,7 @@ static void test_create_skin_info(void) exp_vertices[0] = 0; exp_vertices[1] = 0x87654321; exp_weights[0] = 0.5; - exp_weights[1] = 0.0f / 0.0f; + exp_weights[1] = 0.0f / 0.0f; /* NAN */ num_influences = 2; hr = skininfo->lpVtbl->SetBoneInfluence(skininfo, 1, num_influences, vertices, weights); @@ -4834,7 +4834,7 @@ static void test_create_skin_info(void) for (i = 0; i < num_influences; i++) { ok(exp_vertices[i] == vertices[i], "influence[%d]: expected vertex %u, got %u\n", i, exp_vertices[i], vertices[i]); - ok(exp_weights[i] == weights[i], + ok((isnan(exp_weights[i]) && isnan(weights[i])) || exp_weights[i] == weights[i], "influence[%d]: expected weights %g, got %g\n", i, exp_weights[i], weights[i]); }

1 0

Aric Stewart : usp10: Restart Indic syllable processing immediately after malformed syllable.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: cf40ef178e6cb8da6efc552409f03d07dddaef28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf40ef178e6cb8da6efc55240… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 27 11:00:58 2011 -0500 usp10: Restart Indic syllable processing immediately after malformed syllable. --- dlls/usp10/indic.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index f3b7f3a..43bf0e5 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -353,16 +353,8 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L } else if (index < cChar) { - int i; TRACE("Processing failed at %i\n",index); - for (i = index; i < cChar; i++) - if (lex(input[i])==lex_Generic) - { - TRACE("Restart processing at %i\n",i); - next = i; - index = i; - break; - } + next = ++index; } } TRACE("Processed %i of %i characters into %i syllables\n",index,cChar,*syllable_count);

1 0

Alexandre Julliard : msvcp90: Make sure an exported variable is initialized .
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 75c70dcd775db345fb5c2a8c83aa7385591151ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c70dcd775db345fb5c2a8c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 27 15:07:30 2011 -0500 msvcp90: Make sure an exported variable is initialized. --- dlls/msvcp90/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 6875144..563c366 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -51,7 +51,7 @@ int locale_id__Id_cnt = 0; /* ?_Clocptr@_Locimp@locale@std@@0PAV123@A */ /* ?_Clocptr@_Locimp@locale@std@@0PEAV123@EA */ -locale__Locimp *locale__Locimp__Clocptr; +locale__Locimp *locale__Locimp__Clocptr = NULL; static const vtable_ptr MSVCP_locale_facet_vtable[];

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
81
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 June 2011