January 2011 - Wine-commits

Hans Leidekker : msi: Make sure the return value is initialized in save_table (clang).
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: e861283a62e8bbd8dcba9b3d6956b93945c1fb78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e861283a62e8bbd8dcba9b3d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:55:19 2011 +0100 msi: Make sure the return value is initialized in save_table (clang). --- dlls/msi/table.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 90bcb1f..d3675e2 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -766,7 +766,8 @@ static UINT read_table_int(BYTE *const *data, UINT row, UINT col, UINT bytes) static UINT save_table( MSIDATABASE *db, const MSITABLE *t, UINT bytes_per_strref ) { BYTE *rawdata = NULL; - UINT rawsize, r, i, j, row_size, row_count; + UINT rawsize, i, j, row_size, row_count; + UINT r = ERROR_FUNCTION_FAILED; /* Nothing to do for non-persistent tables */ if( t->persistent == MSICONDITION_FALSE ) @@ -816,7 +817,6 @@ static UINT save_table( MSIDATABASE *db, const MSITABLE *t, UINT bytes_per_strre if (id > 1 << bytes_per_strref * 8) { ERR("string id %u out of range\n", id); - r = ERROR_FUNCTION_FAILED; goto err; } }

1 0

Hans Leidekker : msi: Use a return value (clang).
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: af3733cde55701ad9f27fd4273c13bf024dbc774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3733cde55701ad9f27fd427… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:55:38 2011 +0100 msi: Use a return value (clang). --- dlls/msi/custom.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 8981e62..5e0cbe0 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1184,13 +1184,13 @@ static DWORD ACTION_CallScript( const GUID *guid ) { msi_custom_action_info *info; MSIHANDLE hPackage; - UINT r = ERROR_FUNCTION_FAILED; + UINT r; info = find_action_by_guid( guid ); if (!info) { ERR("failed to find action %s\n", debugstr_guid( guid) ); - return r; + return ERROR_FUNCTION_FAILED; } TRACE("function %s, script %s\n", debugstr_w( info->target ), debugstr_w( info->source ) ); @@ -1199,13 +1199,13 @@ static DWORD ACTION_CallScript( const GUID *guid ) if (hPackage) { r = call_script( hPackage, info->type, info->source, info->target, info->action ); + TRACE("script returned %u\n", r); MsiCloseHandle( hPackage ); } else ERR("failed to create handle for %p\n", info->package ); release_custom_action_data( info ); - return S_OK; }

1 0

Hans Leidekker : msi/tests: Test a return value (clang).
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 4a7371e32d310d61277d977a9c80db5f830bc1e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7371e32d310d61277d977a9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:55:52 2011 +0100 msi/tests: Test a return value (clang). --- dlls/msi/tests/install.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 5461387..1ae39d4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5535,6 +5535,8 @@ static void process_pending_renames(HKEY hkey) BOOL found = FALSE; ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, NULL, &size); + ok(!ret, "RegQueryValueExA failed %d\n", ret); + buf = HeapAlloc(GetProcessHeap(), 0, size + 1); buf2ptr = buf2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + 1);

1 0

Hans Leidekker : msi: Check a return value (clang).
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 53b5e7f319b0abfeb196a8f810013a11d70dae27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b5e7f319b0abfeb196a8f81… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:56:08 2011 +0100 msi: Check a return value (clang). --- dlls/msi/source.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 602f03f..9b7a9ea 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -1130,6 +1130,12 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, RegCloseKey(sourcekey); return ERROR_FUNCTION_FAILED; } + if (rc != ERROR_SUCCESS) + { + ERR("can't open subkey %u\n", rc); + RegCloseKey(sourcekey); + return rc; + } postfix = (dwOptions & MSISOURCETYPE_NETWORK) ? szBackSlash : szForwardSlash; if (szSource[lstrlenW(szSource) - 1] == *postfix)

1 0

Hans Leidekker : msi: Return the correct disk prompt size from MsiSourceListEnumMediaDisksW ( clang).
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: eb4e5d602458a14953cb8c17abd6de9962aa5dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4e5d602458a14953cb8c17a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:56:23 2011 +0100 msi: Return the correct disk prompt size from MsiSourceListEnumMediaDisksW (clang). --- dlls/msi/source.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 9b7a9ea..881f3d2 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -330,7 +330,6 @@ UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, else size = lstrlenW(ptr); - size = lstrlenW(ptr); if (size >= *pcchDiskPrompt) r = ERROR_MORE_DATA; else if (szDiskPrompt)

1 0

Alexandre Julliard : makedep: Add dependencies for the msg.pot file.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 6d659d7e157b29c3883667c709ac53f886fb6856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d659d7e157b29c3883667c70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 15:13:53 2011 +0100 makedep: Add dependencies for the msg.pot file. --- tools/makedep.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 0d592a0..f1b0a12 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -858,7 +858,7 @@ static int output_src( FILE *file, INCL_FILE *pFile, int *column ) } else if (!strcmp( ext, "mc" )) /* message file */ { - *column += fprintf( file, "%s.res: %s", obj, pFile->filename ); + *column += fprintf( file, "msg.pot %s.res: %s", obj, pFile->filename ); } else if (!strcmp( ext, "idl" )) /* IDL file */ {

1 0

Alexandre Julliard : kernel32: Add proper English messages for all error codes.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: c469b776249fb17a155756675fd5fd8fb334daab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c469b776249fb17a155756675… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 15:21:58 2011 +0100 kernel32: Add proper English messages for all error codes. --- dlls/kernel32/winerror.mc | 206 +++++++++--------- po/ar.po | 263 +++++++++++++----------- po/bg.po | 335 +++++++++++++++++------------- po/ca.po | 215 ++++++++++---------- po/cs.po | 360 ++++++++++++++++++-------------- po/da.po | 495 +++++++++++++++++++++++++------------------- po/de.po | 495 +++++++++++++++++++++++++------------------- po/el.po | 308 +++++++++++++++------------- po/en.po | 368 ++++++++++++++++----------------- po/en_US.po | 418 +++++++++++++++++++------------------- po/eo.po | 335 +++++++++++++++++------------- po/es.po | 409 +++++++++++++++++++++--------------- po/fa.po | 263 +++++++++++++----------- po/fi.po | 341 +++++++++++++++++-------------- po/fr.po | 495 +++++++++++++++++++++++++------------------- po/he.po | 389 ++++++++++++++++++++--------------- po/hi.po | 212 ++++++++++---------- po/hu.po | 394 ++++++++++++++++++++--------------- po/it.po | 495 +++++++++++++++++++++++++------------------- po/ja.po | 494 +++++++++++++++++++++++++------------------- po/ko.po | 495 +++++++++++++++++++++++++------------------- po/lt.po | 495 +++++++++++++++++++++++++------------------- po/ml.po | 212 ++++++++++---------- po/nb_NO.po | 495 +++++++++++++++++++++++++------------------- po/nl.po | 495 +++++++++++++++++++++++++------------------- po/or.po | 212 ++++++++++---------- po/pa.po | 212 ++++++++++---------- po/pl.po | 499 ++++++++++++++++++++++++++------------------- po/pt_BR.po | 495 +++++++++++++++++++++++++------------------- po/pt_PT.po | 495 +++++++++++++++++++++++++------------------- po/rm.po | 230 +++++++++++---------- po/ro.po | 407 +++++++++++++++++++++---------------- po/ru.po | 499 ++++++++++++++++++++++++++------------------- po/sk.po | 320 ++++++++++++++++------------- po/sl.po | 392 ++++++++++++++++++++--------------- po/sr_RS(a)cyrillic.po | 389 ++++++++++++++++++++--------------- po/sr_RS(a)latin.po | 389 ++++++++++++++++++++--------------- po/sv.po | 495 +++++++++++++++++++++++++------------------- po/te.po | 212 ++++++++++---------- po/th.po | 329 ++++++++++++++++------------- po/tr.po | 403 +++++++++++++++++++++--------------- po/uk.po | 503 ++++++++++++++++++++++++++------------------- po/wa.po | 263 +++++++++++++----------- po/wine.pot | 212 ++++++++++---------- po/zh_CN.po | 364 +++++++++++++++++++-------------- po/zh_TW.po | 364 +++++++++++++++++++-------------- 46 files changed, 9556 insertions(+), 7610 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c469b776249fb17a15575…

1 0

Hans Leidekker : msi: Check the return value of fetch_int (clang).
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 78ce0a7350b77abb76e4a0b1017e91b7c7b68db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ce0a7350b77abb76e4a0b10… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:54:35 2011 +0100 msi: Check the return value of fetch_int (clang). --- dlls/msi/where.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 7cafa2a..35a6074 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -328,11 +328,15 @@ static UINT WHERE_evaluate( MSIWHEREVIEW *wv, UINT row, { case EXPR_COL_NUMBER: r = wv->table->ops->fetch_int( wv->table, row, cond->u.col_number, &tval ); + if( r != ERROR_SUCCESS ) + return r; *val = tval - 0x8000; return ERROR_SUCCESS; case EXPR_COL_NUMBER32: r = wv->table->ops->fetch_int( wv->table, row, cond->u.col_number, &tval ); + if( r != ERROR_SUCCESS ) + return r; *val = tval - 0x80000000; return r;

1 0

Hans Leidekker : msi/tests: Consistently test return values (clang).
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: a84af95d3e75a23d283cddf9179d1238604a8049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84af95d3e75a23d283cddf91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:54:53 2011 +0100 msi/tests: Consistently test return values (clang). --- dlls/msi/tests/db.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 7ab4ff3..21eb2a1 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2204,6 +2204,7 @@ static void test_msiimport(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); count = MsiRecordGetFieldCount(rec); ok(count == 9, "Expected 9, got %d\n", count); ok(check_record(rec, 1, "FirstPrimaryColumn"), "Expected FirstPrimaryColumn\n"); @@ -2218,6 +2219,7 @@ static void test_msiimport(void) MsiCloseHandle(rec); r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); count = MsiRecordGetFieldCount(rec); ok(count == 9, "Expected 9, got %d\n", count); ok(check_record(rec, 1, "s255"), "Expected s255\n"); @@ -2263,6 +2265,7 @@ static void test_msiimport(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); count = MsiRecordGetFieldCount(rec); ok(count == 2, "Expected 2, got %d\n", count); ok(check_record(rec, 1, "PrimaryOne"), "Expected PrimaryOne\n"); @@ -2271,6 +2274,7 @@ static void test_msiimport(void) MsiCloseHandle(rec); r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); count = MsiRecordGetFieldCount(rec); ok(count == 2, "Expected 2, got %d\n", count); ok(check_record(rec, 1, "s255"), "Expected s255\n"); @@ -2310,6 +2314,7 @@ static void test_msiimport(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); count = MsiRecordGetFieldCount(rec); ok(count == 6, "Expected 6, got %d\n", count); ok(check_record(rec, 1, "A"), "Expected A\n"); @@ -2321,6 +2326,7 @@ static void test_msiimport(void) MsiCloseHandle(rec); r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); count = MsiRecordGetFieldCount(rec); ok(count == 6, "Expected 6, got %d\n", count); ok(check_record(rec, 1, "s72"), "Expected s72\n"); @@ -2932,6 +2938,7 @@ static MSIHANDLE create_package_db(LPCSTR filename) ok( res == ERROR_SUCCESS , "Failed to commit database\n" ); res = set_summary_info(hdb); + ok( res == ERROR_SUCCESS , "Failed to set summary info\n" ); res = create_directory_table(hdb); ok( res == ERROR_SUCCESS , "Failed to create directory table\n" ); @@ -4217,6 +4224,7 @@ static void test_integers(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); count = MsiRecordGetFieldCount(rec); ok(count == 8, "Expected 8, got %d\n", count); ok(check_record(rec, 1, "one"), "Expected one\n"); @@ -4230,6 +4238,7 @@ static void test_integers(void) MsiCloseHandle(rec); r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); count = MsiRecordGetFieldCount(rec); ok(count == 8, "Expected 8, got %d\n", count); ok(check_record(rec, 1, "I2"), "Expected I2\n"); @@ -8059,10 +8068,12 @@ static void test_dbmerge(void) size = MAX_PATH; r = MsiRecordGetString(hrec, 1, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "Table"), "Expected \"Table\", got \"%s\"\n", buf); size = MAX_PATH; r = MsiRecordGetString(hrec, 2, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "NumRowMergeConflicts"), "Expected \"NumRowMergeConflicts\", got \"%s\"\n", buf); @@ -8073,10 +8084,12 @@ static void test_dbmerge(void) size = MAX_PATH; r = MsiRecordGetString(hrec, 1, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "s255"), "Expected \"s255\", got \"%s\"\n", buf); size = MAX_PATH; r = MsiRecordGetString(hrec, 2, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "i2"), "Expected \"i2\", got \"%s\"\n", buf); MsiCloseHandle(hrec); @@ -8914,6 +8927,7 @@ static void test_columnorder(void) query = "SELECT * FROM `Z`"; r = do_query(hdb, query, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiRecordGetInteger(rec, 1); ok(r == 2, "Expected 2, got %d\n", r);

1 0

Greg Geldorp : msi/tests: Check 64-bit reg view if key not present in 32-bit view.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 0abf2da02205e85d4989b5241ce555044f3939ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0abf2da02205e85d4989b5241… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Thu Jan 27 11:35:36 2011 +0100 msi/tests: Check 64-bit reg view if key not present in 32-bit view. --- dlls/msi/tests/action.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 9d90b42..33f5620 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5870,6 +5870,7 @@ static void test_publish_assemblies(void) LONG res; HKEY hkey; const char *path; + int access; if (is_process_limited()) { @@ -5957,24 +5958,31 @@ static void test_publish_assemblies(void) r = MsiInstallProductA(msifile, "ALLUSERS=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_dotnet, &hkey); + access = KEY_QUERY_VALUE; + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_dotnet, 0, access, &hkey); + if (res == ERROR_FILE_NOT_FOUND && is_wow64) /* Vista WOW64 */ + { + trace("Using 64-bit registry view for HKCR\\Installer\n"); + access = KEY_QUERY_VALUE | KEY_WOW64_64KEY; + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_dotnet, 0, access, &hkey); + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_REG_STR(hkey, name_dotnet, "rcHQPHq?CA(a)Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? classes_path_dotnet_local_wow64 : classes_path_dotnet_local; - res = RegOpenKeyA(HKEY_CLASSES_ROOT, path, &hkey); + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_REG_STR(hkey, name_dotnet_local, "rcHQPHq?CA(a)Uv-XqMI1e>LF,8A?0d.AW(a)vcZ$Cgox"); RegCloseKey(hkey); - res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_win32, &hkey); + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_win32, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local; - res = RegOpenKeyA(HKEY_CLASSES_ROOT, path, &hkey); + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey);

1 0