March 2014 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Handle LOG and LOGP in shader_hw_scalar_op.
by Alexandre Julliard March 27, 2014

March 27, 2014

Module: wine Branch: master Commit: 5114507f199ac715849cab0c2c1667aa4e2f5721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5114507f199ac715849cab0c2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 27 11:46:11 2014 +0100 wined3d: Handle LOG and LOGP in shader_hw_scalar_op. --- dlls/wined3d/arb_program_shader.c | 106 ++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fdad2d0..0a669df 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2497,11 +2497,36 @@ static void shader_hw_rcp(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "RCP%s %s, %s;\n", shader_arb_get_modifier(ins), dst, src); } +static DWORD abs_modifier(DWORD mod, BOOL *need_abs) +{ + *need_abs = FALSE; + + switch(mod) + { + case WINED3DSPSM_NONE: return WINED3DSPSM_ABS; + case WINED3DSPSM_NEG: return WINED3DSPSM_ABS; + case WINED3DSPSM_BIAS: *need_abs = TRUE; return WINED3DSPSM_BIAS; + case WINED3DSPSM_BIASNEG: *need_abs = TRUE; return WINED3DSPSM_BIASNEG; + case WINED3DSPSM_SIGN: *need_abs = TRUE; return WINED3DSPSM_SIGN; + case WINED3DSPSM_SIGNNEG: *need_abs = TRUE; return WINED3DSPSM_SIGNNEG; + case WINED3DSPSM_COMP: *need_abs = TRUE; return WINED3DSPSM_COMP; + case WINED3DSPSM_X2: *need_abs = TRUE; return WINED3DSPSM_X2; + case WINED3DSPSM_X2NEG: *need_abs = TRUE; return WINED3DSPSM_X2NEG; + case WINED3DSPSM_DZ: *need_abs = TRUE; return WINED3DSPSM_DZ; + case WINED3DSPSM_DW: *need_abs = TRUE; return WINED3DSPSM_DW; + case WINED3DSPSM_ABS: return WINED3DSPSM_ABS; + case WINED3DSPSM_ABSNEG: return WINED3DSPSM_ABS; + } + FIXME("Unknown modifier %u\n", mod); + return mod; +} + static void shader_hw_scalar_op(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; const char *instruction; struct wined3d_shader_src_param src0_copy = ins->src[0]; + BOOL need_abs = FALSE; char dst[50]; char src[50]; @@ -2512,6 +2537,14 @@ static void shader_hw_scalar_op(const struct wined3d_shader_instruction *ins) case WINED3DSIH_RCP: instruction = "RCP"; break; case WINED3DSIH_EXP: instruction = "EX2"; break; case WINED3DSIH_EXPP: instruction = "EXP"; break; + case WINED3DSIH_LOG: + src0_copy.modifiers = abs_modifier(src0_copy.modifiers, &need_abs); + instruction = "LG2"; + break; + case WINED3DSIH_LOGP: + src0_copy.modifiers = abs_modifier(src0_copy.modifiers, &need_abs); + instruction = "LOG"; + break; default: instruction = ""; FIXME("Unhandled opcode %#x\n", ins->handler_idx); break; @@ -2524,7 +2557,16 @@ static void shader_hw_scalar_op(const struct wined3d_shader_instruction *ins) shader_arb_get_dst_param(ins, &ins->dst[0], dst); /* Destination */ shader_arb_get_src_param(ins, &src0_copy, 0, src); - shader_addline(buffer, "%s%s %s, %s;\n", instruction, shader_arb_get_modifier(ins), dst, src); + if(need_abs) + { + shader_addline(buffer, "ABS TA.w, %s;\n", src); + shader_addline(buffer, "%s%s %s, TA.w;\n", instruction, shader_arb_get_modifier(ins), dst); + } + else + { + shader_addline(buffer, "%s%s %s, %s;\n", instruction, shader_arb_get_modifier(ins), dst, src); + } + } static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) @@ -2764,64 +2806,6 @@ static void shader_hw_dsy(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "MUL%s %s, %s, ycorrection.y;\n", shader_arb_get_modifier(ins), dst, dst_name); } -static DWORD abs_modifier(DWORD mod, BOOL *need_abs) -{ - *need_abs = FALSE; - - switch(mod) - { - case WINED3DSPSM_NONE: return WINED3DSPSM_ABS; - case WINED3DSPSM_NEG: return WINED3DSPSM_ABS; - case WINED3DSPSM_BIAS: *need_abs = TRUE; return WINED3DSPSM_BIAS; - case WINED3DSPSM_BIASNEG: *need_abs = TRUE; return WINED3DSPSM_BIASNEG; - case WINED3DSPSM_SIGN: *need_abs = TRUE; return WINED3DSPSM_SIGN; - case WINED3DSPSM_SIGNNEG: *need_abs = TRUE; return WINED3DSPSM_SIGNNEG; - case WINED3DSPSM_COMP: *need_abs = TRUE; return WINED3DSPSM_COMP; - case WINED3DSPSM_X2: *need_abs = TRUE; return WINED3DSPSM_X2; - case WINED3DSPSM_X2NEG: *need_abs = TRUE; return WINED3DSPSM_X2NEG; - case WINED3DSPSM_DZ: *need_abs = TRUE; return WINED3DSPSM_DZ; - case WINED3DSPSM_DW: *need_abs = TRUE; return WINED3DSPSM_DW; - case WINED3DSPSM_ABS: return WINED3DSPSM_ABS; - case WINED3DSPSM_ABSNEG: return WINED3DSPSM_ABS; - } - FIXME("Unknown modifier %u\n", mod); - return mod; -} - -static void shader_hw_log(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - char src0[50], dst[50]; - struct wined3d_shader_src_param src0_copy = ins->src[0]; - BOOL need_abs = FALSE; - const char *instr; - - switch(ins->handler_idx) - { - case WINED3DSIH_LOG: instr = "LG2"; break; - case WINED3DSIH_LOGP: instr = "LOG"; break; - default: - ERR("Unexpected instruction %d\n", ins->handler_idx); - return; - } - - /* LOG and LOGP operate on the absolute value of the input */ - src0_copy.modifiers = abs_modifier(src0_copy.modifiers, &need_abs); - - shader_arb_get_dst_param(ins, &ins->dst[0], dst); - shader_arb_get_src_param(ins, &src0_copy, 0, src0); - - if(need_abs) - { - shader_addline(buffer, "ABS TA, %s;\n", src0); - shader_addline(buffer, "%s%s %s, TA;\n", instr, shader_arb_get_modifier(ins), dst); - } - else - { - shader_addline(buffer, "%s%s %s, %s;\n", instr, shader_arb_get_modifier(ins), dst, src0); - } -} - static void shader_hw_pow(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; @@ -5246,8 +5230,8 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LD */ NULL, /* WINED3DSIH_LIT */ shader_hw_map2gl, - /* WINED3DSIH_LOG */ shader_hw_log, - /* WINED3DSIH_LOGP */ shader_hw_log, + /* WINED3DSIH_LOG */ shader_hw_scalar_op, + /* WINED3DSIH_LOGP */ shader_hw_scalar_op, /* WINED3DSIH_LOOP */ shader_hw_loop, /* WINED3DSIH_LRP */ shader_hw_lrp, /* WINED3DSIH_LT */ NULL,

1 0

Stefan Dösinger : wined3d: Handle RCP in shader_hw_scalar_op.
by Alexandre Julliard March 27, 2014

March 27, 2014

Module: wine Branch: master Commit: c2541a588781e8e7d2b494e55285fd3809dba916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2541a588781e8e7d2b494e55… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 27 11:46:12 2014 +0100 wined3d: Handle RCP in shader_hw_scalar_op. --- dlls/wined3d/arb_program_shader.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0a669df..5a76332 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2477,26 +2477,6 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) } } -static void shader_hw_rcp(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - - char dst[50]; - char src[50]; - - shader_arb_get_dst_param(ins, &ins->dst[0], dst); /* Destination */ - shader_arb_get_src_param(ins, &ins->src[0], 0, src); - if (ins->src[0].swizzle == WINED3DSP_NOSWIZZLE) - { - /* Dx sdk says .x is used if no swizzle is given, but our test shows that - * .w is used - */ - strcat(src, ".w"); - } - - shader_addline(buffer, "RCP%s %s, %s;\n", shader_arb_get_modifier(ins), dst, src); -} - static DWORD abs_modifier(DWORD mod, BOOL *need_abs) { *need_abs = FALSE; @@ -5251,7 +5231,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ shader_hw_nop, /* WINED3DSIH_POW */ shader_hw_pow, - /* WINED3DSIH_RCP */ shader_hw_rcp, + /* WINED3DSIH_RCP */ shader_hw_scalar_op, /* WINED3DSIH_REP */ shader_hw_rep, /* WINED3DSIH_RET */ shader_hw_ret, /* WINED3DSIH_ROUND_NI */ NULL,

1 0

Nikolay Sivov : msi: Fix a record leak on error path (Coverity).
by Alexandre Julliard March 27, 2014

March 27, 2014

Module: wine Branch: master Commit: 203d282a78c4e022a3a4feb0d98aac7c154f83e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203d282a78c4e022a3a4feb0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 27 06:56:14 2014 +0400 msi: Fix a record leak on error path (Coverity). --- dlls/msi/table.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index f67981c..bd15a8e 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2092,7 +2092,10 @@ static UINT TABLE_drop(struct tagMSIVIEW *view) r = TABLE_CreateView(tv->db, szTables, &tables); if (r != ERROR_SUCCESS) + { + msiobj_release(&rec->hdr); return r; + } r = msi_table_find_row((MSITABLEVIEW *)tables, rec, &row, NULL); if (r != ERROR_SUCCESS)

1 0

Javier Cantero : user32/tests: New test cases for SubtractRect().
by Alexandre Julliard March 27, 2014

March 27, 2014

Module: wine Branch: master Commit: ee5c64f583668988e04cae38169641f647833d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5c64f583668988e04cae381… Author: Javier Cantero <jcantero(a)escomposlinux.org> Date: Wed Mar 26 23:05:16 2014 +0100 user32/tests: New test cases for SubtractRect(). --- dlls/user32/tests/uitools.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c index 0401448..5f10b00 100644 --- a/dlls/user32/tests/uitools.c +++ b/dlls/user32/tests/uitools.c @@ -70,7 +70,7 @@ static void test_SubtractRect(void) RECT rectr; BOOL result; - /* case 1: source rectangles don't intersect */ + /* source rectangles don't intersect */ SetRect(&rect1, 50, 50, 150, 100); SetRect(&rect2, 250, 200, 1500, 1000); result = SubtractRect(&rectr, &rect1, &rect2); @@ -79,7 +79,7 @@ static void test_SubtractRect(void) && rectr.bottom == 100, "wrong rect subtraction of SubtractRect " "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom); - /* case 2: source rect 2 partially overlaps rect 1 */ + /* source rect 2 partially overlaps rect 1 */ SetRect(&rect1, 2431, 626, 3427, 1608); SetRect(&rect2, 2499, 626, 3427, 1608); result = SubtractRect(&rectr, &rect1, &rect2); @@ -88,12 +88,28 @@ static void test_SubtractRect(void) && rectr.bottom == 1608, "wrong rect subtraction of SubtractRect " "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom); - /* case 3: source rect 2 completely overlaps rect 1 */ + /* source rect 2 partially overlaps rect 1 - dest is src rect 2 */ + SetRect(&rect1, 2431, 626, 3427, 1608); + SetRect(&rect2, 2499, 626, 3427, 1608); + result = SubtractRect(&rect2, &rect1, &rect2); + ok(result, "SubtractRect returned FALSE but subtraction should not be empty\n"); + ok(result && rectr.left == 2431 && rectr.top == 626 && rectr.right == 2499 + && rectr.bottom == 1608, "wrong rect subtraction of SubtractRect " + "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom); + + /* source rect 2 completely overlaps rect 1 */ SetRect(&rect1, 250, 250, 400, 500); SetRect(&rect2, 50, 50, 1500, 1000); result = SubtractRect(&rectr, &rect1, &rect2); ok(!result, "SubtractRect returned TRUE but subtraction should be empty " "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom); + + /* source rect 2 completely overlaps rect 1 - dest is src rect 2 */ + SetRect(&rect1, 250, 250, 400, 500); + SetRect(&rect2, 50, 50, 1500, 1000); + result = SubtractRect(&rect2, &rect1, &rect2); + ok(!result, "SubtractRect returned TRUE but subtraction should be empty " + "(dest rect={%d, %d, %d, %d})\n", rect2.left, rect2.top, rect2.right, rect2.bottom); } START_TEST(uitools)

1 0

Nikolay Sivov : msi: Fix a record leak on error paths (Coverity).
by Alexandre Julliard March 27, 2014

March 27, 2014

Module: wine Branch: master Commit: dc33b1358115a7fef739e77ede1be48e3d94078f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc33b1358115a7fef739e77ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 27 06:55:24 2014 +0400 msi: Fix a record leak on error paths (Coverity). --- dlls/msi/custom.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 63bec19..002d861 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1003,7 +1003,7 @@ static UINT HANDLE_CustomType5_6( MSIPACKAGE *package, const WCHAR *source, cons 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','B','i' ,'n','a','r','y','`',' ','W','H','E','R','E',' ', '`','N','a','m','e','`',' ','=',' ','\'','%','s','\'',0}; - MSIRECORD *row = 0; + MSIRECORD *row = NULL; msi_custom_action_info *info; CHAR *buffer = NULL; WCHAR *bufferw = NULL; @@ -1017,10 +1017,14 @@ static UINT HANDLE_CustomType5_6( MSIPACKAGE *package, const WCHAR *source, cons return ERROR_FUNCTION_FAILED; r = MSI_RecordReadStream(row, 2, NULL, &sz); - if (r != ERROR_SUCCESS) return r; + if (r != ERROR_SUCCESS) goto done; buffer = msi_alloc( sz + 1 ); - if (!buffer) return ERROR_FUNCTION_FAILED; + if (!buffer) + { + r = ERROR_FUNCTION_FAILED; + goto done; + } r = MSI_RecordReadStream(row, 2, buffer, &sz); if (r != ERROR_SUCCESS) @@ -1040,6 +1044,7 @@ static UINT HANDLE_CustomType5_6( MSIPACKAGE *package, const WCHAR *source, cons done: msi_free(bufferw); msi_free(buffer); + msiobj_release(&row->hdr); return r; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard March 27, 2014

March 27, 2014

Module: wine Branch: master Commit: c8269c2cd73a7b95563bec2e195143bff5441c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8269c2cd73a7b95563bec2e1… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Mar 26 22:34:52 2014 +0200 po: Update Lithuanian translation. --- po/lt.po | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index 4b77e45..f573e7e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-02-10 22:51+0300\n" +"PO-Revision-Date: 2014-03-26 22:34+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -11680,6 +11680,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Wine DLL bibliotekų registravimo serveris\n" +"\n" +"Teikia DLL bibliotekų registravimo paslaugą.\n" +"\n" #: regsvr32.rc:40 msgid "" @@ -11694,54 +11698,64 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"Naudojimas:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdeilutė]] DllVardas\n" +"\n" +"Parametrai:\n" +" [/u] Išregistruoti modulį serveryje.\n" +" [/s] Tyli veiksena (nebus rodomi pranešimai).\n" +" [/i] Kviesti „DllInstall“, perduodant nebūtiną [cmdeilutę].\n" +"\tKai naudojama su [/u], regsvr32 taip pat kviečia „DLL Uninstall“.\n" +" [/n] Nekviesti „DllRegisterServer“. Privalo būti naudojamas su [/i].\n" +"\n" #: regsvr32.rc:41 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regsvr32: Netinkamas arba neatpažintas parametras [%1]\n" +"\n" #: regsvr32.rc:42 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "Nepavyko atverti „%1“\n" +msgstr "regsvr32: Nepavyko įkelti DLL bibliotekos „%1“\n" #: regsvr32.rc:43 msgid "regsvr32: %1 not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: %1 neįgyvendinta DLL bibliotekoje „%2“\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Nepavyko užregistruoti DLL bibliotekos „%1“\n" #: regsvr32.rc:45 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Sėkmingai užregistruota DLL biblioteka „%1“\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Nepavyko išregistruoti DLL bibliotekos „%1“\n" #: regsvr32.rc:47 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Sėkmingai išregistruota DLL biblioteka „%1“\n" #: regsvr32.rc:48 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Nepavyko įdiegti DLL bibliotekos „%1“\n" #: regsvr32.rc:49 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Sėkmingai įdiegta DLL biblioteka „%1“\n" #: regsvr32.rc:50 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Nepavyko pašalinti DLL bibliotekos „%1“\n" #: regsvr32.rc:51 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Sėkmingai pašalinta DLL biblioteka „%1“\n" #: start.rc:55 msgid ""

1 0

Thomas Faber : setupapi: Fix buffer overflow in SetupGetFileCompressionInfoW.
by Alexandre Julliard March 27, 2014

March 27, 2014

Module: wine Branch: master Commit: b8c42020a98e3a5f486cbd03ef80302d6d605871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8c42020a98e3a5f486cbd03e… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Mar 27 13:54:13 2014 +0100 setupapi: Fix buffer overflow in SetupGetFileCompressionInfoW. --- dlls/setupapi/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 22e55d9..6bdb404 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1412,7 +1412,8 @@ DWORD WINAPI SetupGetFileCompressionInfoW( PCWSTR source, PWSTR *name, PDWORD so return ERROR_INVALID_PARAMETER; ret = SetupGetFileCompressionInfoExW( source, NULL, 0, &required, NULL, NULL, NULL ); - if (!(actual_name = MyMalloc( required ))) return ERROR_NOT_ENOUGH_MEMORY; + if (!(actual_name = MyMalloc( required * sizeof(WCHAR) ))) + return ERROR_NOT_ENOUGH_MEMORY; ret = SetupGetFileCompressionInfoExW( source, actual_name, required, &required, source_size, target_size, type );

1 0

Nikolay Sivov : msi: Fix a record leak on failure removing a column ( Coverity).
by Alexandre Julliard March 27, 2014

March 27, 2014

Module: wine Branch: master Commit: 195168351fe0aadc1e1a550a80e68c88f3832b12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=195168351fe0aadc1e1a550a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 27 06:57:30 2014 +0400 msi: Fix a record leak on failure removing a column (Coverity). --- dlls/msi/table.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index bd15a8e..8012369 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1970,7 +1970,10 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num r = TABLE_CreateView(tv->db, szColumns, &columns); if (r != ERROR_SUCCESS) + { + msiobj_release(&rec->hdr); return r; + } r = msi_table_find_row((MSITABLEVIEW *)columns, rec, &row, NULL); if (r != ERROR_SUCCESS)

1 0

Nikolay Sivov : msi: Fix a leak of allocated string buffer on error path ( Coverity).
by Alexandre Julliard March 27, 2014

March 27, 2014

Module: wine Branch: master Commit: c01c0b52ed95a695698c29fae63e42e825cd4172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c01c0b52ed95a695698c29fae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 27 06:55:45 2014 +0400 msi: Fix a leak of allocated string buffer on error path (Coverity). --- dlls/msi/format.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 756c4d1..3c815d9 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -370,7 +370,11 @@ static LPWSTR build_default_format(const MSIRECORD* record) { max_len = len; buf = msi_realloc(buf, (max_len + 1) * sizeof(WCHAR)); - if (!buf) return NULL; + if (!buf) + { + msi_free(rc); + return NULL; + } } if (str)

1 0

Jactry Zeng : riched20: Fix a typo in CreateIRichEditOle.
by Alexandre Julliard March 27, 2014

March 27, 2014

Module: wine Branch: master Commit: 2a55f8d6639185ee7e22004bc7249ba3b6f3873d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a55f8d6639185ee7e22004bc… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Thu Mar 27 22:59:50 2014 +0800 riched20: Fix a typo in CreateIRichEditOle. --- dlls/riched20/richole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index bec228e..6f2d579 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1517,7 +1517,7 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj) return 0; } reo->clientSite = CreateOleClientSite(reo); - if (!reo->txtSel) + if (!reo->clientSite) { ITextSelection_Release(&reo->txtSel->ITextSelection_iface); heap_free(reo);

1 0