October 2006 - Wine-Commits

Michael Stefaniuc : tools: Remove redundant NULL checks before free() ( found by Smatch).
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 0fb444b58c0fa1ac91b34ab7f742662a5f1f6b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb444b58c0fa1ac91b34ab7f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 9 23:34:53 2006 +0200 tools: Remove redundant NULL checks before free() (found by Smatch). --- tools/widl/parser.y | 2 +- tools/winedump/msmangle.c | 2 +- tools/winedump/search.c | 7 ++----- tools/winedump/symbol.c | 14 ++++---------- tools/wmc/write.c | 3 +-- tools/wrc/parser.y | 6 ++---- 6 files changed, 11 insertions(+), 23 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 63e4c6d..5564936 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1179,7 +1179,7 @@ static typeref_t *uniq_tref(typeref_t *r static type_t *type_ref(typeref_t *ref) { type_t *t = ref->ref; - if (ref->name) free(ref->name); + free(ref->name); free(ref); return t; } diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index 0857595..c330b8c 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -37,7 +37,7 @@ typedef struct _compound_type #define INIT_CT(ct) do { memset (&ct, 0, sizeof (ct)); } while (0) /* free the memory used by a compound structure */ -#define FREE_CT(ct) do { if (ct.expression) free (ct.expression); } while (0) +#define FREE_CT(ct) free (ct.expression) /* Flags for data types */ #define DATA_VTABLE 0x1 diff --git a/tools/winedump/search.c b/tools/winedump/search.c index d9b15f2..8ae82de 100644 --- a/tools/winedump/search.c +++ b/tools/winedump/search.c @@ -348,10 +348,7 @@ #ifdef __GNUC__ void search_cleanup (void) __attribute__ ((destructor)); void search_cleanup (void) { - if (grep_buff) - free (grep_buff); - - if (fgrep_buff) - free (fgrep_buff); + free (grep_buff); + free (fgrep_buff); } #endif diff --git a/tools/winedump/symbol.c b/tools/winedump/symbol.c index 7336ed7..c79442f 100644 --- a/tools/winedump/symbol.c +++ b/tools/winedump/symbol.c @@ -109,19 +109,13 @@ void symbol_clear(parsed_symbol *sym) assert (sym->symbol); free (sym->symbol); - - if (sym->return_text) - free (sym->return_text); - - if (sym->function_name) - free (sym->function_name); + free (sym->return_text); + free (sym->function_name); for (i = sym->argc - 1; i >= 0; i--) { - if (sym->arg_text [i]) - free (sym->arg_text [i]); - if (sym->arg_name [i]) - free (sym->arg_name [i]); + free (sym->arg_text [i]); + free (sym->arg_name [i]); } memset (sym, 0, sizeof (parsed_symbol)); } diff --git a/tools/wmc/write.c b/tools/wmc/write.c index b6da9af..5a8cd71 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -274,8 +274,7 @@ void write_h_file(const char *fname) internal_error(__FILE__, __LINE__, "Invalid base for number print"); } free(cptr); - if(cast) - free(cast); + free(cast); break; default: internal_error(__FILE__, __LINE__, "Invalid node type %d", ndp->type); diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 3ee0be2..595042c 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -2906,10 +2906,8 @@ #endif free(lanfnt); clean: - if(fnt) - free(fnt); - if(fnd) - free(fnd); + free(fnt); + free(fnd); free(str.str.cstr); return lst; }

1 0

Michael Stefaniuc : server: Remove redundant NULL check before free() ( found by Smatch).
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 5cecceccb2658cc4568a86f4f52be40e924f9fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cecceccb2658cc4568a86f4f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 9 23:34:36 2006 +0200 server: Remove redundant NULL check before free() (found by Smatch). --- server/atom.c | 2 +- server/change.c | 3 +-- server/console.c | 10 +++++----- server/hook.c | 4 ++-- server/mailslot.c | 2 +- server/mapping.c | 4 ++-- server/named_pipe.c | 2 +- server/process.c | 6 +++--- server/queue.c | 4 ++-- server/registry.c | 20 ++++++++++---------- server/request.c | 7 ++----- server/thread.c | 6 +++--- server/token.c | 9 +++------ server/window.c | 4 ++-- 14 files changed, 38 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5cecceccb2658cc4568a8…

1 0

Mike McCormack : msi: Avoid an unnecessary strdup.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 47949afc359f1512c574966548f3afa2d3066cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=47949afc359f1512c57496654… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 10 19:19:56 2006 +0900 msi: Avoid an unnecessary strdup. --- dlls/msi/msiquery.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index ff8aa42..824a5be 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -390,11 +390,10 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIR if( type & MSITYPE_STRING ) { - LPWSTR sval; + LPCWSTR sval; - sval = MSI_makestring( query->db, ival ); + sval = msi_string_lookup_id( query->db->strings, ival ); MSI_RecordSetStringW( rec, i, sval ); - msi_free( sval ); } else {

1 0

Mike McCormack : msi: Fix a memory leak.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 2d48706d7476ce434143c1ab2a26ba616144522d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d48706d7476ce434143c1ab2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 10 19:20:32 2006 +0900 msi: Fix a memory leak. --- dlls/msi/table.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 8fe3728..4c0075a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -977,6 +977,7 @@ static UINT get_tablecolumns( MSIDATABAS { ERR("oops. data in the _Columns table isn't in the right " "order for table %s\n", debugstr_w(szTableName)); + msi_free_colinfo(colinfo, n+1 ); return ERROR_FUNCTION_FAILED; } }

1 0

Mike McCormack : msi: Avoid reading the transform table data twice.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 07c85fe89584ddf13b24a16030be0fa59406d340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c85fe89584ddf13b24a1603… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 10 19:19:37 2006 +0900 msi: Avoid reading the transform table data twice. --- dlls/msi/table.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index dfbc73a..8fe3728 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1833,6 +1833,7 @@ static UINT msi_table_load_transform( MS TRACE("%p %p %p %s\n", db, stg, st, debugstr_w(name) ); + /* read the transform data */ read_stream_data( stg, name, &rawdata, &rawsize ); if ( !rawdata ) { @@ -1849,15 +1850,6 @@ static UINT msi_table_load_transform( MS if( r != ERROR_SUCCESS ) goto err; - /* read the transform data */ - r = ERROR_FUNCTION_FAILED; - read_stream_data( stg, name, &rawdata, &rawsize ); - if( !rawdata || (rawsize < 2) ) - { - ERR("odd sized transform for table %s\n", debugstr_w(name)); - goto err; - } - TRACE("name = %s columns = %u row_size = %u raw size = %u\n", debugstr_w(name), tv->num_cols, tv->row_size, rawsize );

1 0

Mike McCormack : msi: Fix handle leaks in the test cases.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: e9c5e93fda05dba577821f2902dd576947ed973b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9c5e93fda05dba577821f290… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 10 15:21:24 2006 +0900 msi: Fix handle leaks in the test cases. --- dlls/msi/tests/db.c | 31 +++++++++++++++++++------------ dlls/msi/tests/format.c | 1 + dlls/msi/tests/install.c | 7 +++++-- dlls/msi/tests/package.c | 1 + 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index a065477..b8ca3d3 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1313,6 +1313,7 @@ static void test_where(void) ok( 2 == r, "field wrong\n"); r = MsiRecordGetInteger(rec, 2); ok( 1 == r, "field wrong\n"); + MsiCloseHandle( rec ); query = "SELECT `DiskId` FROM `Media` WHERE `LastSequence` >= 1 AND DiskId >= 0"; r = MsiDatabaseOpenView(hdb, query, &view); @@ -1332,6 +1333,7 @@ static void test_where(void) ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); ok( !lstrcmp( buf, "2" ), "For (row %d, column 1) expected '%d', got %s\n", 0, 2, buf ); + MsiCloseHandle( rec ); r = MsiViewFetch(view, &rec); ok( r == ERROR_SUCCESS, "failed to fetch view: %d\n", r ); @@ -1341,6 +1343,7 @@ static void test_where(void) ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); ok( !lstrcmp( buf, "3" ), "For (row %d, column 1) expected '%d', got %s\n", 1, 3, buf ); + MsiCloseHandle( rec ); r = MsiViewFetch(view, &rec); ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); @@ -1414,6 +1417,7 @@ static void test_msiimport(void) ok(check_record(rec, 7, "String"), "Expected String\n"); ok(check_record(rec, 8, "LocalizableString"), "Expected LocalizableString\n"); ok(check_record(rec, 9, "LocalizableStringNullable"), "Expected LocalizableStringNullable\n"); + MsiCloseHandle(rec); r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); count = MsiRecordGetFieldCount(rec); @@ -1430,6 +1434,7 @@ static void test_msiimport(void) ok(check_record(rec, 3, "i2"), "Expected i2\n"); ok(check_record(rec, 5, "i4"), "Expected i4\n"); } + MsiCloseHandle(rec); query = "SELECT * FROM `TestTable`"; r = do_query(hdb, query, &rec); @@ -1508,18 +1513,18 @@ static void test_markers(void) query = "CREATE TABLE `Mable` ( `?` SHORT NOT NULL, `Two` CHAR(255) PRIMARY KEY `One`)"; r = run_query(hdb, rec, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + MsiCloseHandle(rec); /* try column names as markers */ - MsiCloseHandle(rec); rec = MsiCreateRecord(2); MsiRecordSetString(rec, 1, "One"); MsiRecordSetString(rec, 2, "Two"); query = "CREATE TABLE `Mable` ( `?` SHORT NOT NULL, `?` CHAR(255) PRIMARY KEY `One`)"; r = run_query(hdb, rec, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + MsiCloseHandle(rec); /* try names with backticks */ - MsiCloseHandle(rec); rec = MsiCreateRecord(3); MsiRecordSetString(rec, 1, "One"); MsiRecordSetString(rec, 2, "Two"); @@ -1537,17 +1542,17 @@ static void test_markers(void) query = "CREATE TABLE `Mable` ( ? SHORT NOT NULL, ? CHAR(255) PRIMARY KEY ?)"; r = run_query(hdb, rec, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + MsiCloseHandle(rec); /* try one long marker */ - MsiCloseHandle(rec); rec = MsiCreateRecord(1); MsiRecordSetString(rec, 1, "`One` SHORT NOT NULL, `Two` CHAR(255) PRIMARY KEY `One`"); query = "CREATE TABLE `Mable` ( ? )"; r = run_query(hdb, rec, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + MsiCloseHandle(rec); /* try all names as markers */ - MsiCloseHandle(rec); rec = MsiCreateRecord(4); MsiRecordSetString(rec, 1, "Mable"); MsiRecordSetString(rec, 2, "One"); @@ -1556,6 +1561,7 @@ static void test_markers(void) query = "CREATE TABLE `?` ( `?` SHORT NOT NULL, `?` CHAR(255) PRIMARY KEY `?`)"; r = run_query(hdb, rec, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + MsiCloseHandle(rec); /* try a legit insert */ query = "INSERT INTO `Table` ( `One`, `Two` ) VALUES ( 5, 'hello' )"; @@ -1566,16 +1572,15 @@ static void test_markers(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* try values as markers */ - MsiCloseHandle(rec); rec = MsiCreateRecord(2); MsiRecordSetInteger(rec, 1, 4); MsiRecordSetString(rec, 2, "hi"); query = "INSERT INTO `Table` ( `One`, `Two` ) VALUES ( ?, '?' )"; r = run_query(hdb, rec, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + MsiCloseHandle(rec); /* try column names and values as markers */ - MsiCloseHandle(rec); rec = MsiCreateRecord(4); MsiRecordSetString(rec, 1, "One"); MsiRecordSetString(rec, 2, "Two"); @@ -1584,26 +1589,26 @@ static void test_markers(void) query = "INSERT INTO `Table` ( `?`, `?` ) VALUES ( ?, '?' )"; r = run_query(hdb, rec, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + MsiCloseHandle(rec); /* try column names as markers */ - MsiCloseHandle(rec); rec = MsiCreateRecord(2); MsiRecordSetString(rec, 1, "One"); MsiRecordSetString(rec, 2, "Two"); query = "INSERT INTO `Table` ( `?`, `?` ) VALUES ( 3, 'yellow' )"; r = run_query(hdb, rec, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + MsiCloseHandle(rec); /* try table name as a marker */ - MsiCloseHandle(rec); rec = MsiCreateRecord(1); MsiRecordSetString(rec, 1, "Table"); query = "INSERT INTO `?` ( `One`, `Two` ) VALUES ( 2, 'green' )"; r = run_query(hdb, rec, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + MsiCloseHandle(rec); /* try table name and values as markers */ - MsiCloseHandle(rec); rec = MsiCreateRecord(3); MsiRecordSetString(rec, 1, "Table"); MsiRecordSetInteger(rec, 2, 10); @@ -1611,9 +1616,9 @@ static void test_markers(void) query = "INSERT INTO `?` ( `One`, `Two` ) VALUES ( ?, '?' )"; r = run_query(hdb, rec, query); ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r); + MsiCloseHandle(rec); /* try all markers */ - MsiCloseHandle(rec); rec = MsiCreateRecord(5); MsiRecordSetString(rec, 1, "Table"); MsiRecordSetString(rec, 1, "One"); @@ -1623,18 +1628,18 @@ static void test_markers(void) query = "INSERT INTO `?` ( `?`, `?` ) VALUES ( ?, '?' )"; r = run_query(hdb, rec, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + MsiCloseHandle(rec); /* insert an integer as a string */ - MsiCloseHandle(rec); rec = MsiCreateRecord(2); MsiRecordSetString(rec, 1, "11"); MsiRecordSetString(rec, 2, "hi"); query = "INSERT INTO `Table` ( `One`, `Two` ) VALUES ( ?, '?' )"; r = run_query(hdb, rec, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + MsiCloseHandle(rec); /* leave off the '' for the string */ - MsiCloseHandle(rec); rec = MsiCreateRecord(2); MsiRecordSetInteger(rec, 1, 12); MsiRecordSetString(rec, 2, "hi"); @@ -2460,9 +2465,11 @@ static void test_temporary_table(void) rec = 0; r = do_query(hdb, "select * from `_Columns` where `Table` = 'T' AND `Name` = 'B'", &rec); ok( r == ERROR_NO_MORE_ITEMS, "temporary table exists in _Columns\n"); + if (rec) MsiCloseHandle( rec ); r = do_query(hdb, "select * from `_Columns` where `Table` = 'T' AND `Name` = 'C'", &rec); ok( r == ERROR_NO_MORE_ITEMS, "temporary table exists in _Columns\n"); + if (rec) MsiCloseHandle( rec ); } MsiCloseHandle( hdb ); diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 9ffcd9f..2a05782 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -2240,6 +2240,7 @@ static void test_formatrecord_tables(voi DeleteFile( "C:\\I am a really long directory\\temporal.txt" ); RemoveDirectory( "C:\\I am a really long directory" ); + MsiCloseHandle( hrec ); MsiCloseHandle( hpkg ); DeleteFile( msifile ); } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 94925dc..cc2f71a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -705,6 +705,7 @@ static void test_packagecoltypes(void) ok(check_record(rec, 4, "Cabinet"), "wrong column label\n"); ok(check_record(rec, 5, "VolumeLabel"), "wrong column label\n"); ok(check_record(rec, 6, "Source"), "wrong column label\n"); + MsiCloseHandle(rec); r = MsiViewGetColumnInfo( view, MSICOLINFO_TYPES, &rec ); count = MsiRecordGetFieldCount( rec ); @@ -720,6 +721,8 @@ static void test_packagecoltypes(void) ok(check_record(rec, 3, "L64"), "wrong column label\n"); } + MsiCloseHandle(rec); + MsiCloseHandle(view); MsiCloseHandle(hdb); DeleteFile(msifile); } @@ -731,10 +734,10 @@ START_TEST(install) create_test_files(); create_database(msifile, tables, sizeof(tables) / sizeof(msi_table)); - + test_MsiInstallProduct(); test_MsiSetComponentState(); test_packagecoltypes(); - + delete_test_files(); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 40cf6d8..550245d 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2715,6 +2715,7 @@ static void test_installprops(void) r = MsiGetProperty(hpkg, "DATABASE", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); + MsiCloseHandle(hpkg); } START_TEST(package)

1 0

Mike McCormack : msi: Fix memory leaks and bad frees.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 73c7bcb6e53514ef2be9627324ef896a9319c0dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=73c7bcb6e53514ef2be962732… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 10 15:20:39 2006 +0900 msi: Fix memory leaks and bad frees. --- dlls/msi/appsearch.c | 4 ++-- dlls/msi/custom.c | 3 +++ dlls/msi/database.c | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 622b97c..1d3559c 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -398,7 +398,7 @@ static UINT ACTION_AppSearchReg(MSIPACKA appValue); break; case msidbLocatorTypeFileName: - *appValue = (LPWSTR)value; + *appValue = strdupW((LPCWSTR)value); break; case msidbLocatorTypeRawValue: ACTION_ConvertRegValue(regType, value, sz, appValue); @@ -996,7 +996,7 @@ UINT ACTION_AppSearch(MSIPACKAGE *packag while (!rc) { MSISIGNATURE sig; - LPWSTR value; + LPWSTR value = NULL; rc = MSI_ViewFetch(view,&row); if (rc != ERROR_SUCCESS) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index dfebfce..5220a57 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -167,7 +167,10 @@ UINT ACTION_CustomAction(MSIPACKAGE *pac row = MSI_QueryGetRecord( package->db, ExecSeqQuery, action ); if (!row) + { + msi_free(action_copy); return ERROR_CALL_NOT_IMPLEMENTED; + } type = MSI_RecordGetInteger(row,2); diff --git a/dlls/msi/database.c b/dlls/msi/database.c index a0d1867..266b467 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -668,6 +668,7 @@ done: msi_free(data); msi_free(columns); msi_free(types); + msi_free(labels); for (i = 0; i < num_records; i++) msi_free(records[i]);

1 0

Hwang YunSong(황윤성) : regedit: Updated Korean resource.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 5b160a429c440f433e64aecadddf2613121f8ef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b160a429c440f433e64aecad… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Oct 10 16:14:41 2006 +0900 regedit: Updated Korean resource. --- programs/regedit/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/Ko.rc b/programs/regedit/Ko.rc index d5af338..4b909b2 100644 --- a/programs/regedit/Ko.rc +++ b/programs/regedit/Ko.rc @@ -100,7 +100,7 @@ BEGIN POPUP "" BEGIN MENUITEM "��(&M)", ID_EDIT_MODIFY - MENUITEM "Modify Binary Data", ID_EDIT_MODIFY_BIN + MENUITEM "�� ġ��", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR MENUITEM "��(&D)\tDel", ID_EDIT_DELETE MENUITEM "�̸� �ٲٱ�(&R)", ID_EDIT_RENAME

1 0

Markus Amsler : wined3d: Fix DEBUG_SINGLE_MODE.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 8192555dff0a09f5e78b0e2ec2a428bbb3f99e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8192555dff0a09f5e78b0e2ec… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Oct 9 20:53:17 2006 +0200 wined3d: Fix DEBUG_SINGLE_MODE. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bbedfe3..b75ab29 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1111,13 +1111,14 @@ static HRESULT WINAPI IWineD3DImpl_EnumA } if (Adapter == 0) { /* Display */ + int bpp; #if !defined( DEBUG_SINGLE_MODE ) DEVMODEW DevModeW; int ModeIdx = 0; /* Work out the current screen bpp */ HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); - int bpp = GetDeviceCaps(hdc, BITSPIXEL); + bpp = GetDeviceCaps(hdc, BITSPIXEL); DeleteDC(hdc); /* If we are filtering to a specific format, then need to skip all unrelated

1 0

James Hawkins : msi: NULL-terminate dst on error.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 915898fbb75b8f2f945f4934d3b67496d3073558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915898fbb75b8f2f945f4934d… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Oct 9 14:06:53 2006 -0700 msi: NULL-terminate dst on error. --- dlls/msi/appsearch.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index e36d20c..622b97c 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -530,7 +530,10 @@ static void ACTION_ExpandAnyPath(MSIPACK size_t copied = 0; if (!src || !dst || !len) + { + if (dst) *dst = '\0'; return; + } /* Ignore the short portion of the path, don't think we can use it anyway */ if ((ptr = strchrW(src, '|')))

1 0