October 2008 - Wine-Commits

James Hawkins : msi: Simplify and clean up ACTION_RecurseSearchDirectory.
by Alexandre Julliard Oct. 20, 2008

Oct. 20, 2008

Module: wine Branch: master Commit: 2e17638dc4f63c03ac1f70908dd39ae6e801f392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e17638dc4f63c03ac1f70908… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:20:10 2008 -0500 msi: Simplify and clean up ACTION_RecurseSearchDirectory. --- dlls/msi/appsearch.c | 97 +++++++++++++++++++++++++------------------------ 1 files changed, 49 insertions(+), 48 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index d72edda..e2f03c6 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -727,13 +727,16 @@ static UINT ACTION_FileMatchesSig(const MSISIGNATURE *sig, static UINT ACTION_RecurseSearchDirectory(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATURE *sig, LPCWSTR dir, int depth) { - static const WCHAR starDotStarW[] = { '*','.','*',0 }; + HANDLE hFind; + WIN32_FIND_DATAW findData; UINT rc = ERROR_SUCCESS; size_t dirLen = lstrlenW(dir), fileLen = lstrlenW(sig->File); WCHAR *buf; + static const WCHAR starDotStarW[] = { '*','.','*',0 }; + TRACE("Searching directory %s for file %s, depth %d\n", debugstr_w(dir), - debugstr_w(sig->File), depth); + debugstr_w(sig->File), depth); if (depth < 0) return ERROR_INVALID_PARAMETER; @@ -744,62 +747,60 @@ static UINT ACTION_RecurseSearchDirectory(MSIPACKAGE *package, LPWSTR *appValue, * isn't backslash-terminated. */ buf = msi_alloc( (dirLen + max(fileLen, lstrlenW(starDotStarW)) + 2) * sizeof(WCHAR)); - if (buf) + if (!buf) + return ERROR_OUTOFMEMORY; + + lstrcpyW(buf, dir); + PathAddBackslashW(buf); + lstrcatW(buf, sig->File); + + hFind = FindFirstFileW(buf, &findData); + if (hFind != INVALID_HANDLE_VALUE) { - /* a depth of 0 implies we should search dir, so go ahead and search */ - HANDLE hFind; - WIN32_FIND_DATAW findData; - - memcpy(buf, dir, dirLen * sizeof(WCHAR)); - if (buf[dirLen - 1] != '\\') - buf[dirLen++ - 1] = '\\'; - memcpy(buf + dirLen, sig->File, (fileLen + 1) * sizeof(WCHAR)); + BOOL matches; + + /* assuming Signature can't contain wildcards for the file name, + * so don't bother with FindNextFileW here. + */ + rc = ACTION_FileMatchesSig(sig, &findData, buf, &matches); + if (rc == ERROR_SUCCESS && matches) + { + TRACE("found file, returning %s\n", debugstr_w(buf)); + *appValue = buf; + } + + FindClose(hFind); + } + + if (rc == ERROR_SUCCESS && !*appValue && depth > 0) + { + lstrcpyW(buf, dir); + PathAddBackslashW(buf); + lstrcatW(buf, starDotStarW); + hFind = FindFirstFileW(buf, &findData); if (hFind != INVALID_HANDLE_VALUE) { - BOOL matches; + if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + rc = ACTION_RecurseSearchDirectory(package, appValue, sig, + findData.cFileName, + depth - 1); - /* assuming Signature can't contain wildcards for the file name, - * so don't bother with FindNextFileW here. - */ - if (!(rc = ACTION_FileMatchesSig(sig, &findData, buf, &matches)) - && matches) - { - TRACE("found file, returning %s\n", debugstr_w(buf)); - *appValue = buf; - } - FindClose(hFind); - } - if (rc == ERROR_SUCCESS && !*appValue && depth > 0) - { - HANDLE hFind; - WIN32_FIND_DATAW findData; - - memcpy(buf, dir, dirLen * sizeof(WCHAR)); - if (buf[dirLen - 1] != '\\') - buf[dirLen++ - 1] = '\\'; - lstrcpyW(buf + dirLen, starDotStarW); - hFind = FindFirstFileW(buf, &findData); - if (hFind != INVALID_HANDLE_VALUE) + while (rc == ERROR_SUCCESS && !*appValue && + FindNextFileW(hFind, &findData) != 0) { if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - rc = ACTION_RecurseSearchDirectory(package, appValue, sig, - findData.cFileName, depth - 1); - while (rc == ERROR_SUCCESS && !*appValue && - FindNextFileW(hFind, &findData) != 0) - { - if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - rc = ACTION_RecurseSearchDirectory(package, appValue, - sig, findData.cFileName, depth - 1); - } - FindClose(hFind); + rc = ACTION_RecurseSearchDirectory(package, appValue, + sig, findData.cFileName, + depth - 1); } + + FindClose(hFind); } - if (!*appValue) - msi_free(buf); } - else - rc = ERROR_OUTOFMEMORY; + + if (!*appValue) + msi_free(buf); return rc; }

1 0

James Hawkins : msi: Handle searching for directories in the IniLocator part of the AppSearch action .
by Alexandre Julliard Oct. 20, 2008

Oct. 20, 2008

Module: wine Branch: master Commit: 29c0836fcc7b3c7ea99f3cb1d5b2f30007a99b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c0836fcc7b3c7ea99f3cb1d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:20:06 2008 -0500 msi: Handle searching for directories in the IniLocator part of the AppSearch action. --- dlls/msi/appsearch.c | 2 +- dlls/msi/tests/package.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 6d92886..d72edda 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -539,7 +539,7 @@ static UINT ACTION_AppSearchIni(MSIPACKAGE *package, LPWSTR *appValue, switch (type & 0x0f) { case msidbLocatorTypeDirectory: - FIXME("unimplemented for Directory (%s)\n", debugstr_w(buf)); + ACTION_SearchDirectory(package, sig, buf, 0, appValue); break; case msidbLocatorTypeFileName: *appValue = app_search_file(buf, sig); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a243957..e9a9bb0 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -6935,10 +6935,7 @@ static void test_appsearch_inilocator(void) 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); - } + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; sprintf(path, "%s\\", CURR_DIR);

1 0

James Hawkins : msi: Handle searching for a file with no signature.
by Alexandre Julliard Oct. 20, 2008

Oct. 20, 2008

Module: wine Branch: master Commit: c48497d0e665a3deb3393bc1ffee65b9aeb733d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48497d0e665a3deb3393bc1f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:19:57 2008 -0500 msi: Handle searching for a file with no signature. --- dlls/msi/appsearch.c | 13 +++++++++++++ dlls/msi/tests/package.c | 25 +++++-------------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 31a1f5d..6d92886 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -164,6 +164,19 @@ static LPWSTR app_search_file(LPWSTR path, MSISIGNATURE *sig) static const WCHAR root[] = {'\\',0}; + if (!sig->File) + { + PathRemoveFileSpecW(path); + PathAddBackslashW(path); + + attr = GetFileAttributesW(path); + if (attr != INVALID_FILE_ATTRIBUTES && + (attr & FILE_ATTRIBUTE_DIRECTORY)) + return strdupW(path); + + return NULL; + } + attr = GetFileAttributesW(path); if (attr == INVALID_FILE_ATTRIBUTES || attr == FILE_ATTRIBUTE_DIRECTORY) return NULL; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 4225af8..a243957 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -6594,10 +6594,7 @@ static void test_appsearch_reglocator(void) sprintf(path, "%s\\", CURR_DIR); r = MsiGetPropertyA(hpkg, "SIGPROP11", 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, "SIGPROP12", prop, &size); @@ -6672,19 +6669,13 @@ static void test_appsearch_reglocator(void) *ptr = '\0'; r = MsiGetPropertyA(hpkg, "SIGPROP24", 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); r = MsiGetPropertyA(hpkg, "SIGPROP25", 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, "SIGPROP26", prop, &size); @@ -6953,10 +6944,7 @@ static void test_appsearch_inilocator(void) 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); - } + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; lstrcpyA(path, CURR_DIR); @@ -6964,10 +6952,7 @@ static void test_appsearch_inilocator(void) *(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); - } + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP9", prop, &size);

1 0

James Hawkins : msi: Add more tests for the RegLocator part of the AppSearch action.
by Alexandre Julliard Oct. 20, 2008

Oct. 20, 2008

Module: wine Branch: master Commit: 326a1b6c4734540952633b99349d7f1f5b994784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=326a1b6c4734540952633b993… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:19:49 2008 -0500 msi: Add more tests for the RegLocator part of the AppSearch action. --- dlls/msi/tests/package.c | 97 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 91 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a900b73..4225af8 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -6149,6 +6149,7 @@ static void test_appsearch_reglocator(void) HKEY hklm, classes; HKEY hkcu, users; LPCSTR str; + LPSTR ptr; LONG res; UINT r; @@ -6328,6 +6329,21 @@ static void test_appsearch_reglocator(void) r = add_appsearch_entry(hdb, "'SIGPROP23', 'NewSignature23'"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = add_appsearch_entry(hdb, "'SIGPROP24', 'NewSignature24'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP25', 'NewSignature25'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP26', 'NewSignature26'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP27', 'NewSignature27'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP28', 'NewSignature28'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = create_reglocator_table(hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -6371,12 +6387,12 @@ static void test_appsearch_reglocator(void) r = add_reglocator_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - /* HKLM, msidbLocatorTypeFileName, file exists */ + /* HKLM, msidbLocatorTypeFileName, signature, file exists */ str = "'NewSignature9', 2, 'Software\\Wine', 'Value9', 1"; r = add_reglocator_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - /* HKLM, msidbLocatorTypeFileName, file does not exist */ + /* HKLM, msidbLocatorTypeFileName, signature, file does not exist */ str = "'NewSignature10', 2, 'Software\\Wine', 'Value10', 1"; r = add_reglocator_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -6386,17 +6402,17 @@ static void test_appsearch_reglocator(void) r = add_reglocator_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - /* HKLM, msidbLocatorTypeDirectory, file exists */ + /* HKLM, msidbLocatorTypeDirectory, no signature, file exists */ str = "'NewSignature12', 2, 'Software\\Wine', 'Value9', 0"; r = add_reglocator_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - /* HKLM, msidbLocatorTypeDirectory, directory */ + /* HKLM, msidbLocatorTypeDirectory, no signature, directory exists */ str = "'NewSignature13', 2, 'Software\\Wine', 'Value11', 0"; r = add_reglocator_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - /* HKLM, msidbLocatorTypeDirectory, file exists, with signature */ + /* HKLM, msidbLocatorTypeDirectory, signature, file exists */ str = "'NewSignature14', 2, 'Software\\Wine', 'Value9', 0"; r = add_reglocator_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -6431,7 +6447,7 @@ static void test_appsearch_reglocator(void) r = add_reglocator_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - /* HKLM, msidbLocatorTypeFileName, file exists w/ version, signature */ + /* HKLM, msidbLocatorTypeFileName, signature, file exists w/ version */ str = "'NewSignature21', 2, 'Software\\Wine', 'Value13', 1"; r = add_reglocator_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -6446,6 +6462,31 @@ static void test_appsearch_reglocator(void) r = add_reglocator_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + /* HKLM, msidbLocatorTypeFileName, no signature, directory exists */ + str = "'NewSignature24', 2, 'Software\\Wine', 'Value11', 1"; + r = add_reglocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* HKLM, msidbLocatorTypeFileName, no signature, file does not exist */ + str = "'NewSignature25', 2, 'Software\\Wine', 'Value10', 1"; + r = add_reglocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* HKLM, msidbLocatorTypeDirectory, signature, directory exists */ + str = "'NewSignature26', 2, 'Software\\Wine', 'Value11', 0"; + r = add_reglocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* HKLM, msidbLocatorTypeDirectory, signature, file does not exist */ + str = "'NewSignature27', 2, 'Software\\Wine', 'Value10', 0"; + r = add_reglocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* HKLM, msidbLocatorTypeDirectory, no signature, file does not exist */ + str = "'NewSignature28', 2, 'Software\\Wine', 'Value10', 0"; + r = add_reglocator_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); @@ -6473,6 +6514,15 @@ static void test_appsearch_reglocator(void) r = add_signature_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ptr = strrchr(CURR_DIR, '\\') + 1; + sprintf(path, "'NewSignature26', '%s', '', '', '', '', '', '', ''", ptr); + r = add_signature_entry(hdb, path); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + str = "'NewSignature27', '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"); @@ -6616,6 +6666,41 @@ static void test_appsearch_reglocator(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + size = MAX_PATH; + lstrcpyA(path, CURR_DIR); + ptr = strrchr(path, '\\') + 1; + *ptr = '\0'; + r = MsiGetPropertyA(hpkg, "SIGPROP24", 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, "SIGPROP25", 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, "SIGPROP26", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); + + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "SIGPROP27", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); + + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "SIGPROP28", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); + RegSetValueA(hklm, NULL, REG_SZ, "", 0); RegDeleteValueA(hklm, "Value1"); RegDeleteValueA(hklm, "Value2");

1 0

James Hawkins : msi: Check the file version when a version is provided in the signature.
by Alexandre Julliard Oct. 20, 2008

Oct. 20, 2008

Module: wine Branch: master Commit: 859bd01b5e0d492808721570c5d77b247782f31e URL: http://source.winehq.org/git/wine.git/?a=commit;h=859bd01b5e0d492808721570c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:19:30 2008 -0500 msi: Check the file version when a version is provided in the signature. --- dlls/msi/appsearch.c | 60 +++++++++++++++++++++++++++++++++++++++++++-- dlls/msi/tests/package.c | 35 +++++++------------------- 2 files changed, 67 insertions(+), 28 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 247cee0..31a1f5d 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -155,6 +155,60 @@ static void ACTION_FreeSignature(MSISIGNATURE *sig) msi_free(sig->Languages); } +static LPWSTR app_search_file(LPWSTR path, MSISIGNATURE *sig) +{ + VS_FIXEDFILEINFO *info; + DWORD attr, handle, size; + LPWSTR val = NULL; + LPBYTE buffer; + + static const WCHAR root[] = {'\\',0}; + + attr = GetFileAttributesW(path); + if (attr == INVALID_FILE_ATTRIBUTES || attr == FILE_ATTRIBUTE_DIRECTORY) + return NULL; + + size = GetFileVersionInfoSizeW(path, &handle); + if (!size) + return strdupW(path); + + buffer = msi_alloc(size); + if (!buffer) + return NULL; + + if (!GetFileVersionInfoW(path, 0, size, buffer)) + goto done; + + if (!VerQueryValueW(buffer, root, (LPVOID)&info, &size) || !info) + goto done; + + if (sig->MinVersionLS || sig->MinVersionMS) + { + if (info->dwFileVersionMS < sig->MinVersionMS) + goto done; + + if (info->dwFileVersionMS == sig->MinVersionMS && + info->dwFileVersionLS < sig->MinVersionLS) + goto done; + } + + if (sig->MaxVersionLS || sig->MaxVersionMS) + { + if (info->dwFileVersionMS > sig->MaxVersionMS) + goto done; + + if (info->dwFileVersionMS == sig->MaxVersionMS && + info->dwFileVersionLS > sig->MaxVersionLS) + goto done; + } + + val = strdupW(path); + +done: + msi_free(buffer); + return val; +} + static UINT ACTION_AppSearchComponents(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATURE *sig) { static const WCHAR query[] = { @@ -211,7 +265,7 @@ static UINT ACTION_AppSearchComponents(MSIPACKAGE *package, LPWSTR *appValue, MS if (type != msidbLocatorTypeDirectory && sigpresent && !isdir) { - *appValue = strdupW(path); + *appValue = app_search_file(path, sig); } else if (!sigpresent && (type != msidbLocatorTypeDirectory || isdir)) { @@ -383,7 +437,7 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT rc = ACTION_SearchDirectory(package, sig, (LPWSTR)value, 0, appValue); break; case msidbLocatorTypeFileName: - *appValue = strdupW((LPWSTR)value); + *appValue = app_search_file((LPWSTR)value, sig); break; case msidbLocatorTypeRawValue: ACTION_ConvertRegValue(regType, value, sz, appValue); @@ -475,7 +529,7 @@ static UINT ACTION_AppSearchIni(MSIPACKAGE *package, LPWSTR *appValue, FIXME("unimplemented for Directory (%s)\n", debugstr_w(buf)); break; case msidbLocatorTypeFileName: - FIXME("unimplemented for File (%s)\n", debugstr_w(buf)); + *appValue = app_search_file(buf, sig); break; case msidbLocatorTypeRawValue: *appValue = get_ini_field(buf, field); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index fcb1969..a900b73 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5840,7 +5840,10 @@ static void test_appsearch(void) r = MsiGetPropertyA( hpkg, "WEBBROWSERPROG", prop, &size ); ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); - ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + todo_wine + { + ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + } MsiCloseHandle( hpkg ); DeleteFileA(msifile); @@ -6093,10 +6096,7 @@ static void test_appsearch_complocator(void) size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP11", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); - } + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; sprintf(path, "%s\\FileName10.dll", CURR_DIR); @@ -6538,10 +6538,7 @@ static void test_appsearch_reglocator(void) size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP10", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); - } + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; sprintf(path, "%s\\", CURR_DIR); @@ -6611,10 +6608,7 @@ static void test_appsearch_reglocator(void) size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP22", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); - } + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; sprintf(path, "%s\\FileName5.dll", CURR_DIR); @@ -6854,10 +6848,7 @@ static void test_appsearch_inilocator(void) 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); - } + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP5", prop, &size); @@ -6902,10 +6893,7 @@ static void test_appsearch_inilocator(void) sprintf(path, "%s\\FileName2.dll", CURR_DIR); r = MsiGetPropertyA(hpkg, "SIGPROP10", 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, "SIGPROP11", prop, &size); @@ -6916,10 +6904,7 @@ static void test_appsearch_inilocator(void) sprintf(path, "%s\\FileName4.dll", CURR_DIR); r = MsiGetPropertyA(hpkg, "SIGPROP12", 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); delete_win_ini("IniFile.ini"); DeleteFileA("FileName1");

1 0

James Hawkins : msi: Add more tests for the AppSearch action.
by Alexandre Julliard Oct. 20, 2008

Oct. 20, 2008

Module: wine Branch: master Commit: fbba2e8b9393fca532ba387d324cd9791fca5751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbba2e8b9393fca532ba387d3… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:19:26 2008 -0500 msi: Add more tests for the AppSearch action. --- dlls/msi/tests/package.c | 348 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 347 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbba2e8b9393fca532ba3…

1 0

James Hawkins : msi: Return the requested ini field.
by Alexandre Julliard Oct. 20, 2008

Oct. 20, 2008

Module: wine Branch: master Commit: 642cddf1806e95167c053e929f148dca0562430f URL: http://source.winehq.org/git/wine.git/?a=commit;h=642cddf1806e95167c053e929… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:19:22 2008 -0500 msi: Return the requested ini field. --- dlls/msi/appsearch.c | 28 +++++++++++++++++++++++++++- dlls/msi/tests/package.c | 10 ++-------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index b335946..247cee0 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -405,6 +405,32 @@ end: return ERROR_SUCCESS; } +static LPWSTR get_ini_field(LPWSTR buf, int field) +{ + LPWSTR beg, end; + int i = 1; + + if (field == 0) + return strdupW(buf); + + beg = buf; + while ((end = strchrW(beg, ',')) && i < field) + { + beg = end + 1; + while (*beg && *beg == ' ') + beg++; + + i++; + } + + end = strchrW(beg, ','); + if (!end) + end = beg + lstrlenW(beg); + + *end = '\0'; + return strdupW(beg); +} + static UINT ACTION_AppSearchIni(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATURE *sig) { @@ -452,7 +478,7 @@ static UINT ACTION_AppSearchIni(MSIPACKAGE *package, LPWSTR *appValue, FIXME("unimplemented for File (%s)\n", debugstr_w(buf)); break; case msidbLocatorTypeRawValue: - *appValue = strdupW(buf); + *appValue = get_ini_field(buf, field); break; } } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index b6b3a78..fd9c58f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -6584,18 +6584,12 @@ static void test_appsearch_inilocator(void) 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); - } + 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); - } + ok(!lstrcmpA(prop, "field2"), "Expected \"field2\", got \"%s\"\n", prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP3", prop, &size);

1 0

Hans Leidekker : cryptui: Add a partial implementation of CryptUIWizImport.
by Alexandre Julliard Oct. 20, 2008

Oct. 20, 2008

Module: wine Branch: master Commit: d0baa50681263d5a03eb2d67cf07a0a79eaa170c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0baa50681263d5a03eb2d67c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 20 10:16:45 2008 +0200 cryptui: Add a partial implementation of CryptUIWizImport. This is just enough to make importing a certificate in Outlook 2007 work. --- dlls/cryptui/Makefile.in | 2 +- dlls/cryptui/cryptui.spec | 2 +- dlls/cryptui/main.c | 73 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in index 996711a..abb0b27 100644 --- a/dlls/cryptui/Makefile.in +++ b/dlls/cryptui/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cryptui.dll -IMPORTS = kernel32 +IMPORTS = crypt32 kernel32 IMPORTLIB = cryptui C_SRCS = \ diff --git a/dlls/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec index 088d087..201282f 100644 --- a/dlls/cryptui/cryptui.spec +++ b/dlls/cryptui/cryptui.spec @@ -34,7 +34,7 @@ 34 stub CryptUIWizExport 35 stub CryptUIWizFreeCertRequestNoDS 36 stub CryptUIWizFreeDigitalSignContext -37 stub CryptUIWizImport +37 stdcall CryptUIWizImport(long ptr wstr ptr ptr) 38 stub CryptUIWizQueryCertRequestNoDS 39 stub CryptUIWizSubmitCertRequestNoDS 40 stub DllRegisterServer diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 00e8683..0aab87e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -98,3 +98,76 @@ BOOL WINAPI CryptUIDlgViewCertificateW(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertVi if (pfPropertiesChanged) *pfPropertiesChanged = FALSE; return TRUE; } + +BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, + PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc, HCERTSTORE hDestCertStore) +{ + static const WCHAR Root[] = {'R','o','o','t',0}; + BOOL ret; + HANDLE file; + HCERTSTORE store; + BYTE *buffer; + DWORD size, encoding = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; + const CERT_CONTEXT *cert; + + TRACE("(0x%08x, %p, %s, %p, %p)\n", dwFlags, hwndParent, debugstr_w(pwszWizardTitle), + pImportSrc, hDestCertStore); + + FIXME("only certificate files are supported\n"); + + if (!(dwFlags & CRYPTUI_WIZ_NO_UI)) FIXME("UI not implemented\n"); + + if (pImportSrc->dwSubjectChoice != CRYPTUI_WIZ_IMPORT_SUBJECT_FILE) + { + FIXME("source type not implemented: %u\n", pImportSrc->dwSubjectChoice); + return FALSE; + } + file = CreateFileW(pImportSrc->pwszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, 0, NULL); + if (file == INVALID_HANDLE_VALUE) + { + WARN("can't open certificate file %s\n", debugstr_w(pImportSrc->pwszFileName)); + return FALSE; + } + if ((size = GetFileSize(file, NULL))) + { + if ((buffer = HeapAlloc(GetProcessHeap(), 0, size))) + { + DWORD read; + if (!ReadFile(file, buffer, size, &read, NULL) || read != size) + { + WARN("can't read certificate file %s\n", debugstr_w(pImportSrc->pwszFileName)); + HeapFree(GetProcessHeap(), 0, buffer); + CloseHandle(file); + return FALSE; + } + } + } + else + { + WARN("empty file %s\n", debugstr_w(pImportSrc->pwszFileName)); + CloseHandle(file); + return FALSE; + } + CloseHandle(file); + if (!(cert = CertCreateCertificateContext(encoding, buffer, size))) + { + WARN("unable to create certificate context\n"); + HeapFree(GetProcessHeap(), 0, buffer); + return FALSE; + } + /* FIXME: verify certificate and determine store name dynamically */ + if (!(store = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, Root))) + { + WARN("unable to open certificate store\n"); + CertFreeCertificateContext(cert); + HeapFree(GetProcessHeap(), 0, buffer); + return FALSE; + } + ret = CertAddCertificateContextToStore(store, cert, CERT_STORE_ADD_REPLACE_EXISTING, NULL); + + CertCloseStore(store, 0); + CertFreeCertificateContext(cert); + HeapFree(GetProcessHeap(), 0, buffer); + return ret; +}

1 0

James Hawkins : msi: Pass the correct view to get_row.
by Alexandre Julliard Oct. 20, 2008

Oct. 20, 2008

Module: wine Branch: master Commit: f1e2041bf451cfdb853821904054aa0fa04c1bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1e2041bf451cfdb853821904… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:19:18 2008 -0500 msi: Pass the correct view to get_row. --- dlls/msi/where.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 28f115e..65f1be9 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -180,7 +180,7 @@ static UINT WHERE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) if (r != ERROR_SUCCESS) return r; - return wv->table->ops->get_row(view, row, rec); + return wv->table->ops->get_row(wv->table, row, rec); } static UINT WHERE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask )

1 0

Dmitry Timoshkov : user32: Fix a typo.
by Alexandre Julliard Oct. 20, 2008

Oct. 20, 2008

Module: wine Branch: master Commit: d6544f041b4e929626ee1b2ecf09338ebc463d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6544f041b4e929626ee1b2ec… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 20 08:26:52 2008 +0900 user32: Fix a typo. --- dlls/user32/tests/win.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 1b9d729..76ca103 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5091,7 +5091,7 @@ static void test_fullscreen(void) } } - UnregisterClass("MinMax_WndClass", GetModuleHandle(0)); + UnregisterClass("fullscreen_class", GetModuleHandle(0)); } START_TEST(win)

1 0