October 2008 - Wine-commits

James Hawkins : msi: Append the file signature to the component' s directory when searching for the component's key path.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 65915af1ae6fd800c70a34fefe7199555bbff3a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65915af1ae6fd800c70a34fef… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 13 03:57:36 2008 -0500 msi: Append the file signature to the component's directory when searching for the component's key path. --- dlls/msi/appsearch.c | 9 +++++++++ dlls/msi/tests/package.c | 5 +---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 0743aee..e013b58 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -225,6 +225,15 @@ static UINT ACTION_AppSearchComponents(MSIPACKAGE *package, LPWSTR *appValue, MS *appValue = strdupW(path); } + else if (sigpresent) + { + PathAddBackslashW(path); + lstrcatW(path, MSI_RecordGetString(rec, 2)); + + attr = GetFileAttributesW(path); + if (attr != INVALID_FILE_ATTRIBUTES && attr != FILE_ATTRIBUTE_DIRECTORY) + *appValue = strdupW(path); + } done: if (rec) msiobj_release(&rec->hdr); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e52c931..b2a3cf4 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5963,10 +5963,7 @@ static void test_appsearch_complocator(void) sprintf(path, "%s\\FileName5", CURR_DIR); r = MsiGetPropertyA(hpkg, "SIGPROP5", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); - } + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; sprintf(path, "%s\\", CURR_DIR);

1 0

James Hawkins : msi: Expand REG_EXPAND_SZ registry values in the RegLocator table.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 6d02194a4679d15f6d121e2e0ee09dabba739043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d02194a4679d15f6d121e2e0… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 13 03:57:40 2008 -0500 msi: Expand REG_EXPAND_SZ registry values in the RegLocator table. --- dlls/msi/appsearch.c | 7 +++---- dlls/msi/tests/package.c | 12 +++--------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index e013b58..ed02f83 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -245,7 +245,6 @@ static void ACTION_ConvertRegValue(DWORD regType, const BYTE *value, DWORD sz, LPWSTR *appValue) { static const WCHAR dwordFmt[] = { '#','%','d','\0' }; - static const WCHAR expandSzFmt[] = { '#','%','%','%','s','\0' }; static const WCHAR binFmt[] = { '#','x','%','x','\0' }; DWORD i; @@ -273,9 +272,9 @@ static void ACTION_ConvertRegValue(DWORD regType, const BYTE *value, DWORD sz, sprintfW(*appValue, dwordFmt, *(const DWORD *)value); break; case REG_EXPAND_SZ: - /* space for extra #% characters in front */ - *appValue = msi_alloc(sz + 2 * sizeof(WCHAR)); - sprintfW(*appValue, expandSzFmt, (LPCWSTR)value); + sz = ExpandEnvironmentStringsW((LPCWSTR)value, NULL, 0); + *appValue = msi_alloc(sz * sizeof(WCHAR)); + ExpandEnvironmentStringsW((LPCWSTR)value, *appValue, sz); break; case REG_BINARY: /* 3 == length of "#x<nibble>" */ diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index b2a3cf4..31f5ad6 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -6318,19 +6318,13 @@ static void test_appsearch_reglocator(void) size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP4", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); - } + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP5", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, - "my%NOVAR%"), "Expected \"my%%NOVAR%%\", got \"%s\"\n", prop); - } + ok(!lstrcmpA(prop, + "my%NOVAR%"), "Expected \"my%%NOVAR%%\", got \"%s\"\n", prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP6", prop, &size);

1 0

James Hawkins : msi: Add tests for the RegLocator part of the AppSearch action.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 33c9e80be51002be1dedca1ccbbab47bfb3bc500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c9e80be51002be1dedca1cc… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 13 03:57:26 2008 -0500 msi: Add tests for the RegLocator part of the AppSearch action. --- dlls/msi/tests/package.c | 455 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 455 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33c9e80be51002be1dedc…

1 0

James Hawkins : msi: Add more tests for the CompLocator part of the AppSearch action.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 41c8bc8ae6434f54c401aedf283bfe9e760d09cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c8bc8ae6434f54c401aedf2… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 13 03:57:17 2008 -0500 msi: Add more tests for the CompLocator part of the AppSearch action. --- dlls/msi/tests/package.c | 526 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 421 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41c8bc8ae6434f54c401a…

1 0

Jeremy White : gdi32: Expand maximum font count to 4096, warn when we go over that limit.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: fed3d50663e36935cd12b367f926b7fe0bc55791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed3d50663e36935cd12b367f… Author: Jeremy White <jwhite(a)winehq.org> Date: Sun Oct 12 14:18:14 2008 -0500 gdi32: Expand maximum font count to 4096, warn when we go over that limit. --- dlls/gdi32/tests/font.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bbcdf0b..06ef26d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1571,7 +1571,7 @@ static void test_GetFontUnicodeRanges(void) ReleaseDC(NULL, hdc); } -#define MAX_ENUM_FONTS 256 +#define MAX_ENUM_FONTS 4096 struct enum_font_data { @@ -1596,6 +1596,8 @@ static INT CALLBACK arial_enum_proc(const LOGFONT *lf, const TEXTMETRIC *tm, DWO #endif if (efd->total < MAX_ENUM_FONTS) efd->lf[efd->total++] = *lf; + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); return 1; } @@ -1608,6 +1610,8 @@ static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, if (efd->total < MAX_ENUM_FONTS) efd->lf[efd->total++] = *lf; + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); return 1; }

1 0

Jeremy White : gdi32/tests: Make the comparison of the enumerated and returned logfont structures actually work .
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 484add22201569568773ae67e4633b828cc4e840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484add22201569568773ae67e… Author: Jeremy White <jwhite(a)winehq.org> Date: Sun Oct 12 15:36:14 2008 -0500 gdi32/tests: Make the comparison of the enumerated and returned logfont structures actually work. --- 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 06ef26d..48a8fe5 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -106,7 +106,7 @@ static void check_font(const char* test, const LOGFONTA* lf, HFONT hfont) minlen++; minlen += FIELD_OFFSET(LOGFONTA, lfFaceName) + 1; ok(ret == sizeof(LOGFONTA) || ret == minlen, "%s: GetObject returned %d\n", test, ret); - ok(!memcmp(&lf, &lf, FIELD_OFFSET(LOGFONTA, lfFaceName)), "%s: fonts don't match\n", test); + ok(!memcmp(lf, &getobj_lf, FIELD_OFFSET(LOGFONTA, lfFaceName)), "%s: fonts don't match\n", test); ok(!lstrcmpA(lf->lfFaceName, getobj_lf.lfFaceName), "%s: font names don't match: %s != %s\n", test, lf->lfFaceName, getobj_lf.lfFaceName); }

1 0

James Hawkins : msi: Add tests for the IniLocator part of the AppSearch action.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 3e76ade6c8a28ef77eb305aad9fe6123444e4a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e76ade6c8a28ef77eb305aad… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 13 03:57:22 2008 -0500 msi: Add tests for the IniLocator part of the AppSearch action. --- dlls/msi/tests/package.c | 234 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 234 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 870998d..803c9cd 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -470,6 +470,19 @@ static UINT create_complocator_table( MSIHANDLE hdb ) "PRIMARY KEY `Signature_`)" ); } +static UINT create_inilocator_table( MSIHANDLE hdb ) +{ + return run_query( hdb, + "CREATE TABLE `IniLocator` (" + "`Signature_` CHAR(72) NOT NULL, " + "`FileName` CHAR(255) NOT NULL, " + "`Section` CHAR(96)NOT NULL, " + "`Key` CHAR(128)NOT NULL, " + "`Field` SHORT, " + "`Type` SHORT " + "PRIMARY KEY `Signature_`)" ); +} + static UINT add_component_entry( MSIHANDLE hdb, const char *values ) { char insert[] = "INSERT INTO `Component` " @@ -706,6 +719,22 @@ static UINT add_complocator_entry( MSIHANDLE hdb, const char *values ) return r; } +static UINT add_inilocator_entry( MSIHANDLE hdb, const char *values ) +{ + char insert[] = "INSERT INTO `IniLocator` " + "(`Signature_`, `FileName`, `Section`, `Key`, `Field`, `Type`) " + "VALUES( %s )"; + char *query; + UINT sz, r; + + sz = strlen(values) + sizeof insert; + query = HeapAlloc(GetProcessHeap(),0,sz); + sprintf(query,insert,values); + r = run_query( hdb, query ); + HeapFree(GetProcessHeap(), 0, query); + return r; +} + static UINT set_summary_info(MSIHANDLE hdb) { UINT res; @@ -5985,6 +6014,210 @@ static void test_appsearch_complocator(void) DeleteFileA(msifile); } +static void delete_win_ini(LPCSTR file) +{ + CHAR path[MAX_PATH]; + + GetWindowsDirectoryA(path, MAX_PATH); + lstrcatA(path, "\\"); + lstrcatA(path, file); + + DeleteFileA(path); +} + +static void test_appsearch_inilocator(void) +{ + MSIHANDLE hpkg, hdb; + CHAR path[MAX_PATH]; + CHAR prop[MAX_PATH]; + LPCSTR str; + LPSTR ptr; + DWORD size; + UINT r; + + WritePrivateProfileStringA("Section", "Key", "keydata,field2", "IniFile.ini"); + + create_test_file("FileName1"); + sprintf(path, "%s\\FileName1", CURR_DIR); + WritePrivateProfileStringA("Section", "Key2", path, "IniFile.ini"); + + WritePrivateProfileStringA("Section", "Key3", CURR_DIR, "IniFile.ini"); + + sprintf(path, "%s\\IDontExist", CURR_DIR); + WritePrivateProfileStringA("Section", "Key4", path, "IniFile.ini"); + + hdb = create_package_db(); + ok(hdb, "Expected a valid database handle\n"); + + r = create_appsearch_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP1', 'NewSignature1'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP2', 'NewSignature2'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP3', 'NewSignature3'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP4', 'NewSignature4'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP5', 'NewSignature5'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP6', 'NewSignature6'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP7', 'NewSignature7'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP8', 'NewSignature8'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP9', 'NewSignature9'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = create_inilocator_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* msidbLocatorTypeRawValue, field 1 */ + str = "'NewSignature1', 'IniFile.ini', 'Section', 'Key', 1, 2"; + r = add_inilocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* msidbLocatorTypeRawValue, field 2 */ + str = "'NewSignature2', 'IniFile.ini', 'Section', 'Key', 2, 2"; + r = add_inilocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* msidbLocatorTypeRawValue, entire field */ + str = "'NewSignature3', 'IniFile.ini', 'Section', 'Key', 0, 2"; + r = add_inilocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* msidbLocatorTypeFile */ + str = "'NewSignature4', 'IniFile.ini', 'Section', 'Key2', 1, 1"; + r = add_inilocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* msidbLocatorTypeDirectory, file */ + str = "'NewSignature5', 'IniFile.ini', 'Section', 'Key2', 1, 0"; + r = add_inilocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* msidbLocatorTypeDirectory, directory */ + str = "'NewSignature6', 'IniFile.ini', 'Section', 'Key3', 1, 0"; + r = add_inilocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* msidbLocatorTypeFile, file, no signature */ + str = "'NewSignature7', 'IniFile.ini', 'Section', 'Key2', 1, 1"; + r = add_inilocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* msidbLocatorTypeFile, dir, no signature */ + str = "'NewSignature8', 'IniFile.ini', 'Section', 'Key3', 1, 1"; + r = add_inilocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* msidbLocatorTypeFile, file does not exist */ + str = "'NewSignature9', 'IniFile.ini', 'Section', 'Key4', 1, 1"; + r = add_inilocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = create_signature_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_signature_entry(hdb, "'NewSignature4', 'FileName1', '', '', '', '', '', '', ''"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_signature_entry(hdb, "'NewSignature9', 'IDontExist', '', '', '', '', '', '', ''"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + hpkg = package_from_db(hdb); + ok(hpkg, "Expected a valid package handle\n"); + + r = MsiDoAction(hpkg, "AppSearch"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "SIGPROP1", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(prop, "keydata"), "Expected \"keydata\", got \"%s\"\n", prop); + } + + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "SIGPROP2", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(prop, "field2"), "Expected \"field2\", got \"%s\"\n", prop); + } + + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "SIGPROP3", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(prop, "keydata,field2"), + "Expected \"keydata,field2\", got \"%s\"\n", prop); + + size = MAX_PATH; + sprintf(path, "%s\\FileName1", CURR_DIR); + r = MsiGetPropertyA(hpkg, "SIGPROP4", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + } + + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "SIGPROP5", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); + + size = MAX_PATH; + sprintf(path, "%s\\", CURR_DIR); + r = MsiGetPropertyA(hpkg, "SIGPROP6", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + } + + size = MAX_PATH; + sprintf(path, "%s\\", CURR_DIR); + r = MsiGetPropertyA(hpkg, "SIGPROP7", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + } + + size = MAX_PATH; + lstrcpyA(path, CURR_DIR); + ptr = strrchr(path, '\\'); + *(ptr + 1) = '\0'; + r = MsiGetPropertyA(hpkg, "SIGPROP8", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + } + + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "SIGPROP9", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); + + delete_win_ini("IniFile.ini"); + DeleteFileA("FileName1"); + MsiCloseHandle(hpkg); + DeleteFileA(msifile); +} + static void test_featureparents(void) { MSIHANDLE hpkg; @@ -8366,6 +8599,7 @@ START_TEST(package) test_removefiles(); test_appsearch(); test_appsearch_complocator(); + test_appsearch_inilocator(); test_featureparents(); test_installprops(); test_launchconditions();

1 0

James Hawkins : msi: Add tests for the DrLocator part of the AppSearch action.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 701c2a2728982d6278ed851e2e53976fe50909ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=701c2a2728982d6278ed851e2… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 13 03:57:29 2008 -0500 msi: Add tests for the DrLocator part of the AppSearch action. --- dlls/msi/tests/package.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 182 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c585cae..e52c931 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -6672,6 +6672,187 @@ static void test_appsearch_inilocator(void) DeleteFileA(msifile); } +static void test_appsearch_drlocator(void) +{ + MSIHANDLE hpkg, hdb; + CHAR path[MAX_PATH]; + CHAR prop[MAX_PATH]; + LPCSTR str; + DWORD size; + UINT r; + + create_test_file("FileName1"); + CreateDirectoryA("one", NULL); + CreateDirectoryA("one\\two", NULL); + CreateDirectoryA("one\\two\\three", NULL); + create_test_file("one\\two\\three\\FileName2"); + CreateDirectoryA("another", NULL); + + hdb = create_package_db(); + ok(hdb, "Expected a valid database handle\n"); + + r = create_appsearch_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP1', 'NewSignature1'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP2', 'NewSignature2'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP3', 'NewSignature3'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP4', 'NewSignature4'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP5', 'NewSignature5'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP6', 'NewSignature6'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP7', 'NewSignature7'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = create_drlocator_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* no parent, full path, depth 0, signature */ + sprintf(path, "'NewSignature1', '', '%s', 0", CURR_DIR); + r = add_drlocator_entry(hdb, path); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* no parent, full path, depth 0, no signature */ + sprintf(path, "'NewSignature2', '', '%s', 0", CURR_DIR); + r = add_drlocator_entry(hdb, path); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* no parent, relative path, depth 0, no signature */ + sprintf(path, "'NewSignature3', '', '%s', 0", CURR_DIR + 3); + r = add_drlocator_entry(hdb, path); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* no parent, full path, depth 2, signature */ + sprintf(path, "'NewSignature4', '', '%s', 2", CURR_DIR); + r = add_drlocator_entry(hdb, path); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* no parent, full path, depth 3, signature */ + sprintf(path, "'NewSignature5', '', '%s', 3", CURR_DIR); + r = add_drlocator_entry(hdb, path); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* no parent, full path, depth 1, signature is dir */ + sprintf(path, "'NewSignature6', '', '%s', 1", CURR_DIR); + r = add_drlocator_entry(hdb, path); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* parent is in DrLocator, relative path, depth 0, signature */ + sprintf(path, "'NewSignature7', 'NewSignature1', 'one\\two\\three', 1"); + r = add_drlocator_entry(hdb, path); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = create_signature_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + str = "'NewSignature1', 'FileName1', '', '', '', '', '', '', ''"; + r = add_signature_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + str = "'NewSignature4', 'FileName2', '', '', '', '', '', '', ''"; + r = add_signature_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + str = "'NewSignature5', 'FileName2', '', '', '', '', '', '', ''"; + r = add_signature_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + str = "'NewSignature6', 'another', '', '', '', '', '', '', ''"; + r = add_signature_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + str = "'NewSignature7', 'FileName2', '', '', '', '', '', '', ''"; + r = add_signature_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + hpkg = package_from_db(hdb); + ok(hpkg, "Expected a valid package handle\n"); + + r = MsiDoAction(hpkg, "AppSearch"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + sprintf(path, "%s\\FileName1", CURR_DIR); + r = MsiGetPropertyA(hpkg, "SIGPROP1", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + } + + size = MAX_PATH; + sprintf(path, "%s\\", CURR_DIR); + r = MsiGetPropertyA(hpkg, "SIGPROP2", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + } + + size = MAX_PATH; + sprintf(path, "%s\\", CURR_DIR); + r = MsiGetPropertyA(hpkg, "SIGPROP3", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + } + + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "SIGPROP4", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); + } + + size = MAX_PATH; + sprintf(path, "%s\\one\\two\\three\\FileName2", CURR_DIR); + r = MsiGetPropertyA(hpkg, "SIGPROP5", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + } + + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "SIGPROP6", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); + } + + size = MAX_PATH; + sprintf(path, "%s\\one\\two\\three\\FileName2", CURR_DIR); + r = MsiGetPropertyA(hpkg, "SIGPROP7", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + } + + DeleteFileA("FileName1"); + DeleteFileA("one\\two\\three\\FileName2"); + RemoveDirectoryA("one\\two\\three"); + RemoveDirectoryA("one\\two"); + RemoveDirectoryA("one"); + RemoveDirectoryA("another"); + MsiCloseHandle(hpkg); + DeleteFileA(msifile); +} + static void test_featureparents(void) { MSIHANDLE hpkg; @@ -9055,6 +9236,7 @@ START_TEST(package) test_appsearch_complocator(); test_appsearch_reglocator(); test_appsearch_inilocator(); + test_appsearch_drlocator(); test_featureparents(); test_installprops(); test_launchconditions();

1 0

Detlef Riekenberg : d3d9/tests: Fix test on win9x.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: c27b37a77ecaed5d12820284c70ce70cea39cecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27b37a77ecaed5d12820284c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 13 01:47:46 2008 +0200 d3d9/tests: Fix test on win9x. --- dlls/d3d9/tests/device.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index cd57772..3cafce2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -122,8 +122,11 @@ static void test_mipmap_levels(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(SUCCEEDED(hr), "Failed to create IDirect3D9Device (%08x)\n", hr); - if (FAILED(hr)) goto cleanup; + ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE, "Failed to create IDirect3D9Device (%08x)\n", hr); + if (FAILED(hr)) { + skip("failed to create a d3d device\n"); + goto cleanup; + } check_mipmap_levels(pDevice, 32, 32, 6); check_mipmap_levels(pDevice, 256, 1, 9);

1 0

Detlef Riekenberg : d3d8/tests: Fix test on win9x with broken driver.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 38abbe3d607f03c3b70e06897bc4c5f7059f2c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38abbe3d607f03c3b70e06897… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 13 01:33:13 2008 +0200 d3d8/tests: Fix test on win9x with broken driver. --- dlls/d3d8/tests/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fbbdf1d..439267d 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1190,7 +1190,8 @@ static void test_lights(void) hr = IDirect3DDevice8_LightEnable(device, i, TRUE); ok(hr == D3D_OK, "Enabling light %u failed with %08x\n", i, hr); hr = IDirect3DDevice8_GetLightEnable(device, i, &enabled); - ok(hr == D3D_OK, "GetLightEnable on light %u failed with %08x\n", i, hr); + ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), + "GetLightEnable on light %u failed with %08x\n", i, hr); ok(enabled, "Light %d is %s\n", i, enabled ? "enabled" : "disabled"); }

1 0