October 2012 - Wine-Commits

Henri Verbeet : wined3d: Explicitly check the shader type in shader_glsl_get_register_name().
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 7365f9e6afaa6deb1afaad95388cfbb627f85ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7365f9e6afaa6deb1afaad953… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 18 22:12:49 2012 +0200 wined3d: Explicitly check the shader type in shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a66107c..56c2746 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1319,9 +1319,9 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct wined3d_shader_version *version = &reg_maps->shader_version; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; - char pshader = shader_is_pshader_version(reg_maps->shader_version.type); - const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + const char *prefix = shader_glsl_get_prefix(version->type); *is_color = FALSE; @@ -1333,7 +1333,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_INPUT: /* vertex shaders */ - if (!pshader) + if (version->type == WINED3D_SHADER_TYPE_VERTEX) { struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; if (priv->cur_vs_args->swizzle_map & (1 << reg->idx[0].offset)) @@ -1343,10 +1343,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * } /* pixel shaders >= 3.0 */ - if (reg_maps->shader_version.major >= 3) + if (version->major >= 3) { DWORD idx = shader->u.ps.input_reg_map[reg->idx[0].offset]; - unsigned int in_count = vec4_varyings(reg_maps->shader_version.major, gl_info); + unsigned int in_count = vec4_varyings(version->major, gl_info); if (reg->idx[0].rel_addr) { @@ -1432,7 +1432,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_TEXTURE: /* case WINED3DSPR_ADDR: */ - if (pshader) + if (version->type == WINED3D_SHADER_TYPE_PIXEL) sprintf(register_name, "T%u", reg->idx[0].offset); else sprintf(register_name, "A%u", reg->idx[0].offset);

1 0

Henri Verbeet : wined3d: Explicitly check the shader type in shader_glsl_load_constantsF().
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 0c1dd7f7d121c967e3896a47fd38e4cc37fb16ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1dd7f7d121c967e3896a47f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 18 22:12:50 2012 +0200 wined3d: Explicitly check the shader type in shader_glsl_load_constantsF(). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 56c2746..57119e1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -539,7 +539,7 @@ static void shader_glsl_load_constantsF(const struct wined3d_shader *shader, con /* 1.X pshaders have the constants clamped to [-1;1] implicitly. */ if (shader->reg_maps.shader_version.major == 1 - && shader_is_pshader_version(shader->reg_maps.shader_version.type)) + && shader->reg_maps.shader_version.type == WINED3D_SHADER_TYPE_PIXEL) walk_constant_heap_clamped(gl_info, constants, constant_locations, heap, stack, version); else walk_constant_heap(gl_info, constants, constant_locations, heap, stack, version);

1 0

Qian Hong : gdi32/tests: Fixed broken value in bitmap font metrics on Japanese locale.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 416664babd93accee19cec36490546d883b41cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=416664babd93accee19cec364… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Oct 19 02:09:59 2012 +0800 gdi32/tests: Fixed broken value in bitmap font metrics on Japanese locale. --- dlls/gdi32/tests/font.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 92cc0a7..3961578 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -774,32 +774,32 @@ static void test_bitmap_font_metrics(void) { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 }, { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 15, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, - { "System", FW_NORMAL, 18, 16, 2, 0, 2, 8, 16, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "System", FW_NORMAL, 18, 16, 2, 0, 2, 8, 16, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, { "System", FW_BOLD, 20, 16, 4, 4, 0, 9, 14, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 }, { "System", FW_BOLD, 20, 16, 4, 4, 0, 9, 17, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, - { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 2, 4, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 2, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 2, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, - { "Small Fonts", FW_NORMAL, 5, 4, 1, 0, 0, 3, 6, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "Small Fonts", FW_NORMAL, 5, 4, 1, 0, 0, 3, 6, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, 0, 0, 0, 0, FS_ARABIC }, - { "Small Fonts", FW_NORMAL, 6, 5, 1, 0, 0, 4, 8, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "Small Fonts", FW_NORMAL, 6, 5, 1, 0, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, 0, 0, 0, 0, FS_ARABIC }, - { "Small Fonts", FW_NORMAL, 8, 7, 1, 0, 0, 5, 10, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "Small Fonts", FW_NORMAL, 8, 7, 1, 0, 0, 5, 10, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 5, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 9, 96, 0, 0, 0, 0, FS_ARABIC }, - { "Small Fonts", FW_NORMAL, 10, 8, 2, 0, 0, 6, 12, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "Small Fonts", FW_NORMAL, 10, 8, 2, 0, 0, 6, 12, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 4, 10, 96, 0, 0, 0, 0, FS_ARABIC }, - { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 8, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, @@ -816,7 +816,7 @@ static void test_bitmap_font_metrics(void) { "Fixedsys", FW_NORMAL, 15, 12, 3, 3, 0, 8, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 }, { "Fixedsys", FW_NORMAL, 16, 12, 4, 3, 0, 8, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_CYRILLIC }, - { "FixedSys", FW_NORMAL, 18, 16, 2, 0, 0, 8, 16, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "FixedSys", FW_NORMAL, 18, 16, 2, 0, 0, 8, 16, 96, 0x20, 0xff, 0xa0, 0x20, FS_JISJAPAN }, { "Fixedsys", FW_NORMAL, 20, 16, 4, 2, 0, 10, 10, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC }

1 0

André Hentschel : d3drm: Fix memcpy arguments for matrix transformations (coverity).
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 2a42410e7c104bc8532a39b1fa0e69772b804593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a42410e7c104bc8532a39b1f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 19 00:06:12 2012 +0200 d3drm: Fix memcpy arguments for matrix transformations (coverity). --- dlls/d3drm/frame.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 6cab5fa..e4c7cfc 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -813,7 +813,7 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetTransform(IDirect3DRMFrame2* ifac TRACE("(%p/%p)->(%p)\n", iface, This, return_matrix); - memcpy(&return_matrix[0][0], &This->transform[0][0], sizeof(D3DRMMATRIX4D)); + memcpy(return_matrix, This->transform, sizeof(D3DRMMATRIX4D)); return D3DRM_OK; } @@ -1639,7 +1639,7 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddTransform(IDirect3DRMFrame3* ifac switch (type) { case D3DRMCOMBINE_REPLACE: - memcpy(&This->transform[0][0], &matrix[0][0], sizeof(D3DRMMATRIX4D)); + memcpy(This->transform, matrix, sizeof(D3DRMMATRIX4D)); break; case D3DRMCOMBINE_BEFORE: @@ -1905,7 +1905,7 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetTransform(IDirect3DRMFrame3* ifac if (reference) FIXME("Specifying a frame as the root of the scene different from the current root frame is not supported yet\n"); - memcpy(&return_matrix[0][0], &This->transform[0][0], sizeof(D3DRMMATRIX4D)); + memcpy(return_matrix, This->transform, sizeof(D3DRMMATRIX4D)); return D3DRM_OK; } @@ -2694,7 +2694,7 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa object->ref = 1; object->scenebackground = D3DCOLOR_ARGB(0xff, 0, 0, 0); - memcpy(&object->transform[0][0], &identity[0][0], sizeof(D3DRMMATRIX4D)); + memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D)); if (parent) {

1 0

Daniel Lehman : msvcp90: In num_put, use default precision of 6 if 0 and not fixed.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 9416918a5d32afa26c7cfc1aefd38ac6fc6bcb07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9416918a5d32afa26c7cfc1ae… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 4 09:42:25 2012 -0700 msvcp90: In num_put, use default precision of 6 if 0 and not fixed. --- dlls/msvcp90/locale.c | 23 ++++-- dlls/msvcp90/tests/ios.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9416918a5d32afa26c7cf…

1 0

Qian Hong : gdi32/tests: Skip some broken bitmap font metrics tests on Arabic locale.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 284b382abaa1b16dc484ab3cfebf51c8b3d6df8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=284b382abaa1b16dc484ab3cf… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Oct 19 02:12:11 2012 +0800 gdi32/tests: Skip some broken bitmap font metrics tests on Arabic locale. --- dlls/gdi32/tests/font.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 287826e..f32d2b9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -688,15 +688,15 @@ static void test_bitmap_font_metrics(void) int scaled_height; } fd[] = { - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 16 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 16 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 16 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 13, 3, 3, 0, 7, 14, 120, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 16 },

1 0

Aric Stewart : winemenubuilder: Scale 64x64 classic icons to 128x128 for Icns format.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: baf2ac6fbeb3362bbab1943f27df506d942f3b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf2ac6fbeb3362bbab1943f2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 18 16:05:28 2012 -0500 winemenubuilder: Scale 64x64 classic icons to 128x128 for Icns format. --- programs/winemenubuilder/winemenubuilder.c | 55 +++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 9a0c05c..468a5e2 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -379,6 +379,7 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd IWICImagingFactory *factory = NULL; IWICBitmapDecoder *decoder = NULL; IWICBitmapEncoder *encoder = NULL; + IWICBitmapScaler *scaler = NULL; IStream *outputFile = NULL; int i; HRESULT hr = E_FAIL; @@ -403,6 +404,14 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd WINE_ERR("error 0x%08X creating IWICBitmapDecoder\n", hr); goto end; } + if (IsEqualCLSID(outputFormat,&CLSID_WICIcnsEncoder)) + { + hr = IWICImagingFactory_CreateBitmapScaler(factory, &scaler); + if (FAILED(hr)) + { + WINE_WARN("error 0x%08X creating IWICBitmapScaler\n", hr); + } + } hr = CoCreateInstance(outputFormat, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapEncoder, (void**)&encoder); if (FAILED(hr)) @@ -443,6 +452,22 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd WINE_ERR("error 0x%08X converting bitmap to 32bppBGRA\n", hr); goto endloop; } + if ( scaler) + { + IWICBitmapSource_GetSize(sourceBitmap, &width, &height); + if (width == 64) /* Classic Mode */ + { + hr = IWICBitmapScaler_Initialize( scaler, sourceBitmap, 128, 128, + WICBitmapInterpolationModeNearestNeighbor); + if (FAILED(hr)) + WINE_ERR("error 0x%08X scaling bitmap\n", hr); + else + { + IWICBitmapSource_Release(sourceBitmap); + IWICBitmapScaler_QueryInterface(scaler, &IID_IWICBitmapSource, (LPVOID)&sourceBitmap); + } + } + } hr = IWICBitmapEncoder_CreateNewFrame(encoder, &dstFrame, &options); if (FAILED(hr)) { @@ -507,6 +532,8 @@ end: IWICImagingFactory_Release(factory); if (decoder) IWICBitmapDecoder_Release(decoder); + if (scaler) + IWICBitmapScaler_Release(scaler); if (encoder) IWICBitmapEncoder_Release(encoder); if (outputFile) @@ -1052,6 +1079,7 @@ static inline int size_to_slot(int size) case 16: return 0; case 32: return 1; case 48: return 2; + case 64: return -2; /* Classic Mode */ case 128: return 3; case 256: return 4; case 512: return 5; @@ -1060,6 +1088,8 @@ static inline int size_to_slot(int size) return -1; } +#define CLASSIC_SLOT 3 + static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR icoPathW, const char *destFilename, char **nativeIdentifier) { @@ -1068,6 +1098,7 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico struct { int index; int maxBits; + BOOL scaled; } best[ICNS_SLOTS]; int indexes[ICNS_SLOTS]; int i; @@ -1091,19 +1122,39 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico int slot; int width = iconDirEntries[i].bWidth ? iconDirEntries[i].bWidth : 256; int height = iconDirEntries[i].bHeight ? iconDirEntries[i].bHeight : 256; + BOOL scaled = FALSE; WINE_TRACE("[%d]: %d x %d @ %d\n", i, width, height, iconDirEntries[i].wBitCount); if (height != width) continue; slot = size_to_slot(width); - if (slot < 0) + if (slot == -2) + { + scaled = TRUE; + slot = CLASSIC_SLOT; + } + else if (slot < 0) continue; - if (iconDirEntries[i].wBitCount >= best[slot].maxBits) + if (scaled && best[slot].maxBits && !best[slot].scaled) + continue; /* don't replace unscaled with scaled */ + if (iconDirEntries[i].wBitCount >= best[slot].maxBits || (!scaled && best[slot].scaled)) { best[slot].index = i; best[slot].maxBits = iconDirEntries[i].wBitCount; + best[slot].scaled = scaled; } } + /* remove the scaled icon if a larger unscaled icon exists */ + if (best[CLASSIC_SLOT].scaled) + { + for (i = CLASSIC_SLOT+1; i < ICNS_SLOTS; i++) + if (best[i].index >= 0 && !best[i].scaled) + { + best[CLASSIC_SLOT].index = 0; + break; + } + } + numEntries = 0; for (i = 0; i < ICNS_SLOTS; i++) {

1 0

Jacek Caban : mshtml: Properly handle OOM errors in task.c (coverity).
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 08485aeb48d6e70625e0d11ea29733a17360fc83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08485aeb48d6e70625e0d11ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 19 11:56:59 2012 +0200 mshtml: Properly handle OOM errors in task.c (coverity). --- dlls/mshtml/htmlwindow.c | 5 ++- dlls/mshtml/mshtml_private.h | 4 +- dlls/mshtml/navigate.c | 13 ++++------ dlls/mshtml/nsio.c | 4 ++- dlls/mshtml/persist.c | 10 +++++--- dlls/mshtml/task.c | 52 ++++++++++++++++++++++++++++++++++------- 6 files changed, 62 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 59b02ab..dede0a7 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1544,6 +1544,7 @@ static HRESULT window_set_timer(HTMLInnerWindow *This, VARIANT *expr, LONG msec, BOOL interval, LONG *timer_id) { IDispatch *disp = NULL; + HRESULT hres; switch(V_VT(expr)) { case VT_DISPATCH: @@ -1563,10 +1564,10 @@ static HRESULT window_set_timer(HTMLInnerWindow *This, VARIANT *expr, LONG msec, if(!disp) return E_FAIL; - *timer_id = set_task_timer(This, msec, interval, disp); + hres = set_task_timer(This, msec, interval, disp, timer_id); IDispatch_Release(disp); - return S_OK; + return hres; } static HRESULT WINAPI HTMLWindow3_setTimeout(IHTMLWindow3 *iface, VARIANT *expression, LONG msec, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c54a865..f94f226 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -977,10 +977,10 @@ thread_data_t *get_thread_data(BOOL) DECLSPEC_HIDDEN; HWND get_thread_hwnd(void) DECLSPEC_HIDDEN; LONG get_task_target_magic(void) DECLSPEC_HIDDEN; -void push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN; +HRESULT push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN; void remove_target_tasks(LONG) DECLSPEC_HIDDEN; -DWORD set_task_timer(HTMLInnerWindow*,DWORD,BOOL,IDispatch*) DECLSPEC_HIDDEN; +HRESULT set_task_timer(HTMLInnerWindow*,DWORD,BOOL,IDispatch*,LONG*) DECLSPEC_HIDDEN; HRESULT clear_task_timer(HTMLInnerWindow*,BOOL,DWORD) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 8554ddb..f1f0f98 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1437,8 +1437,7 @@ static HRESULT async_stop_request(nsChannelBSC *This) IBindStatusCallback_AddRef(&This->bsc.IBindStatusCallback_iface); task->bsc = This; - push_task(&task->header, stop_request_proc, stop_request_task_destr, This->bsc.window->task_magic); - return S_OK; + return push_task(&task->header, stop_request_proc, stop_request_task_destr, This->bsc.window->task_magic); } static void handle_navigation_error(nsChannelBSC *This, DWORD result) @@ -1798,8 +1797,7 @@ HRESULT async_start_doc_binding(HTMLOuterWindow *window, HTMLInnerWindow *pendin task->pending_window = pending_window; IHTMLWindow2_AddRef(&pending_window->base.IHTMLWindow2_iface); - push_task(&task->header, start_doc_binding_proc, start_doc_binding_task_destr, pending_window->task_magic); - return S_OK; + return push_task(&task->header, start_doc_binding_proc, start_doc_binding_task_destr, pending_window->task_magic); } void abort_window_bindings(HTMLInnerWindow *window) @@ -2105,8 +2103,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers, task->window = window; task->bscallback = bsc; task->mon = mon; - push_task(&task->header, navigate_proc, navigate_task_destr, window->task_magic); - + hres = push_task(&task->header, navigate_proc, navigate_task_destr, window->task_magic); }else { navigate_javascript_task_t *task; @@ -2124,10 +2121,10 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers, IUri_AddRef(uri); task->window = window; task->uri = uri; - push_task(&task->header, navigate_javascript_proc, navigate_javascript_task_destr, window->task_magic); + hres = push_task(&task->header, navigate_javascript_proc, navigate_javascript_task_destr, window->task_magic); } - return S_OK; + return hres; } HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *name, IHTMLWindow2 **ret) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index cf71ec5..6e63244 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1013,7 +1013,9 @@ static nsresult async_open(nsChannel *This, HTMLOuterWindow *window, BOOL is_doc task->window = window->base.inner_window; task->bscallback = bscallback; - push_task(&task->header, start_binding_proc, start_binding_task_destr, window->base.inner_window->task_magic); + hres = push_task(&task->header, start_binding_proc, start_binding_task_destr, window->base.inner_window->task_magic); + if(FAILED(hres)) + return NS_ERROR_OUT_OF_MEMORY; } return NS_OK; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index b518b56..b68f79a 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -388,16 +388,18 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel task = heap_alloc(sizeof(docobj_task_t)); task->doc = This->doc_obj; - push_task(&task->header, set_progress_proc, NULL, This->doc_obj->basedoc.task_magic); + hres = push_task(&task->header, set_progress_proc, NULL, This->doc_obj->basedoc.task_magic); + if(FAILED(hres)) { + CoTaskMemFree(url); + return hres; + } } download_task = heap_alloc(sizeof(download_proc_task_t)); download_task->doc = This->doc_obj; download_task->set_download = set_download; download_task->url = url; - push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, This->doc_obj->basedoc.task_magic); - - return S_OK; + return push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, This->doc_obj->basedoc.task_magic); } void set_ready_state(HTMLOuterWindow *window, READYSTATE readystate) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 0fea1ca..bb8b4e0 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #define COBJMACROS @@ -52,9 +53,18 @@ static void default_task_destr(task_t *task) heap_free(task); } -void push_task(task_t *task, task_proc_t proc, task_proc_t destr, LONG magic) +HRESULT push_task(task_t *task, task_proc_t proc, task_proc_t destr, LONG magic) { - thread_data_t *thread_data = get_thread_data(TRUE); + thread_data_t *thread_data; + + thread_data = get_thread_data(TRUE); + if(!thread_data) { + if(destr) + destr(task); + else + heap_free(task); + return E_OUTOFMEMORY; + } task->target_magic = magic; task->proc = proc; @@ -69,13 +79,19 @@ void push_task(task_t *task, task_proc_t proc, task_proc_t destr, LONG magic) thread_data->task_queue_tail = task; PostMessageW(thread_data->thread_hwnd, WM_PROCESSTASK, 0, 0); + return S_OK; } static task_t *pop_task(void) { - thread_data_t *thread_data = get_thread_data(TRUE); - task_t *task = thread_data->task_queue_head; + thread_data_t *thread_data; + task_t *task; + thread_data = get_thread_data(FALSE); + if(!thread_data) + return NULL; + + task = thread_data->task_queue_head; if(!task) return NULL; @@ -163,15 +179,22 @@ static BOOL queue_timer(thread_data_t *thread_data, task_timer_t *timer) return FALSE; } -DWORD set_task_timer(HTMLInnerWindow *window, DWORD msec, BOOL interval, IDispatch *disp) +HRESULT set_task_timer(HTMLInnerWindow *window, DWORD msec, BOOL interval, IDispatch *disp, LONG *id) { - thread_data_t *thread_data = get_thread_data(TRUE); + thread_data_t *thread_data; task_timer_t *timer; DWORD tc = GetTickCount(); static DWORD id_cnt = 0x20000000; + thread_data = get_thread_data(TRUE); + if(!thread_data) + return E_OUTOFMEMORY; + timer = heap_alloc(sizeof(task_timer_t)); + if(!timer) + return E_OUTOFMEMORY; + timer->id = id_cnt++; timer->window = window; timer->time = tc + msec; @@ -184,7 +207,8 @@ DWORD set_task_timer(HTMLInnerWindow *window, DWORD msec, BOOL interval, IDispat if(queue_timer(thread_data, timer)) SetTimer(thread_data->thread_hwnd, TIMER_ID, msec, NULL); - return timer->id; + *id = timer->id; + return S_OK; } HRESULT clear_task_timer(HTMLInnerWindow *window, BOOL interval, DWORD id) @@ -228,13 +252,16 @@ static void call_timer_disp(IDispatch *disp) static LRESULT process_timer(void) { - thread_data_t *thread_data = get_thread_data(TRUE); + thread_data_t *thread_data; IDispatch *disp; DWORD tc; task_timer_t *timer; TRACE("\n"); + thread_data = get_thread_data(FALSE); + assert(thread_data != NULL); + while(!list_empty(&thread_data->timer_list)) { timer = LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry); @@ -311,7 +338,11 @@ static HWND create_thread_hwnd(void) HWND get_thread_hwnd(void) { - thread_data_t *thread_data = get_thread_data(TRUE); + thread_data_t *thread_data; + + thread_data = get_thread_data(TRUE); + if(!thread_data) + return NULL; if(!thread_data->thread_hwnd) thread_data->thread_hwnd = create_thread_hwnd(); @@ -341,6 +372,9 @@ thread_data_t *get_thread_data(BOOL create) thread_data = TlsGetValue(mshtml_tls); if(!thread_data && create) { thread_data = heap_alloc_zero(sizeof(thread_data_t)); + if(!thread_data) + return NULL; + TlsSetValue(mshtml_tls, thread_data); list_init(&thread_data->timer_list); }

1 0

Qian Hong : gdi32/tests: Fixed typo in localized name tests.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 648a8ce40e05dc2b0f84d3a6d624e402e4e24037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=648a8ce40e05dc2b0f84d3a6d… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Oct 19 02:13:44 2012 +0800 gdi32/tests: Fixed typo in localized name tests. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 82c0409..4d41388 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4162,7 +4162,7 @@ static void test_fullname2_helper(const char *Family) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, GetSystemDefaultLangID()); if (!ret) { - trace("no localized FONT_SUBFAMILY font.\n"); + trace("no localized FONT_SUBFAMILY found.\n"); ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); } ok(ret, "SUBFAMILY (style name) could not be read\n");

1 0

Alexandre Julliard : gdi32/tests: Avoid deleting invalid objects.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 446bff7897a44d498b5c4025d8232cc436e3de80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=446bff7897a44d498b5c4025d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 18 20:19:26 2012 +0200 gdi32/tests: Avoid deleting invalid objects. --- dlls/gdi32/tests/bitmap.c | 9 +++------ dlls/gdi32/tests/dib.c | 2 +- dlls/gdi32/tests/metafile.c | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a620361..04c93c1 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3523,7 +3523,6 @@ static void test_GdiAlphaBlend(void) HDC hdcNull; HDC hdcDst; HBITMAP bmpDst; - HBITMAP oldDst; BITMAPINFO *bmi; HDC hdcSrc; HBITMAP bmpSrc; @@ -3553,7 +3552,7 @@ static void test_GdiAlphaBlend(void) bmpSrc = CreateDIBSection(hdcDst, bmi, DIB_RGB_COLORS, &bits, NULL, 0); ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); - oldDst = SelectObject(hdcDst, bmpDst); + SelectObject(hdcDst, bmpDst); oldSrc = SelectObject(hdcSrc, bmpSrc); blend.BlendOp = AC_SRC_OVER; @@ -3736,12 +3735,10 @@ static void test_GdiAlphaBlend(void) ok( !ret, "GdiAlphaBlend succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); - SelectObject(hdcDst, oldDst); - SelectObject(hdcSrc, oldSrc); - DeleteObject(bmpSrc); - DeleteObject(bmpDst); DeleteDC(hdcDst); DeleteDC(hdcSrc); + DeleteObject(bmpSrc); + DeleteObject(bmpDst); ReleaseDC(NULL, hdcNull); diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index b431add..f4ed8e1 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1904,6 +1904,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits) DeleteObject(bmp); SelectObject(hdc, orig_brush); + DeleteObject( dib_brush ); SetBrushOrgEx(hdc, 0, 0, NULL); SetTextColor(hdc, old_text); SetBkColor(hdc, old_bkgnd); @@ -2656,7 +2657,6 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits) SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); - DeleteObject(dib_brush); DeleteObject(solid_brush); DeleteObject(wide_pen); DeleteObject(dashed_pen); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index e6bab5d..e4413db 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2489,7 +2489,6 @@ todo_wine hemf = CloseEnhMetaFile(hdc); DeleteEnhMetaFile(hemf); DeleteObject(hrgn); - DeleteDC(hdc); } static const unsigned char MF_CLIP_BITS[] = {

1 0