October 2012 - Wine-Commits

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

Oct. 19, 2012

Module: wine Branch: master Commit: 4638fbf167ffaf9ec019f8ad2b54ae45238113e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4638fbf167ffaf9ec019f8ad2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 19 11:57:30 2012 +0200 mshtml: Properly handle OOM errors in script.c (coverity). --- dlls/mshtml/script.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index d99269a..90f9ba0 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -666,6 +666,9 @@ static ScriptHost *create_script_host(HTMLInnerWindow *window, const GUID *guid) HRESULT hres; ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return NULL; + ret->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; ret->IActiveScriptSiteInterruptPoll_iface.lpVtbl = &ActiveScriptSiteInterruptPollVtbl; ret->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; @@ -944,6 +947,9 @@ IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text) BOOL b; language = heap_alloc((ptr-text+1)*sizeof(WCHAR)); + if(!language) + return NULL; + memcpy(language, text, (ptr-text)*sizeof(WCHAR)); language[ptr-text] = 0; @@ -1207,9 +1213,10 @@ void bind_event_scripts(HTMLDocumentNode *doc) if(event_disp) { event_target = find_event_target(doc, script_elem); if(event_target) { - IHTMLElement_QueryInterface(&event_target->IHTMLElement_iface, &IID_HTMLPluginContainer, (void**)&plugin_container); + hres = IHTMLElement_QueryInterface(&event_target->IHTMLElement_iface, &IID_HTMLPluginContainer, + (void**)&plugin_container); - if(plugin_container) + if(SUCCEEDED(hres)) bind_activex_event(doc, plugin_container, event, event_disp); else bind_elem_event(doc, event_target, event, event_disp);

1 0

Qian Hong : gdi32/tests: Declared system_lang_id as a global variable.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 16f2a1948e095ebb9be6c8ab03f758416befe72d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f2a1948e095ebb9be6c8ab0… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Oct 19 02:13:25 2012 +0800 gdi32/tests: Declared system_lang_id as a global variable. --- dlls/gdi32/tests/font.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4e34a4c..82c0409 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -54,6 +54,7 @@ static BOOL (WINAPI *pRemoveFontResourceExA)(LPCSTR, DWORD, PVOID); static HMODULE hgdi32 = 0; static const MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; +static WORD system_lang_id; static void init(void) { @@ -74,6 +75,8 @@ static void init(void) pRemoveFontMemResourceEx = (void *)GetProcAddress(hgdi32, "RemoveFontMemResourceEx"); pAddFontResourceExA = (void *)GetProcAddress(hgdi32, "AddFontResourceExA"); pRemoveFontResourceExA = (void *)GetProcAddress(hgdi32, "RemoveFontResourceExA"); + + system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); } static INT CALLBACK is_truetype_font_installed_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) @@ -670,7 +673,6 @@ static INT CALLBACK find_font_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DW static BOOL is_CJK(void) { - WORD system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); return (system_lang_id == LANG_CHINESE || system_lang_id == LANG_JAPANESE || system_lang_id == LANG_KOREAN); } @@ -834,11 +836,9 @@ static void test_bitmap_font_metrics(void) HFONT hfont, old_hfont; TEXTMETRIC tm; INT ret, i, expected_cs, screen_log_pixels, diff, font_res; - WORD system_lang_id; char face_name[LF_FACESIZE]; CHARSETINFO csi; - system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); trace("system language id %04x\n", system_lang_id); expected_cs = GetACP(); @@ -2421,7 +2421,6 @@ static void test_EnumFontFamiliesEx_default_charset(void) LOGFONT gui_font, enum_font; DWORD ret; HDC hdc; - WORD system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); ret = GetObject(GetStockObject(DEFAULT_GUI_FONT), sizeof(gui_font), &gui_font); ok(ret, "GetObject failed.\n");

1 0

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

Oct. 19, 2012

Module: wine Branch: master Commit: b31dababdeea471784416d44ea421f0c60276561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b31dababdeea471784416d44e… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Oct 19 02:11:41 2012 +0800 gdi32/tests: Fixed broken value in bitmap font metrics on Arabic locale. --- dlls/gdi32/tests/font.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index fef38e9..287826e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -793,18 +793,18 @@ static void test_bitmap_font_metrics(void) { "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, 1, 0, 3, 8, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "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, 1, 0, 4, 8, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "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, 2, 0, 4, 9, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "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, 2, 0, 4, 10, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "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 },

1 0

Qian Hong : gdi32/tests: Marked EnumFontFamiliesEx_default_charset test on Arabic locale as broken.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: f9546329b6b94d98517252d438c9998a2af46bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9546329b6b94d98517252d43… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Oct 19 02:13:01 2012 +0800 gdi32/tests: Marked EnumFontFamiliesEx_default_charset test on Arabic locale as broken. --- dlls/gdi32/tests/font.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f32d2b9..4e34a4c 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2421,6 +2421,7 @@ static void test_EnumFontFamiliesEx_default_charset(void) LOGFONT gui_font, enum_font; DWORD ret; HDC hdc; + WORD system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); ret = GetObject(GetStockObject(DEFAULT_GUI_FONT), sizeof(gui_font), &gui_font); ok(ret, "GetObject failed.\n"); @@ -2442,7 +2443,7 @@ static void test_EnumFontFamiliesEx_default_charset(void) } trace("'%s' has %d charsets.\n", gui_font.lfFaceName, efd.total); - ok(efd.lf[0].lfCharSet == gui_font.lfCharSet, + ok(efd.lf[0].lfCharSet == gui_font.lfCharSet || broken(system_lang_id == LANG_ARABIC), "(%s) got charset %d expected %d\n", efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, gui_font.lfCharSet);

1 0

Henri Verbeet : wined3d: Merge most of the code for shader_glsl_cmp() and shader_glsl_cnd().
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 6beb7dc1a8a7adb9f6a3a213f9428c744944f309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6beb7dc1a8a7adb9f6a3a213f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 18 22:12:52 2012 +0200 wined3d: Merge most of the code for shader_glsl_cmp() and shader_glsl_cnd(). --- dlls/wined3d/glsl_shader.c | 159 +++++++++++++++++++++----------------------- 1 files changed, 77 insertions(+), 82 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 993b547..9ce89b3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2758,79 +2758,100 @@ static void shader_glsl_compare(const struct wined3d_shader_instruction *ins) } } -/** Process CMP instruction in GLSL (dst = src0 >= 0.0 ? src1 : src2), per channel */ -static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) +static void shader_glsl_conditional_move(const struct wined3d_shader_instruction *ins) { + struct wined3d_shader_dst_param dst; struct glsl_src_param src0_param; struct glsl_src_param src1_param; struct glsl_src_param src2_param; - DWORD write_mask, cmp_channel = 0; + BOOL temp_destination = FALSE; + const char *condition_suffix; + DWORD cmp_channel = 0; unsigned int i, j; char mask_char[6]; - BOOL temp_destination = FALSE; + DWORD write_mask; + + switch (ins->handler_idx) + { + case WINED3DSIH_CMP: + condition_suffix = " >= 0.0"; + break; + + case WINED3DSIH_CND: + condition_suffix = " > 0.5"; + break; + + default: + FIXME("Unhandled instruction %#x.\n", ins->handler_idx); + condition_suffix = "<unhandled suffix>"; + break; + } if (shader_is_scalar(&ins->src[0].reg)) { write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); - - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_ALL, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &src2_param); - shader_addline(ins->ctx->buffer, "%s >= 0.0 ? %s : %s);\n", - src0_param.param_str, src1_param.param_str, src2_param.param_str); - } else { - DWORD dst_mask = ins->dst[0].write_mask; - struct wined3d_shader_dst_param dst = ins->dst[0]; - - /* Cycle through all source0 channels */ - for (i=0; i<4; i++) { - write_mask = 0; - /* Find the destination channels which use the current source0 channel */ - for (j=0; j<4; j++) { - if (((ins->src[0].swizzle >> (2 * j)) & 0x3) == i) - { - write_mask |= WINED3DSP_WRITEMASK_0 << j; - cmp_channel = WINED3DSP_WRITEMASK_0 << j; - } - } - dst.write_mask = dst_mask & write_mask; - - /* Splitting the cmp instruction up in multiple lines imposes a problem: - * The first lines may overwrite source parameters of the following lines. - * Deal with that by using a temporary destination register if needed - */ - if ((ins->src[0].reg.idx[0].offset == ins->dst[0].reg.idx[0].offset - && ins->src[0].reg.type == ins->dst[0].reg.type) - || (ins->src[1].reg.idx[0].offset == ins->dst[0].reg.idx[0].offset - && ins->src[1].reg.type == ins->dst[0].reg.type) - || (ins->src[2].reg.idx[0].offset == ins->dst[0].reg.idx[0].offset - && ins->src[2].reg.type == ins->dst[0].reg.type)) - { - write_mask = shader_glsl_get_write_mask(&dst, mask_char); - if (!write_mask) continue; - shader_addline(ins->ctx->buffer, "tmp0%s = (", mask_char); - temp_destination = TRUE; - } else { - write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst); - if (!write_mask) continue; - } + shader_addline(ins->ctx->buffer, "%s%s ? %s : %s);\n", + src0_param.param_str, condition_suffix, + src1_param.param_str, src2_param.param_str); + return; + } - shader_glsl_add_src_param(ins, &ins->src[0], cmp_channel, &src0_param); - shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); - shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &src2_param); + dst = ins->dst[0]; - shader_addline(ins->ctx->buffer, "%s >= 0.0 ? %s : %s);\n", - src0_param.param_str, src1_param.param_str, src2_param.param_str); + /* Splitting the instruction up in multiple lines imposes a problem: + * The first lines may overwrite source parameters of the following lines. + * Deal with that by using a temporary destination register if needed. */ + if ((ins->src[0].reg.idx[0].offset == dst.reg.idx[0].offset + && ins->src[0].reg.type == dst.reg.type) + || (ins->src[1].reg.idx[0].offset == dst.reg.idx[0].offset + && ins->src[1].reg.type == dst.reg.type) + || (ins->src[2].reg.idx[0].offset == dst.reg.idx[0].offset + && ins->src[2].reg.type == dst.reg.type)) + temp_destination = TRUE; + + /* Cycle through all source0 channels. */ + for (i = 0; i < 4; ++i) + { + write_mask = 0; + /* Find the destination channels which use the current source0 channel. */ + for (j = 0; j < 4; ++j) + { + if (((ins->src[0].swizzle >> (2 * j)) & 0x3) == i) + { + write_mask |= WINED3DSP_WRITEMASK_0 << j; + cmp_channel = WINED3DSP_WRITEMASK_0 << j; + } } + dst.write_mask = ins->dst[0].write_mask & write_mask; - if(temp_destination) { - shader_glsl_get_write_mask(&ins->dst[0], mask_char); - shader_glsl_append_dst(ins->ctx->buffer, ins); - shader_addline(ins->ctx->buffer, "tmp0%s);\n", mask_char); + if (temp_destination) + { + if (!(write_mask = shader_glsl_get_write_mask(&dst, mask_char))) + continue; + shader_addline(ins->ctx->buffer, "tmp0%s = (", mask_char); } + else if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst))) + continue; + + shader_glsl_add_src_param(ins, &ins->src[0], cmp_channel, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); + shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &src2_param); + + shader_addline(ins->ctx->buffer, "%s%s ? %s : %s);\n", + src0_param.param_str, condition_suffix, + src1_param.param_str, src2_param.param_str); } + if (temp_destination) + { + shader_glsl_get_write_mask(&ins->dst[0], mask_char); + shader_glsl_append_dst(ins->ctx->buffer, ins); + shader_addline(ins->ctx->buffer, "tmp0%s);\n", mask_char); + } } /** Process the CND opcode in GLSL (dst = (src0 > 0.5) ? src1 : src2) */ @@ -2838,13 +2859,10 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) * the compare is done per component of src0. */ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) { - struct wined3d_shader_dst_param dst; struct glsl_src_param src0_param; struct glsl_src_param src1_param; struct glsl_src_param src2_param; - DWORD write_mask, cmp_channel = 0; - unsigned int i, j; - DWORD dst_mask; + DWORD write_mask; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); @@ -2865,31 +2883,8 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) } return; } - /* Cycle through all source0 channels */ - dst_mask = ins->dst[0].write_mask; - dst = ins->dst[0]; - for (i=0; i<4; i++) { - write_mask = 0; - /* Find the destination channels which use the current source0 channel */ - for (j=0; j<4; j++) { - if (((ins->src[0].swizzle >> (2 * j)) & 0x3) == i) - { - write_mask |= WINED3DSP_WRITEMASK_0 << j; - cmp_channel = WINED3DSP_WRITEMASK_0 << j; - } - } - - dst.write_mask = dst_mask & write_mask; - write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst); - if (!write_mask) continue; - - shader_glsl_add_src_param(ins, &ins->src[0], cmp_channel, &src0_param); - shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); - shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &src2_param); - shader_addline(ins->ctx->buffer, "%s > 0.5 ? %s : %s);\n", - src0_param.param_str, src1_param.param_str, src2_param.param_str); - } + shader_glsl_conditional_move(ins); } /** GLSL code generation for WINED3DSIO_MAD: Multiply the first 2 opcodes, then add the last */ @@ -5369,7 +5364,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_BREAKP */ shader_glsl_breakp, /* WINED3DSIH_CALL */ shader_glsl_call, /* WINED3DSIH_CALLNZ */ shader_glsl_callnz, - /* WINED3DSIH_CMP */ shader_glsl_cmp, + /* WINED3DSIH_CMP */ shader_glsl_conditional_move, /* WINED3DSIH_CND */ shader_glsl_cnd, /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ shader_glsl_cut,

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_ROUND_NI in the GLSL shader backend.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: b72ab48ed861108f6cedbf9615a1acf82994268e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72ab48ed861108f6cedbf961… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 18 22:12:51 2012 +0200 wined3d: Implement WINED3DSIH_ROUND_NI in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 57119e1..993b547 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2530,6 +2530,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_EXP: instruction = "exp2"; break; case WINED3DSIH_DSX: instruction = "dFdx"; break; case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; + case WINED3DSIH_ROUND_NI: instruction = "floor"; break; default: instruction = ""; FIXME("Opcode %#x not yet handled in GLSL\n", ins->handler_idx); break; @@ -5432,7 +5433,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RCP */ shader_glsl_rcp, /* WINED3DSIH_REP */ shader_glsl_rep, /* WINED3DSIH_RET */ shader_glsl_ret, - /* WINED3DSIH_ROUND_NI */ NULL, + /* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl, /* WINED3DSIH_RSQ */ shader_glsl_rsq, /* WINED3DSIH_SAMPLE */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL,

1 0

Alexandre Julliard : user32/tests: Don't release a random DC handle.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 181e432e22b6231c0b461e52cb6a80b44562d1f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=181e432e22b6231c0b461e52c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 18 20:19:50 2012 +0200 user32/tests: Don't release a random DC handle. --- dlls/user32/tests/dce.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 1aa548e..f75e6b3 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -78,7 +78,7 @@ static void test_dc_attributes(void) old_hdc = hdcs[0]; SetROP2( old_hdc, R2_WHITE ); } - while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] ); + while (i > 0) ReleaseDC( hwnd_cache, hdcs[--i] ); for (i = 0; i < 20; i++) { @@ -91,7 +91,7 @@ static void test_dc_attributes(void) else ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); } - while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] ); + while (i > 0) ReleaseDC( hwnd_cache, hdcs[--i] ); for (i = 0; i < 20; i++) { @@ -107,7 +107,7 @@ static void test_dc_attributes(void) else ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); } - while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] ); + while (i > 0) ReleaseDC( hwnd_cache, hdcs[--i] ); /* test own DC */

1 0

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

Oct. 19, 2012

Module: wine Branch: master Commit: 421368b8758e1f700743a8c5fafb650f332bf28f URL: http://source.winehq.org/git/wine.git/?a=commit;h=421368b8758e1f700743a8c5f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 19 11:58:01 2012 +0200 mshtml: Properly handle OOM errors in nsio.c (coverity). --- dlls/mshtml/nsio.c | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 6e63244..7fc2a3a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1005,11 +1005,17 @@ static nsresult async_open(nsChannel *This, HTMLOuterWindow *window, BOOL is_doc hres = create_pending_window(window, bscallback); if(SUCCEEDED(hres)) async_start_doc_binding(window, window->pending_window); - IUnknown_Release((IUnknown*)bscallback); + IBindStatusCallback_Release(&bscallback->bsc.IBindStatusCallback_iface); if(FAILED(hres)) return NS_ERROR_UNEXPECTED; }else { - start_binding_task_t *task = heap_alloc(sizeof(start_binding_task_t)); + start_binding_task_t *task; + + task = heap_alloc(sizeof(start_binding_task_t)); + if(!task) { + IBindStatusCallback_Release(&bscallback->bsc.IBindStatusCallback_iface); + return NS_ERROR_OUT_OF_MEMORY; + } task->window = window->base.inner_window; task->bscallback = bscallback; @@ -2846,9 +2852,13 @@ static const nsIStandardURLVtbl nsStandardURLVtbl = { static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *container, nsWineURI **_retval) { - nsWineURI *ret = heap_alloc_zero(sizeof(nsWineURI)); + nsWineURI *ret; HRESULT hres; + ret = heap_alloc_zero(sizeof(nsWineURI)); + if(!ret) + return NS_ERROR_OUT_OF_MEMORY; + ret->nsIFileURL_iface.lpVtbl = &nsFileURLVtbl; ret->nsIStandardURL_iface.lpVtbl = &nsStandardURLVtbl; ret->ref = 1; @@ -3121,17 +3131,6 @@ static const nsIProtocolHandlerVtbl nsProtocolHandlerVtbl = { nsProtocolHandler_AllowPort }; -static nsIProtocolHandler *create_protocol_handler(nsIProtocolHandler *nshandler) -{ - nsProtocolHandler *ret = heap_alloc(sizeof(nsProtocolHandler)); - - ret->nsIProtocolHandler_iface.lpVtbl = &nsProtocolHandlerVtbl; - ret->ref = 1; - ret->nshandler = nshandler; - - return &ret->nsIProtocolHandler_iface; -} - static nsresult NSAPI nsIOService_QueryInterface(nsIIOService*,nsIIDRef,void**); static nsrefcnt NSAPI nsIOService_AddRef(nsIIOService *iface) @@ -3149,6 +3148,7 @@ static nsresult NSAPI nsIOService_GetProtocolHandler(nsIIOService *iface, const { nsIExternalProtocolHandler *nsexthandler; nsIProtocolHandler *nshandler; + nsProtocolHandler *ret; nsresult nsres; TRACE("(%s %p)\n", debugstr_a(aScheme), _retval); @@ -3167,7 +3167,16 @@ static nsresult NSAPI nsIOService_GetProtocolHandler(nsIIOService *iface, const } nsIExternalProtocolHandler_Release(nsexthandler); - *_retval = create_protocol_handler(nshandler); + + ret = heap_alloc(sizeof(nsProtocolHandler)); + if(!ret) + return NS_ERROR_OUT_OF_MEMORY; + + ret->nsIProtocolHandler_iface.lpVtbl = &nsProtocolHandlerVtbl; + ret->ref = 1; + ret->nshandler = nshandler; + *_retval = &ret->nsIProtocolHandler_iface; + TRACE("return %p\n", *_retval); return NS_OK; }

1 0

Alexandre Julliard : oleaut32/tests: Delete the correct object in the icon test.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 9351867e6aa3ae96a6d6de97445409697219813f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9351867e6aa3ae96a6d6de974… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 18 20:18:47 2012 +0200 oleaut32/tests: Delete the correct object in the icon test. --- dlls/oleaut32/tests/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index b214d76..696f8cd 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1055,7 +1055,7 @@ todo_wine GlobalUnlock(hmem); GlobalFree(hmem); - DeleteObject(desc.u.bmp.hbitmap); + DestroyIcon(desc.u.icon.hicon); IPicture_Release(pic); }

1 0

Alexandre Julliard : comctl32/tests: Don't delete the global font object.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: c4bae8fab01877ab67037c451d840e7daf2dc14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4bae8fab01877ab67037c451… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 18 20:17:56 2012 +0200 comctl32/tests: Don't delete the global font object. --- dlls/comctl32/tests/tab.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index a2937ef..51a8a91 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -657,7 +657,6 @@ static void test_tab(INT nMinTabWidth) DestroyWindow (hwTab); ImageList_Destroy(himl); - DeleteObject(hFont); } static void test_width(void)

1 0